From dd0047a9295e5688d55239135aa1952516d57ae3 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 25 Dec 2019 11:44:36 +0800 Subject: [PATCH] =?UTF-8?q?[WxJava][=E5=8D=87=E7=BA=A7]:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/config/ShiroConfig.java | 9 ++++----- .../src/main/java/com/iformall/config/WebConfig.java | 4 ++-- .../java/com/iformall/schedule/MsgReSendSchedule.java | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java index 8fe04734d..71ad373c3 100644 --- a/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java @@ -160,10 +160,10 @@ public class ShiroConfig { } @Bean - public SecurityManager securityManager(@Qualifier("myRetryLimitCredentialsMatcher") MyRetryLimitCredentialsMatcher matcher) { + public SecurityManager securityManager() { DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager(); //设置realm. - securityManager.setRealm(myShiroRealm(matcher)); + securityManager.setRealm(myShiroRealm()); // 自定义缓存实现 使用redis //securityManager.setCacheManager(cacheManager()); // 自定义session管理 使用redis @@ -172,9 +172,9 @@ public class ShiroConfig { } @Bean - public MyShiroRealm myShiroRealm(MyRetryLimitCredentialsMatcher matcher) { + public MyShiroRealm myShiroRealm() { MyShiroRealm myShiroRealm = new MyShiroRealm(); - myShiroRealm.setCredentialsMatcher(matcher); + myShiroRealm.setCredentialsMatcher(hashedCredentialsMatcher()); return myShiroRealm; } @@ -187,7 +187,6 @@ public class ShiroConfig { * * @return */ - @Bean(name = "myRetryLimitCredentialsMatcher") public MyRetryLimitCredentialsMatcher hashedCredentialsMatcher() { MyRetryLimitCredentialsMatcher hashedCredentialsMatcher = new MyRetryLimitCredentialsMatcher(); diff --git a/mallinkCallback/src/main/java/com/iformall/config/WebConfig.java b/mallinkCallback/src/main/java/com/iformall/config/WebConfig.java index c736af6d3..69232a7cf 100644 --- a/mallinkCallback/src/main/java/com/iformall/config/WebConfig.java +++ b/mallinkCallback/src/main/java/com/iformall/config/WebConfig.java @@ -39,7 +39,7 @@ public class WebConfig implements WebMvcConfigurer { @Autowired private RequestInterceptor requestInterceptor; - @Bean + @Bean("myRequestMappingHandlerAdapter") public RequestMappingHandlerAdapter requestMappingHandlerAdapter() { RequestMappingHandlerAdapter adapter = new RequestMappingHandlerAdapter(); @@ -114,7 +114,7 @@ public class WebConfig implements WebMvcConfigurer { * * @return */ - @Bean + @Bean("myCharacterEncodingFilter") public Filter characterEncodingFilter() { CharacterEncodingFilter characterEncodingFilter = new CharacterEncodingFilter(); characterEncodingFilter.setEncoding("UTF-8"); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java index 2657b1f3f..776e8d00f 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java @@ -25,8 +25,8 @@ public class MsgReSendSchedule { @Autowired private MqBaseProducer mqBaseProducer; - //@Scheduled(cron = "0 */1 * * * *?") // 每5分钟检查一次 - @Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 + @Scheduled(cron = "0 */5 * * * *?") // 每5分钟检查一次 + //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 public void msgReSend() { logger.info("消息重发开始..."); //消息重发