From 71a2a8245db4c04be3f96a9eb9b47931d3130650 Mon Sep 17 00:00:00 2001 From: zlyx <1242874891@qq.com> Date: 星期三, 18 一月 2023 17:09:43 +0800 Subject: [PATCH] refactor 重构 common, framework 包结构, 参照 cloud 版本拆分子模块 ; update 更新模块包名 ; delete 移除 sms 模块, oss 模块, framework 模块 (并入 common 模块) ; --- ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java | 40 +++++++++++++++------------------------- 1 files changed, 15 insertions(+), 25 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 5ac4e96..80e998e 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 @@ -1,16 +1,14 @@ package com.ruoyi.system.domain.bo; -import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.common.core.web.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,96 +20,88 @@ @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 = "閰嶇疆key", required = true) @NotBlank(message = "閰嶇疆key涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class}) - @Size(min = 2, max = 100, message = "configKey闀垮害蹇呴』浠嬩簬2鍜�20 涔嬮棿") + @Size(min = 2, max = 100, message = "configKey闀垮害蹇呴』浠嬩簬{min}鍜寋max} 涔嬮棿") 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 涔嬮棿") + @Size(min = 2, max = 100, message = "accessKey闀垮害蹇呴』浠嬩簬{min}鍜寋max} 涔嬮棿") private String accessKey; /** * 绉橀挜 */ - @ApiModelProperty(value = "secretKey", required = true) @NotBlank(message = "secretKey涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class}) - @Size(min = 2, max = 100, message = "secretKey闀垮害蹇呴』浠嬩簬2鍜�100 涔嬮棿") + @Size(min = 2, max = 100, message = "secretKey闀垮害蹇呴』浠嬩簬{min}鍜寋max} 涔嬮棿") private String secretKey; /** * 妗跺悕绉� */ - @ApiModelProperty(value = "妗跺悕绉�", required = true) @NotBlank(message = "妗跺悕绉颁笉鑳戒负绌�", groups = {AddGroup.class, EditGroup.class}) - @Size(min = 2, max = 100, message = "bucketName闀垮害蹇呴』浠嬩簬2鍜�100涔嬮棿") + @Size(min = 2, max = 100, message = "bucketName闀垮害蹇呴』浠嬩簬{min}鍜寋max}涔嬮棿") private String bucketName; /** * 鍓嶇紑 */ - @ApiModelProperty(value = "鍓嶇紑") private String prefix; /** * 璁块棶绔欑偣 */ - @ApiModelProperty(value = "璁块棶绔欑偣", required = true) @NotBlank(message = "璁块棶绔欑偣涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class}) - @Size(min = 2, max = 100, message = "endpoint闀垮害蹇呴』浠嬩簬2鍜�100涔嬮棿") + @Size(min = 2, max = 100, message = "endpoint闀垮害蹇呴』浠嬩簬{min}鍜寋max}涔嬮棿") private String endpoint; /** * 鑷畾涔夊煙鍚� */ - @ApiModelProperty("鑷畾涔夊煙鍚�") private String domain; /** * 鏄惁https锛圷=鏄�,N=鍚︼級 */ - @ApiModelProperty("鏄惁https锛圷=鏄�,N=鍚︼級") private String isHttps; /** * 鐘舵�侊紙0=姝e父,1=鍋滅敤锛� */ - @ApiModelProperty("鐘舵�侊紙0=姝e父,1=鍋滅敤锛�") private String status; /** * 鍩� */ - @ApiModelProperty(value = "鍩�") private String region; /** * 鎵╁睍瀛楁 */ - @ApiModelProperty(value = "鎵╁睍瀛楁") private String ext1; /** * 澶囨敞 */ - @ApiModelProperty(value = "澶囨敞") private String remark; + /** + * 妗舵潈闄愮被鍨�(0private 1public 2custom) + */ + @NotBlank(message = "妗舵潈闄愮被鍨嬩笉鑳戒负绌�", groups = {AddGroup.class, EditGroup.class}) + private String accessPolicy; + } -- Gitblit v1.9.3