appId

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

@@ -767,7 +767,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
             resDTO.setRegFlag(resiResDTO.getRegFlag());
 
             //3.生成token，并且存放Redis
-            String token=this.saveTokenDtoDing(formDTO.getClientId(),AppClientConstant.APP_RESI,AppClientConstant.MINI_DING, resDTO.getEpmetUserId(), resDTO.getCustomerId());
+            String token=this.saveTokenDtoDing(formDTO.getMiniAppId(),AppClientConstant.APP_RESI,AppClientConstant.MINI_DING, resDTO.getEpmetUserId(), resDTO.getCustomerId());
             resDTO.setAuthorization(token);
 
         } catch (ApiException e) {
@@ -776,26 +776,26 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         return resDTO;
     }
 
-    private String saveTokenDtoDing(String suiteKey,String app,String client, String userId,String customerId) {
+    private String saveTokenDtoDing(String miniAppId,String app,String client, String userId,String customerId) {
         //生成token串
         Map<String, Object> map = new HashMap<>();
         map.put(AppClientConstant.APP, app);
         // map.put(AppClientConstant.CLIENT, client);
         // 第三方企业应用传应用的SuiteKey 作为client
-        map.put(AppClientConstant.CLIENT, client.concat(suiteKey));
+        map.put(AppClientConstant.CLIENT, client.concat(miniAppId));
         map.put("userId", userId);
         String token = jwtTokenUtils.createToken(map);
         int expire = jwtTokenProperties.getExpire();
         TokenDto tokenDto = new TokenDto();
         tokenDto.setCustomerId(customerId);
         tokenDto.setApp(app);
-        tokenDto.setClient(client.concat(suiteKey));
+        tokenDto.setClient(client.concat(miniAppId));
         tokenDto.setUserId(userId);
         tokenDto.setToken(token);
         tokenDto.setUpdateTime(System.currentTimeMillis());
         tokenDto.setExpireTime(jwtTokenUtils.getExpiration(token).getTime());
         cpUserDetailRedis.set(tokenDto, expire);
-        // cpUserDetailRedis.setForDingApp(suiteKey,tokenDto, expire);
+        // cpUserDetailRedis.setForDingApp(miniAppId,tokenDto, expire);
         logger.info("截止时间：" + DateUtils.format(jwtTokenUtils.getExpiration(token), "yyyy-MM-dd HH:mm:ss"));
         return token;
     }
@@ -830,8 +830,8 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
                 resDTO.setRegFlag(true);
             }
 
-            //1、获取用户手机号
-            String clientId = formDTO.getClientId();
+            //1、获取用户手机号 todo 这里暂时没改为miniappId
+            String clientId = formDTO.getMiniAppId();
             DingTalkResult<AccessTokenResult> userAccessToken = dingTalkClientToken.getUserAccessToken(formDTO.getAuthCode(), clientId, DingMiniAppEnum.getEnum(clientId).getSuiteSecret());
             log.info("resiLoginDing userAccessToken:{}",JSON.toJSONString(userAccessToken));
             if (!userAccessToken.success() || null == userAccessToken.getData()) {