diff --git a/mlWechatOpen/pom.xml b/mlWechatOpen/pom.xml index 03fabc8..c12a924 100644 --- a/mlWechatOpen/pom.xml +++ b/mlWechatOpen/pom.xml @@ -71,6 +71,7 @@ com.squareup.okio, com.sun, com.sun.mail, + com.sun.xml.messaging.saaj, com.thoughtworks.xstream, com.zaxxer, commons-beanutils, @@ -112,6 +113,7 @@ org.checkerframework, org.crazycake, org.dom4j, + org.glassfish, org.flowable, org.hibernate.validator, org.jasypt, diff --git a/mlWechatOpen/src/main/java/com/iformall/config/ShiroConfig.java b/mlWechatOpen/src/main/java/com/iformall/config/ShiroConfig.java index 24db6fe..62e95a6 100644 --- a/mlWechatOpen/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mlWechatOpen/src/main/java/com/iformall/config/ShiroConfig.java @@ -154,7 +154,7 @@ public class ShiroConfig { } @Bean - public SecurityManager securityManager(@Qualifier("myRetryLimitCredentialsMatcher") MyRetryLimitCredentialsMatcher matcher) { + public SecurityManager securityManager(@Qualifier("retryLimitCredentialsMatcher") MyRetryLimitCredentialsMatcher matcher) { DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager(); //设置realm. securityManager.setRealm(myShiroRealm(matcher)); @@ -181,7 +181,7 @@ public class ShiroConfig { * * @return */ - @Bean(name = "myRetryLimitCredentialsMatcher") + @Bean(name = "retryLimitCredentialsMatcher") public MyRetryLimitCredentialsMatcher hashedCredentialsMatcher() { MyRetryLimitCredentialsMatcher hashedCredentialsMatcher = new MyRetryLimitCredentialsMatcher(); diff --git a/pom.xml b/pom.xml index be988f6..9a2023d 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.7.RELEASE + 2.1.4.RELEASE @@ -266,13 +266,6 @@ 2.6 - - - cn.afterturn - easypoi-spring-boot-starter - 4.0.0 - - com.squareup.okhttp3