Merge branch 'dev'

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -86,7 +86,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
         String token = this.generateToken(formDTO, userId);
 
         //4.存放Redis
-        this.saveTokenDto(formDTO, userId, userWechatDTO, token);
+        this.saveTokenDto(formDTO, userId, userWechatDTO, token, userWechatDTO.getCustomerId());
 
         //5.接口返参
         UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
@@ -111,9 +111,10 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
     /**
      * @Description 将token存入redis
      **/
-    private String saveTokenDto(LoginCommonFormDTO formDTO, String userId, UserWechatDTO userWechatDTO, String token) {
+    private String saveTokenDto(LoginCommonFormDTO formDTO, String userId, UserWechatDTO userWechatDTO, String token, String customerId) {
         int expire = jwtTokenProperties.getExpire();
         TokenDto tokenDto = new TokenDto();
+        tokenDto.setCustomerId(customerId);
         tokenDto.setApp(formDTO.getApp());
         tokenDto.setClient(formDTO.getClient());
         tokenDto.setUserId(userId);

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CustomerMpServiceImpl.java

@@ -142,6 +142,9 @@ public class CustomerMpServiceImpl extends BaseServiceImpl<CustomerMpDao, Custom
         //2.调用微信API获取用户信息
         UserWechatDTO resultMap = wxLoginService.resiAndWorkLogin(formDTO.getAppId(), formDTO.getWxCode(), mpDTO.getCustomerId(), mpDTO.getClient());
 
+        //3.返参添加客户Id sun  2021.1.8
+        resultMap.setCustomerId(mpDTO.getCustomerId());
+
         return resultMap;
     }
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserWechatDTO.java

@@ -110,4 +110,9 @@ public class UserWechatDTO implements Serializable{
 
     //@JsonIgnore
     private String sessionKey;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
 }