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

fix: 删除系统配置提示未授权bug修复

Browse Source 
删除系统配置提示未授权bug修复
This commit is contained in:
Theo
2024-07-30 19:36:28 +08:00
parent d5077a395a
commit 13ad4fd1db
7 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/mysql5/youlai_boot.sql
View File

@@ -25,9 +25,9 @@ SET FOREIGN_KEY_CHECKS = 0;
DROP TABLE IF EXISTS `sys_config`; DROP TABLE IF EXISTS `sys_config`;
CREATE TABLE `sys_config` ( CREATE TABLE `sys_config` (
`id` bigint NOT NULL AUTO_INCREMENT, `id` bigint NOT NULL AUTO_INCREMENT,
`sys_name` varchar(50) NOT NULL COMMENT '配置名称', `config_name` varchar(50) NOT NULL COMMENT '配置名称',
`sys_key` varchar(50) NOT NULL COMMENT '配置key', `config_key` varchar(50) NOT NULL COMMENT '配置key',
`sys_value` varchar(100) NOT NULL COMMENT '配置值', `config_value` varchar(100) NOT NULL COMMENT '配置值',
`remark` varchar(200) DEFAULT NULL COMMENT '描述、备注', `remark` varchar(200) DEFAULT NULL COMMENT '描述、备注',
`create_time` datetime NOT NULL COMMENT '创建时间', `create_time` datetime NOT NULL COMMENT '创建时间',
`create_by` bigint NOT NULL COMMENT '创建人ID', `create_by` bigint NOT NULL COMMENT '创建人ID',
@@ -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 (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 (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 (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 -- 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, 117);
INSERT INTO `sys_role_menu` VALUES (2, 118); INSERT INTO `sys_role_menu` VALUES (2, 118);
INSERT INTO `sys_role_menu` VALUES (2, 119); 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 -- Table structure for sys_user
-- ---------------------------- -- ----------------------------

18
sql/mysql8/youlai_boot.sql
View File

@@ -26,9 +26,9 @@ SET FOREIGN_KEY_CHECKS = 0;
DROP TABLE IF EXISTS `sys_config`; DROP TABLE IF EXISTS `sys_config`;
CREATE TABLE `sys_config` ( CREATE TABLE `sys_config` (
`id` bigint NOT NULL AUTO_INCREMENT, `id` bigint NOT NULL AUTO_INCREMENT,
`sys_name` varchar(50) NOT NULL COMMENT '配置名称', `config_name` varchar(50) NOT NULL COMMENT '配置名称',
`sys_key` varchar(50) NOT NULL COMMENT '配置key', `config_key` varchar(50) NOT NULL COMMENT '配置key',
`sys_value` varchar(100) NOT NULL COMMENT '配置值', `config_value` varchar(100) NOT NULL COMMENT '配置值',
`remark` varchar(200) DEFAULT NULL COMMENT '描述、备注', `remark` varchar(200) DEFAULT NULL COMMENT '描述、备注',
`create_time` datetime NOT NULL COMMENT '创建时间', `create_time` datetime NOT NULL COMMENT '创建时间',
`create_by` bigint NOT NULL COMMENT '创建人ID', `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 (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 (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 (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 -- 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, 117);
INSERT INTO `sys_role_menu` VALUES (2, 118); INSERT INTO `sys_role_menu` VALUES (2, 118);
INSERT INTO `sys_role_menu` VALUES (2, 119); 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 -- Table structure for sys_user
-- ---------------------------- -- ----------------------------

2
src/main/java/com/youlai/system/controller/SysConfigController.java
View File

@@ -73,7 +73,7 @@ public class SysConfigController {
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
@Operation(summary = "删除系统配置") @Operation(summary = "删除系统配置")
@PreAuthorize("@ss.hasPerm('business:config:delete')") @PreAuthorize("@ss.hasPerm('sys:config:delete')")
public Result<?> delete(@PathVariable Long id) { public Result<?> delete(@PathVariable Long id) {
return Result.judge(sysConfigService.delete(id)); return Result.judge(sysConfigService.delete(id));
} }

6
src/main/java/com/youlai/system/model/entity/SysConfig.java
View File

@@ -19,13 +19,13 @@ import io.swagger.v3.oas.annotations.media.Schema;
public class SysConfig extends BaseEntity { public class SysConfig extends BaseEntity {
@Schema(description = "配置名称") @Schema(description = "配置名称")
private String sysName; private String configName;
@Schema(description = "配置key") @Schema(description = "配置key")
private String sysKey; private String configKey;
@Schema(description = "配置值") @Schema(description = "配置值")
private String sysValue; private String configValue;
@Schema(description = "描述、备注") @Schema(description = "描述、备注")
private String remark; private String remark;

6
src/main/java/com/youlai/system/model/form/ConfigForm.java
View File

@@ -26,15 +26,15 @@ public class ConfigForm implements Serializable {
@NotBlank(message = "配置名称不能为空") @NotBlank(message = "配置名称不能为空")
@Schema(description = "配置名称") @Schema(description = "配置名称")
private String sysName; private String configName;
@NotBlank(message = "配置key不能为空") @NotBlank(message = "配置key不能为空")
@Schema(description = "配置key") @Schema(description = "配置key")
private String sysKey; private String configKey;
@NotBlank(message = "配置值不能为空") @NotBlank(message = "配置值不能为空")
@Schema(description = "配置值") @Schema(description = "配置值")
private String sysValue; private String configValue;
@Schema(description = "描述、备注") @Schema(description = "描述、备注")
private String remark; private String remark;

6
src/main/java/com/youlai/system/model/vo/ConfigVO.java
View File

@@ -25,13 +25,13 @@ public class ConfigVO {
private Long id; private Long id;
@Schema(description = "配置名称") @Schema(description = "配置名称")
private String sysName; private String configName;
@Schema(description = "配置key") @Schema(description = "配置key")
private String sysKey; private String configKey;
@Schema(description = "配置值") @Schema(description = "配置值")
private String sysValue; private String configValue;
@Schema(description = "描述、备注") @Schema(description = "描述、备注")
private String remark; private String remark;

8
src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java
View File

@@ -50,7 +50,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
Page<SysConfig> page = new Page<>(configPageQuery.getPageNum(), configPageQuery.getPageSize()); Page<SysConfig> page = new Page<>(configPageQuery.getPageNum(), configPageQuery.getPageSize());
QueryWrapper<SysConfig> query = new QueryWrapper<>(); QueryWrapper<SysConfig> query = new QueryWrapper<>();
if(StringUtils.isNotBlank(configPageQuery.getKeywords())) { 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<SysConfig> pageList = this.page(page, query); Page<SysConfig> pageList = this.page(page, query);
return sysConfigConverter.convertToPageVo(pageList); return sysConfigConverter.convertToPageVo(pageList);
@@ -63,7 +63,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
*/ */
@Override @Override
public boolean save(ConfigForm configForm) { public boolean save(ConfigForm configForm) {
Assert.isTrue(super.count(new QueryWrapper<SysConfig>().eq("sys_key", configForm.getSysKey())) == 0, "配置key已存在"); Assert.isTrue(super.count(new QueryWrapper<SysConfig>().eq("config_key", configForm.getConfigKey())) == 0, "配置key已存在");
SysConfig sysConfig = sysConfigConverter.toEntity(configForm); SysConfig sysConfig = sysConfigConverter.toEntity(configForm);
sysConfig.setCreateBy(SecurityUtils.getUserId()); sysConfig.setCreateBy(SecurityUtils.getUserId());
sysConfig.setIsDeleted(SystemConstants.NOT_DELETED_STATUS); sysConfig.setIsDeleted(SystemConstants.NOT_DELETED_STATUS);
@@ -90,7 +90,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
*/ */
@Override @Override
public boolean edit(Long id, ConfigForm configForm) { public boolean edit(Long id, ConfigForm configForm) {
Assert.isTrue(super.count(new QueryWrapper<SysConfig>().eq("sys_key", configForm.getSysKey()).ne("id", id)) == 0, "配置key已存在"); Assert.isTrue(super.count(new QueryWrapper<SysConfig>().eq("config_key", configForm.getConfigKey()).ne("id", id)) == 0, "配置key已存在");
SysConfig sysConfig = sysConfigConverter.toEntity(configForm); SysConfig sysConfig = sysConfigConverter.toEntity(configForm);
sysConfig.setUpdateBy(SecurityUtils.getUserId()); sysConfig.setUpdateBy(SecurityUtils.getUserId());
return this.update(sysConfig, new QueryWrapper<SysConfig>().eq("id", id)); return this.update(sysConfig, new QueryWrapper<SysConfig>().eq("id", id));
@@ -118,7 +118,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
redisTemplate.delete(RedisKeyConstants.SYSTEM_CONFIG_KEY); redisTemplate.delete(RedisKeyConstants.SYSTEM_CONFIG_KEY);
List<SysConfig> list = this.list(); List<SysConfig> list = this.list();
if (list != null) { if (list != null) {
Map<String, String> map = list.stream().collect(Collectors.toMap(SysConfig::getSysKey, SysConfig::getSysValue)); Map<String, String> map = list.stream().collect(Collectors.toMap(SysConfig::getConfigKey, SysConfig::getConfigValue));
redisTemplate.opsForHash().putAll(RedisKeyConstants.SYSTEM_CONFIG_KEY,map); redisTemplate.opsForHash().putAll(RedisKeyConstants.SYSTEM_CONFIG_KEY,map);
return true; return true;
} }