From 8e04b7e7f3a6b17a3dbf73c28bf1a2cbdc1e90cd Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Mon, 17 Feb 2020 10:21:20 +0800
Subject: [PATCH] =?UTF-8?q?redis=E9=85=8D=E7=BD=AE=E7=B1=BB=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/service/DynamicDataSourceTest.java    | 11 +++++++++++
 .../elink/esua/epdc/config/RedisMessageConfig.java  | 13 ++++++++-----
 .../listener/SentryPostUserInfoRedisListener.java   |  1 -
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/test/java/com/elink/esua/epdc/service/DynamicDataSourceTest.java b/esua-epdc/epdc-admin/epdc-admin-server/src/test/java/com/elink/esua/epdc/service/DynamicDataSourceTest.java
index e7655f979..536cd90aa 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/test/java/com/elink/esua/epdc/service/DynamicDataSourceTest.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/test/java/com/elink/esua/epdc/service/DynamicDataSourceTest.java
@@ -18,12 +18,14 @@
 package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.exception.RenException;
+import com.elink.esua.epdc.commons.tools.redis.RedisChannels;
 import com.elink.esua.epdc.utils.WxMaServiceUtils;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.io.File;
@@ -76,4 +78,13 @@ public class DynamicDataSourceTest {
 
     }
 
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
+
+    @Test
+    public void test3() {
+        String json = "{'postId':'666','carNum':'123'}";
+        redisTemplate.convertAndSend(RedisChannels.COMPLETE_INFO_BY_SENTRY_POST, json);
+    }
+
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/config/RedisMessageConfig.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/config/RedisMessageConfig.java
index bd82b73e4..b45516215 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/config/RedisMessageConfig.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/config/RedisMessageConfig.java
@@ -17,20 +17,23 @@ import org.springframework.stereotype.Component;
 @Component
 public class RedisMessageConfig {
 
+    @Autowired
+    private RedisConnectionFactory factory;
+
     @Autowired
     private SentryPostUserInfoRedisListener sentryPostUserInfoRedisListener;
 
     @Bean
-    MessageListenerAdapter SentryPostUserInfoAdapter() {
+    MessageListenerAdapter sentryPostUserInfoAdapter() {
         return new MessageListenerAdapter(sentryPostUserInfoRedisListener);
     }
 
+
     @Bean
-    RedisMessageListenerContainer container(RedisConnectionFactory connectionFactory,
-                                            MessageListenerAdapter SentryPostUserInfoAdapter) {
+    RedisMessageListenerContainer container() {
         RedisMessageListenerContainer container = new RedisMessageListenerContainer();
-        container.setConnectionFactory(connectionFactory);
-        container.addMessageListener(SentryPostUserInfoAdapter, new PatternTopic(RedisChannels.COMPLETE_INFO_BY_SENTRY_POST));
+        container.setConnectionFactory(factory);
+        container.addMessageListener(sentryPostUserInfoAdapter(), new PatternTopic(RedisChannels.COMPLETE_INFO_BY_SENTRY_POST));
         return container;
     }
 
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/listener/SentryPostUserInfoRedisListener.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/listener/SentryPostUserInfoRedisListener.java
index b07a72012..5bee613ed 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/listener/SentryPostUserInfoRedisListener.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/listener/SentryPostUserInfoRedisListener.java
@@ -12,7 +12,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.Message;
 import org.springframework.data.redis.connection.MessageListener;
-import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Service;
 
 /**