Merge branch 'dev' into test

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/partner/KylinCheckUserPartnerController.java

@@ -52,7 +52,7 @@ public class KylinCheckUserPartnerController {
         return checkUserPartnerService.del(merchantId, checkUserId);
     }
 
-    @PutMapping(value = "")
+    @PostMapping(value = "change")
     @ApiOperation(value = "修改验票账号", position = 1)
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<String> change(@RequestParam("merchantId") @NotNull String merchantId,

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/DataMigrationProcessorService.java

@@ -46,5 +46,5 @@ public abstract class DataMigrationProcessorService {
         return DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD);
     }
 
-    protected abstract void dataProcessing(Connection connection, Integer dg, Integer lS, String incrDt, String flg, String flu);
+    protected abstract void dataProcessing(Integer dg, Integer lS, String incrDt, String flg, String flu);
 }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMAddressesProcessor.java

@@ -28,7 +28,7 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    public void dataProcessing(Connection connection, Integer dg, Integer dG, String incrDt, String flg, String flu) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.addresses:{}", userMapper.executeForDM("adam_addresses"));
 //            log.info("DM.flush.AdamAddressesVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamAddressesVo.class.getSimpleName()).getDeletedCount());
@@ -48,12 +48,12 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-//        Connection connection = null;
+        Connection connection = null;
         PreparedStatement statement = null;
         ResultSetImpl row = null;
         try {
-//            Class.forName(DB_DRIVER);
-//            connection = DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD);
+            Class.forName(DB_DRIVER);
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD);
             statement = connection.prepareStatement(sqlCount);
             row = (ResultSetImpl) statement.executeQuery();
             row.first();
@@ -118,7 +118,7 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
         } catch (Exception e) {
-            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+            log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
         }
         try {
             if (null != row) row.close();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMCollectionProcessor.java

@@ -28,7 +28,7 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    public void dataProcessing(Connection connection, Integer dg, Integer dG, String incrDt, String flg, String flu) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.collection:{}", userMapper.executeForDM("adam_collection"));
 
@@ -49,12 +49,12 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-//        Connection connection = null;
+        Connection connection = null;
         PreparedStatement statement = null;
         ResultSetImpl row = null;
         try {
-//            Class.forName(DB_DRIVER);
-//            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            Class.forName(DB_DRIVER);
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
             statement = connection.prepareStatement(sqlCount);
             row = (ResultSetImpl) statement.executeQuery();
             row.first();
@@ -109,7 +109,7 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
         } catch (Exception e) {
-            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+            log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
         }
         try {
             if (null != row) row.close();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMEntersProcessor.java

@@ -28,7 +28,7 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    public void dataProcessing(Connection connection, Integer dg, Integer dG, String incrDt, String flg, String flu) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.enters:{}", userMapper.executeForDM("adam_enters"));
 
@@ -51,12 +51,12 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-//        Connection connection = null;
+        Connection connection = null;
         PreparedStatement statement = null;
         ResultSetImpl row = null;
         try {
-//            Class.forName(DB_DRIVER);
-//            connection = DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD);
+            Class.forName(DB_DRIVER);
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD);
             statement = connection.prepareStatement(sqlCount);
             row = (ResultSetImpl) statement.executeQuery();
             row.first();
@@ -122,7 +122,7 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
         } catch (Exception e) {
-            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+            log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
         }
         try {
             if (null != row) row.close();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMMemberCodeProcessor.java

@@ -182,7 +182,7 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    public void dataProcessing(Connection connection, Integer dg, Integer dG, String incrDt, String flg, String flu) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.member_code:{}", userMapper.executeForDM("adam_member_code"));
 
@@ -199,12 +199,12 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
         String sql = sqlCount.replace("count(1)", field);
         sql += " order by id limit ?,?";
 
-//        Connection connection = null;
+        Connection connection = null;
         PreparedStatement statement = null;
         ResultSetImpl row = null;
         try {
-//            Class.forName(DB_DRIVER);
-//            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            Class.forName(DB_DRIVER);
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
             statement = connection.prepareStatement(sqlCount);
             row = (ResultSetImpl) statement.executeQuery();
             row.first();
@@ -273,7 +273,7 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
         } catch (Exception e) {
-            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+            log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
         }
         try {
             if (null != row) row.close();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMMemberOrderProcessor.java

@@ -52,7 +52,7 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    public void dataProcessing(Connection connection, Integer dg, Integer dG, String incrDt, String flg, String flu) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.member_order:{}", userMapper.executeForDM("adam_member_order"));
 
@@ -74,12 +74,12 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-//        Connection connection = null;
+        Connection connection = null;
         PreparedStatement statement = null;
         ResultSetImpl row = null;
         try {
-//            Class.forName(DB_DRIVER);
-//            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            Class.forName(DB_DRIVER);
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
             statement = connection.prepareStatement(sqlCount);
             row = (ResultSetImpl) statement.executeQuery();
             row.first();
@@ -154,7 +154,7 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
         } catch (Exception e) {
-            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+            log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
         }
         try {
             if (null != row) row.close();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMRealNameProcessor.java

@@ -28,7 +28,7 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    public void dataProcessing(Connection connection, Integer dg, Integer dG, String incrDt, String flg, String flu) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.real_name:{}", userMapper.executeForDM("adam_real_name"));
 
@@ -49,12 +49,12 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-//        Connection connection = null;
+        Connection connection = null;
         PreparedStatement statement = null;
         ResultSetImpl row = null;
         try {
-//            Class.forName(DB_DRIVER);
-//            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            Class.forName(DB_DRIVER);
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
             statement = connection.prepareStatement(sqlCount);
             row = (ResultSetImpl) statement.executeQuery();
             row.first();
@@ -121,7 +121,7 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
         } catch (Exception e) {
-            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+            log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
         }
         try {
             if (null != row) row.close();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMThirdPartsProcessor.java

@@ -30,7 +30,7 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    public void dataProcessing(Connection connection, Integer dg, Integer dG, String incrDt, String flg, String flu) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.third_party:{}", userMapper.executeForDM("adam_third_party"));
 
@@ -54,12 +54,12 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
         sql += " order by id limit ?,?";
 
         LocalDateTime currentYear = DateUtil.Formatter.yyyyMMddHHmmss.parse("2021-01-01 00:00:00");
-//        Connection connection = null;
+        Connection connection = null;
         PreparedStatement statement = null;
         ResultSetImpl row = null;
         try {
-//            Class.forName(DB_DRIVER);
-//            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            Class.forName(DB_DRIVER);
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
             statement = connection.prepareStatement(sqlCount);
             row = (ResultSetImpl) statement.executeQuery();
             row.first();
@@ -130,7 +130,7 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
         } catch (Exception e) {
-            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+            log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
         }
         try {
             if (null != row) row.close();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMTracesInfoProcessor.java

@@ -32,7 +32,7 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
     AdamMemberPriceMapper memberPriceMapper;
 
     @Override
-    public void dataProcessing(Connection connection, Integer dg, Integer dG, String incrDt, String flg, String flu) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.member:{}", userMapper.executeForDM("adam_member"));
             log.info("DM.flush.member_price:{}", userMapper.executeForDM("adam_member_price"));

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMUserInformationProcessor.java

@@ -47,7 +47,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    public void dataProcessing(Connection connection, Integer dg, Integer dG, String incrDt, String flg, String flu) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.user:{}", userMapper.executeForDM("adam_user"));
             log.info("DM.flush.user_info:{}", userMapper.executeForDM("adam_user_info"));
@@ -70,8 +70,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
         }
         sql += " order by uid limit ?,?";
 
-        LocalDateTime currentYear = DateUtil.Formatter.yyyyMMddHHmmss.parse("2021-01-01 00:00:00");
-//        Connection connection = null;
+        Connection connection = null;
         PreparedStatement statement = null;
         ResultSetImpl row = null;
         try {
@@ -170,7 +169,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
         } catch (Exception e) {
-            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+            log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
         }
         try {
             if (null != row) row.close();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMUserMemberProcessor.java

@@ -28,7 +28,7 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    public void dataProcessing(Connection connection, Integer dg, Integer dG, String incrDt, String flg, String flu) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.user_member:{}", userMapper.executeForDM("adam_user_member"));
 
@@ -49,12 +49,12 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-//        Connection connection = null;
+        Connection connection = null;
         PreparedStatement statement = null;
         ResultSetImpl row = null;
         try {
-//            Class.forName(DB_DRIVER);
-//            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            Class.forName(DB_DRIVER);
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
             statement = connection.prepareStatement(sqlCount);
             row = (ResultSetImpl) statement.executeQuery();
             row.first();
@@ -127,7 +127,7 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
                 dmRdmService.setMaxMemberNo(Integer.parseInt(max.getMemberNo()));
             }
         } catch (Exception e) {
-            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+            log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
         }
         try {
             if (null != row) row.close();

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/handler/SubscribeHandler.java

+package com.liquidnet.service.sweet.handler;
+
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpMessageHandler;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.result.WxMpUser;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 关注
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-07-31 5:06 下午
+ */
+@Component
+@Slf4j
+public class SubscribeHandler implements WxMpMessageHandler {
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService,
+                                    WxSessionManager sessionManager) throws WxErrorException {
+        log.info("接收到一个扫码订阅事件:[{}]", wxMessage.toString());
+        // 1、获取微信用户信息
+        WxMpUser wxMpUser = wxMpService.getUserService().userInfo(wxMessage.getFromUser());
+        if (null == wxMpUser) {
+            log.warn("从微信公众号获取用户(FromUser)信息:[{}]失败.", wxMessage.getFromUser());
+            return null;
+        }
+        log.info("根据 openId:[{}]获取到的微信用户信息:[{}]", wxMessage.getFromUser(), wxMpUser.toString());
+
+        return null;
+    }
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/handler/UnsubscribeHandler.java

+package com.liquidnet.service.sweet.handler;
+
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpMessageHandler;
+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.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 取消关注
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-07-31 5:08 下午
+ */
+@Component
+@Slf4j
+public class UnsubscribeHandler implements WxMpMessageHandler {
+
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService,
+                                    WxSessionManager sessionManager) throws WxErrorException {
+        log.info("接收到一个扫码取消订阅事件:[{}]", wxMessage.toString());
+        return null;
+    }
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatCallbackServiceImpl.java

 package com.liquidnet.service.sweet.service.impl;
 
+import com.liquidnet.service.sweet.handler.SubscribeHandler;
+import com.liquidnet.service.sweet.handler.UnsubscribeHandler;
 import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.api.WxConsts;
+import me.chanjar.weixin.common.api.WxMessageInMemoryDuplicateChecker;
 import me.chanjar.weixin.mp.api.WxMpMessageRouter;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
@@ -24,22 +28,80 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class SweetWechatCallbackServiceImpl {
 
-    /*@Autowired
-    private WxMpMessageRouter wxMpMessageRouter;*/
+    @Value("${liquidnet.wechat.zhengzai.service.appid}")
+    private String appid;
+    @Value("${liquidnet.wechat.zhengzai.service.secret}")
+    private String secret;
+    @Value("${liquidnet.wechat.zhengzai.service.token}")
+    private String token;
+    @Value("${liquidnet.wechat.zhengzai.service.aeskey}")
+    private String aeskey;
+
+    @Autowired
+    private SubscribeHandler subscribeHandler;
+    @Autowired
+    private UnsubscribeHandler unsubscribeHandler;
+
+
+    private WxMpConfigStorage wxMpConfig(String appId, String appSecret, String token, String aeskey) {
+        WxMpDefaultConfigImpl config = new WxMpDefaultConfigImpl();
+        config.setAppId(appId);
+        config.setSecret(appSecret);
+        config.setAesKey(aeskey);
+        config.setToken(token);
+        return config;
+    }
+
+    private WxMpService wxMpService(WxMpConfigStorage mpConfig) {
+        WxMpService service = new WxMpServiceImpl();
+        service.setWxMpConfigStorage(mpConfig);
+        return service;
+    }
+
+    public WxMpMessageRouter messageRouter(WxMpService wxMpService) {
+        WxMpMessageRouter router = new WxMpMessageRouter(wxMpService);
+        // 消息去重
+        router.setMessageDuplicateChecker(new WxMessageInMemoryDuplicateChecker());
+
+        // 关注事件
+        router.rule().async(false).msgType(WxConsts.XmlMsgType.EVENT)
+                .event(WxConsts.EventType.SUBSCRIBE)
+                .handler(subscribeHandler)
+                .end();
+
+        // 取消关注事件
+        router.rule().async(false).msgType(WxConsts.XmlMsgType.EVENT)
+                .event(WxConsts.EventType.UNSUBSCRIBE)
+                .handler(unsubscribeHandler)
+                .end();
+
+        return router;
+    }
 
     public String record(String requestBody, String timestamp, String nonce, String encType, String msgSignature) {
-        /*String out = null;
+        WxMpConfigStorage wxMpConfig = wxMpConfig(appid, secret, token, aeskey);
+        WxMpService wxMpService = wxMpService(wxMpConfig);
+        String out = null;
         if (encType == null) {
             // 明文传输的消息
             WxMpXmlMessage inMessage = WxMpXmlMessage.fromXml(requestBody);
-            WxMpXmlOutMessage outMessage = wxMpMessageRouter.route(inMessage);
+            WxMpXmlOutMessage outMessage = messageRouter(wxMpService).route(inMessage);
             if (outMessage == null) {
                 return "";
             }
             out = outMessage.toXml();
+        } else if ("aes".equalsIgnoreCase(encType)) {
+            // aes加密的消息
+            WxMpXmlMessage inMessage = WxMpXmlMessage.fromEncryptedXml(requestBody, wxMpService.getWxMpConfigStorage(),
+                    timestamp, nonce, msgSignature);
+            log.info("\n消息解密后内容为：\n[{}] ", inMessage.toString());
+            WxMpXmlOutMessage outMessage = messageRouter(wxMpService).route(inMessage);
+            if (outMessage == null) {
+                return "";
+            }
+            out = outMessage.toEncryptedXml(wxMpService.getWxMpConfigStorage());
         }
         log.info("\n组装回复信息：[{}]", out);
-        return out;*/
-        return "";
+        return out;
     }
 }