From 0fc796b90d3f44b81ef30285edb897223df439f7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 13 一月 2023 23:04:09 +0800
Subject: [PATCH] update 适配 javax.servlet 替换为 jakarta.servlet 更新所有代码 update 适配 ServletUtils 更换继承 JakartaServletUtil
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java | 59 ++++++++++++++++++-----------------------------------------
1 files changed, 18 insertions(+), 41 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 9b8b378..6f69f0b 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,14 +3,12 @@
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;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
/**
* 瀵硅薄瀛樺偍閰嶇疆涓氬姟瀵硅薄 sys_oss_config
@@ -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,72 +52,56 @@
/**
* 妗跺悕绉�
*/
- @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;
/**
- * 鍒嗛〉澶у皬
+ * 妗舵潈闄愮被鍨�(0private 1public 2custom)
*/
- @ApiModelProperty("鍒嗛〉澶у皬")
- private Integer pageSize;
-
- /**
- * 褰撳墠椤垫暟
- */
- @ApiModelProperty("褰撳墠椤垫暟")
- private Integer pageNum;
-
- /**
- * 鎺掑簭鍒�
- */
- @ApiModelProperty("鎺掑簭鍒�")
- private String orderByColumn;
-
- /**
- * 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc
- */
- @ApiModelProperty(value = "鎺掑簭鐨勬柟鍚�", example = "asc,desc")
- private String isAsc;
+ @NotBlank(message = "妗舵潈闄愮被鍨嬩笉鑳戒负绌�", groups = {AddGroup.class, EditGroup.class})
+ private String accessPolicy;
}
--
Gitblit v1.9.3