From 07f3517b6f178efea6150429a3867468b718e3c4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 08 八月 2022 18:20:29 +0800
Subject: [PATCH] fix 修复 用户登录与短信登录 国际化格式不一致
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java | 91 +++++++++++++++------------------------------
1 files changed, 31 insertions(+), 60 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 3e8defc..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;
@@ -13,7 +11,7 @@
import javax.validation.constraints.Size;
/**
- * 浜戝瓨鍌ㄩ厤缃笟鍔″璞� sys_oss_config
+ * 瀵硅薄瀛樺偍閰嶇疆涓氬姟瀵硅薄 sys_oss_config
*
* @author Lion Li
* @author 瀛よ垷鐑熼洦
@@ -22,109 +20,82 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@ApiModel("浜戝瓨鍌ㄩ厤缃笟鍔″璞�")
public class SysOssConfigBo extends BaseEntity {
- /**
- * 涓诲缓
- */
- @ApiModelProperty(value = "涓诲缓", required = true)
- @NotNull(message = "涓诲缓涓嶈兘涓虹┖", groups = { EditGroup.class })
- private Long ossConfigId;
+ /**
+ * 涓诲缓
+ */
+ @NotNull(message = "涓诲缓涓嶈兘涓虹┖", groups = {EditGroup.class})
+ private Long ossConfigId;
/**
* 閰嶇疆key
*/
- @ApiModelProperty(value = "configKey", required = true)
- @NotBlank(message = "configKey涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
- @Size(min = 2, max = 100, message = "configKey闀垮害蹇呴』浠嬩簬2鍜�20 涔嬮棿")
+ @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 涔嬮棿")
+ @NotBlank(message = "accessKey涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
+ @Size(min = 2, max = 100, message = "accessKey闀垮害蹇呴』浠嬩簬2鍜�100 涔嬮棿")
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 涔嬮棿")
+ @NotBlank(message = "secretKey涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
+ @Size(min = 2, max = 100, message = "secretKey闀垮害蹇呴』浠嬩簬2鍜�100 涔嬮棿")
private String secretKey;
/**
* 妗跺悕绉�
*/
- @ApiModelProperty(value = "bucketName", required = true)
- @NotBlank(message = "bucketName涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
- @Size(min = 2, max = 100, message = "bucketName闀垮害蹇呴』浠嬩簬2鍜�100涔嬮棿")
+ @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 })
- @Size(min = 2, max = 100, message = "endpoint闀垮害蹇呴』浠嬩簬2鍜�100涔嬮棿")
+ @NotBlank(message = "璁块棶绔欑偣涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
+ @Size(min = 2, max = 100, message = "endpoint闀垮害蹇呴』浠嬩簬2鍜�100涔嬮棿")
private String endpoint;
- /**
- * 鏄惁https锛圷=鏄�,N=鍚︼級
- */
- @ApiModelProperty("鏄惁https锛圷=鏄�,N=鍚︼級")
- private String isHttps;
+ /**
+ * 鑷畾涔夊煙鍚�
+ */
+ private String domain;
- /**
- * 鐘舵�侊紙0=姝ｅ父,1=鍋滅敤锛�
- */
- @ApiModelProperty("鐘舵�侊紙0=姝ｅ父,1=鍋滅敤锛�")
- private String status;
+ /**
+ * 鏄惁https锛圷=鏄�,N=鍚︼級
+ */
+ private String isHttps;
+
+ /**
+ * 鐘舵�侊紙0=姝ｅ父,1=鍋滅敤锛�
+ */
+ private String status;
/**
* 鍩�
*/
- @ApiModelProperty(value = "region")
private String region;
/**
* 鎵╁睍瀛楁
*/
- @ApiModelProperty(value = "鎵╁睍瀛楁")
private String ext1;
-
/**
- * 鍒嗛〉澶у皬
+ * 澶囨敞
*/
- @ApiModelProperty("鍒嗛〉澶у皬")
- private Integer pageSize;
-
- /**
- * 褰撳墠椤垫暟
- */
- @ApiModelProperty("褰撳墠椤垫暟")
- private Integer pageNum;
-
- /**
- * 鎺掑簭鍒�
- */
- @ApiModelProperty("鎺掑簭鍒�")
- private String orderByColumn;
-
- /**
- * 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc
- */
- @ApiModelProperty(value = "鎺掑簭鐨勬柟鍚�", example = "asc,desc")
- private String isAsc;
+ private String remark;
}
--
Gitblit v1.9.3