From 555469cd43df4b874b46d3bbea4c71e07bd5edb7 Mon Sep 17 00:00:00 2001
From: wangqing <smalljop@foxmail.com>
Date: Wed, 14 Apr 2021 16:03:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cloud/wx/mp/config/WxMpConfiguration.java | 40 ++++++++++++-------
 .../cloud/wx/mp/handler/ScanHandler.java      | 11 ++---
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/tduck-wx-mp/src/main/java/com/tduck/cloud/wx/mp/config/WxMpConfiguration.java b/tduck-wx-mp/src/main/java/com/tduck/cloud/wx/mp/config/WxMpConfiguration.java
index a099ee1..7127d57 100644
--- a/tduck-wx-mp/src/main/java/com/tduck/cloud/wx/mp/config/WxMpConfiguration.java
+++ b/tduck-wx-mp/src/main/java/com/tduck/cloud/wx/mp/config/WxMpConfiguration.java
@@ -1,8 +1,6 @@
 package com.tduck.cloud.wx.mp.config;
 
 import com.tduck.cloud.wx.mp.handler.*;
-import lombok.AllArgsConstructor;
-import me.chanjar.weixin.common.redis.JedisWxRedisOps;
 import me.chanjar.weixin.common.redis.RedisTemplateWxRedisOps;
 import me.chanjar.weixin.common.redis.WxRedisOps;
 import me.chanjar.weixin.mp.api.WxMpMessageRouter;
@@ -10,6 +8,7 @@ import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
 import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
 import me.chanjar.weixin.mp.config.impl.WxMpRedisConfigImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -31,22 +30,33 @@ import static me.chanjar.weixin.mp.constant.WxMpEventConstants.POI_CHECK_NOTIFY;
  *
  * @author Binary Wang(https://github.com/binarywang)
  */
-@AllArgsConstructor
 @Configuration
 @EnableConfigurationProperties(WxMpProperties.class)
 public class WxMpConfiguration {
-    private final LogHandler logHandler;
-    private final NullHandler nullHandler;
-    private final KfSessionHandler kfSessionHandler;
-    private final StoreCheckNotifyHandler storeCheckNotifyHandler;
-    private final LocationHandler locationHandler;
-    private final MenuHandler menuHandler;
-    private final MsgHandler msgHandler;
-    private final UnsubscribeHandler unsubscribeHandler;
-    private final SubscribeHandler subscribeHandler;
-    private final ScanHandler scanHandler;
-    private final WxMpProperties properties;
-    private final StringRedisTemplate redisTemplate;
+    @Autowired
+    private LogHandler logHandler;
+    @Autowired
+    private NullHandler nullHandler;
+    @Autowired
+    private KfSessionHandler kfSessionHandler;
+    @Autowired
+    private StoreCheckNotifyHandler storeCheckNotifyHandler;
+    @Autowired
+    private LocationHandler locationHandler;
+    @Autowired
+    private MenuHandler menuHandler;
+    @Autowired
+    private MsgHandler msgHandler;
+    @Autowired
+    private UnsubscribeHandler unsubscribeHandler;
+    @Autowired
+    private SubscribeHandler subscribeHandler;
+    @Autowired
+    private ScanHandler scanHandler;
+    @Autowired
+    private WxMpProperties properties;
+    @Autowired
+    private StringRedisTemplate redisTemplate;
 
     @Bean
     public WxMpService wxMpService() {
diff --git a/tduck-wx-mp/src/main/java/com/tduck/cloud/wx/mp/handler/ScanHandler.java b/tduck-wx-mp/src/main/java/com/tduck/cloud/wx/mp/handler/ScanHandler.java
index 2fdd9a3..059f37c 100644
--- a/tduck-wx-mp/src/main/java/com/tduck/cloud/wx/mp/handler/ScanHandler.java
+++ b/tduck-wx-mp/src/main/java/com/tduck/cloud/wx/mp/handler/ScanHandler.java
@@ -1,16 +1,16 @@
 package com.tduck.cloud.wx.mp.handler;
 
-import java.util.Map;
-
 import com.tduck.cloud.wx.mp.handler.scan.ScanStrategyContext;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
 
 /**
  * @author Binary Wang(https://github.com/binarywang)
@@ -18,7 +18,8 @@ import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 @Component
 @RequiredArgsConstructor
 public class ScanHandler extends AbstractHandler {
-    private final ScanStrategyContext scanStrategyContext;
+    @Autowired
+    private ScanStrategyContext scanStrategyContext;
 
     @Override
     public WxMpXmlOutMessage handle(WxMpXmlMessage wxMpXmlMessage, Map<String, Object> map,