添加参数配置名称

config/local/sa-token.yml

@@ -6,7 +6,7 @@ sa-token:
   timeout: 604800
   # 多端不同 token 有效期 可查看 LoginHelper.loginByDevice 方法自定义
   # token最低活跃时间 (指定时间无操作就过期) 单位: 秒
-  active-timeout: 1800
+  active-timeout: 86400
   # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
   is-concurrent: true
   # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
@@ -18,4 +18,6 @@ sa-token:
   # 是否打印log
   is-print: false
   # jwt秘钥
-  jwt-secret-key: abcdefghijklmnopqrstuvwxyz
+  jwt-secret-key: abcdefghijklmnopqrstuvwxyz
+  # 同一账号最大登录数量，-1代表不限
+  max-login-count: -1

config/local/security.yml

@@ -15,5 +15,4 @@ security:
     - /actuator
     - /actuator/**
     # 其它链接
-    - /auth/login
-    - /**
+    - /auth/login

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/config/ConfigController.java

@@ -56,6 +56,9 @@ public class ConfigController {
     @PostMapping("/add")
     @SaCheckPermission("system:config:add")
     public CommonResult<String> add(@RequestBody @Valid ConfigBO configBO) {
+        if (configService.hasKeyByKey(configBO.getConfigKey())) {
+            return fail("参数键名已存在！");
+        }
         boolean result = configService.insert(configBO);
         if (!result) {
             return fail("新增失败！");

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/domain/config/Config.java

@@ -28,6 +28,11 @@ public class Config extends BaseEntity {
     @Id
     private String configId;
 
+    /**
+     * 名称
+     */
+    private String name;
+
     /**
      * key
      */

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/domain/config/pojo/ConfigBO.java

@@ -7,6 +7,7 @@ package org.eco.vip.nexus.core.domain.config.pojo;
 
 
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.eco.vip.nexus.core.domain.config.Config;
@@ -27,14 +28,22 @@ public class ConfigBO extends BaseBO {
      */
     private String configId;
 
+    /**
+     * 名称
+     */
+    @NotBlank(message = "name不能为空")
+    private String name;
+
     /**
      * key
      */
+    @NotBlank(message = "configKey不能为空")
     private String configKey;
 
     /**
      * 值
      */
+    @NotBlank(message = "configValue不能为空")
     private String configValue;
 
     /**

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/domain/config/pojo/ConfigVO.java

@@ -28,6 +28,11 @@ public class ConfigVO extends BaseEntity {
      */
     private String configId;
 
+    /**
+     * 名称
+     */
+    private String name;
+
     /**
      * key
      */

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/auth/PasswordAuthStrategy.java

@@ -68,7 +68,7 @@ public class PasswordAuthStrategy implements IAuthStrategy {
         loginParameter.setDeviceType(clientVO.getDeviceType());
         loginParameter.setTimeout(clientVO.getTimeout());
         loginParameter.setActiveTimeout(clientVO.getActiveTimeout());
-        loginParameter.setExtra(LoginHelper.CLIENT_KEY, clientVO.getClientKey());
+        loginParameter.setExtra(LoginHelper.CLIENT_KEY, clientVO.getClientId());
         return loginParameter;
     }
 

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/config/ConfigService.java

@@ -16,6 +16,7 @@ import org.eco.vip.nexus.core.mapper.ConfigMapper;
 import org.eco.vip.orm.domain.PageQuery;
 import org.eco.vip.orm.pojo.PageResult;
 import org.eco.vip.orm.service.BaseService;
+import org.eco.vip.orm.utils.CollUtils;
 import org.eco.vip.orm.utils.MapstructUtils;
 import org.springframework.stereotype.Service;
 
@@ -38,6 +39,7 @@ public class ConfigService extends BaseService<ConfigMapper, Config> implements
     private QueryWrapper buildQueryWrapper(ConfigBO configBO) {
         return super.buildBaseQueryWrapper()
                 .and(CONFIG.CONFIG_ID.eq(configBO.getConfigId()))
+                .and(CONFIG.NAME.eq(configBO.getName()))
                 .and(CONFIG.CONFIG_KEY.eq(configBO.getConfigKey()))
                 .and(CONFIG.CONFIG_VALUE.eq(configBO.getConfigValue()))
                 .and(CONFIG.STATUS.eq(configBO.getStatus()));
@@ -78,4 +80,11 @@ public class ConfigService extends BaseService<ConfigMapper, Config> implements
         QueryWrapper queryWrapper = query().where(CONFIG.CONFIG_ID.eq(id));
         return this.getOneAs(queryWrapper, ConfigVO.class);
     }
+
+    @Override
+    public boolean hasKeyByKey(String key) {
+        QueryWrapper queryWrapper = query().where(CONFIG.CONFIG_KEY.eq(key));
+        List<Config> list = this.list(queryWrapper);
+        return CollUtils.isNotEmpty(list);
+    }
 }

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/config/IConfigService.java

@@ -62,4 +62,11 @@ public interface IConfigService {
      * @return 信息
      */
     ConfigVO selectById(String id);
+
+    /**
+     * @description: 删除
+     * @param key key
+     * @return boolean 是否成功
+     **/
+    boolean hasKeyByKey(String key);
 }

eco-start/src/main/resources/db/mysql/V1_0_0_1__sys-init-ddl.sql

@@ -378,9 +378,10 @@ VALUES ('72249010234000105', '72248983950000119', '否', '0', NULL, 'danger', 2,
 DROP TABLE IF EXISTS `system_config_t`;
 CREATE TABLE `system_config_t`
 (
-    `config_id`             varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '唯一标识',
-    `config_kay`          varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'key',
-    `config_value`        varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'value',
+    `config_id`           varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '唯一标识',
+    `name`                varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称',
+    `config_key`          varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'key',
+    `config_value`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'value',
     `category`            varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分类',
     `order_num`           int NULL DEFAULT NULL COMMENT '显示顺序',
     `is_lock`             varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据锁1：锁定',