elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'remotes/origin/dev_shibei_match' into shibei_master

release
jianjun 4 years ago
parent
dbe45fdfa7 eba897d4d8
commit
9b4244dab2
1 changed files with 16 additions and 12 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. 28
      epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java

28
epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java
View File

@ -74,23 +74,27 @@ public class InternalAuthProcessor extends AuthProcessor {
app = (String) claims.get(AppClientConstant.APP); app = (String) claims.get(AppClientConstant.APP);
client = (String) claims.get(AppClientConstant.CLIENT); client = (String) claims.get(AppClientConstant.CLIENT);
userId = (String) claims.get(AppClientConstant.USER_ID); userId = (String) claims.get(AppClientConstant.USER_ID);
customerId = (String) claims.get(AppClientConstant.CUSTOMER_ID);
expiration = claims.getExpiration(); expiration = claims.getExpiration();
baseTokenDto = cpUserDetailRedis.get(app, client, userId, BaseTokenDto.class); baseTokenDto = cpUserDetailRedis.get(app, client, userId, BaseTokenDto.class);
//市北数字社区 如果redis里不存在 则自动登陆 生成token放入redis //市北数字社区 如果redis里不存在 则自动登陆 生成token放入redis
if (baseTokenDto == null){ if (baseTokenDto == null){
Result<String> stringResult = epmetAuthOpenFeignClient.generateTokenBySSOKey("123", userId, CustomerIdConstant.SHI_BEI_CUSTOMER_ID); //目前只支持市北客户ID 这样免登陆
if (stringResult != null && stringResult.success() && StringUtils.isNotBlank(stringResult.getData())){ if (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(customerId)){
baseTokenDto = new BaseTokenDto(); Result<String> stringResult = epmetAuthOpenFeignClient.generateTokenBySSOKey("123", userId, customerId);
baseTokenDto.setApp(app); if (stringResult != null && stringResult.success() && StringUtils.isNotBlank(stringResult.getData())){
baseTokenDto.setClient(client); baseTokenDto = new BaseTokenDto();
baseTokenDto.setUserId(userId); baseTokenDto.setApp(app);
String tokenNew = stringResult.getData(); baseTokenDto.setClient(client);
//把传过来的token用新的token 替换 baseTokenDto.setUserId(userId);
token = tokenNew; String tokenNew = stringResult.getData();
baseTokenDto.setToken(tokenNew); //把传过来的token用新的token 替换
baseTokenDto.setCustomerId(CustomerIdConstant.SHI_BEI_CUSTOMER_ID); token = tokenNew;
baseTokenDto.setToken(tokenNew);
baseTokenDto.setCustomerId(CustomerIdConstant.SHI_BEI_CUSTOMER_ID);
}
logger.info("stringResult"+ JSON.toJSONString(stringResult));
} }
logger.info("stringResult"+ JSON.toJSONString(stringResult));
} }
} }
} }

Write Preview
Loading…
Cancel
Save