From 543c5ec0b9d3ed4a67934361f0c837cf0dde7c95 Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Tue, 25 Feb 2025 18:28:42 +0800 Subject: [PATCH 1/9] =?UTF-8?q?chore:=20=E7=B2=BE=E7=AE=80=20MySQL=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/mysql/conf/my.cnf | 51 ++++++++++++---------------------------- 1 file changed, 15 insertions(+), 36 deletions(-) diff --git a/docker/mysql/conf/my.cnf b/docker/mysql/conf/my.cnf index b71a794b..73981f81 100644 --- a/docker/mysql/conf/my.cnf +++ b/docker/mysql/conf/my.cnf @@ -1,41 +1,20 @@ -# 服务端参数配置 + + [mysqld] -skip-name-resolve -user=mysql # MySQL启动用户 -default-storage-engine=INNODB # 创建新表时将使用的默认存储引擎 -character-set-server=utf8mb4 # 设置mysql服务端默认字符集 -collation-server = utf8mb4_general_ci # 数据库字符集对应一些排序等规则，注意要和character-set-server对应 +# 字符集与排序规则 +character-set-server = utf8mb4 # 服务端默认字符集 +collation-server = utf8mb4_0900_ai_ci # 服务端默认排序规则 -pid-file = /var/lib/mysql/mysqld.pid # pid文件所在目录 -socket = /var/lib/mysql/mysqld.sock # 用于本地连接的socket套接字 -datadir = /var/lib/mysql # 数据文件存放的目录 -bind-address = 0.0.0.0 # 允许本机及外部网络连接 -expire_logs_days= 7 # 定义清除过期日志的时间(这里设置为7天) +# 网络与路径 +datadir = /var/lib/mysql # 数据文件存放的目录 +bind-address = 0.0.0.0 # 允许远程连接，默认 127.0.0.1 只允许本地连接 +port = 3306 # 显式指定端口（默认3306可不写） -# 设置client连接mysql时的字符集,防止乱码 -init_connect='SET NAMES utf8mb4' - -# 是否对sql语句大小写敏感，1表示不敏感 -lower_case_table_names = 1 - -# 执行sql的模式，规定了sql的安全等级, 暂时屏蔽，my.cnf文件中配置报错 -#sql_mode = STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION - -# 事务隔离级别，默认为可重复读，mysql默认可重复读级别（此级别下可能参数很多间隙锁，影响性能） -transaction_isolation = READ-COMMITTED - -# TIMESTAMP如果没有显示声明NOT NULL，允许NULL值 -explicit_defaults_for_timestamp = true - -#它控制着mysqld进程能使用的最大文件描述(FD)符数量。 -#需要注意的是这个变量的值并不一定是你设定的值，mysqld会在系统允许的情况下尽量获取更多的FD数量 -open_files_limit = 65535 - -# 允许最大连接数 -max_connections=200 - -#最大错误连接数 -max_connect_errors = 600 +# 客户端字符集同步（避免乱码） +init_connect = 'SET NAMES utf8mb4' # 连接初始化时设置字符集 [client] -default-character-set=utf8mb4 # 设置mysql客户端默认字符集 \ No newline at end of file +default-character-set = utf8mb4 # 客户端默认字符集 + +[mysql] +default-character-set = utf8mb4 # MySQL 命令行工具字符集 From 509dae345980c996b7e712576c742bda7e7640c7 Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Tue, 25 Feb 2025 18:30:14 +0800 Subject: [PATCH 2/9] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=20minio=20?= =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index eade344f..7cb652f9 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -43,7 +43,7 @@ services: command: server /data --console-address ":9090" ports: - 9000:9000 - - 9090:9090 + - 9001:9001 environment: - TZ=Asia/Shanghai - LANG=en_US.UTF-8 From 6adadb9e7738a53c5da386e77b98501984e49605 Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Tue, 25 Feb 2025 22:59:49 +0800 Subject: [PATCH 3/9] =?UTF-8?q?style:=20=E7=A7=BB=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=A9=BA=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/youlai/boot/system/controller/UserController.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/youlai/boot/system/controller/UserController.java b/src/main/java/com/youlai/boot/system/controller/UserController.java index 2e2b626a..0b5e39fa 100644 --- a/src/main/java/com/youlai/boot/system/controller/UserController.java +++ b/src/main/java/com/youlai/boot/system/controller/UserController.java @@ -1,6 +1,5 @@ package com.youlai.boot.system.controller; -import cn.hutool.json.JSONUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -64,7 +63,6 @@ public class UserController { @Valid UserPageQuery queryParams ) { IPage result = userService.getUserPage(queryParams); - return PageResult.success(result); } From 2e9faf15232cb9b5f5a15e63755da9334f96d72e Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Tue, 25 Feb 2025 23:03:10 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:=20=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=E6=9C=AC=E4=BA=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/youlai/boot/system/mapper/UserMapper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/youlai/boot/system/mapper/UserMapper.java b/src/main/java/com/youlai/boot/system/mapper/UserMapper.java index c087d453..690e74ec 100644 --- a/src/main/java/com/youlai/boot/system/mapper/UserMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/UserMapper.java @@ -25,11 +25,11 @@ public interface UserMapper extends BaseMapper { /** * 获取用户分页列表 * - * @param page 分页参数 + * @param page 分页参数 * @param queryParams 查询参数 * @return 用户分页列表 */ - @DataPermission(deptAlias = "u") + @DataPermission(deptAlias = "u", userAlias = "u") Page getUserPage(Page page, UserPageQuery queryParams); /** @@ -70,7 +70,7 @@ public interface UserMapper extends BaseMapper { * @param queryParams 查询参数 * @return 导出用户列表 */ - @DataPermission(deptAlias = "u") + @DataPermission(deptAlias = "u", userAlias = "u") List listExportUsers(UserPageQuery queryParams); /** From ac61f47d252a4fc36f5cc2e1e6f44c319158e7a3 Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Tue, 25 Feb 2025 23:05:32 +0800 Subject: [PATCH 5/9] =?UTF-8?q?chore:=20=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/model/form/PasswordResetForm.java | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 src/main/java/com/youlai/boot/system/model/form/PasswordResetForm.java diff --git a/src/main/java/com/youlai/boot/system/model/form/PasswordResetForm.java b/src/main/java/com/youlai/boot/system/model/form/PasswordResetForm.java deleted file mode 100644 index a1acca63..00000000 --- a/src/main/java/com/youlai/boot/system/model/form/PasswordResetForm.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.youlai.boot.system.model.form; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -/** - * 重置密码表单 - * - * @author Ray - * @since 2024/8/13 - */ -@Schema(description = "重置密码表单") -@Data -public class PasswordResetForm { - - @Schema(description = "用户ID") - private Long userId; - - @Schema(description = "密码") - private String password; - - -} From 42cfe6ce20d6f29d45bebfd68f0c17dcf56dc2a2 Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Tue, 25 Feb 2025 23:06:32 +0800 Subject: [PATCH 6/9] =?UTF-8?q?refactor:=20=E5=85=BC=E5=AE=B9=20MySQL=205.?= =?UTF-8?q?7=20=E7=89=88=E6=9C=AC=E8=84=9A=E6=9C=AC=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/mysql/youlai_boot.sql | 50 +++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/sql/mysql/youlai_boot.sql b/sql/mysql/youlai_boot.sql index 0fd3a84c..4b3e5c30 100644 --- a/sql/mysql/youlai_boot.sql +++ b/sql/mysql/youlai_boot.sql @@ -6,7 +6,7 @@ -- ---------------------------- -- 1. 创建数据库 -- ---------------------------- -CREATE DATABASE IF NOT EXISTS youlai_boot DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci; +CREATE DATABASE IF NOT EXISTS youlai_boot CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci; -- ---------------------------- @@ -14,11 +14,8 @@ CREATE DATABASE IF NOT EXISTS youlai_boot DEFAULT CHARACTER SET utf8mb4 DEFAULT -- ---------------------------- use youlai_boot; -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - - -- 开启事务 -START TRANSACTION; +SET NAMES utf8mb4; # 设置字符集 +SET FOREIGN_KEY_CHECKS = 0; # 关闭外键检查，加快导入速度 -- ---------------------------- -- Table structure for sys_dept @@ -39,7 +36,7 @@ CREATE TABLE `sys_dept` ( `is_deleted` tinyint DEFAULT 0 COMMENT '逻辑删除标识(1-已删除 0-未删除)', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `uk_code`(`code` ASC) USING BTREE COMMENT '部门编号唯一索引' -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '部门表'; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COMMENT = '部门表'; -- ---------------------------- -- Records of sys_dept @@ -65,7 +62,7 @@ CREATE TABLE `sys_dict` ( `is_deleted` tinyint DEFAULT '0' COMMENT '是否删除(1-删除，0-未删除)', PRIMARY KEY (`id`) USING BTREE, KEY `idx_dict_code` (`dict_code`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='字典表'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='字典表'; -- ---------------------------- -- Records of sys_dict -- ---------------------------- @@ -92,7 +89,7 @@ CREATE TABLE `sys_dict_data` ( `update_time` datetime COMMENT '更新时间', `update_by` bigint COMMENT '修改人ID', PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='字典数据表'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='字典数据表'; -- ---------------------------- -- Records of sys_dict_data @@ -132,9 +129,9 @@ CREATE TABLE `sys_menu` ( `redirect` varchar(128) COMMENT '跳转路径', `create_time` datetime NULL COMMENT '创建时间', `update_time` datetime NULL COMMENT '更新时间', - `params` json NULL COMMENT '路由参数', + `params` varchar(255) NULL COMMENT '路由参数', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '菜单管理'; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COMMENT = '菜单管理'; -- ---------------------------- -- Records of sys_menu @@ -233,7 +230,7 @@ CREATE TABLE `sys_role` ( PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `uk_name`(`name` ASC) USING BTREE COMMENT '角色名称唯一索引', UNIQUE INDEX `uk_code`(`code` ASC) USING BTREE COMMENT '角色编码唯一索引' -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '角色表'; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COMMENT = '角色表'; -- ---------------------------- -- Records of sys_role @@ -259,7 +256,7 @@ CREATE TABLE `sys_role_menu` ( `role_id` bigint NOT NULL COMMENT '角色ID', `menu_id` bigint NOT NULL COMMENT '菜单ID', UNIQUE INDEX `uk_roleid_menuid`(`role_id` ASC, `menu_id` ASC) USING BTREE COMMENT '角色菜单唯一索引' -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '角色和菜单关联表'; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COMMENT = '角色和菜单关联表'; -- ---------------------------- -- Records of sys_role_menu @@ -370,7 +367,7 @@ CREATE TABLE `sys_user` ( `openid` char(28) COMMENT '微信 openid', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `login_name`(`username` ASC) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户信息表'; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COMMENT = '用户信息表'; -- ---------------------------- -- Records of sys_user @@ -387,7 +384,7 @@ CREATE TABLE `sys_user_role` ( `user_id` bigint NOT NULL COMMENT '用户ID', `role_id` bigint NOT NULL COMMENT '角色ID', PRIMARY KEY (`user_id`, `role_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户和角色关联表'; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COMMENT = '用户和角色关联表'; -- ---------------------------- -- Records of sys_user_role @@ -403,14 +400,14 @@ INSERT INTO `sys_user_role` VALUES (3, 3); DROP TABLE IF EXISTS `sys_log`; CREATE TABLE `sys_log` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键', - `module` varchar(50) CHARACTER SET utf8mb4 NOT NULL COMMENT '日志模块', + `module` varchar(50) NOT NULL COMMENT '日志模块', `request_method` varchar(64) NOT NULL COMMENT '请求方式', `request_params` text COMMENT '请求参数(批量请求参数可能会超过text)', `response_content` mediumtext COMMENT '返回参数', - `content` varchar(255) CHARACTER SET utf8mb4 NOT NULL COMMENT '日志内容', + `content` varchar(255) NOT NULL COMMENT '日志内容', `request_uri` varchar(255) COMMENT '请求路径', - `method` varchar(255) CHARACTER SET utf8mb4 COMMENT '方法名', - `ip` varchar(45) CHARACTER SET utf8mb4 COMMENT 'IP地址', + `method` varchar(255) COMMENT '方法名', + `ip` varchar(45) COMMENT 'IP地址', `province` varchar(100) COMMENT '省份', `city` varchar(100) COMMENT '城市', `execution_time` bigint COMMENT '执行时间(ms)', @@ -422,7 +419,7 @@ CREATE TABLE `sys_log` ( `is_deleted` tinyint DEFAULT '0' COMMENT '逻辑删除标识(1-已删除 0-未删除)', PRIMARY KEY (`id`) USING BTREE, KEY `idx_create_time` (`create_time`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='系统日志表'; +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COMMENT='系统日志表'; -- ---------------------------- -- Table structure for gen_config @@ -442,7 +439,7 @@ CREATE TABLE `gen_config` ( `is_deleted` bit(1) DEFAULT b'0' COMMENT '是否删除', PRIMARY KEY (`id`), UNIQUE KEY `uk_tablename` (`table_name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='代码生成基础配置表'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='代码生成基础配置表'; -- ---------------------------- -- Table structure for gen_field_config @@ -470,7 +467,7 @@ CREATE TABLE `gen_field_config` ( `update_time` datetime COMMENT '更新时间', PRIMARY KEY (`id`), KEY `config_id` (`config_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='代码生成字段配置表'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='代码生成字段配置表'; -- ---------------------------- -- 系统配置表 @@ -514,7 +511,7 @@ CREATE TABLE `sys_notice` ( `update_time` datetime COMMENT '更新时间', `is_deleted` tinyint(1) DEFAULT '0' COMMENT '是否删除（0: 未删除, 1: 已删除）', PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='通知公告表'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='通知公告表'; INSERT INTO `sys_notice` VALUES (1, 'v2.12.0 新增系统日志，访问趋势统计功能。', '

1. 消息通知

2. 字典重构

3. 代码生成

', 1, 'L', 1, '2', 1, 1, now(), now(), 2, now(), 1, now(), 0); INSERT INTO `sys_notice` VALUES (2, 'v2.13.0 新增菜单搜索。', '

1. 消息通知

2. 字典重构

3. 代码生成

', 1, 'L', 1, '2', 1, 1, now(), now(), 2, now(), 1, now(), 0); @@ -541,7 +538,7 @@ CREATE TABLE `sys_user_notice` ( `update_time` datetime COMMENT '更新时间', `is_deleted` tinyint DEFAULT '0' COMMENT '逻辑删除(0: 未删除, 1: 已删除)', PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='用户通知公告表'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户通知公告表'; INSERT INTO `sys_user_notice` VALUES (1, 1, 2, 1, NULL, now(), now(), 0); INSERT INTO `sys_user_notice` VALUES (2, 2, 2, 1, NULL, now(), now(), 0); @@ -554,7 +551,4 @@ INSERT INTO `sys_user_notice` VALUES (8, 8, 2, 1, NULL, now(), now(), 0); INSERT INTO `sys_user_notice` VALUES (9, 9, 2, 1, NULL, now(), now(), 0); INSERT INTO `sys_user_notice` VALUES (10, 10, 2, 1, NULL, now(), now(), 0); -SET FOREIGN_KEY_CHECKS = 1; - - -- 提交事务 -COMMIT; +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file From 7c7eaf21ea2b5aa43d4cade77e630fdb51217057 Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Tue, 25 Feb 2025 23:07:21 +0800 Subject: [PATCH 7/9] =?UTF-8?q?docs:=20=E5=AE=8C=E5=96=84=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../youlai/boot/system/service/impl/NoticeServiceImpl.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java index e986f0f0..a05f3051 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java @@ -50,11 +50,8 @@ import java.util.stream.Collectors; public class NoticeServiceImpl extends ServiceImpl implements NoticeService { private final NoticeConverter noticeConverter; - private final UserNoticeService userNoticeService; - private final UserService userService; - private final SimpMessagingTemplate messagingTemplate; private final OnlineUserService onlineUserService; @@ -266,10 +263,9 @@ public class NoticeServiceImpl extends ServiceImpl impleme } /** - * 阅读获取通知公告详情 * * @param id 通知公告ID - * @return + * @return NoticeDetailVO 通知公告详情 */ @Override public NoticeDetailVO getNoticeDetail(Long id) { From 300c35a2baf3f4e0d97d3bdde0227729b334aebc Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Tue, 25 Feb 2025 23:08:16 +0800 Subject: [PATCH 8/9] =?UTF-8?q?refactor:=20=E8=B6=85=E7=BA=A7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=9C=A8=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/system/UserMapper.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/resources/mapper/system/UserMapper.xml b/src/main/resources/mapper/system/UserMapper.xml index 0940c488..2ce46ee6 100644 --- a/src/main/resources/mapper/system/UserMapper.xml +++ b/src/main/resources/mapper/system/UserMapper.xml @@ -24,7 +24,9 @@ LEFT JOIN sys_user_role sur ON u.id = sur.user_id LEFT JOIN sys_role r ON sur.role_id = r.id - u.is_deleted = 0 AND u.username != 'root' + u.is_deleted = 0 + + AND r.name != '${@com.youlai.boot.common.constant.SystemConstants@ROOT_ROLE_CODE}' AND ( u.username LIKE CONCAT('%',#{queryParams.keywords},'%') @@ -118,9 +120,9 @@ - + - + @@ -191,7 +193,7 @@ sys_user u LEFT JOIN sys_dept d ON u.dept_id = d.id - u.is_deleted = 0 AND u.username != 'root' + u.is_deleted = 0 AND (u.username LIKE CONCAT('%',#{keywords},'%') OR u.nickname LIKE CONCAT('%',#{keywords},'%') From 7feb5973249965532ad7dd576ab2f56223e9eb17 Mon Sep 17 00:00:00 2001 From: Theo <971366405@qq.com> Date: Fri, 28 Feb 2025 15:23:21 +0800 Subject: [PATCH 9/9] =?UTF-8?q?refactor(system):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B3=A8=E9=87=8A=E5=92=8C=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 JwtTokenManager 类中更新 generateToken 方法的注释 - 在 MenuServiceImpl 类中修正菜单类型判断逻辑并优化注释 - 在 MyAuthenticationEntryPoint 类中调整导入顺序和删除未使用的导入 --- .../security/exception/MyAuthenticationEntryPoint.java | 9 +++------ .../boot/core/security/manager/JwtTokenManager.java | 2 +- .../youlai/boot/system/service/impl/MenuServiceImpl.java | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/youlai/boot/core/security/exception/MyAuthenticationEntryPoint.java b/src/main/java/com/youlai/boot/core/security/exception/MyAuthenticationEntryPoint.java index 11efd9df..a8768cdf 100644 --- a/src/main/java/com/youlai/boot/core/security/exception/MyAuthenticationEntryPoint.java +++ b/src/main/java/com/youlai/boot/core/security/exception/MyAuthenticationEntryPoint.java @@ -2,15 +2,12 @@ package com.youlai.boot.core.security.exception; import com.youlai.boot.common.result.ResultCode; import com.youlai.boot.common.util.ResponseUtils; -import org.springframework.security.authentication.BadCredentialsException; -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.security.web.AuthenticationEntryPoint; -import org.springframework.stereotype.Component; - import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; import java.io.IOException; diff --git a/src/main/java/com/youlai/boot/core/security/manager/JwtTokenManager.java b/src/main/java/com/youlai/boot/core/security/manager/JwtTokenManager.java index 6bb06473..4da6987b 100644 --- a/src/main/java/com/youlai/boot/core/security/manager/JwtTokenManager.java +++ b/src/main/java/com/youlai/boot/core/security/manager/JwtTokenManager.java @@ -188,7 +188,7 @@ public class JwtTokenManager implements TokenManager { * * @param authentication 认证信息 * @param ttl 过期时间 - * @return + * @return JWT Token */ private String generateToken(Authentication authentication, int ttl) { diff --git a/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java index fc27d8da..cf71ebeb 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java @@ -241,13 +241,13 @@ public class MenuServiceImpl extends ServiceImpl implements Me MenuTypeEnum menuType = menuForm.getType(); - if (menuType == MenuTypeEnum.CATALOG) { // 如果是外链 + if (menuType == MenuTypeEnum.CATALOG) { // 如果是目录 String path = menuForm.getRoutePath(); if (menuForm.getParentId() == 0 && !path.startsWith("/")) { menuForm.setRoutePath("/" + path); // 一级目录需以 / 开头 } menuForm.setComponent("Layout"); - } else if (menuType == MenuTypeEnum.EXTLINK) { // 如果是目录 + } else if (menuType == MenuTypeEnum.EXTLINK) { // 如果是外链 menuForm.setComponent(null); }