diff --git a/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java b/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java index ca27301..806a564 100644 --- a/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java +++ b/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java @@ -155,8 +155,6 @@ public class TokenController { login.setToken((String) map.get("access_token")); login.setExpireIn((Long) map.get("expires_in")); login.setLogin((boolean) map.get("isLogin")); - login.getSysUser().setPhonenumber(Sm4Utils.custDecrypt(login.getSysUser().getPhonenumber())); - login.getSysUser().setCustName(Sm4Utils.custDecrypt(login.getSysUser().getCustName())); return R.ok(login); } else { return R.ok(tokenService.createToken(login)); diff --git a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java index 55821ae..68b1df7 100644 --- a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java +++ b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java @@ -103,20 +103,21 @@ public class TokenService { delExistingToken(loginUser.getCustId()); String token = IdUtils.fastUUID(); Long custId = loginUser.getCustId(); - String userName = loginUser.getSysUser().getCustName(); + String custName = Sm4Utils.custDecrypt(loginUser.getSysUser().getCustName()); + String phoneNumber = Sm4Utils.custDecrypt(loginUser.getSysUser().getPhonenumber()); loginUser.setToken(token); loginUser.setCustId(custId); - loginUser.getSysUser().setCustName(userName); + loginUser.getSysUser().setCustName(custName); loginUser.setIpaddr(IpUtils.getIpAddr()); refreshToken(loginUser); // Jwt存储信息 Map claimsMap = new HashMap(16); claimsMap.put(SecurityConstants.USER_KEY, token); claimsMap.put(SecurityConstants.DETAILS_USER_ID, custId); - claimsMap.put(SecurityConstants.DETAILS_USERNAME, Sm4Utils.custDecrypt(loginUser.getSysUser().getPhonenumber())); + claimsMap.put(SecurityConstants.DETAILS_USERNAME, phoneNumber); String accessToken = JwtUtils.createToken(claimsMap); Map rspMap = new HashMap(16); - rspMap.put(ACCESS_TOKEN, accessToken); + rspMap.put("access_token", accessToken); rspMap.put("expires_in", EXPIRETIME); rspMap.put("isLogin", isLogin(String.valueOf(custId))); long tokenTime = getTokenTime();