From 0fc796b90d3f44b81ef30285edb897223df439f7 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期五, 13 一月 2023 23:04:09 +0800 Subject: [PATCH] update 适配 javax.servlet 替换为 jakarta.servlet 更新所有代码 update 适配 ServletUtils 更换继承 JakartaServletUtil --- ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java | 17 +++-------------- 1 files changed, 3 insertions(+), 14 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java index 3b9fce0..386d314 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java @@ -7,14 +7,11 @@ import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; import com.ruoyi.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; /** * 鍙傛暟閰嶇疆琛� sys_config @@ -24,16 +21,13 @@ @Data @EqualsAndHashCode(callSuper = true) -@Accessors(chain = true) @TableName("sys_config") @ExcelIgnoreUnannotated -@ApiModel("鍙傛暟閰嶇疆涓氬姟瀵硅薄") public class SysConfig extends BaseEntity { /** * 鍙傛暟涓婚敭 */ - @ApiModelProperty(value = "鍙傛暟涓婚敭") @ExcelProperty(value = "鍙傛暟涓婚敭") @TableId(value = "config_id") private Long configId; @@ -41,7 +35,6 @@ /** * 鍙傛暟鍚嶇О */ - @ApiModelProperty(value = "鍙傛暟鍚嶇О") @ExcelProperty(value = "鍙傛暟鍚嶇О") @NotBlank(message = "鍙傛暟鍚嶇О涓嶈兘涓虹┖") @Size(min = 0, max = 100, message = "鍙傛暟鍚嶇О涓嶈兘瓒呰繃100涓瓧绗�") @@ -50,7 +43,6 @@ /** * 鍙傛暟閿悕 */ - @ApiModelProperty(value = "鍙傛暟閿悕") @ExcelProperty(value = "鍙傛暟閿悕") @NotBlank(message = "鍙傛暟閿悕闀垮害涓嶈兘涓虹┖") @Size(min = 0, max = 100, message = "鍙傛暟閿悕闀垮害涓嶈兘瓒呰繃100涓瓧绗�") @@ -59,7 +51,6 @@ /** * 鍙傛暟閿�� */ - @ApiModelProperty(value = "鍙傛暟閿��") @ExcelProperty(value = "鍙傛暟閿��") @NotBlank(message = "鍙傛暟閿�间笉鑳戒负绌�") @Size(min = 0, max = 500, message = "鍙傛暟閿�奸暱搴︿笉鑳借秴杩�500涓瓧绗�") @@ -68,15 +59,13 @@ /** * 绯荤粺鍐呯疆锛圷鏄� N鍚︼級 */ - @ApiModelProperty(value = "绯荤粺鍐呯疆锛圷鏄� N鍚︼級") @ExcelProperty(value = "绯荤粺鍐呯疆", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_yes_no") + @ExcelDictFormat(dictType = "sys_yes_no") private String configType; /** * 澶囨敞 */ - @ApiModelProperty(value = "澶囨敞") private String remark; } -- Gitblit v1.9.3