From 020760d2747e7e66b8cb492954b6ea5284538295 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Fri, 26 Jan 2024 22:50:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/SysDeptMapper.xml | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/main/resources/mapper/SysDeptMapper.xml b/src/main/resources/mapper/SysDeptMapper.xml
index ecf26412..17da0ce3 100644
--- a/src/main/resources/mapper/SysDeptMapper.xml
+++ b/src/main/resources/mapper/SysDeptMapper.xml
@@ -4,21 +4,4 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.youlai.system.mapper.SysDeptMapper">
 
-    <resultMap id="BaseResultMap" type="com.youlai.system.model.entity.SysDept">
-            <id property="id" column="id" jdbcType="BIGINT"/>
-            <result property="name" column="name" jdbcType="VARCHAR"/>
-            <result property="parentId" column="parent_id" jdbcType="BIGINT"/>
-            <result property="treePath" column="tree_path" jdbcType="VARCHAR"/>
-            <result property="sort" column="sort" jdbcType="INTEGER"/>
-            <result property="status" column="status" jdbcType="TINYINT"/>
-            <result property="deleted" column="deleted" jdbcType="TINYINT"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,name,parent_id,
-        tree_path,sort,status,
-        deleted,create_time,update_time
-    </sql>
 </mapper>

From 3928388c82e637cbef7199e7d302caa494721fb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=87=92=E4=BA=BA=E4=B8=8E=E7=8C=AB?=
 <lazycat_casillas@qq.com>
Date: Wed, 28 Feb 2024 07:14:04 +0000
Subject: [PATCH 2/2] =?UTF-8?q?update=20src/main/java/com/youlai/system/co?=
 =?UTF-8?q?nfig/WebSocketConfig.java.=20=E4=BD=BF=E7=94=A8=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0websocket=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=8F=91?=
 =?UTF-8?q?=E7=8E=B0=E5=90=8E=E5=8F=B0=E4=B8=80=E7=9B=B4=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=8B=BF=E5=88=B0=E7=94=A8=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E6=89=BE=E5=88=B0=E4=B8=80=E5=A4=84=E5=B8=B8?=
 =?UTF-8?q?=E9=87=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 懒人与猫 <lazycat_casillas@qq.com>
---
 src/main/java/com/youlai/system/config/WebSocketConfig.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/youlai/system/config/WebSocketConfig.java b/src/main/java/com/youlai/system/config/WebSocketConfig.java
index 75f8ed21..254fcd39 100644
--- a/src/main/java/com/youlai/system/config/WebSocketConfig.java
+++ b/src/main/java/com/youlai/system/config/WebSocketConfig.java
@@ -79,7 +79,10 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
                     if (StrUtil.isNotBlank(bearerToken) && bearerToken.startsWith("Bearer ")) {
                         try {
                             // 移除 "Bearer " 前缀，从令牌中提取用户信息(username), 并设置到认证信息中
-                            String username = JwtUtils.parseToken(bearerToken).get("name").toString();
+                            
+                            // 这里不应该用"name"
+                            // String username = JwtUtils.parseToken(bearerToken).get("name").toString();
+                            String username = JwtUtils.parseToken(bearerToken).get(JWTPayload.SUBJECT).toString();
 
                             if (StrUtil.isNotBlank(username)) {
                                 accessor.setUser(() -> username);