From 824635df7f95b68ff493b904071e6c053fad9f9b Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期五, 13 八月 2021 12:37:34 +0800 Subject: [PATCH] update 修正 PR 相关问题 --- ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java | 50 +++++++++++++++++++++++++++----------------------- 1 files changed, 27 insertions(+), 23 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 2836f26..3e8defc 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,23 +1,23 @@ package com.ruoyi.system.domain.bo; -import com.baomidou.mybatisplus.annotation.TableId; +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.*; -import java.util.Date; - -import com.ruoyi.common.core.domain.BaseEntity; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; /** * 浜戝瓨鍌ㄩ厤缃笟鍔″璞� sys_oss_config * - * @author ruoyi - * @date 2021-08-11 + * @author Lion Li + * @author 瀛よ垷鐑熼洦 + * @date 2021-08-13 */ @Data @@ -28,8 +28,10 @@ /** * 涓诲缓 */ - @ApiModelProperty("涓诲缓") - private Integer ossConfigId; + @ApiModelProperty(value = "涓诲缓", required = true) + @NotNull(message = "涓诲缓涓嶈兘涓虹┖", groups = { EditGroup.class }) + private Long ossConfigId; + /** * 閰嶇疆key */ @@ -41,7 +43,7 @@ /** * accessKey */ - @ApiModelProperty(value = "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; @@ -49,7 +51,7 @@ /** * 绉橀挜 */ - @ApiModelProperty(value = "secretKey") + @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; @@ -57,7 +59,7 @@ /** * 妗跺悕绉� */ - @ApiModelProperty(value = "bucketName") + @ApiModelProperty(value = "bucketName", required = true) @NotBlank(message = "bucketName涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class }) @Size(min = 2, max = 100, message = "bucketName闀垮害蹇呴』浠嬩簬2鍜�100涔嬮棿") private String bucketName; @@ -71,16 +73,22 @@ /** * 璁块棶绔欑偣 */ - @ApiModelProperty(value = "endpoint") + @ApiModelProperty(value = "endpoint", required = true) @NotBlank(message = "endpoint涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class }) @Size(min = 2, max = 100, message = "endpoint闀垮害蹇呴』浠嬩簬2鍜�100涔嬮棿") private String endpoint; - /** - * 鏄惁htpps锛�0鍚� 1鏄級 - */ - @ApiModelProperty(value = "鏄惁htpps锛�0鍚� 1鏄級") - private String isHttps; + /** + * 鏄惁https锛圷=鏄�,N=鍚︼級 + */ + @ApiModelProperty("鏄惁https锛圷=鏄�,N=鍚︼級") + private String isHttps; + + /** + * 鐘舵�侊紙0=姝e父,1=鍋滅敤锛� + */ + @ApiModelProperty("鐘舵�侊紙0=姝e父,1=鍋滅敤锛�") + private String status; /** * 鍩� @@ -118,9 +126,5 @@ */ @ApiModelProperty(value = "鎺掑簭鐨勬柟鍚�", example = "asc,desc") private String isAsc; - /** - * 鐘舵��(0姝e父 1鍋滅敤) - */ - @ApiModelProperty("鐘舵��(0姝e父 1鍋滅敤)") - private String status; + } -- Gitblit v1.9.3