From a8d798c38a6e7fb186b6d8a20953af200caefc8c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 22 七月 2022 17:34:14 +0800
Subject: [PATCH] fix 修复 RedisUtils 并发 set ttl 错误问题

---
 ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java |   30 +++++++++++++-----------------
 1 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java
index 9a66e38..e9f481d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java
@@ -3,8 +3,6 @@
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -22,28 +20,24 @@
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("瀵硅薄瀛樺偍閰嶇疆涓氬姟瀵硅薄")
 public class SysOssConfigBo extends BaseEntity {
 
     /**
      * 涓诲缓
      */
-    @ApiModelProperty(value = "涓诲缓", required = true)
     @NotNull(message = "涓诲缓涓嶈兘涓虹┖", groups = {EditGroup.class})
     private Long ossConfigId;
 
     /**
      * 閰嶇疆key
      */
-    @ApiModelProperty(value = "configKey", required = true)
-    @NotBlank(message = "configKey涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "閰嶇疆key涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
     @Size(min = 2, max = 100, message = "configKey闀垮害蹇呴』浠嬩簬2鍜�20 涔嬮棿")
     private String configKey;
 
     /**
      * accessKey
      */
-    @ApiModelProperty(value = "accessKey", required = true)
     @NotBlank(message = "accessKey涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
     @Size(min = 2, max = 100, message = "accessKey闀垮害蹇呴』浠嬩簬2鍜�100 涔嬮棿")
     private String accessKey;
@@ -51,7 +45,6 @@
     /**
      * 绉橀挜
      */
-    @ApiModelProperty(value = "secretKey", required = true)
     @NotBlank(message = "secretKey涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
     @Size(min = 2, max = 100, message = "secretKey闀垮害蹇呴』浠嬩簬2鍜�100 涔嬮棿")
     private String secretKey;
@@ -59,47 +52,50 @@
     /**
      * 妗跺悕绉�
      */
-    @ApiModelProperty(value = "bucketName", required = true)
-    @NotBlank(message = "bucketName涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "妗跺悕绉颁笉鑳戒负绌�", groups = {AddGroup.class, EditGroup.class})
     @Size(min = 2, max = 100, message = "bucketName闀垮害蹇呴』浠嬩簬2鍜�100涔嬮棿")
     private String bucketName;
 
     /**
      * 鍓嶇紑
      */
-    @ApiModelProperty(value = "鍓嶇紑")
     private String prefix;
 
     /**
      * 璁块棶绔欑偣
      */
-    @ApiModelProperty(value = "endpoint", required = true)
-    @NotBlank(message = "endpoint涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "璁块棶绔欑偣涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
     @Size(min = 2, max = 100, message = "endpoint闀垮害蹇呴』浠嬩簬2鍜�100涔嬮棿")
     private String endpoint;
 
     /**
+     * 鑷畾涔夊煙鍚�
+     */
+    private String domain;
+
+    /**
      * 鏄惁https锛圷=鏄�,N=鍚︼級
      */
-    @ApiModelProperty("鏄惁https锛圷=鏄�,N=鍚︼級")
     private String isHttps;
 
     /**
      * 鐘舵�侊紙0=姝ｅ父,1=鍋滅敤锛�
      */
-    @ApiModelProperty("鐘舵�侊紙0=姝ｅ父,1=鍋滅敤锛�")
     private String status;
 
     /**
      * 鍩�
      */
-    @ApiModelProperty(value = "region")
     private String region;
 
     /**
      * 鎵╁睍瀛楁
      */
-    @ApiModelProperty(value = "鎵╁睍瀛楁")
     private String ext1;
 
+    /**
+     * 澶囨敞
+     */
+    private String remark;
+
 }

--
Gitblit v1.9.3