From 13ad4fd1db4c979386092f398d0666a114a28017 Mon Sep 17 00:00:00 2001 From: Theo <971366405@qq.com> Date: Tue, 30 Jul 2024 19:36:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=8F=90=E7=A4=BA=E6=9C=AA=E6=8E=88=E6=9D=83?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 删除系统配置提示未授权bug修复 --- sql/mysql5/youlai_boot.sql | 32 +++++++++++++------ sql/mysql8/youlai_boot.sql | 18 +++++++++-- .../controller/SysConfigController.java | 2 +- .../youlai/system/model/entity/SysConfig.java | 6 ++-- .../youlai/system/model/form/ConfigForm.java | 6 ++-- .../com/youlai/system/model/vo/ConfigVO.java | 6 ++-- .../service/impl/SysConfigServiceImpl.java | 8 ++--- 7 files changed, 51 insertions(+), 27 deletions(-) diff --git a/sql/mysql5/youlai_boot.sql b/sql/mysql5/youlai_boot.sql index 60efca37..2dc34ffa 100644 --- a/sql/mysql5/youlai_boot.sql +++ b/sql/mysql5/youlai_boot.sql @@ -24,16 +24,16 @@ SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- DROP TABLE IF EXISTS `sys_config`; CREATE TABLE `sys_config` ( - `id` bigint NOT NULL AUTO_INCREMENT, - `sys_name` varchar(50) NOT NULL COMMENT '配置名称', - `sys_key` varchar(50) NOT NULL COMMENT '配置key', - `sys_value` varchar(100) NOT NULL COMMENT '配置值', - `remark` varchar(200) DEFAULT NULL COMMENT '描述、备注', - `create_time` datetime NOT NULL COMMENT '创建时间', - `create_by` bigint NOT NULL COMMENT '创建人ID', - `update_time` datetime DEFAULT NULL COMMENT '更新时间', - `update_by` bigint DEFAULT NULL COMMENT '更新人ID', - `is_deleted` tinyint(1) NOT NULL COMMENT '逻辑删除标识(0-未删除 1-已删除)', + `id` bigint NOT NULL AUTO_INCREMENT, + `config_name` varchar(50) NOT NULL COMMENT '配置名称', + `config_key` varchar(50) NOT NULL COMMENT '配置key', + `config_value` varchar(100) NOT NULL COMMENT '配置值', + `remark` varchar(200) DEFAULT NULL COMMENT '描述、备注', + `create_time` datetime NOT NULL COMMENT '创建时间', + `create_by` bigint NOT NULL COMMENT '创建人ID', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `update_by` bigint DEFAULT NULL COMMENT '更新人ID', + `is_deleted` tinyint(1) NOT NULL COMMENT '逻辑删除标识(0-未删除 1-已删除)', PRIMARY KEY (`id`) ) ENGINE=InnoDB COMMENT='系统配置'; @@ -217,6 +217,12 @@ INSERT INTO `sys_menu` VALUES (112, 110, '0,110', '参数(type=2)', 1, NULL, 'ro INSERT INTO `sys_menu` VALUES (117, 1, '0,1', '系统日志', 1, 'Log', 'log', 'system/log/index', NULL, 0, 1, 1, 6, 'document', NULL, '2024-06-28 07:43:16', '2024-06-28 07:43:16', NULL); INSERT INTO `sys_menu` VALUES (118, 0, '0', '系统工具', 2, NULL, '/tool', 'Layout', NULL, 0, 1, 1, 2, 'menu', NULL, '2024-07-13 08:41:07', '2024-07-13 08:41:07', NULL); INSERT INTO `sys_menu` VALUES (119, 118, '0,118', '代码生成(Alpha)', 1, 'Generator', 'generator', 'generator/index', NULL, 0, 1, 1, 1, 'code', NULL, '2024-07-13 08:44:51', '2024-07-13 08:44:51', NULL); +INSERT INTO `sys_menu` VALUES (120,1,'0,1','系统配置',1,'Config','config','system/config/index',NULL,0,1,1,7,'setting',NULL,'2024-07-30 16:29:24','2024-07-30 16:29:32',NULL); +INSERT INTO `sys_menu` VALUES (121,120,'0,1,120','查询系统配置',4,NULL,'',NULL,'sys:config:query',0,1,1,1,'',NULL,'2024-07-30 16:29:54','2024-07-30 16:29:54',NULL); +INSERT INTO `sys_menu` VALUES (122,120,'0,1,120','新增系统配置',4,NULL,'',NULL,'sys:config:add',0,1,1,2,'',NULL,'2024-07-30 16:30:12','2024-07-30 16:30:48',NULL); +INSERT INTO `sys_menu` VALUES (123,120,'0,1,120','修改系统配置',4,NULL,'',NULL,'sys:config:update',0,1,1,3,'',NULL,'2024-07-30 16:30:31','2024-07-30 16:30:31',NULL); +INSERT INTO `sys_menu` VALUES (124,120,'0,1,120','删除系统配置',4,NULL,'',NULL,'sys:config:delete',0,1,1,4,'',NULL,'2024-07-30 16:31:07','2024-07-30 16:31:07',NULL); +INSERT INTO `sys_menu` VALUES (125,120,'0,1,120','刷新系统配置',4,NULL,'',NULL,'sys:config:refresh',0,1,1,5,'',NULL,'2024-07-30 16:31:25','2024-07-30 16:31:25',NULL); -- ---------------------------- -- Table structure for sys_message @@ -344,6 +350,12 @@ INSERT INTO `sys_role_menu` VALUES (2, 116); INSERT INTO `sys_role_menu` VALUES (2, 117); INSERT INTO `sys_role_menu` VALUES (2, 118); INSERT INTO `sys_role_menu` VALUES (2, 119); +INSERT INTO `sys_role_menu` VALUES (2, 120); +INSERT INTO `sys_role_menu` VALUES (2, 121); +INSERT INTO `sys_role_menu` VALUES (2, 122); +INSERT INTO `sys_role_menu` VALUES (2, 123); +INSERT INTO `sys_role_menu` VALUES (2, 124); +INSERT INTO `sys_role_menu` VALUES (2, 125); -- ---------------------------- -- Table structure for sys_user -- ---------------------------- diff --git a/sql/mysql8/youlai_boot.sql b/sql/mysql8/youlai_boot.sql index 8fdd651f..8b926e48 100644 --- a/sql/mysql8/youlai_boot.sql +++ b/sql/mysql8/youlai_boot.sql @@ -26,9 +26,9 @@ SET FOREIGN_KEY_CHECKS = 0; DROP TABLE IF EXISTS `sys_config`; CREATE TABLE `sys_config` ( `id` bigint NOT NULL AUTO_INCREMENT, - `sys_name` varchar(50) NOT NULL COMMENT '配置名称', - `sys_key` varchar(50) NOT NULL COMMENT '配置key', - `sys_value` varchar(100) NOT NULL COMMENT '配置值', + `config_name` varchar(50) NOT NULL COMMENT '配置名称', + `config_key` varchar(50) NOT NULL COMMENT '配置key', + `config_value` varchar(100) NOT NULL COMMENT '配置值', `remark` varchar(200) DEFAULT NULL COMMENT '描述、备注', `create_time` datetime NOT NULL COMMENT '创建时间', `create_by` bigint NOT NULL COMMENT '创建人ID', @@ -218,6 +218,12 @@ INSERT INTO `sys_menu` VALUES (112, 110, '0,110', '参数(type=2)', 1, NULL, 'ro INSERT INTO `sys_menu` VALUES (117, 1, '0,1', '系统日志', 1, 'Log', 'log', 'system/log/index', NULL, 0, 1, 1, 6, 'document', NULL, '2024-06-28 07:43:16', '2024-06-28 07:43:16', NULL); INSERT INTO `sys_menu` VALUES (118, 0, '0', '系统工具', 2, NULL, '/tool', 'Layout', NULL, 0, 1, 1, 2, 'menu', NULL, '2024-07-13 08:41:07', '2024-07-13 08:41:07', NULL); INSERT INTO `sys_menu` VALUES (119, 118, '0,118', '代码生成(Alpha)', 1, 'Generator', 'generator', 'generator/index', NULL, 0, 1, 1, 1, 'code', NULL, '2024-07-13 08:44:51', '2024-07-13 08:44:51', NULL); +INSERT INTO `sys_menu` VALUES (120,1,'0,1','系统配置',1,'Config','config','system/config/index',NULL,0,1,1,7,'setting',NULL,'2024-07-30 16:29:24','2024-07-30 16:29:32',NULL); +INSERT INTO `sys_menu` VALUES (121,120,'0,1,120','查询系统配置',4,NULL,'',NULL,'sys:config:query',0,1,1,1,'',NULL,'2024-07-30 16:29:54','2024-07-30 16:29:54',NULL); +INSERT INTO `sys_menu` VALUES (122,120,'0,1,120','新增系统配置',4,NULL,'',NULL,'sys:config:add',0,1,1,2,'',NULL,'2024-07-30 16:30:12','2024-07-30 16:30:48',NULL); +INSERT INTO `sys_menu` VALUES (123,120,'0,1,120','修改系统配置',4,NULL,'',NULL,'sys:config:update',0,1,1,3,'',NULL,'2024-07-30 16:30:31','2024-07-30 16:30:31',NULL); +INSERT INTO `sys_menu` VALUES (124,120,'0,1,120','删除系统配置',4,NULL,'',NULL,'sys:config:delete',0,1,1,4,'',NULL,'2024-07-30 16:31:07','2024-07-30 16:31:07',NULL); +INSERT INTO `sys_menu` VALUES (125,120,'0,1,120','刷新系统配置',4,NULL,'',NULL,'sys:config:refresh',0,1,1,5,'',NULL,'2024-07-30 16:31:25','2024-07-30 16:31:25',NULL); -- ---------------------------- -- Table structure for sys_message @@ -345,6 +351,12 @@ INSERT INTO `sys_role_menu` VALUES (2, 116); INSERT INTO `sys_role_menu` VALUES (2, 117); INSERT INTO `sys_role_menu` VALUES (2, 118); INSERT INTO `sys_role_menu` VALUES (2, 119); +INSERT INTO `sys_role_menu` VALUES (2, 120); +INSERT INTO `sys_role_menu` VALUES (2, 121); +INSERT INTO `sys_role_menu` VALUES (2, 122); +INSERT INTO `sys_role_menu` VALUES (2, 123); +INSERT INTO `sys_role_menu` VALUES (2, 124); +INSERT INTO `sys_role_menu` VALUES (2, 125); -- ---------------------------- -- Table structure for sys_user -- ---------------------------- diff --git a/src/main/java/com/youlai/system/controller/SysConfigController.java b/src/main/java/com/youlai/system/controller/SysConfigController.java index 9a59beee..5e247fe8 100644 --- a/src/main/java/com/youlai/system/controller/SysConfigController.java +++ b/src/main/java/com/youlai/system/controller/SysConfigController.java @@ -73,7 +73,7 @@ public class SysConfigController { @DeleteMapping("/{id}") @Operation(summary = "删除系统配置") - @PreAuthorize("@ss.hasPerm('business:config:delete')") + @PreAuthorize("@ss.hasPerm('sys:config:delete')") public Result delete(@PathVariable Long id) { return Result.judge(sysConfigService.delete(id)); } diff --git a/src/main/java/com/youlai/system/model/entity/SysConfig.java b/src/main/java/com/youlai/system/model/entity/SysConfig.java index f12aa261..809e2ae3 100644 --- a/src/main/java/com/youlai/system/model/entity/SysConfig.java +++ b/src/main/java/com/youlai/system/model/entity/SysConfig.java @@ -19,13 +19,13 @@ import io.swagger.v3.oas.annotations.media.Schema; public class SysConfig extends BaseEntity { @Schema(description = "配置名称") - private String sysName; + private String configName; @Schema(description = "配置key") - private String sysKey; + private String configKey; @Schema(description = "配置值") - private String sysValue; + private String configValue; @Schema(description = "描述、备注") private String remark; diff --git a/src/main/java/com/youlai/system/model/form/ConfigForm.java b/src/main/java/com/youlai/system/model/form/ConfigForm.java index 1dbe156a..27c4d5b9 100644 --- a/src/main/java/com/youlai/system/model/form/ConfigForm.java +++ b/src/main/java/com/youlai/system/model/form/ConfigForm.java @@ -26,15 +26,15 @@ public class ConfigForm implements Serializable { @NotBlank(message = "配置名称不能为空") @Schema(description = "配置名称") - private String sysName; + private String configName; @NotBlank(message = "配置key不能为空") @Schema(description = "配置key") - private String sysKey; + private String configKey; @NotBlank(message = "配置值不能为空") @Schema(description = "配置值") - private String sysValue; + private String configValue; @Schema(description = "描述、备注") private String remark; diff --git a/src/main/java/com/youlai/system/model/vo/ConfigVO.java b/src/main/java/com/youlai/system/model/vo/ConfigVO.java index 2ce26a93..21c8e350 100644 --- a/src/main/java/com/youlai/system/model/vo/ConfigVO.java +++ b/src/main/java/com/youlai/system/model/vo/ConfigVO.java @@ -25,13 +25,13 @@ public class ConfigVO { private Long id; @Schema(description = "配置名称") - private String sysName; + private String configName; @Schema(description = "配置key") - private String sysKey; + private String configKey; @Schema(description = "配置值") - private String sysValue; + private String configValue; @Schema(description = "描述、备注") private String remark; diff --git a/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java index 7b026ea5..991a86e6 100644 --- a/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java @@ -50,7 +50,7 @@ public class SysConfigServiceImpl extends ServiceImpl page = new Page<>(configPageQuery.getPageNum(), configPageQuery.getPageSize()); QueryWrapper query = new QueryWrapper<>(); if(StringUtils.isNotBlank(configPageQuery.getKeywords())) { - query.and(q -> q.like("sys_key", configPageQuery.getKeywords()).or().like("sys_name", configPageQuery.getKeywords())); + query.and(q -> q.like("config_key", configPageQuery.getKeywords()).or().like("config_name", configPageQuery.getKeywords())); } Page pageList = this.page(page, query); return sysConfigConverter.convertToPageVo(pageList); @@ -63,7 +63,7 @@ public class SysConfigServiceImpl extends ServiceImpl().eq("sys_key", configForm.getSysKey())) == 0, "配置key已存在"); + Assert.isTrue(super.count(new QueryWrapper().eq("config_key", configForm.getConfigKey())) == 0, "配置key已存在"); SysConfig sysConfig = sysConfigConverter.toEntity(configForm); sysConfig.setCreateBy(SecurityUtils.getUserId()); sysConfig.setIsDeleted(SystemConstants.NOT_DELETED_STATUS); @@ -90,7 +90,7 @@ public class SysConfigServiceImpl extends ServiceImpl().eq("sys_key", configForm.getSysKey()).ne("id", id)) == 0, "配置key已存在"); + Assert.isTrue(super.count(new QueryWrapper().eq("config_key", configForm.getConfigKey()).ne("id", id)) == 0, "配置key已存在"); SysConfig sysConfig = sysConfigConverter.toEntity(configForm); sysConfig.setUpdateBy(SecurityUtils.getUserId()); return this.update(sysConfig, new QueryWrapper().eq("id", id)); @@ -118,7 +118,7 @@ public class SysConfigServiceImpl extends ServiceImpl list = this.list(); if (list != null) { - Map map = list.stream().collect(Collectors.toMap(SysConfig::getSysKey, SysConfig::getSysValue)); + Map map = list.stream().collect(Collectors.toMap(SysConfig::getConfigKey, SysConfig::getConfigValue)); redisTemplate.opsForHash().putAll(RedisKeyConstants.SYSTEM_CONFIG_KEY,map); return true; }