From 06583a0732a796ecfbb188a69198294202ca1e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com>
Date: Fri, 4 Aug 2023 15:18:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forex/trading_trading/config/security/LoginResult.java     | 3 +++
 .../forex/trading_trading/config/security/TokenProvider.java   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/sztzjy/forex/trading_trading/config/security/LoginResult.java b/src/main/java/com/sztzjy/forex/trading_trading/config/security/LoginResult.java
index c67bc59..35ddc1a 100644
--- a/src/main/java/com/sztzjy/forex/trading_trading/config/security/LoginResult.java
+++ b/src/main/java/com/sztzjy/forex/trading_trading/config/security/LoginResult.java
@@ -39,6 +39,8 @@ public class LoginResult {
 
     @ApiModelProperty("用户所在专业")
     private int majorId;
+    @ApiModelProperty("用户名")
+    private String username;
 
 
 // user.setUserId(dataObject.getStr("userId"));
@@ -71,6 +73,7 @@ public class LoginResult {
         result.setAuthorityCodes(jwtUser.getAuthorityCodes());
         result.setMajorId(jwtUser.getMajorId());
         result.setCollegeId(jwtUser.getCollegeId());
+        result.setUsername(jwtUser.getUsername());
         return result;
     }
 }
diff --git a/src/main/java/com/sztzjy/forex/trading_trading/config/security/TokenProvider.java b/src/main/java/com/sztzjy/forex/trading_trading/config/security/TokenProvider.java
index c1f6ee1..2cfa4b5 100644
--- a/src/main/java/com/sztzjy/forex/trading_trading/config/security/TokenProvider.java
+++ b/src/main/java/com/sztzjy/forex/trading_trading/config/security/TokenProvider.java
@@ -127,7 +127,7 @@ public class TokenProvider {
             jwtUser.setRoleId(Integer.valueOf(claims.get("roleId").toString()));
             jwtUser.setClassId(Integer.valueOf(claims.get("classId").toString()));
             jwtUser.setSchoolId(Integer.valueOf(claims.get("schoolId").toString()));
-            jwtUser.setUsername(claims.get("name").toString());
+            jwtUser.setUsername(claims.get("username").toString());
             return jwtUser;
         } catch (Exception e) {
             throw new UnAuthorizedException("token解析失败");