From 5117fe2958a1bcec82e09fce01e49bb0bc2e0ba4 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期三, 14 十二月 2022 15:11:09 +0800 Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复 文件名包含特殊字符(+、-、*...)的文件无法下载问题 * update 优化 弹窗内容过多展示不全问题 * update echarts 4.9.0 => 5.4.0 * fix 修复 Vue3树形下拉不能默认选中 * update 优化 删除fuse无效选项maxPatternLength * fix 修复 代码生成图片/文件/单选时选择必填无法校验问题 * fix 修复 修改参数键名时 未移除过期缓存配置 --- ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java | 56 +++++++++++++++++--------------------------------------- 1 files changed, 17 insertions(+), 39 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java index 3a6fb83..7f2b05f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java @@ -1,33 +1,26 @@ package com.ruoyi.system.domain; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.core.domain.BaseEntity; import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; -import java.io.Serializable; -import java.util.Date; -import java.math.BigDecimal; +import lombok.EqualsAndHashCode; /** * 瀵硅薄瀛樺偍閰嶇疆瀵硅薄 sys_oss_config * - * @author ruoyi - * @date 2021-08-11 + * @author Lion Li */ @Data -@NoArgsConstructor -@Accessors(chain = true) +@EqualsAndHashCode(callSuper = true) @TableName("sys_oss_config") -public class SysOssConfig implements Serializable { - - private static final long serialVersionUID=1L; - +public class SysOssConfig extends BaseEntity { /** * 涓诲缓 */ @TableId(value = "oss_config_id") - private Integer ossConfigId; + private Long ossConfigId; /** * 閰嶇疆key @@ -60,6 +53,11 @@ private String endpoint; /** + * 鑷畾涔夊煙鍚� + */ + private String domain; + + /** * 鏄惁https锛�0鍚� 1鏄級 */ private String isHttps; @@ -80,32 +78,12 @@ private String ext1; /** - * 鍒涘缓鑰� - */ - @TableField(fill = FieldFill.INSERT) - private String createBy; - - /** - * 鍒涘缓鏃堕棿 - */ - @TableField(fill = FieldFill.INSERT) - private Date createTime; - - /** - * 鏇存柊鑰� - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - private String updateBy; - - /** - * 鏇存柊鏃堕棿 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - private Date updateTime; - - /** * 澶囨敞 */ private String remark; + /** + * 妗舵潈闄愮被鍨�(0private 1public 2custom) + */ + private String accessPolicy; } -- Gitblit v1.9.3