jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 修正 PR 相关问题

Browse Source
This commit is contained in:
疯狂的狮子li
2021-08-13 12:37:34 +08:00
parent c9f7314cd0
commit 824635df7f
13 changed files with 341 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java
View File

@ -60,7 +60,7 @@ public class SysOssConfig implements Serializable {
private String endpoint;
/**
* 是否htpps（0否 1是）
* 是否https（0否 1是）
*/
private String isHttps;

50
ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java
View File

@ -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 @@ public class SysOssConfigBo extends BaseEntity {
/**
* 主建
*/
@ApiModelProperty("主建")
private Integer ossConfigId;
@ApiModelProperty(value = "主建", required = true)
@NotNull(message = "主建不能为空", groups = { EditGroup.class })
private Long ossConfigId;
/**
* 配置key
*/
@ -41,7 +43,7 @@ public class SysOssConfigBo extends BaseEntity {
/**
* 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 @@ public class SysOssConfigBo extends BaseEntity {
/**
* 秘钥
*/
@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 @@ public class SysOssConfigBo extends BaseEntity {
/**
* 桶名称
*/
@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 @@ public class SysOssConfigBo extends BaseEntity {
/**
* 访问站点
*/
@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（Y=是,N=否）
*/
@ApiModelProperty("是否https（Y=是,N=否）")
private String isHttps;
/**
* 状态（0=正常,1=停用）
*/
@ApiModelProperty("状态（0=正常,1=停用）")
private String status;
/**
* 域
@ -118,9 +126,5 @@ public class SysOssConfigBo extends BaseEntity {
*/
@ApiModelProperty(value = "排序的方向", example = "asc,desc")
private String isAsc;
/**
* 状态(0正常 1停用)
*/
@ApiModelProperty("状态(0正常 1停用)")
private String status;
}

26
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java
View File

@ -1,21 +1,18 @@
package com.ruoyi.system.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 云存储配置视图对象 sys_oss_config
*
* @author ruoyi
* @date 2021-08-11
* @author Lion Li
* @author 孤舟烟雨
* @date 2021-08-13
*/
@Data
@ApiModel("云存储配置视图对象")
@ -25,10 +22,10 @@ public class SysOssConfigVo {
private static final long serialVersionUID = 1L;
/**
* 主建
* 主建
*/
@ApiModelProperty("主建")
private Integer ossConfigId;
private Long ossConfigId;
/**
* 配置key
@ -67,9 +64,9 @@ public class SysOssConfigVo {
private String endpoint;
/**
* 是否htpps（0否 1是）
* 是否https（Y=是,N=否）
*/
@ApiModelProperty("是否htpps（0否 1是）")
@ApiModelProperty("是否https（Y=是,N=否）")
private String isHttps;
/**
@ -79,9 +76,9 @@ public class SysOssConfigVo {
private String region;
/**
* 状态(0正常 1停用)
* 状态（0=正常,1=停用）
*/
@ApiModelProperty("状态(0正常 1停用)")
@ApiModelProperty("状态（0=正常,1=停用）")
private String status;
/**
@ -90,5 +87,10 @@ public class SysOssConfigVo {
@ApiModelProperty("扩展字段")
private String ext1;
/**
* 备注
*/
@ApiModelProperty("备注")
private String remark;
}