tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/youlaiorg/youlai-boot

Browse Source
This commit is contained in:
haoxr
2024-03-09 00:03:13 +08:00
parent 1affb04996 fc1d829016
commit 58733cd5c1
2 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/youlai/system/config/WebSocketConfig.java
View File

@@ -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);

17
src/main/resources/mapper/SysDeptMapper.xml
View File

@@ -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>