Merge branch 'dev-sweet' into test

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/constant/AdamWechatConst.java

@@ -22,22 +22,22 @@ public class AdamWechatConst {
 
     /* =============================================================== ｜  */
 
-    @Value("${liquidnet.wechat.zhengzai.applet.appid}")
+    @Value("${liquidnet.wechat.applet.zhengzai.appid}")
     public void setZhengzaiAppletAppid(String zhengzaiAppletAppid) {
         AdamWechatConst.zhengzaiAppletAppid = zhengzaiAppletAppid;
     }
 
-    @Value("${liquidnet.wechat.zhengzai.applet.secret}")
+    @Value("${liquidnet.wechat.applet.zhengzai.secret}")
     public void setZhengzaiAppletSecret(String zhengzaiAppletSecret) {
         AdamWechatConst.zhengzaiAppletSecret = zhengzaiAppletSecret;
     }
 
-    @Value("${liquidnet.wechat.zhengzai.service.appid}")
+    @Value("${liquidnet.wechat.service.zhengzai.appid}")
     public void setZhengzaiServiceAppid(String zhengzaiServiceAppid) {
         AdamWechatConst.zhengzaiServiceAppid = zhengzaiServiceAppid;
     }
 
-    @Value("${liquidnet.wechat.zhengzai.service.secret}")
+    @Value("${liquidnet.wechat.service.zhengzai.secret}")
     public void setZhengzaiServiceSecret(String zhengzaiServiceSecret) {
         AdamWechatConst.zhengzaiServiceSecret = zhengzaiServiceSecret;
     }

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamLoginInfoVo.java

@@ -24,6 +24,11 @@ public class AdamLoginInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 16, value = "用户会员信息")
     private AdamUserMemberVo userMemberVo;
 
+    @ApiModelProperty(position = 17, value = "微信用户openid（微信小程序登录返回，用于给小程序用户推送信息）")
+    private String wechatOpenid;
+    @ApiModelProperty(position = 18, value = "微信用户unionid（微信小程序登录返回，用于给小程序用户推送信息）")
+    private String wechatUnionid;
+
     private static final AdamLoginInfoVo obj = new AdamLoginInfoVo();
 
     public static AdamLoginInfoVo getNew() {

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -92,16 +92,16 @@ liquidnet:
       accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
       accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
   wechat:
-    zhengzai:
-      applet:
-        appid: wx4732efeaa2b08086
-        secret: 94562c1f92da1b6cb3f1327c8842c6d3
-      service:
+    service:
+      zhengzai:
         appid: wx3498304dda39c5a1
         secret: a1307fab0a5f2380086a7c636f7339ea
         token: tftipg1427706847
         aeskey: LwVpmpuOcl7Mi3mtfQgBol11MsmMCATIqbPgHrEpDzx
     applet:
+      zhengzai:
+        appid: wx4732efeaa2b08086
+        secret: 94562c1f92da1b6cb3f1327c8842c6d3
       strawberry:
         appid: wx08b852ade69f8019
         secret: 0aac285fd1fbc6aa4e562b7ad81de392

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -93,16 +93,16 @@ liquidnet:
       accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
       accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
   wechat:
-    zhengzai:
-      applet:
-        appid: wx4732efeaa2b08086
-        secret: 94562c1f92da1b6cb3f1327c8842c6d3
-      service:
+    service:
+      zhengzai:
         appid: wx3498304dda39c5a1
         secret: a1307fab0a5f2380086a7c636f7339ea
         token: tftipg1427706847
         aeskey: LwVpmpuOcl7Mi3mtfQgBol11MsmMCATIqbPgHrEpDzx
     applet:
+      zhengzai:
+        appid: wx4732efeaa2b08086
+        secret: 94562c1f92da1b6cb3f1327c8842c6d3
       strawberry:
         appid: wx08b852ade69f8019
         secret: 0aac285fd1fbc6aa4e562b7ad81de392

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/config/WechatMaConfigure.java

+package com.liquidnet.service.adam.config;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.PostConstruct;
+
+@Configuration
+public class WechatMaConfigure {
+    private static String appletAppidZhengzai;
+    private static String appletSecretZhengzai;
+
+    private static String appletAppidStrawberry;
+    private static String appletSecretStrawberry;
+
+    private static String appletAppidFive;
+    private static String appletSecretFive;
+
+    private static String appletAppidMdsk;
+    private static String appletSecretMdsk;
+
+    @Value("${liquidnet.wechat.applet.strawberry.appid}")
+    public void setAppletAppidZhengzai(String appletAppidZhengzai) {
+        WechatMaConfigure.appletAppidZhengzai = appletAppidZhengzai;
+    }
+
+    @Value("${liquidnet.wechat.applet.strawberry.secret}")
+    public void setAppletSecretZhengzai(String appletSecretZhengzai) {
+        WechatMaConfigure.appletSecretZhengzai = appletSecretZhengzai;
+    }
+
+    @Value("${liquidnet.wechat.applet.strawberry.appid}")
+    public void setAppletAppidStrawberry(String appletAppidStrawberry) {
+        WechatMaConfigure.appletAppidStrawberry = appletAppidStrawberry;
+    }
+
+    @Value("${liquidnet.wechat.applet.strawberry.secret}")
+    public void setAppletSecretStrawberry(String appletSecretStrawberry) {
+        WechatMaConfigure.appletSecretStrawberry = appletSecretStrawberry;
+    }
+
+    @Value("${liquidnet.wechat.applet.five.appid}")
+    public void setAppletAppidFive(String appletAppidFive) {
+        WechatMaConfigure.appletAppidFive = appletAppidFive;
+    }
+
+    @Value("${liquidnet.wechat.applet.five.secret}")
+    public void setAppletSecretFive(String appletSecretFive) {
+        WechatMaConfigure.appletSecretFive = appletSecretFive;
+    }
+
+    @Value("${liquidnet.wechat.applet.mdsk.appid}")
+    public void setAppletAppidMdsk(String appletAppidMdsk) {
+        WechatMaConfigure.appletAppidMdsk = appletAppidMdsk;
+    }
+
+    @Value("${liquidnet.wechat.applet.mdsk.secret}")
+    public void setAppletSecretMdsk(String appletSecretMdsk) {
+        WechatMaConfigure.appletSecretMdsk = appletSecretMdsk;
+    }
+
+    private WxMaService wxMaAppletZhengzaiService;
+    private WxMaService wxMaAppletStrawberryService;
+    private WxMaService wxMaAppletFiveService;
+    private WxMaService wxMaAppletMdskService;
+
+    @PostConstruct
+    public void init() {
+        wxMaAppletZhengzaiService = new WxMaServiceImpl() {
+            {
+                WxMaDefaultConfigImpl wxMaDefaultConfig = new WxMaDefaultConfigImpl();
+                wxMaDefaultConfig.setAppid(appletAppidZhengzai);
+                wxMaDefaultConfig.setSecret(appletSecretZhengzai);
+                wxMaDefaultConfig.setMsgDataFormat("JSON");
+
+                this.setWxMaConfig(wxMaDefaultConfig);
+            }
+        };
+        wxMaAppletStrawberryService = new WxMaServiceImpl() {
+            {
+                WxMaDefaultConfigImpl wxMaDefaultConfig = new WxMaDefaultConfigImpl();
+                wxMaDefaultConfig.setAppid(appletAppidStrawberry);
+                wxMaDefaultConfig.setSecret(appletSecretStrawberry);
+                wxMaDefaultConfig.setMsgDataFormat("JSON");
+
+                this.setWxMaConfig(wxMaDefaultConfig);
+            }
+        };
+        wxMaAppletFiveService = new WxMaServiceImpl() {
+            {
+                WxMaDefaultConfigImpl wxMaDefaultConfig = new WxMaDefaultConfigImpl();
+                wxMaDefaultConfig.setAppid(appletAppidFive);
+                wxMaDefaultConfig.setSecret(appletSecretFive);
+                wxMaDefaultConfig.setMsgDataFormat("JSON");
+
+                this.setWxMaConfig(wxMaDefaultConfig);
+            }
+        };
+        wxMaAppletMdskService = new WxMaServiceImpl() {
+            {
+                WxMaDefaultConfigImpl wxMaDefaultConfig = new WxMaDefaultConfigImpl();
+                wxMaDefaultConfig.setAppid(appletAppidMdsk);
+                wxMaDefaultConfig.setSecret(appletSecretMdsk);
+                wxMaDefaultConfig.setMsgDataFormat("JSON");
+
+                this.setWxMaConfig(wxMaDefaultConfig);
+            }
+        };
+    }
+
+    public WxMaService getWxMaService(Integer anum) {
+        switch (anum) {
+            case 1:
+                return wxMaAppletZhengzaiService;
+            case 2:
+                return wxMaAppletStrawberryService;
+            case 3:
+                return wxMaAppletFiveService;
+            case 4:
+                return wxMaAppletMdskService;
+        }
+        return null;
+    }
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

 package com.liquidnet.service.adam.controller;
 
+import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.dypnsapi.model.v20170525.GetMobileRequest;
 import com.aliyuncs.dypnsapi.model.v20170525.GetMobileResponse;
@@ -19,6 +21,7 @@ import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.vo.AdamLoginInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.service.AdamRdmService;
+import com.liquidnet.service.adam.service.AdamWechatService;
 import com.liquidnet.service.adam.service.IAdamUserService;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
@@ -28,6 +31,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -68,6 +72,8 @@ public class AdamLoginController {
     IAdamUserService adamUserService;
     @Autowired
     SmsProcessor smsProcessor;
+    @Autowired
+    AdamWechatService adamWechatService;
 
     @Value("${liquidnet.reviewer.app-login.mobile}")
     private String reviewMobile;
@@ -267,9 +273,71 @@ public class AdamLoginController {
     }
 
     @ApiOperationSupport(order = 5)
+    @ApiOperation(value = "微信小程序登录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "anum", value = "应用标识[1-正在｜2-草莓音乐节｜3-五百里｜4-MDSK]", allowableValues = "1,2,3,4"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "code", value = "临时票据"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "encryptedData", value = "访问令牌"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "iv", value = "访问令牌"),
+    })
+    @PostMapping(value = {"login/wca"})
+    public ResponseDto<AdamLoginInfoVo> loginByWechatApplet(@RequestParam Integer anum,
+                                                            @RequestParam String code,
+                                                            @RequestParam String encryptedData,
+                                                            @RequestParam String iv) {
+        log.debug("login by wechat applet:[anum:{},code:{},encryptedData:{},iv:{}]", anum, code, encryptedData, iv);
+        String wechatMobile, wechatOpenid, wechatUnionid;
+        try {
+            WxMaJscode2SessionResult wxMaJscode2SessionResult = adamWechatService.sessionInfo(code, anum);
+
+            WxMaPhoneNumberInfo wxMaPhoneNumberInfo = adamWechatService.phoneNumberInfo(wxMaJscode2SessionResult.getSessionKey(), encryptedData, iv, anum);
+
+            wechatMobile = wxMaPhoneNumberInfo.getPurePhoneNumber();
+            wechatOpenid = wxMaJscode2SessionResult.getOpenid();
+            wechatUnionid = wxMaJscode2SessionResult.getUnionid();
+        } catch (WxErrorException e) {
+            log.error("login by wechat applet exception:[anum:{},code:{},encryptedData:{},iv:{}], errmsg:{}", anum, code, encryptedData, iv, e.getMessage());
+            return ResponseDto.failure("微信小程序解码信息失败");
+        }
+
+        if (StringUtils.isEmpty(wechatMobile)) return ResponseDto.failure(ErrorMapping.get("10005"));
+
+        String uid = adamRdmService.getUidByMobile(wechatMobile);
+        boolean toRegister = StringUtils.isEmpty(uid);
+
+        AdamUserInfoVo userInfoVo;
+        if (toRegister) {
+            userInfoVo = adamUserService.register(wechatMobile);
+            if (null == userInfoVo) {
+                return ResponseDto.failure(ErrorMapping.get("10000"));
+            }
+        } else {
+            userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
+        }
+
+        // 根据skip值，设置IsComplete（考虑到已存在用户未完善信息的情况，这里只对返回数据单独设置IsComplete）
+        userInfoVo.setIsComplete(1);
+
+        AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew();
+        if (!toRegister) {
+//            loginInfoVo.setRealNameInfo(adamRdmService.getRealInfoVoByUid(userInfoVo.getUid()));
+//            loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(userInfoVo.getUid()));
+            loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(userInfoVo.getUid()));
+        }
+//        loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
+        loginInfoVo.setUserInfo(userInfoVo);
+        loginInfoVo.setToken(this.ssoProcess(userInfoVo));
+        loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(userInfoVo.getMobile(), 3, 4));
+        loginInfoVo.setWechatOpenid(wechatOpenid);
+        loginInfoVo.setWechatUnionid(wechatUnionid);
+        log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
+        return ResponseDto.success(loginInfoVo);
+    }
+
+    @ApiOperationSupport(order = 6)
     @ApiOperation(value = "第三方账号登录")
     @PostMapping(value = {"login/tpa"})
-    public ResponseDto<AdamLoginInfoVo> loginByTpa(@Valid @RequestBody AdamThirdPartParam parameter) {
+    public ResponseDto<AdamLoginInfoVo> loginByThirdPartApp(@Valid @RequestBody AdamThirdPartParam parameter) {
         log.debug("login by tpa:{}", JsonUtils.toJson(parameter));
         boolean toRegister = false;
         AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew();
@@ -304,7 +372,7 @@ public class AdamLoginController {
         return ResponseDto.success(loginInfoVo);
     }
 
-    @ApiOperationSupport(order = 6)
+    @ApiOperationSupport(order = 7)
     @ApiOperation(value = "登出")
     @PostMapping(value = {"out"})
     public void logout() {
@@ -313,7 +381,7 @@ public class AdamLoginController {
         redisUtil.del(jwtValidator.getSsoRedisKey().concat(CurrentUtil.getCurrentUid()));
     }
 
-    @ApiOperationSupport(order = 7)
+    @ApiOperationSupport(order = 8)
     @ApiOperation(value = "注销")
     @PostMapping(value = {"close"})
     public ResponseDto<Object> close() {
@@ -326,14 +394,14 @@ public class AdamLoginController {
         return ResponseDto.success();
     }
 
-    @ApiOperationSupport(order = 8)
+    @ApiOperationSupport(order = 9)
     @ApiOperation(value = "时间戳")
     @GetMapping(value = {"ts"})
     public ResponseDto<Long> timestamp() {
         return ResponseDto.success(LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli());
     }
 
-    @ApiOperationSupport(order = 9)
+    @ApiOperationSupport(order = 10)
     @ApiOperation(value = "微信小程序登录凭证校验", notes = "这里仅用于获取OPENID使用。登录凭证校验。通过 wx.login 接口获得临时登录凭证 code 后传到开发者服务器调用此接口完成登录流程。更多使用方法详见 https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/login/auth.code2Session.html")
     @GetMapping(value = {"wxa/code2session"})
     public ResponseDto<String> wxaCode2Session(@RequestParam String jsCode) {
@@ -356,7 +424,7 @@ public class AdamLoginController {
         return ResponseDto.success(openId);
     }
 
-    @ApiOperationSupport(order = 10)
+    @ApiOperationSupport(order = 11)
     @ApiOperation(value = "微信网站应用登录", notes = "这里仅用于获取OPENID使用。方法详见 https://developers.weixin.qq.com/doc/oplatform/Website_App/WeChat_Login/Wechat_Login.html")
     @GetMapping(value = {"wx/oauth2/access_token"})
     public ResponseDto<String> wxOauth2AccessToken(@RequestParam String code) {

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/AdamWechatService.java

+package com.liquidnet.service.adam.service;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
+import com.liquidnet.service.adam.config.WechatMaConfigure;
+import me.chanjar.weixin.common.error.WxErrorException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AdamWechatService {
+    @Autowired
+    WechatMaConfigure wechatMaConfigure;
+
+    public WxMaJscode2SessionResult sessionInfo(String code, Integer anum) throws WxErrorException {
+        WxMaService wxMaService = wechatMaConfigure.getWxMaService(anum);
+        return wxMaService.getUserService().getSessionInfo(code);
+    }
+
+    public WxMaUserInfo userInfo(String sessionKey, String encryptedData, String iv, Integer anum) {
+        WxMaService wxMaService = wechatMaConfigure.getWxMaService(anum);
+        return wxMaService.getUserService().getUserInfo(sessionKey, encryptedData, iv);
+    }
+
+    public WxMaPhoneNumberInfo phoneNumberInfo(String sessionKey, String encryptedData, String iv, Integer anum) {
+        WxMaService wxMaService = wechatMaConfigure.getWxMaService(anum);
+        return wxMaService.getUserService().getPhoneNoInfo(sessionKey, encryptedData, iv);
+    }
+}

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

@@ -28,13 +28,13 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class SweetWechatCallbackServiceImpl {
 
-    @Value("${liquidnet.wechat.zhengzai.service.appid}")
+    @Value("${liquidnet.wechat.service.zhengzai.appid}")
     private String appid;
-    @Value("${liquidnet.wechat.zhengzai.service.secret}")
+    @Value("${liquidnet.wechat.service.zhengzai.secret}")
     private String secret;
-    @Value("${liquidnet.wechat.zhengzai.service.token}")
+    @Value("${liquidnet.wechat.service.zhengzai.token}")
     private String token;
-    @Value("${liquidnet.wechat.zhengzai.service.aeskey}")
+    @Value("${liquidnet.wechat.service.zhengzai.aeskey}")
     private String aeskey;
 
     @Autowired

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

@@ -37,9 +37,9 @@ import java.util.Set;
 @Service
 public class SweetWechatTemplateServiceImpl {
 
-    @Value("${liquidnet.wechat.zhengzai.service.appid}")
+    @Value("${liquidnet.wechat.service.zhengzai.appid}")
     private String appid;
-    @Value("${liquidnet.wechat.zhengzai.service.secret}")
+    @Value("${liquidnet.wechat.service.zhengzai.secret}")
     private String secret;
     @Value("${liquidnet.client.admin.h5Url}")
     private String h5Url;

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

@@ -19,7 +19,7 @@ import java.util.Arrays;
 public class WechatSignUtils {
 
     // 与接口配置信息中的 Token 要一致
-    @Value("${liquidnet.wechat.zhengzai.service.token}")
+    @Value("${liquidnet.wechat.service.zhengzai.token}")
     private String token;
 
     /**