修改老师端单点登录

src/main/java/com/sztzjy/financial_bigdata/config/security/JwtUser.java

@@ -2,6 +2,7 @@ package com.sztzjy.financial_bigdata.config.security;
 
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
@@ -14,6 +15,7 @@ import java.util.Objects;
  */
 @Getter
 @Setter
+@ToString
 public class JwtUser implements UserDetails {
     private String username;
     private String password;

src/main/java/com/sztzjy/financial_bigdata/config/security/TokenProvider.java

@@ -103,9 +103,11 @@ public class TokenProvider {
     }
 
     public static void main(String[] args) {
-      JwtUser jwtUser =  getJWTUserByZhiYun("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjb2xsZWdlIjoi5ryU56S65a2m6ZmiIiwiaWNpYnRTY2hvb2xJZCI6NCwibWQ1UHdkIjoiNDYtRjktNEMtOEQtRTEtNEYtQjMtNjYtODAtODUtMDctNjgtRkYtMUItN0YtMkEiLCJyb2xlaWQiOiI0Iiwic2V4Ijoi55S3IiwidXNlcklkIjoiNDg3Iiwic3R1ZGVudElkIjoiNDA0OCIsInBhc3N3b3JkIjoiMTIzcXdlIiwiY2xhc3NJZCI6IjIxMSIsImljaWJ0Q2xhc3NJZCI6MjA0LCJtYWpvciI6IuS6p-WTgea8lOekuuS4k-S4miIsInNjaG9vbCI6IuWkqeaLqeWkp-WtpiIsInNjaG9vbElkIjoiMjMyIiwibmFtZSI6InR6czAwMSIsInN0dWRlbnRObyI6InR6czAwMSIsImFwcGxpY2F0aW9uSWQiOiIxMTkiLCJjbGFzcyI6IuWkqeaLqea8lOekujHnj60iLCJ1c2VybmFtZSI6InR6czAwMSJ9.p6Uu15B1zNzuuCMOkDTkMksvjU6EOvGWprMWuJB0OII");
+//        JwtUser jwtUser = getJWTUserByZhiYun("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjb2xsZWdlIjoi5ryU56S65a2m6ZmiIiwiaWNpYnRTY2hvb2xJZCI6NCwibWQ1UHdkIjoiNDYtRjktNEMtOEQtRTEtNEYtQjMtNjYtODAtODUtMDctNjgtRkYtMUItN0YtMkEiLCJyb2xlaWQiOiI0Iiwic2V4Ijoi55S3IiwidXNlcklkIjoiNDg3Iiwic3R1ZGVudElkIjoiNDA0OCIsInBhc3N3b3JkIjoiMTIzcXdlIiwiY2xhc3NJZCI6IjIxMSIsImljaWJ0Q2xhc3NJZCI6MjA0LCJtYWpvciI6IuS6p-WTgea8lOekuuS4k-S4miIsInNjaG9vbCI6IuWkqeaLqeWkp-WtpiIsInNjaG9vbElkIjoiMjMyIiwibmFtZSI6InR6czAwMSIsInN0dWRlbnRObyI6InR6czAwMSIsImFwcGxpY2F0aW9uSWQiOiIxMTkiLCJjbGFzcyI6IuWkqeaLqea8lOekujHnj60iLCJ1c2VybmFtZSI6InR6czAwMSJ9.p6Uu15B1zNzuuCMOkDTkMksvjU6EOvGWprMWuJB0OII");
+        JwtUser jwtUser = getJWTUserByZhiYun("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjb2xsZWdlIjoi5ryU56S65a2m6ZmiIiwiaWNpYnRTY2hvb2xJZCI6NCwibWQ1UHdkIjoiNDYtRjktNEMtOEQtRTEtNEYtQjMtNjYtODAtODUtMDctNjgtRkYtMUItN0YtMkEiLCJyb2xlaWQiOiIzIiwic2V4Ijoi55S3IiwidXNlcklkIjoiMTg0NSIsInBhc3N3b3JkIjoiMTIzcXdlIiwidGVhY2hlcklkIjoiMzIzIiwibWFqb3IiOiLkuqflk4HmvJTnpLrkuJPkuJoiLCJzY2hvb2wiOiLlpKnmi6nlpKflraYiLCJzY2hvb2xJZCI6IjIzMiIsIm5hbWUiOiJ0enQwMDEiLCJhcHBsaWNhdGlvbklkIjoiMTE5IiwidXNlcm5hbWUiOiJ0enQwMDEifQ.rLKb20eOCN4KkyFQ5ZH8E56TsUVjBl2865nwnxYpsyk");
         System.out.println(jwtUser);
     }
+
     /**
      * 解析智云平台的token
      */
@@ -122,14 +124,20 @@ public class TokenProvider {
                     .getBody();
 
             JwtUser jwtUser = new JwtUser();
+            System.out.println(claims.toString());
             jwtUser.setName(claims.get("name") == null ? null : claims.get("name").toString());
             jwtUser.setUserId(claims.get("userId") == null ? null : claims.get("userId").toString());
             jwtUser.setRoleId(Integer.valueOf(claims.get("roleid") == null ? "0" : claims.get("roleid").toString()));
             jwtUser.setClassId(Integer.valueOf(claims.get("classId") == null ? "0" : claims.get("classId").toString()));
             jwtUser.setSchoolId(Integer.valueOf(claims.get("schoolId") == null ? "0" : claims.get("schoolId").toString()));
+            jwtUser.setClassName(claims.get("class") == null ? null : claims.get("class").toString());
+            jwtUser.setSchoolName(claims.get("school") == null ? "0" : claims.get("school").toString());
             jwtUser.setUsername(claims.get("username").toString());
             jwtUser.setPassword(claims.get("password").toString());
-            jwtUser.setStudentId(claims.get("studentNo").toString());
+            if (org.apache.commons.lang3.StringUtils.isNotBlank((String) claims.get("studentNo"))) {
+                String studentNo = (String) claims.get("studentNo");
+                jwtUser.setStudentId(studentNo);
+            }
             return jwtUser;
         } catch (Exception e) {
             throw new UnAuthorizedException("token解析失败");

src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java

@@ -102,7 +102,7 @@ public class UserController {
             map.put("name", user.getName());
             map.put("username", user.getUsername());
             map.put("roleId", user.getRoleId());
-            map.put("phone", user.getPhone());
+//            map.put("phone", user.getPhone());
             map.put("schoolId", user.getSchoolId());
             map.put("classId", user.getClassId());
             map.put("userId", user.getUserid());
@@ -126,7 +126,9 @@ public class UserController {
             map.put("username", loginResult.getUsername());
             map.put("roleId", loginResult.getRoleId());
             map.put("schoolId", loginResult.getSchoolId());
+            if (StringUtils.isNotBlank(loginResult.getUserId())) {
                 map.put("classId", loginResult.getClassId());
+            }
             map.put("userId", loginResult.getUserId());
             map.put("token", token);
             String uuid = getIPAndPlace(request, loginResult.getName(), loginResult.getUserId(), jwtUser.getStudentId());
@@ -150,7 +152,7 @@ public class UserController {
         sysLoginLog.setLogId(uuid);
         sysLoginLog.setUserid(userId);
         sysLoginLog.setName(name);
-        if (studentId != null) {
+        if (StringUtils.isNotBlank(studentId)) {
             sysLoginLog.setStudentId(studentId);
         }
         sysLoginLog.setLoginTime(new Date());