Merge remote-tracking branch 'origin/dev-sweet' into dev-sweet

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/config/WechatMpConfigure.java

@@ -15,6 +15,8 @@ import javax.annotation.PostConstruct;
 public class WechatMpConfigure {
     private static String appidZhengzai;
     private static String secretZhengzai;
+    private static String tokenZhengzai;
+    private static String aeskeyZhengzai;
 
     @Value("${liquidnet.wechat.service.zhengzai.appid}")
     public void setAppidZhengzai(String appidZhengzai) {
@@ -25,6 +27,14 @@ public class WechatMpConfigure {
     public void setSecretZhengzai(String secretZhengzai) {
         WechatMpConfigure.secretZhengzai = secretZhengzai;
     }
+    @Value("${liquidnet.wechat.service.zhengzai.token}")
+    public void setTokenZhengzai(String tokenZhengzai) {
+        WechatMpConfigure.tokenZhengzai = tokenZhengzai;
+    }
+    @Value("${liquidnet.wechat.service.zhengzai.aeskey}")
+    public void setAeskeyZhengzai(String aeskeyZhengzai) {
+        WechatMpConfigure.aeskeyZhengzai = aeskeyZhengzai;
+    }
 
     private WxMpService wxMpZhengzaiService;
 
@@ -38,9 +48,10 @@ public class WechatMpConfigure {
                 RedisTemplateWxRedisOps redisTemplateWxRedisOps = new RedisTemplateWxRedisOps(stringRedisTemplate);
                 WxMpRedisConfigImpl wxMpDefaultConfig = new WxMpRedisConfigImpl(redisTemplateWxRedisOps, "sweet:accessToken:service:zhengzai");
 
-//                WxMaDefaultConfigImpl wxMaDefaultConfig = new WxMaDefaultConfigImpl();
                 wxMpDefaultConfig.setAppId(appidZhengzai);
                 wxMpDefaultConfig.setSecret(secretZhengzai);
+                wxMpDefaultConfig.setToken(tokenZhengzai);
+                wxMpDefaultConfig.setAesKey(aeskeyZhengzai);
 
                 this.setWxMpConfigStorage(wxMpDefaultConfig);
             }

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

@@ -5,7 +5,6 @@ import com.liquidnet.service.sweet.service.impl.SweetWechatMpService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,11 +18,6 @@ import java.io.*;
 @RequestMapping("/wechatSync")
 public class SweetWechatSyncDataController {
 
-    @Value("${liquidnet.wechat.service.zhengzai.appid}")
-    private String zhengzaiAppid;
-    @Value("${liquidnet.wechat.service.zhengzai.secret}")
-    private String zhengzaiSecret;
-
     @Autowired
     private SweetWechatMpService sweetWechatMpService;
 

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.config.WechatMpConfigure;
 import com.liquidnet.service.sweet.handler.SubscribeHandler;
 import com.liquidnet.service.sweet.handler.UnsubscribeHandler;
 import lombok.extern.slf4j.Slf4j;
@@ -7,13 +8,9 @@ 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;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
-import me.chanjar.weixin.mp.config.WxMpConfigStorage;
-import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 /**
@@ -28,35 +25,13 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class SweetWechatCallbackServiceImpl {
 
-    @Value("${liquidnet.wechat.service.zhengzai.appid}")
-    private String appid;
-    @Value("${liquidnet.wechat.service.zhengzai.secret}")
-    private String secret;
-    @Value("${liquidnet.wechat.service.zhengzai.token}")
-    private String token;
-    @Value("${liquidnet.wechat.service.zhengzai.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;
-    }
+    @Autowired
+    WechatMpConfigure wechatMpConfigure;
 
     public WxMpMessageRouter messageRouter(WxMpService wxMpService) {
         WxMpMessageRouter router = new WxMpMessageRouter(wxMpService);
@@ -79,8 +54,7 @@ public class SweetWechatCallbackServiceImpl {
     }
 
     public String record(String requestBody, String timestamp, String nonce, String encType, String msgSignature) {
-        WxMpConfigStorage wxMpConfig = wxMpConfig(appid, secret, token, aeskey);
-        WxMpService wxMpService = wxMpService(wxMpConfig);
+        WxMpService wxMpService = wechatMpConfigure.getWxMpService();
         String out = null;
         if (encType == null || encType.isEmpty()) {
             // 明文传输的消息

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

 package com.liquidnet.service.sweet.service.impl;
 
-import cn.binarywang.wx.miniapp.api.WxMaService;
-import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
-import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
-import cn.binarywang.wx.miniapp.config.WxMaConfig;
-import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.ResponseDto;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -31,26 +25,6 @@ import java.util.Objects;
 @Service
 public class SweetWechatLoginServiceImpl {
 
-    @Value("${liquidnet.wechat.applet.strawberry.appid}")
-    private String strawberryAppid;
-    @Value("${liquidnet.wechat.applet.strawberry.secret}")
-    private String strawberrySecret;
-
-    @Value("${liquidnet.wechat.applet.five.appid}")
-    private String fiveAppid;
-    @Value("${liquidnet.wechat.applet.five.secret}")
-    private String fiveSecret;
-
-    @Value("${liquidnet.wechat.applet.mdsk.appid}")
-    private String mdskAppid;
-    @Value("${liquidnet.wechat.applet.mdsk.secret}")
-    private String mdskSecret;
-
-    @Value("${liquidnet.wechat.applet.zhengzai.appid}")
-    private String zhengzaiAppid;
-    @Value("${liquidnet.wechat.applet.zhengzai.secret}")
-    private String zhengzaiSecret;
-
     @Autowired
     private SweetWechatService sweetWechatService;
 
@@ -90,77 +64,4 @@ public class SweetWechatLoginServiceImpl {
         }
     }
 
-    /*public ResponseDto userInfo(String code, String encryptedData, String iv, Integer type) {
-        log.info("\n参数code：[{}] ", code);
-        log.info("\n参数encryptedData：[{}] ", encryptedData);
-        log.info("\n参数iv：[{}] ", iv);
-        log.info("\n参数type：[{}] ", type);
-        try {
-            String appId = "";
-            String appSecret = "";
-            switch (type) {
-                case 1:
-                    appId = strawberryAppid;
-                    appSecret = strawberrySecret;
-                    break;
-                case 2:
-                    appId = fiveAppid;
-                    appSecret = fiveSecret;
-                    break;
-                case 3:
-                    appId = mdskAppid;
-                    appSecret = mdskSecret;
-                    break;
-                case 4:
-                    appId = zhengzaiAppid;
-                    appSecret = zhengzaiSecret;
-                    break;
-            }
-            WxMaConfig wxMaConfig = wxMaConfig(appId, appSecret);
-            WxMaService wxMaService = wxMaService(wxMaConfig);
-            WxMaJscode2SessionResult sessionInfo = wxMaService.getUserService().getSessionInfo(code);
-            log.info("\nWxMaJscode2SessionResult：[{}] ", JsonUtils.toJson(sessionInfo));
-            if (null == sessionInfo) {
-                return ResponseDto.failure("login handler error");
-            }
-
-            // 解密手机号码信息
-            WxMaPhoneNumberInfo wxMaPhoneNumberInfo = wxMaService.getUserService().getPhoneNoInfo(sessionInfo.getSessionKey(),
-                    encryptedData, iv);
-            log.info("\nWxMaPhoneNumberInfo：[{}] ", wxMaPhoneNumberInfo.toString());
-            if (Objects.isNull(wxMaPhoneNumberInfo) || StringUtils.isBlank(wxMaPhoneNumberInfo.getPhoneNumber())) {
-                return ResponseDto.failure("解密手机号码信息错误");
-            }
-
-            String unionId = sessionInfo.getUnionid();
-            String openId = sessionInfo.getOpenid();
-
-            HashMap<String,Object> userInfo = CollectionUtil.mapStringObject();
-            userInfo.put("unionId", unionId);
-            userInfo.put("openId", openId);
-            userInfo.put("getPhoneNumber", wxMaPhoneNumberInfo.getPhoneNumber());
-            userInfo.put("getPurePhoneNumber", wxMaPhoneNumberInfo.getPurePhoneNumber());
-            userInfo.put("getCountryCode", wxMaPhoneNumberInfo.getCountryCode());
-
-            return ResponseDto.success(userInfo);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ResponseDto.failure();
-        }
-    }*/
-
-    private WxMaConfig wxMaConfig(String appId, String appSecret) {
-        WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
-        config.setAppid(appId);
-        config.setSecret(appSecret);
-        config.setMsgDataFormat("JSON");
-        return config;
-    }
-
-    private WxMaService wxMaService(WxMaConfig maConfig) {
-        WxMaService service = new WxMaServiceImpl();
-        service.setWxMaConfig(maConfig);
-        return service;
-    }
-
 }

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

@@ -31,14 +31,8 @@ public class SweetWechatMpService {
     @Autowired
     private QueueUtils queueUtils;
 
-    @Autowired
-    private SweetWechatTemplateServiceImpl sweetWechatTemplateService;
-
-
     public void userInfo() throws WxErrorException {
         WxMpService wxMpService = wechatMpConfigure.getWxMpService();
-        log.info("isAccessTokenExpired：[{}] ", wxMpService.getWxMpConfigStorage().isAccessTokenExpired());
-        log.info("getAccessToken：[{}] ", wxMpService.getWxMpConfigStorage().getAccessToken());
 
         String nextOpenid = "";
         do {

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

@@ -8,6 +8,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.sweet.config.WechatMpConfigure;
 import com.liquidnet.service.sweet.entity.SweetRemind;
 import com.liquidnet.service.sweet.entity.SweetWechatUser;
 import com.liquidnet.service.sweet.mapper.SweetRemindMapper;
@@ -15,11 +16,8 @@ import com.liquidnet.service.sweet.utils.RedisDataUtils;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
-import me.chanjar.weixin.mp.config.WxMpConfigStorage;
-import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -42,10 +40,6 @@ import java.util.List;
 @Service
 public class SweetWechatTemplateServiceImpl {
 
-    @Value("${liquidnet.wechat.service.zhengzai.appid}")
-    private String appid;
-    @Value("${liquidnet.wechat.service.zhengzai.secret}")
-    private String secret;
     @Value("${liquidnet.client.admin.h5Url}")
     private String h5Url;
 
@@ -60,6 +54,9 @@ public class SweetWechatTemplateServiceImpl {
     @Autowired
     private SweetRemindMapper sweetRemindMapper;
 
+    @Autowired
+    WechatMpConfigure wechatMpConfigure;
+
     public ResponseDto sendRemindMsg() {
         String templateId = "CNLDBZYQoDgTWudicx8WU81Jr9b6RyG9hmK4O0tpK-k";
 
@@ -210,8 +207,9 @@ public class SweetWechatTemplateServiceImpl {
         String msgId = null;
         try {
             // 发送模板消息
-            WxMpConfigStorage wxMpConfig = wxMpConfig(appid, secret);
-            WxMpService wxMpService = wxMpService(wxMpConfig);
+            WxMpService wxMpService = wechatMpConfigure.getWxMpService();
+            log.info("sendTmpMsg-isAccessTokenExpired：[{}] ", wxMpService.getWxMpConfigStorage().isAccessTokenExpired());
+            log.info("sendTmpMsg-getAccessToken：[{}] ", wxMpService.getWxMpConfigStorage().getAccessToken());
             msgId = wxMpService.getTemplateMsgService().sendTemplateMsg(templateMessage);
             log.info("发送成功：[msgId=[{}]", msgId);
         } catch (WxErrorException e) {
@@ -221,19 +219,6 @@ public class SweetWechatTemplateServiceImpl {
         return msgId;
     }
 
-    private WxMpConfigStorage wxMpConfig(String appId, String appSecret) {
-        WxMpDefaultConfigImpl config = new WxMpDefaultConfigImpl();
-        config.setAppId(appId);
-        config.setSecret(appSecret);
-        return config;
-    }
-
-    private WxMpService wxMpService(WxMpConfigStorage mpConfig) {
-        WxMpService service = new WxMpServiceImpl();
-        service.setWxMpConfigStorage(mpConfig);
-        return service;
-    }
-
     public ResponseDto remind(String openId, String unionId, String performancesId) {
         redisDataUtils.setSweetRemind(openId, unionId, performancesId);
         return ResponseDto.success();