elink-star
/
epmet-cloud-lingshan
forked from luyan/epmet-cloud-lingshan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

appId

master
jianjun 3 years ago
parent
cc10a53e1a
commit
fa9b4cf824
1 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

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

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

Write Preview
Loading…
Cancel
Save