diff --git a/pom.xml b/pom.xml index 1aa7cff..c5fd24c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.ynxbd wx - 6.2.1 + 6.3.2 war wx Maven Webapp @@ -60,8 +60,6 @@ compile - - org.ehcache ehcache @@ -212,7 +210,7 @@ org.apache.pdfbox pdfbox - 2.0.25 + 2.0.35 commons-logging @@ -224,7 +222,7 @@ org.apache.poi poi - 5.5.0 + 5.5.1 commons-io @@ -234,13 +232,17 @@ log4j-api org.apache.logging.log4j + + commons-codec + commons-codec + org.apache.poi poi-ooxml - 5.5.0 + 5.5.1 commons-io @@ -261,7 +263,7 @@ org.dom4j dom4j - 2.1.4 + 2.1.5 @@ -275,7 +277,7 @@ jaxen jaxen - 1.2.0 + 2.0.0 @@ -295,7 +297,7 @@ eu.agno3.jcifs jcifs-ng - 2.1.6 + 2.1.10 slf4j-api @@ -308,59 +310,15 @@ com.google.zxing core - 3.4.1 + 3.5.4 - - com.aliyun - aliyun-java-sdk-core - 4.6.0 - - - slf4j-api - org.slf4j - - - commons-lang3 - org.apache.commons - - - bcprov-jdk15on - org.bouncycastle - - - org.jacoco.agent - org.jacoco - - - commons-codec - commons-codec - - - jaxb-runtime - org.glassfish.jaxb - - - gson - com.google.code.gson - - - httpcore - org.apache.httpcomponents - - - commons-logging - commons-logging - - - httpclient - org.apache.httpcomponents - - + cn.hutool + hutool-all + 5.8.41 - com.alibaba druid @@ -377,7 +335,7 @@ org.mariadb.jdbc mariadb-java-client - 3.0.8 + 3.0.11 @@ -390,7 +348,7 @@ net.coobird thumbnailator - 0.4.15 + 0.4.21 @@ -438,6 +396,55 @@ + + + com.aliyun + aliyun-java-sdk-core + 4.6.0 + + + slf4j-api + org.slf4j + + + commons-lang3 + org.apache.commons + + + bcprov-jdk15on + org.bouncycastle + + + org.jacoco.agent + org.jacoco + + + commons-codec + commons-codec + + + jaxb-runtime + org.glassfish.jaxb + + + gson + com.google.code.gson + + + httpcore + org.apache.httpcomponents + + + commons-logging + commons-logging + + + httpclient + org.apache.httpcomponents + + + + com.baidu.aip @@ -459,12 +466,6 @@ - - cn.hutool - hutool-all - 5.8.41 - - com.tencent healthcard diff --git a/src/main/java/com/ynxbd/common/action/test/TestAction.java b/src/main/java/com/ynxbd/common/action/test/TestAction.java index 5391d21..32b9f5d 100644 --- a/src/main/java/com/ynxbd/common/action/test/TestAction.java +++ b/src/main/java/com/ynxbd/common/action/test/TestAction.java @@ -99,9 +99,9 @@ public class TestAction extends BaseAction { } - @Action("testLog") - public Result testLog() throws ServiceException { - log.info("testLog====="); + @Action("log_test") + public Result log_test() throws ServiceException { + log.warn("log_test====="); return Result.success(); }