record 增加摩登

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetWechatActionCallbackController.java

@@ -50,6 +50,7 @@ public class SweetWechatActionCallbackController {
     @ApiOperation("用户动作微信回调")
     public String record(
             @RequestBody String requestBody,
+            @RequestParam("type") Integer type,
             @RequestParam("signature") String signature,
             @RequestParam("timestamp") String timestamp,
             @RequestParam("nonce") String nonce,
@@ -57,13 +58,13 @@ public class SweetWechatActionCallbackController {
             @RequestParam(name = "encrypt_type", required = false) String encType,
             @RequestParam(name = "msg_signature", required = false) String msgSignature
     ) {
-        log.info("\n接收微信请求：[openid=[{}], [signature=[{}], encType=[{}], msgSignature=[{}],"
+        log.info("\n接收微信请求：[type=[{}], openid=[{}], [signature=[{}], encType=[{}], msgSignature=[{}],"
                         + " timestamp=[{}], nonce=[{}], requestBody=[\n{}\n] ",
-                openid, signature, encType, msgSignature, timestamp, nonce, requestBody);
+                type, openid, signature, encType, msgSignature, timestamp, nonce, requestBody);
         if (!wechatSignUtils.checkSignature(signature, timestamp, nonce)) {
             log.info("验签未通过，非法请求，可能属于伪造的请求！");
             return "";
         }
-        return sweetWechatCallbackService.record(requestBody, timestamp, nonce, encType, msgSignature);
+        return sweetWechatCallbackService.record(requestBody, type, timestamp, nonce, encType, msgSignature);
     }
 }

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

@@ -73,7 +73,6 @@ public class SubscribeHandler implements WxMpMessageHandler {
             sweetWechatUser.setUserId(IDGenerator.nextSnowId());
             LinkedList<String> sqls = CollectionUtil.linkedListString();
             LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
-            LocalDateTime now = LocalDateTime.now();
             sqls.add(SqlMapping.get("sweet_user.insert"));
             sqlsDataA.add(new Object[]{
                     sweetWechatUser.getUserId(), sweetWechatUser.getOpenId(), sweetWechatUser.getUnionId(), sweetWechatUser.getNickname(),

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

@@ -53,8 +53,11 @@ public class SweetWechatCallbackServiceImpl {
         return router;
     }
 
-    public String record(String requestBody, String timestamp, String nonce, String encType, String msgSignature) {
-        WxMpService wxMpService = wechatMpConfigure.getWxMpService(1);
+    public String record(String requestBody, Integer type, String timestamp, String nonce, String encType, String msgSignature) {
+        if (null == type || type <= 0) {
+            type = 1;
+        }
+        WxMpService wxMpService = wechatMpConfigure.getWxMpService(type);
         String out = null;
         if (encType == null || encType.isEmpty()) {
             // 明文传输的消息

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/WechatSignUtils.java

@@ -24,7 +24,7 @@ public class WechatSignUtils {
 
     /**
      * 验证签名
-     *
+     * 验签不区分服务号 token url配置成一样
      * @param signature
      * @param timestamp
      * @param nonce