add 整合 springdoc 移除 knife4j

2025-09-24 07:19:46 +08:00 · 2022-07-07 18:08:14 +08:00
parent 48cb0a1bb1
commit 0b07780619
82 changed files with 873 additions and 1014 deletions
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java
@ -1,8 +1,7 @@
 package com.ruoyi.system.domain;

 import com.ruoyi.common.utils.StringUtils;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;

@ -13,31 +12,31 @@ import lombok.NoArgsConstructor;
 */
@Data
@NoArgsConstructor
-@ApiModel("缓存信息")
+@Schema(name = "缓存信息")
 public class SysCache {

    /**
     * 缓存名称
     */
-    @ApiModelProperty(value = "缓存名称")
+    @Schema(name = "缓存名称")
    private String cacheName = "";

    /**
     * 缓存键名
     */
-    @ApiModelProperty(value = "缓存键名")
+    @Schema(name = "缓存键名")
    private String cacheKey = "";

    /**
     * 缓存内容
     */
-    @ApiModelProperty(value = "缓存内容")
+    @Schema(name = "缓存内容")
    private String cacheValue = "";

    /**
     * 备注
     */
-    @ApiModelProperty(value = "备注")
+    @Schema(name = "备注")
    private String remark = "";

    public SysCache(String cacheName, String remark) {
--- 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,8 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 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 io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

@ -25,13 +24,13 @@ import javax.validation.constraints.Size;
@EqualsAndHashCode(callSuper = true)
@TableName("sys_config")
@ExcelIgnoreUnannotated
-@ApiModel("参数配置业务对象")
+@Schema(name = "参数配置业务对象")
 public class SysConfig extends BaseEntity {

    /**
     * 参数主键
     */
-    @ApiModelProperty(value = "参数主键")
+    @Schema(name = "参数主键")
    @ExcelProperty(value = "参数主键")
    @TableId(value = "config_id")
    private Long configId;
@ -39,7 +38,7 @@ public class SysConfig extends BaseEntity {
    /**
     * 参数名称
     */
-    @ApiModelProperty(value = "参数名称")
+    @Schema(name = "参数名称")
    @ExcelProperty(value = "参数名称")
    @NotBlank(message = "参数名称不能为空")
    @Size(min = 0, max = 100, message = "参数名称不能超过100个字符")
@ -48,7 +47,7 @@ public class SysConfig extends BaseEntity {
    /**
     * 参数键名
     */
-    @ApiModelProperty(value = "参数键名")
+    @Schema(name = "参数键名")
    @ExcelProperty(value = "参数键名")
    @NotBlank(message = "参数键名长度不能为空")
    @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符")
@ -57,7 +56,7 @@ public class SysConfig extends BaseEntity {
    /**
     * 参数键值
     */
-    @ApiModelProperty(value = "参数键值")
+    @Schema(name = "参数键值")
    @ExcelProperty(value = "参数键值")
    @NotBlank(message = "参数键值不能为空")
    @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符")
@ -66,7 +65,7 @@ public class SysConfig extends BaseEntity {
    /**
     * 系统内置（Y是 N否）
     */
-    @ApiModelProperty(value = "系统内置（Y是 N否）")
+    @Schema(name = "系统内置（Y是 N否）")
    @ExcelProperty(value = "系统内置", converter = ExcelDictConvert.class)
    @ExcelDictFormat(dictType = "sys_yes_no")
    private String configType;
@ -74,7 +73,7 @@ public class SysConfig extends BaseEntity {
    /**
     * 备注
     */
-    @ApiModelProperty(value = "备注")
+    @Schema(name = "备注")
    private String remark;

 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
@ -7,8 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 import java.io.Serializable;
@ -25,14 +24,14 @@ import java.util.Map;
@Data
@TableName("sys_logininfor")
@ExcelIgnoreUnannotated
-@ApiModel("系统访问记录业务对象")
+@Schema(name = "系统访问记录业务对象")
 public class SysLogininfor implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * ID
     */
-    @ApiModelProperty(value = "访问ID")
+    @Schema(name = "访问ID")
    @ExcelProperty(value = "序号")
    @TableId(value = "info_id")
    private Long infoId;
@ -40,14 +39,14 @@ public class SysLogininfor implements Serializable {
    /**
     * 用户账号
     */
-    @ApiModelProperty(value = "用户账号")
+    @Schema(name = "用户账号")
    @ExcelProperty(value = "用户账号")
    private String userName;

    /**
     * 登录状态 0成功 1失败
     */
-    @ApiModelProperty(value = "登录状态 0成功 1失败")
+    @Schema(name = "登录状态 0成功 1失败")
    @ExcelProperty(value = "登录状态", converter = ExcelDictConvert.class)
    @ExcelDictFormat(dictType = "sys_common_status")
    private String status;
@ -55,49 +54,49 @@ public class SysLogininfor implements Serializable {
    /**
     * 登录IP地址
     */
-    @ApiModelProperty(value = "登录IP地址")
+    @Schema(name = "登录IP地址")
    @ExcelProperty(value = "登录地址")
    private String ipaddr;

    /**
     * 登录地点
     */
-    @ApiModelProperty(value = "登录地点")
+    @Schema(name = "登录地点")
    @ExcelProperty(value = "登录地点")
    private String loginLocation;

    /**
     * 浏览器类型
     */
-    @ApiModelProperty(value = "浏览器类型")
+    @Schema(name = "浏览器类型")
    @ExcelProperty(value = "浏览器")
    private String browser;

    /**
     * 操作系统
     */
-    @ApiModelProperty(value = "操作系统")
+    @Schema(name = "操作系统")
    @ExcelProperty(value = "操作系统")
    private String os;

    /**
     * 提示消息
     */
-    @ApiModelProperty(value = "提示消息")
+    @Schema(name = "提示消息")
    @ExcelProperty(value = "提示消息")
    private String msg;

    /**
     * 访问时间
     */
-    @ApiModelProperty(value = "访问时间")
+    @Schema(name = "访问时间")
    @ExcelProperty(value = "访问时间")
    private Date loginTime;

    /**
     * 请求参数
     */
-    @ApiModelProperty(value = "请求参数")
+    @Schema(name = "请求参数")
    @TableField(exist = false)
    private Map<String, Object> params = new HashMap<>();

--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.xss.Xss;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

@ -25,7 +25,7 @@ public class SysNotice extends BaseEntity {
    /**
     * 公告ID
     */
-    @ApiModelProperty(value = "公告ID")
+    @Schema(name = "公告ID")
    @TableId(value = "notice_id")
    private Long noticeId;

@ -33,7 +33,7 @@ public class SysNotice extends BaseEntity {
     * 公告标题
     */
    @Xss(message = "公告标题不能包含脚本字符")
-    @ApiModelProperty(value = "公告标题")
+    @Schema(name = "公告标题")
    @NotBlank(message = "公告标题不能为空")
    @Size(min = 0, max = 50, message = "公告标题不能超过50个字符")
    private String noticeTitle;
@ -41,25 +41,25 @@ public class SysNotice extends BaseEntity {
    /**
     * 公告类型（1通知 2公告）
     */
-    @ApiModelProperty(value = "公告类型（1通知 2公告）")
+    @Schema(name = "公告类型（1通知 2公告）")
    private String noticeType;

    /**
     * 公告内容
     */
-    @ApiModelProperty(value = "公告内容")
+    @Schema(name = "公告内容")
    private String noticeContent;

    /**
     * 公告状态（0正常 1关闭）
     */
-    @ApiModelProperty(value = "公告状态（0正常 1关闭）")
+    @Schema(name = "公告状态（0正常 1关闭）")
    private String status;

    /**
     * 备注
     */
-    @ApiModelProperty(value = "备注")
+    @Schema(name = "备注")
    private String remark;

 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
@ -7,8 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 import java.io.Serializable;
@ -25,7 +24,7 @@ import java.util.Map;
@Data
@TableName("sys_oper_log")
@ExcelIgnoreUnannotated
-@ApiModel("操作日志记录业务对象")
+@Schema(name = "操作日志记录业务对象")
 public class SysOperLog implements Serializable {

    private static final long serialVersionUID = 1L;
@ -33,7 +32,7 @@ public class SysOperLog implements Serializable {
    /**
     * 日志主键
     */
-    @ApiModelProperty(value = "日志主键")
+    @Schema(name = "日志主键")
    @ExcelProperty(value = "日志主键")
    @TableId(value = "oper_id")
    private Long operId;
@ -41,14 +40,14 @@ public class SysOperLog implements Serializable {
    /**
     * 操作模块
     */
-    @ApiModelProperty(value = "操作模块")
+    @Schema(name = "操作模块")
    @ExcelProperty(value = "操作模块")
    private String title;

    /**
     * 业务类型（0其它 1新增 2修改 3删除）
     */
-    @ApiModelProperty(value = "业务类型（0其它 1新增 2修改 3删除）")
+    @Schema(name = "业务类型（0其它 1新增 2修改 3删除）")
    @ExcelProperty(value = "业务类型", converter = ExcelDictConvert.class)
    @ExcelDictFormat(dictType = "sys_oper_type")
    private Integer businessType;
@ -56,28 +55,28 @@ public class SysOperLog implements Serializable {
    /**
     * 业务类型数组
     */
-    @ApiModelProperty(value = "业务类型数组")
+    @Schema(name = "业务类型数组")
    @TableField(exist = false)
    private Integer[] businessTypes;

    /**
     * 请求方法
     */
-    @ApiModelProperty(value = "请求方法")
+    @Schema(name = "请求方法")
    @ExcelProperty(value = "请求方法")
    private String method;

    /**
     * 请求方式
     */
-    @ApiModelProperty(value = "请求方式")
+    @Schema(name = "请求方式")
    @ExcelProperty(value = "请求方式")
    private String requestMethod;

    /**
     * 操作类别（0其它 1后台用户 2手机端用户）
     */
-    @ApiModelProperty(value = "操作类别（0其它 1后台用户 2手机端用户）")
+    @Schema(name = "操作类别（0其它 1后台用户 2手机端用户）")
    @ExcelProperty(value = "操作类别", converter = ExcelDictConvert.class)
    @ExcelDictFormat(readConverterExp = "0=其它,1=后台用户,2=手机端用户")
    private Integer operatorType;
@ -85,56 +84,56 @@ public class SysOperLog implements Serializable {
    /**
     * 操作人员
     */
-    @ApiModelProperty(value = "操作人员")
+    @Schema(name = "操作人员")
    @ExcelProperty(value = "操作人员")
    private String operName;

    /**
     * 部门名称
     */
-    @ApiModelProperty(value = "部门名称")
+    @Schema(name = "部门名称")
    @ExcelProperty(value = "部门名称")
    private String deptName;

    /**
     * 请求url
     */
-    @ApiModelProperty(value = "请求url")
+    @Schema(name = "请求url")
    @ExcelProperty(value = "请求地址")
    private String operUrl;

    /**
     * 操作地址
     */
-    @ApiModelProperty(value = "操作地址")
+    @Schema(name = "操作地址")
    @ExcelProperty(value = "操作地址")
    private String operIp;

    /**
     * 操作地点
     */
-    @ApiModelProperty(value = "操作地点")
+    @Schema(name = "操作地点")
    @ExcelProperty(value = "操作地点")
    private String operLocation;

    /**
     * 请求参数
     */
-    @ApiModelProperty(value = "请求参数")
+    @Schema(name = "请求参数")
    @ExcelProperty(value = "请求参数")
    private String operParam;

    /**
     * 返回参数
     */
-    @ApiModelProperty(value = "返回参数")
+    @Schema(name = "返回参数")
    @ExcelProperty(value = "返回参数")
    private String jsonResult;

    /**
     * 操作状态（0正常 1异常）
     */
-    @ApiModelProperty(value = "操作状态（0正常 1异常）")
+    @Schema(name = "操作状态（0正常 1异常）")
    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
    @ExcelDictFormat(dictType = "sys_common_status")
    private Integer status;
@ -142,21 +141,21 @@ public class SysOperLog implements Serializable {
    /**
     * 错误消息
     */
-    @ApiModelProperty(value = "错误消息")
+    @Schema(name = "错误消息")
    @ExcelProperty(value = "错误消息")
    private String errorMsg;

    /**
     * 操作时间
     */
-    @ApiModelProperty(value = "操作时间")
+    @Schema(name = "操作时间")
    @ExcelProperty(value = "操作时间")
    private Date operTime;

    /**
     * 请求参数
     */
-    @ApiModelProperty(value = "请求参数")
+    @Schema(name = "请求参数")
    @TableField(exist = false)
    private Map<String, Object> params = new HashMap<>();

--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
@ -8,8 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 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 io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

@ -27,13 +26,13 @@ import javax.validation.constraints.Size;
@EqualsAndHashCode(callSuper = true)
@TableName("sys_post")
@ExcelIgnoreUnannotated
-@ApiModel("岗位信息业务对象")
+@Schema(name = "岗位信息业务对象")
 public class SysPost extends BaseEntity {

    /**
     * 岗位序号
     */
-    @ApiModelProperty(value = "岗位序号")
+    @Schema(name = "岗位序号")
    @ExcelProperty(value = "岗位序号")
    @TableId(value = "post_id")
    private Long postId;
@ -41,7 +40,7 @@ public class SysPost extends BaseEntity {
    /**
     * 岗位编码
     */
-    @ApiModelProperty(value = "岗位编码")
+    @Schema(name = "岗位编码")
    @ExcelProperty(value = "岗位编码")
    @NotBlank(message = "岗位编码不能为空")
    @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符")
@ -50,7 +49,7 @@ public class SysPost extends BaseEntity {
    /**
     * 岗位名称
     */
-    @ApiModelProperty(value = "岗位名称")
+    @Schema(name = "岗位名称")
    @ExcelProperty(value = "岗位名称")
    @NotBlank(message = "岗位名称不能为空")
    @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符")
@ -59,7 +58,7 @@ public class SysPost extends BaseEntity {
    /**
     * 岗位排序
     */
-    @ApiModelProperty(value = "岗位排序")
+    @Schema(name = "岗位排序")
    @ExcelProperty(value = "岗位排序")
    @NotNull(message = "显示顺序不能为空")
    private Integer postSort;
@ -67,7 +66,7 @@ public class SysPost extends BaseEntity {
    /**
     * 状态（0正常 1停用）
     */
-    @ApiModelProperty(value = "状态（0正常 1停用）")
+    @Schema(name = "状态（0正常 1停用）")
    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
    @ExcelDictFormat(dictType = "sys_common_status")
    private String status;
@ -75,13 +74,13 @@ public class SysPost extends BaseEntity {
    /**
     * 备注
     */
-    @ApiModelProperty(value = "备注")
+    @Schema(name = "备注")
    private String remark;

    /**
     * 用户是否存在此岗位标识 默认不存在
     */
-    @ApiModelProperty(value = "用户是否存在此岗位标识 默认不存在")
+    @Schema(name = "用户是否存在此岗位标识 默认不存在")
    @TableField(exist = false)
    private boolean flag = false;

--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
@ -3,8 +3,7 @@ package com.ruoyi.system.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 /**
@ -15,20 +14,20 @@ import lombok.Data;

@Data
@TableName("sys_role_dept")
-@ApiModel("角色和部门关联")
+@Schema(name = "角色和部门关联")
 public class SysRoleDept {

    /**
     * 角色ID
     */
    @TableId(type = IdType.INPUT)
-    @ApiModelProperty(value = "角色ID")
+    @Schema(name = "角色ID")
    private Long roleId;

    /**
     * 部门ID
     */
-    @ApiModelProperty(value = "部门ID")
+    @Schema(name = "部门ID")
    private Long deptId;

 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
@ -3,8 +3,7 @@ package com.ruoyi.system.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 /**
@ -15,20 +14,20 @@ import lombok.Data;

@Data
@TableName("sys_role_menu")
-@ApiModel("角色和菜单关联")
+@Schema(name = "角色和菜单关联")
 public class SysRoleMenu {

    /**
     * 角色ID
     */
    @TableId(type = IdType.INPUT)
-    @ApiModelProperty(value = "角色ID")
+    @Schema(name = "角色ID")
    private Long roleId;

    /**
     * 菜单ID
     */
-    @ApiModelProperty(value = "角色ID")
+    @Schema(name = "角色ID")
    private Long menuId;

 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
@ -1,7 +1,6 @@
 package com.ruoyi.system.domain;

-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 /**
@ -11,55 +10,55 @@ import lombok.Data;
 */

@Data
-@ApiModel("当前在线会话业务对象")
+@Schema(name = "当前在线会话业务对象")
 public class SysUserOnline {

    /**
     * 会话编号
     */
-    @ApiModelProperty(value = "会话编号")
+    @Schema(name = "会话编号")
    private String tokenId;

    /**
     * 部门名称
     */
-    @ApiModelProperty(value = "部门名称")
+    @Schema(name = "部门名称")
    private String deptName;

    /**
     * 用户名称
     */
-    @ApiModelProperty(value = "用户名称")
+    @Schema(name = "用户名称")
    private String userName;

    /**
     * 登录IP地址
     */
-    @ApiModelProperty(value = "登录IP地址")
+    @Schema(name = "登录IP地址")
    private String ipaddr;

    /**
     * 登录地址
     */
-    @ApiModelProperty(value = "登录地址")
+    @Schema(name = "登录地址")
    private String loginLocation;

    /**
     * 浏览器类型
     */
-    @ApiModelProperty(value = "浏览器类型")
+    @Schema(name = "浏览器类型")
    private String browser;

    /**
     * 操作系统
     */
-    @ApiModelProperty(value = "操作系统")
+    @Schema(name = "操作系统")
    private String os;

    /**
     * 登录时间
     */
-    @ApiModelProperty(value = "登录时间")
+    @Schema(name = "登录时间")
    private Long loginTime;

 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
@ -3,8 +3,7 @@ package com.ruoyi.system.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 /**
@ -15,20 +14,20 @@ import lombok.Data;

@Data
@TableName("sys_user_post")
-@ApiModel("用户和岗位关联")
+@Schema(name = "用户和岗位关联")
 public class SysUserPost {

    /**
     * 用户ID
     */
    @TableId(type = IdType.INPUT)
-    @ApiModelProperty(value = "用户ID")
+    @Schema(name = "用户ID")
    private Long userId;

    /**
     * 岗位ID
     */
-    @ApiModelProperty(value = "岗位ID")
+    @Schema(name = "岗位ID")
    private Long postId;

 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
@ -3,8 +3,7 @@ package com.ruoyi.system.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 /**
@ -15,20 +14,20 @@ import lombok.Data;

@Data
@TableName("sys_user_role")
-@ApiModel("用户和角色关联")
+@Schema(name = "用户和角色关联")
 public class SysUserRole {

    /**
     * 用户ID
     */
    @TableId(type = IdType.INPUT)
-    @ApiModelProperty(value = "用户ID")
+    @Schema(name = "用户ID")
    private Long userId;

    /**
     * 角色ID
     */
-    @ApiModelProperty(value = "角色ID")
+    @Schema(name = "角色ID")
    private Long roleId;

 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java
@ -1,8 +1,7 @@
 package com.ruoyi.system.domain.bo;

 import com.ruoyi.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

@ -13,33 +12,33 @@ import lombok.EqualsAndHashCode;
 */
@Data
@EqualsAndHashCode(callSuper = true)
-@ApiModel("OSS对象存储分页查询对象")
+@Schema(name = "OSS对象存储分页查询对象")
 public class SysOssBo extends BaseEntity {

    /**
     * 文件名
     */
-    @ApiModelProperty("文件名")
+    @Schema(name = "文件名")
    private String fileName;
    /**
     * 原名
     */
-    @ApiModelProperty("原名")
+    @Schema(name = "原名")
    private String originalName;
    /**
     * 文件后缀名
     */
-    @ApiModelProperty("文件后缀名")
+    @Schema(name = "文件后缀名")
    private String fileSuffix;
    /**
     * URL地址
     */
-    @ApiModelProperty("URL地址")
+    @Schema(name = "URL地址")
    private String url;
    /**
     * 服务商
     */
-    @ApiModelProperty("服务商")
+    @Schema(name = "服务商")
    private String service;

 }
--- 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,7 @@ package com.ruoyi.system.domain.bo;
 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 io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

@ -22,20 +21,20 @@ import javax.validation.constraints.Size;

@Data
@EqualsAndHashCode(callSuper = true)
-@ApiModel("对象存储配置业务对象")
+@Schema(name = "对象存储配置业务对象")
 public class SysOssConfigBo extends BaseEntity {

    /**
     * 主建
     */
-    @ApiModelProperty(value = "主建", required = true)
+    @Schema(name = "主建", required = true)
    @NotNull(message = "主建不能为空", groups = {EditGroup.class})
    private Long ossConfigId;

    /**
     * 配置key
     */
-    @ApiModelProperty(value = "配置key", required = true)
+    @Schema(name = "配置key", required = true)
    @NotBlank(message = "配置key不能为空", groups = {AddGroup.class, EditGroup.class})
    @Size(min = 2, max = 100, message = "configKey长度必须介于2和20 之间")
    private String configKey;
@ -43,7 +42,7 @@ public class SysOssConfigBo extends BaseEntity {
    /**
     * accessKey
     */
-    @ApiModelProperty(value = "accessKey", required = true)
+    @Schema(name = "accessKey", required = true)
    @NotBlank(message = "accessKey不能为空", groups = {AddGroup.class, EditGroup.class})
    @Size(min = 2, max = 100, message = "accessKey长度必须介于2和100 之间")
    private String accessKey;
@ -51,7 +50,7 @@ public class SysOssConfigBo extends BaseEntity {
    /**
     * 秘钥
     */
-    @ApiModelProperty(value = "secretKey", required = true)
+    @Schema(name = "secretKey", required = true)
    @NotBlank(message = "secretKey不能为空", groups = {AddGroup.class, EditGroup.class})
    @Size(min = 2, max = 100, message = "secretKey长度必须介于2和100 之间")
    private String secretKey;
@ -59,7 +58,7 @@ public class SysOssConfigBo extends BaseEntity {
    /**
     * 桶名称
     */
-    @ApiModelProperty(value = "桶名称", required = true)
+    @Schema(name = "桶名称", required = true)
    @NotBlank(message = "桶名称不能为空", groups = {AddGroup.class, EditGroup.class})
    @Size(min = 2, max = 100, message = "bucketName长度必须介于2和100之间")
    private String bucketName;
@ -67,13 +66,13 @@ public class SysOssConfigBo extends BaseEntity {
    /**
     * 前缀
     */
-    @ApiModelProperty(value = "前缀")
+    @Schema(name = "前缀")
    private String prefix;

    /**
     * 访问站点
     */
-    @ApiModelProperty(value = "访问站点", required = true)
+    @Schema(name = "访问站点", required = true)
    @NotBlank(message = "访问站点不能为空", groups = {AddGroup.class, EditGroup.class})
    @Size(min = 2, max = 100, message = "endpoint长度必须介于2和100之间")
    private String endpoint;
@ -81,37 +80,37 @@ public class SysOssConfigBo extends BaseEntity {
    /**
     * 自定义域名
     */
-    @ApiModelProperty("自定义域名")
+    @Schema(name = "自定义域名")
    private String domain;

    /**
     * 是否https（Y=是,N=否）
     */
-    @ApiModelProperty("是否https（Y=是,N=否）")
+    @Schema(name = "是否https（Y=是,N=否）")
    private String isHttps;

    /**
     * 状态（0=正常,1=停用）
     */
-    @ApiModelProperty("状态（0=正常,1=停用）")
+    @Schema(name = "状态（0=正常,1=停用）")
    private String status;

    /**
     * 域
     */
-    @ApiModelProperty(value = "域")
+    @Schema(name = "域")
    private String region;

    /**
     * 扩展字段
     */
-    @ApiModelProperty(value = "扩展字段")
+    @Schema(name = "扩展字段")
    private String ext1;

    /**
     * 备注
     */
-    @ApiModelProperty(value = "备注")
+    @Schema(name = "备注")
    private String remark;

 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
@ -1,8 +1,7 @@
 package com.ruoyi.system.domain.vo;

 import com.ruoyi.common.utils.StringUtils;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 /**
@ -12,31 +11,31 @@ import lombok.Data;
 */

@Data
-@ApiModel("路由显示信息")
+@Schema(name = "路由显示信息")
 public class MetaVo {

    /**
     * 设置该路由在侧边栏和面包屑中展示的名字
     */
-    @ApiModelProperty(value = "设置该路由在侧边栏和面包屑中展示的名字")
+    @Schema(name = "设置该路由在侧边栏和面包屑中展示的名字")
    private String title;

    /**
     * 设置该路由的图标，对应路径src/assets/icons/svg
     */
-    @ApiModelProperty(value = "设置该路由的图标，对应路径src/assets/icons/svg")
+    @Schema(name = "设置该路由的图标，对应路径src/assets/icons/svg")
    private String icon;

    /**
     * 设置为true，则不会被 <keep-alive>缓存
     */
-    @ApiModelProperty(value = "设置为true，则不会被 <keep-alive>缓存")
+    @Schema(name = "设置为true，则不会被 <keep-alive>缓存")
    private boolean noCache;

    /**
     * 内链地址（http(s)://开头）
     */
-    @ApiModelProperty(value = "内链地址（http(s)://开头）")
+    @Schema(name = "内链地址（http(s)://开头）")
    private String link;

    public MetaVo(String title, String icon) {
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
@ -1,8 +1,7 @@
 package com.ruoyi.system.domain.vo;

 import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 import java.util.List;
@ -14,61 +13,61 @@ import java.util.List;
 */
@Data
@JsonInclude(JsonInclude.Include.NON_EMPTY)
-@ApiModel("路由配置信息")
+@Schema(name = "路由配置信息")
 public class RouterVo {

    /**
     * 路由名字
     */
-    @ApiModelProperty(value = "路由名字")
+    @Schema(name = "路由名字")
    private String name;

    /**
     * 路由地址
     */
-    @ApiModelProperty(value = "路由地址")
+    @Schema(name = "路由地址")
    private String path;

    /**
     * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现
     */
-    @ApiModelProperty(value = "是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现")
+    @Schema(name = "是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现")
    private boolean hidden;

    /**
     * 重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
     */
-    @ApiModelProperty(value = "重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击")
+    @Schema(name = "重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击")
    private String redirect;

    /**
     * 组件地址
     */
-    @ApiModelProperty(value = "组件地址")
+    @Schema(name = "组件地址")
    private String component;

    /**
     * 路由参数：如 {"id": 1, "name": "ry"}
     */
-    @ApiModelProperty(value = "路由参数：如 {\"id\": 1, \"name\": \"ry\"}")
+    @Schema(name = "路由参数：如 {\"id\": 1, \"name\": \"ry\"}")
    private String query;

    /**
     * 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
     */
-    @ApiModelProperty(value = "当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面")
+    @Schema(name = "当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面")
    private Boolean alwaysShow;

    /**
     * 其他元素
     */
-    @ApiModelProperty(value = "其他元素")
+    @Schema(name = "其他元素")
    private MetaVo meta;

    /**
     * 子路由
     */
-    @ApiModelProperty(value = "子路由")
+    @Schema(name = "子路由")
    private List<RouterVo> children;

 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java
@ -1,8 +1,7 @@
 package com.ruoyi.system.domain.vo;

 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;


@ -14,7 +13,7 @@ import lombok.Data;
 * @date 2021-08-13
 */
@Data
-@ApiModel("对象存储配置视图对象")
+@Schema(name = "对象存储配置视图对象")
@ExcelIgnoreUnannotated
 public class SysOssConfigVo {

@ -23,79 +22,79 @@ public class SysOssConfigVo {
    /**
     * 主建
     */
-    @ApiModelProperty("主建")
+    @Schema(name = "主建")
    private Long ossConfigId;

    /**
     * 配置key
     */
-    @ApiModelProperty("配置key")
+    @Schema(name = "配置key")
    private String configKey;

    /**
     * accessKey
     */
-    @ApiModelProperty("accessKey")
+    @Schema(name = "accessKey")
    private String accessKey;

    /**
     * 秘钥
     */
-    @ApiModelProperty("secretKey")
+    @Schema(name = "secretKey")
    private String secretKey;

    /**
     * 桶名称
     */
-    @ApiModelProperty("桶名称")
+    @Schema(name = "桶名称")
    private String bucketName;

    /**
     * 前缀
     */
-    @ApiModelProperty("前缀")
+    @Schema(name = "前缀")
    private String prefix;

    /**
     * 访问站点
     */
-    @ApiModelProperty("访问站点")
+    @Schema(name = "访问站点")
    private String endpoint;

    /**
     * 自定义域名
     */
-    @ApiModelProperty("自定义域名")
+    @Schema(name = "自定义域名")
    private String domain;

    /**
     * 是否https（Y=是,N=否）
     */
-    @ApiModelProperty("是否https（Y=是,N=否）")
+    @Schema(name = "是否https（Y=是,N=否）")
    private String isHttps;

    /**
     * 域
     */
-    @ApiModelProperty("域")
+    @Schema(name = "域")
    private String region;

    /**
     * 状态（0=正常,1=停用）
     */
-    @ApiModelProperty("状态（0=正常,1=停用）")
+    @Schema(name = "状态（0=正常,1=停用）")
    private String status;

    /**
     * 扩展字段
     */
-    @ApiModelProperty("扩展字段")
+    @Schema(name = "扩展字段")
    private String ext1;

    /**
     * 备注
     */
-    @ApiModelProperty("备注")
+    @Schema(name = "备注")
    private String remark;

 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java
@ -1,7 +1,6 @@
 package com.ruoyi.system.domain.vo;

-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

 import java.util.Date;
@ -12,7 +11,7 @@ import java.util.Date;
 * @author Lion Li
 */
@Data
-@ApiModel("OSS对象存储视图对象")
+@Schema(name = "OSS对象存储视图对象")
 public class SysOssVo {

    private static final long serialVersionUID = 1L;
@ -20,49 +19,49 @@ public class SysOssVo {
    /**
     * 对象存储主键
     */
-    @ApiModelProperty("对象存储主键")
+    @Schema(name = "对象存储主键")
    private Long ossId;

    /**
     * 文件名
     */
-    @ApiModelProperty("文件名")
+    @Schema(name = "文件名")
    private String fileName;

    /**
     * 原名
     */
-    @ApiModelProperty("原名")
+    @Schema(name = "原名")
    private String originalName;

    /**
     * 文件后缀名
     */
-    @ApiModelProperty("文件后缀名")
+    @Schema(name = "文件后缀名")
    private String fileSuffix;

    /**
     * URL地址
     */
-    @ApiModelProperty("URL地址")
+    @Schema(name = "URL地址")
    private String url;

    /**
     * 创建时间
     */
-    @ApiModelProperty("创建时间")
+    @Schema(name = "创建时间")
    private Date createTime;

    /**
     * 上传人
     */
-    @ApiModelProperty("上传人")
+    @Schema(name = "上传人")
    private String createBy;

    /**
     * 服务商
     */
-    @ApiModelProperty("服务商")
+    @Schema(name = "服务商")
    private String service;


--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java
@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Lists;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
@ -120,7 +119,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
                throw new ServiceException("系统内置, 不可删除!");
            }
        }
-        List<SysOssConfig> list = Lists.newArrayList();
+        List<SysOssConfig> list = CollUtil.newArrayList();
        for (Long configId : ids) {
            SysOssConfig config = baseMapper.selectById(configId);
            list.add(config);