登录信息修改

base-servers/auth/auth-dto/src/main/java/com/usoftchina/smartschool/auth/jwt/JwtHelper.java

@@ -41,6 +41,7 @@ public class JwtHelper {
                             .claim("userId", jwtInfo.getUserId())
                             .claim("userName", jwtInfo.getUserName())
                             .claim("school_id", jwtInfo.getSchool_id())
+                            .claim("mobile", jwtInfo.getMobile())
                             .setExpiration(DateTime.now().plusSeconds(expire).toDate())
                             // 设置算法（必须）
                             .signWith(SignatureAlgorithm.RS256, RsaUtils.getPrivateKey(priKeyPath))
@@ -97,7 +98,8 @@ public class JwtHelper {
                 ObjectUtils.getStringValue(body.get("appId")),
                 ObjectUtils.getLongValue(body.get("school_id")),
                 ObjectUtils.getLongValue(body.get("userId")),
-                ObjectUtils.getStringValue(body.get("userName"))
+                ObjectUtils.getStringValue(body.get("userName")),
+                ObjectUtils.getStringValue(body.get("mobile"))
         );
     }
 }

base-servers/auth/auth-dto/src/main/java/com/usoftchina/smartschool/auth/jwt/JwtInfo.java

@@ -11,15 +11,25 @@ public class JwtInfo implements Serializable{
     private Long school_id;
     private Long userId;
     private String userName;
+    private String mobile;
 
     public JwtInfo() {
     }
 
-    public JwtInfo(String appId, Long school_id, Long userId, String userName) {
+    public JwtInfo(String appId, Long school_id, Long userId, String userName, String mobile) {
         this.appId = appId;
         this.school_id = school_id;
         this.userId = userId;
         this.userName = userName;
+        this.mobile = mobile;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
     }
 
     public String getAppId() {

base-servers/auth/auth-server/src/main/java/com/usoftchina/smartschool/auth/controller/AuthController.java

@@ -52,7 +52,7 @@ public class AuthController {
             accountDTO.setSchool_id(school_id);
             String realName = accountApi.getUsername(school_id, accountDTO.getId()).getData();
             accountDTO.setUsername(realName);
-            JwtInfo jwtInfo = new JwtInfo("school", school_id, accountDTO.getId(), StringUtils.isEmpty(realName) ? accountDTO.getUser_phone() : realName);
+            JwtInfo jwtInfo = new JwtInfo("school", school_id, accountDTO.getId(), StringUtils.isEmpty(realName) ? accountDTO.getUser_phone() : realName, accountDTO.getUser_phone());
             JwtToken jwtToken = JwtHelper.generateToken(jwtInfo, privateKeyPath, expire);
             TokenDTO tokenDTO = BeanMapper.map(jwtToken, TokenDTO.class);
             // 登录日志

base-servers/gateway-server/src/main/java/com/usoftchina/smartschool/gateway/config/AuthFilter.java

@@ -53,7 +53,7 @@ public class AuthFilter implements GlobalFilter, Ordered {
                 BaseContextHolder.setUserName(jwt.getUserName());
                 BaseContextHolder.setSchoolId(jwt.getSchool_id());
                 BaseContextHolder.setToken(token);
-                AccountDTO accountDTO = accountApi.findByMobile(jwt.getUserName()).getData();
+                AccountDTO accountDTO = accountApi.findByMobile(jwt.getMobile()).getData();
                 if (null == accountDTO) {
                     throw new BizException(ExceptionCode.USER_NOT_EXIST);
                 }