remove 移除所有 swagger 配置 准备对接 springdoc

config/dev/application-common.yml

@@ -254,27 +254,6 @@ swagger:
     email: crazylionli@163.com
     url: https://gitee.com/JavaLionLi/RuoYi-Cloud-Plus
 
-knife4j:
-  # 是否开启Knife4j增强模式
-  enable: true
-  # 是否开启生产环境保护策略
-  production: false
-  # 登录认证
-  basic:
-    enable: true
-    username: ruoyi
-    password: 123456
-  # 前端Ui的个性化配置属性
-  setting:
-    # 默认语言
-    language: zh-CN
-    # 是否显示Footer
-    enableFooter: true
-    # 是否开启动态参数调试功能
-    enableDynamicParameter: true
-    # 是否在每个Debug调试栏后显示刷新变量按钮
-    enableReloadCacheParameter: true
-
 # seata配置
 seata:
   # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启

pom.xml

@@ -22,7 +22,6 @@
         <spring-boot-admin.version>2.7.2</spring-boot-admin.version>
         <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
         <mybatis.version>3.5.10</mybatis.version>
-        <swagger.core.version>1.5.22</swagger.core.version>
         <mybatis-plus.version>3.5.2</mybatis-plus.version>
         <p6spy.version>3.9.1</p6spy.version>
         <druid.version>1.2.11</druid.version>
@@ -35,8 +34,6 @@
         <redisson.version>3.17.4</redisson.version>
         <lock4j.version>2.2.2</lock4j.version>
         <xxl-job.version>2.3.1</xxl-job.version>
-        <knife4j-aggregation.version>2.0.9</knife4j-aggregation.version>
-        <knife4j.version>3.0.3</knife4j.version>
         <satoken.version>1.30.0</satoken.version>
         <logstash.version>7.1.1</logstash.version>
 
@@ -163,19 +160,6 @@
                 <version>${mybatis.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.github.xiaoymin</groupId>
-                <artifactId>knife4j-micro-spring-boot-starter</artifactId>
-                <version>${knife4j.version}</version>
-            </dependency>
-
-            <!-- Swagger 依赖配置 -->
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-annotations</artifactId>
-                <version>${swagger.core.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.baomidou</groupId>
                 <artifactId>mybatis-plus-boot-starter</artifactId>

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.web.domain.TreeEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -25,21 +23,18 @@ import javax.validation.constraints.Size;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @TableName("sys_dept")
-@ApiModel("部门业务对象")
 public class SysDept extends TreeEntity<SysDept> {
     private static final long serialVersionUID = 1L;
 
     /**
      * 部门ID
      */
-    @ApiModelProperty(value = "部门id")
     @TableId(value = "dept_id")
     private Long deptId;
 
     /**
      * 部门名称
      */
-    @ApiModelProperty(value = "部门名称")
     @NotBlank(message = "部门名称不能为空")
     @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
     private String deptName;
@@ -47,27 +42,23 @@ public class SysDept extends TreeEntity<SysDept> {
     /**
      * 显示顺序
      */
-    @ApiModelProperty(value = "显示顺序")
     @NotNull(message = "显示顺序不能为空")
     private Integer orderNum;
 
     /**
      * 负责人
      */
-    @ApiModelProperty(value = "负责人")
     private String leader;
 
     /**
      * 联系电话
      */
-    @ApiModelProperty(value = "联系电话")
     @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
     private String phone;
 
     /**
      * 邮箱
      */
-    @ApiModelProperty(value = "邮箱")
     @Email(message = "邮箱格式不正确")
     @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
     private String email;
@@ -75,20 +66,17 @@ public class SysDept extends TreeEntity<SysDept> {
     /**
      * 部门状态:0正常,1停用
      */
-    @ApiModelProperty(value = "部门状态:0正常,1停用")
     private String status;
 
     /**
      * 删除标志（0代表存在 2代表删除）
      */
-    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     @TableLogic
     private String delFlag;
 
     /**
      * 祖级列表
      */
-    @ApiModelProperty(value = "祖级列表")
     private String ancestors;
 
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java

@@ -8,8 +8,6 @@ import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.common.excel.annotation.ExcelDictFormat;
 import com.ruoyi.common.excel.convert.ExcelDictConvert;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -28,13 +26,11 @@ import javax.validation.constraints.Size;
 @NoArgsConstructor
 @TableName("sys_dict_data")
 @ExcelIgnoreUnannotated
-@ApiModel("字典数据业务对象")
 public class SysDictData extends BaseEntity {
 
     /**
      * 字典编码
      */
-    @ApiModelProperty(value = "字典编码")
     @ExcelProperty(value = "字典编码")
     @TableId(value = "dict_code")
     private Long dictCode;
@@ -42,14 +38,12 @@ public class SysDictData extends BaseEntity {
     /**
      * 字典排序
      */
-    @ApiModelProperty(value = "字典排序")
     @ExcelProperty(value = "字典排序")
     private Integer dictSort;
 
     /**
      * 字典标签
      */
-    @ApiModelProperty(value = "字典标签")
     @ExcelProperty(value = "字典标签")
     @NotBlank(message = "字典标签不能为空")
     @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
@@ -58,7 +52,6 @@ public class SysDictData extends BaseEntity {
     /**
      * 字典键值
      */
-    @ApiModelProperty(value = "字典键值")
     @ExcelProperty(value = "字典键值")
     @NotBlank(message = "字典键值不能为空")
     @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
@@ -67,7 +60,6 @@ public class SysDictData extends BaseEntity {
     /**
      * 字典类型
      */
-    @ApiModelProperty(value = "字典类型")
     @ExcelProperty(value = "字典类型")
     @NotBlank(message = "字典类型不能为空")
     @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
@@ -76,20 +68,17 @@ public class SysDictData extends BaseEntity {
     /**
      * 样式属性（其他样式扩展）
      */
-    @ApiModelProperty(value = "样式属性（其他样式扩展）")
     @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
     private String cssClass;
 
     /**
      * 表格字典样式
      */
-    @ApiModelProperty(value = "表格字典样式")
     private String listClass;
 
     /**
      * 是否默认（Y是 N否）
      */
-    @ApiModelProperty(value = "是否默认（Y是 N否）")
     @ExcelProperty(value = "是否默认", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_yes_no")
     private String isDefault;
@@ -97,7 +86,6 @@ public class SysDictData extends BaseEntity {
     /**
      * 状态（0正常 1停用）
      */
-    @ApiModelProperty(value = "状态（0正常 1停用）")
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_normal_disable")
     private String status;
@@ -105,7 +93,6 @@ public class SysDictData extends BaseEntity {
     /**
      * 备注
      */
-    @ApiModelProperty(value = "备注")
     private String remark;
 
     public boolean getDefault() {

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java

@@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.common.excel.annotation.ExcelDictFormat;
 import com.ruoyi.common.excel.convert.ExcelDictConvert;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -28,13 +26,11 @@ import javax.validation.constraints.Size;
 @NoArgsConstructor
 @TableName("sys_dict_type")
 @ExcelIgnoreUnannotated
-@ApiModel("字典类型业务对象")
 public class SysDictType extends BaseEntity {
 
     /**
      * 字典主键
      */
-    @ApiModelProperty(value = "字典主键")
     @ExcelProperty(value = "字典主键")
     @TableId(value = "dict_id")
     private Long dictId;
@@ -42,7 +38,6 @@ public class SysDictType extends BaseEntity {
     /**
      * 字典名称
      */
-    @ApiModelProperty(value = "字典名称")
     @ExcelProperty(value = "字典名称")
     @NotBlank(message = "字典名称不能为空")
     @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
@@ -51,7 +46,6 @@ public class SysDictType extends BaseEntity {
     /**
      * 字典类型
      */
-    @ApiModelProperty(value = "字典类型")
     @ExcelProperty(value = "字典类型")
     @NotBlank(message = "字典类型不能为空")
     @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
@@ -61,7 +55,6 @@ public class SysDictType extends BaseEntity {
     /**
      * 状态（0正常 1停用）
      */
-    @ApiModelProperty(value = "状态（0正常 1停用）")
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_normal_disable")
     private String status;
@@ -69,7 +62,6 @@ public class SysDictType extends BaseEntity {
     /**
      * 备注
      */
-    @ApiModelProperty(value = "备注")
     private String remark;
 
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java

@@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.excel.annotation.ExcelDictFormat;
 import com.ruoyi.common.excel.convert.ExcelDictConvert;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -27,14 +25,12 @@ import java.util.Map;
 @NoArgsConstructor
 @TableName("sys_logininfor")
 @ExcelIgnoreUnannotated
-@ApiModel("系统访问记录业务对象")
 public class SysLogininfor implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
      * ID
      */
-    @ApiModelProperty(value = "访问ID")
     @ExcelProperty(value = "序号")
     @TableId(value = "info_id")
     private Long infoId;
@@ -42,14 +38,12 @@ public class SysLogininfor implements Serializable {
     /**
      * 用户账号
      */
-    @ApiModelProperty(value = "用户账号")
     @ExcelProperty(value = "用户账号")
     private String userName;
 
     /**
      * 状态 0成功 1失败
      */
-    @ApiModelProperty(value = "状态 0成功 1失败")
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_common_status")
     private String status;
@@ -57,28 +51,24 @@ public class SysLogininfor implements Serializable {
     /**
      * 地址
      */
-    @ApiModelProperty(value = "地址")
     @ExcelProperty(value = "地址")
     private String ipaddr;
 
     /**
      * 描述
      */
-    @ApiModelProperty(value = "描述")
     @ExcelProperty(value = "描述")
     private String msg;
 
     /**
      * 访问时间
      */
-    @ApiModelProperty(value = "访问时间")
     @ExcelProperty(value = "访问时间")
     private Date accessTime;
 
     /**
      * 请求参数
      */
-    @ApiModelProperty(value = "请求参数")
     @TableField(exist = false)
     private Map<String, Object> params = new HashMap<>();
 

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java

@@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.excel.annotation.ExcelDictFormat;
 import com.ruoyi.common.excel.convert.ExcelDictConvert;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -27,7 +25,6 @@ import java.util.Map;
 @NoArgsConstructor
 @TableName("sys_oper_log")
 @ExcelIgnoreUnannotated
-@ApiModel("操作日志记录业务对象")
 public class SysOperLog implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -35,7 +32,6 @@ public class SysOperLog implements Serializable {
     /**
      * 日志主键
      */
-    @ApiModelProperty(value = "日志主键")
     @ExcelProperty(value = "日志主键")
     @TableId(value = "oper_id")
     private Long operId;
@@ -43,14 +39,12 @@ public class SysOperLog implements Serializable {
     /**
      * 操作模块
      */
-    @ApiModelProperty(value = "操作模块")
     @ExcelProperty(value = "操作模块")
     private String title;
 
     /**
      * 业务类型（0其它 1新增 2修改 3删除）
      */
-    @ApiModelProperty(value = "业务类型（0其它 1新增 2修改 3删除）")
     @ExcelProperty(value = "业务类型", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_oper_type")
     private Integer businessType;
@@ -58,28 +52,24 @@ public class SysOperLog implements Serializable {
     /**
      * 业务类型数组
      */
-    @ApiModelProperty(value = "业务类型数组")
     @TableField(exist = false)
     private Integer[] businessTypes;
 
     /**
      * 请求方法
      */
-    @ApiModelProperty(value = "请求方法")
     @ExcelProperty(value = "请求方法")
     private String method;
 
     /**
      * 请求方式
      */
-    @ApiModelProperty(value = "请求方式")
     @ExcelProperty(value = "请求方式")
     private String requestMethod;
 
     /**
      * 操作类别（0其它 1后台用户 2手机端用户）
      */
-    @ApiModelProperty(value = "操作类别（0其它 1后台用户 2手机端用户）")
     @ExcelProperty(value = "操作类别", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=其它,1=后台用户,2=手机端用户")
     private Integer operatorType;
@@ -87,49 +77,42 @@ public class SysOperLog implements Serializable {
     /**
      * 操作人员
      */
-    @ApiModelProperty(value = "操作人员")
     @ExcelProperty(value = "操作人员")
     private String operName;
 
     /**
      * 部门名称
      */
-    @ApiModelProperty(value = "部门名称")
     @ExcelProperty(value = "部门名称")
     private String deptName;
 
     /**
      * 请求url
      */
-    @ApiModelProperty(value = "请求url")
     @ExcelProperty(value = "请求地址")
     private String operUrl;
 
     /**
      * 操作地址
      */
-    @ApiModelProperty(value = "操作地址")
     @ExcelProperty(value = "操作地址")
     private String operIp;
 
     /**
      * 请求参数
      */
-    @ApiModelProperty(value = "请求参数")
     @ExcelProperty(value = "请求参数")
     private String operParam;
 
     /**
      * 返回参数
      */
-    @ApiModelProperty(value = "返回参数")
     @ExcelProperty(value = "返回参数")
     private String jsonResult;
 
     /**
      * 操作状态（0正常 1异常）
      */
-    @ApiModelProperty(value = "操作状态（0正常 1异常）")
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_common_status")
     private Integer status;
@@ -137,21 +120,18 @@ public class SysOperLog implements Serializable {
     /**
      * 错误消息
      */
-    @ApiModelProperty(value = "错误消息")
     @ExcelProperty(value = "错误消息")
     private String errorMsg;
 
     /**
      * 操作时间
      */
-    @ApiModelProperty(value = "操作时间")
     @ExcelProperty(value = "操作时间")
     private Date operTime;
 
     /**
      * 请求参数
      */
-    @ApiModelProperty(value = "请求参数")
     @TableField(exist = false)
     private Map<String, Object> params = new HashMap<>();
 

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java

@@ -10,7 +10,6 @@ import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.common.excel.annotation.ExcelDictFormat;
 import com.ruoyi.common.excel.convert.ExcelDictConvert;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -35,7 +34,6 @@ public class SysRole extends BaseEntity {
     /**
      * 角色ID
      */
-    @ApiModelProperty(value = "角色ID")
     @ExcelProperty(value = "角色序号")
     @TableId(value = "role_id")
     private Long roleId;
@@ -43,7 +41,6 @@ public class SysRole extends BaseEntity {
     /**
      * 角色名称
      */
-    @ApiModelProperty(value = "角色名称")
     @ExcelProperty(value = "角色名称")
     @NotBlank(message = "角色名称不能为空")
     @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
@@ -52,7 +49,6 @@ public class SysRole extends BaseEntity {
     /**
      * 角色权限
      */
-    @ApiModelProperty(value = "角色权限")
     @ExcelProperty(value = "角色权限")
     @NotBlank(message = "权限字符不能为空")
     @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
@@ -61,7 +57,6 @@ public class SysRole extends BaseEntity {
     /**
      * 角色排序
      */
-    @ApiModelProperty(value = "角色排序")
     @ExcelProperty(value = "角色排序")
     @NotNull(message = "显示顺序不能为空")
     private Integer roleSort;
@@ -69,7 +64,6 @@ public class SysRole extends BaseEntity {
     /**
      * 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）
      */
-    @ApiModelProperty(value = "数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）")
     @ExcelProperty(value = "数据范围", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
     private String dataScope;
@@ -77,19 +71,16 @@ public class SysRole extends BaseEntity {
     /**
      * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）
      */
-    @ApiModelProperty(value = "菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）")
     private Boolean menuCheckStrictly;
 
     /**
      * 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）
      */
-    @ApiModelProperty(value = "部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）")
     private Boolean deptCheckStrictly;
 
     /**
      * 角色状态（0正常 1停用）
      */
-    @ApiModelProperty(value = "角色状态（0正常 1停用）")
     @ExcelProperty(value = "角色状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_common_status")
     private String status;
@@ -97,34 +88,29 @@ public class SysRole extends BaseEntity {
     /**
      * 删除标志（0代表存在 2代表删除）
      */
-    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     @TableLogic
     private String delFlag;
 
     /**
      * 备注
      */
-    @ApiModelProperty(value = "备注")
     private String remark;
 
     /**
      * 用户是否存在此角色标识 默认不存在
      */
-    @ApiModelProperty(value = "用户是否存在此角色标识 默认不存在")
     @TableField(exist = false)
     private boolean flag = false;
 
     /**
      * 菜单组
      */
-    @ApiModelProperty(value = "菜单组")
     @TableField(exist = false)
     private Long[] menuIds;
 
     /**
      * 部门组（数据权限）
      */
-    @ApiModelProperty(value = "部门组（数据权限）")
     @TableField(exist = false)
     private Long[] deptIds;
 
@@ -132,7 +118,9 @@ public class SysRole extends BaseEntity {
         this.roleId = roleId;
     }
 
-    @ApiModelProperty(value = "是否管理员")
+    /**
+     * 是否管理员
+     */
     public boolean isAdmin() {
         return UserConstants.ADMIN_ID.equals(this.roleId);
     }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@@ -8,8 +8,6 @@ import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.enums.SensitiveStrategy;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.common.core.xss.Xss;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -30,26 +28,22 @@ import java.util.List;
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @TableName("sys_user")
-@ApiModel("用户信息业务对象")
 public class SysUser extends BaseEntity {
 
     /**
      * 用户ID
      */
-    @ApiModelProperty(value = "用户ID")
     @TableId(value = "user_id")
     private Long userId;
 
     /**
      * 部门ID
      */
-    @ApiModelProperty(value = "部门ID")
     private Long deptId;
 
     /**
      * 用户账号
      */
-    @ApiModelProperty(value = "用户账号")
     @Xss(message = "用户账号不能包含脚本字符")
     @NotBlank(message = "用户账号不能为空")
     @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
@@ -58,7 +52,6 @@ public class SysUser extends BaseEntity {
     /**
      * 用户昵称
      */
-    @ApiModelProperty(value = "用户昵称")
     @Xss(message = "用户昵称不能包含脚本字符")
     @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
     private String nickName;
@@ -66,14 +59,12 @@ public class SysUser extends BaseEntity {
     /**
      * 用户类型（sys_user系统用户）
      */
-    @ApiModelProperty(value = "用户类型")
     private String userType;
 
     /**
      * 用户邮箱
      */
     @Sensitive(strategy = SensitiveStrategy.EMAIL)
-    @ApiModelProperty(value = "用户邮箱")
     @Email(message = "邮箱格式不正确")
     @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
     private String email;
@@ -82,25 +73,21 @@ public class SysUser extends BaseEntity {
      * 手机号码
      */
     @Sensitive(strategy = SensitiveStrategy.PHONE)
-    @ApiModelProperty(value = "手机号码")
     private String phonenumber;
 
     /**
      * 用户性别
      */
-    @ApiModelProperty(value = "用户性别")
     private String sex;
 
     /**
      * 用户头像
      */
-    @ApiModelProperty(value = "用户头像")
     private String avatar;
 
     /**
      * 密码
      */
-    @ApiModelProperty(value = "密码")
     @TableField(
         insertStrategy = FieldStrategy.NOT_EMPTY,
         updateStrategy = FieldStrategy.NOT_EMPTY,
@@ -117,66 +104,56 @@ public class SysUser extends BaseEntity {
     /**
      * 帐号状态（0正常 1停用）
      */
-    @ApiModelProperty(value = "帐号状态（0正常 1停用）")
     private String status;
 
     /**
      * 删除标志（0代表存在 2代表删除）
      */
-    @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     @TableLogic
     private String delFlag;
 
     /**
      * 最后登录IP
      */
-    @ApiModelProperty(value = "最后登录IP")
     private String loginIp;
 
     /**
      * 最后登录时间
      */
-    @ApiModelProperty(value = "最后登录时间")
     private Date loginDate;
 
     /**
      * 备注
      */
-    @ApiModelProperty(value = "备注")
     private String remark;
 
     /**
      * 部门对象
      */
-    @ApiModelProperty(value = "部门对象")
     @TableField(exist = false)
     private SysDept dept;
 
     /**
      * 角色对象
      */
-    @ApiModelProperty(value = "角色对象")
     @TableField(exist = false)
     private List<SysRole> roles;
 
     /**
      * 角色组
      */
-    @ApiModelProperty(value = "角色组")
     @TableField(exist = false)
     private Long[] roleIds;
 
     /**
      * 岗位组
      */
-    @ApiModelProperty(value = "岗位组")
     @TableField(exist = false)
     private Long[] postIds;
 
     /**
      * 数据权限 当前角色ID
      */
-    @ApiModelProperty(value = "角色ID")
     @TableField(exist = false)
     private Long roleId;
 
@@ -184,7 +161,9 @@ public class SysUser extends BaseEntity {
         this.userId = userId;
     }
 
-    @ApiModelProperty(value = "是否管理员")
+    /**
+     * 是否管理员
+     */
     public boolean isAdmin() {
         return UserConstants.ADMIN_ID.equals(this.userId);
     }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUserOnline.java

@@ -1,7 +1,5 @@
 package com.ruoyi.system.api.domain;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -15,55 +13,46 @@ import java.io.Serializable;
 
 @Data
 @NoArgsConstructor
-@ApiModel("当前在线会话业务对象")
 public class SysUserOnline implements Serializable {
 
     /**
      * 会话编号
      */
-    @ApiModelProperty(value = "会话编号")
     private String tokenId;
 
     /**
      * 部门名称
      */
-    @ApiModelProperty(value = "部门名称")
     private String deptName;
 
     /**
      * 用户名称
      */
-    @ApiModelProperty(value = "用户名称")
     private String userName;
 
     /**
      * 登录IP地址
      */
-    @ApiModelProperty(value = "登录IP地址")
     private String ipaddr;
 
     /**
      * 登录地址
      */
-    @ApiModelProperty(value = "登录地址")
     private String loginLocation;
 
     /**
      * 浏览器类型
      */
-    @ApiModelProperty(value = "浏览器类型")
     private String browser;
 
     /**
      * 操作系统
      */
-    @ApiModelProperty(value = "操作系统")
     private String os;
 
     /**
      * 登录时间
      */
-    @ApiModelProperty(value = "登录时间")
     private Long loginTime;
 
 }

ruoyi-auth/pom.xml

@@ -46,12 +46,6 @@
             <artifactId>ruoyi-common-security</artifactId>
         </dependency>
 
-        <!-- RuoYi Common Swagger -->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-swagger</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-web</artifactId>

ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -1,16 +1,11 @@
 package com.ruoyi.auth.controller;
 
-import cn.dev33.satoken.exception.NotLoginException;
-import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.nacos.api.common.Constants;
 import com.ruoyi.auth.form.LoginBody;
 import com.ruoyi.auth.form.RegisterBody;
 import com.ruoyi.auth.form.SmsLoginBody;
 import com.ruoyi.auth.service.SysLoginService;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.satoken.utils.LoginHelper;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -28,14 +23,15 @@ import java.util.Map;
  * @author Lion Li
  */
 @Validated
-@Api(value = "认证鉴权控制器", tags = {"认证鉴权管理"})
 @RequiredArgsConstructor
 @RestController
 public class TokenController {
 
     private final SysLoginService sysLoginService;
 
-    @ApiOperation("登录方法")
+    /**
+     * 登录方法
+     */
     @PostMapping("login")
     public R<Map<String, Object>> login(@Validated @RequestBody LoginBody form) {
         // 用户登录
@@ -53,7 +49,6 @@ public class TokenController {
      * @param smsLoginBody 登录信息
      * @return 结果
      */
-    @ApiOperation("短信登录")
     @PostMapping("/smsLogin")
     public R<Map<String, Object>> smsLogin(@Validated @RequestBody SmsLoginBody smsLoginBody) {
         Map<String, Object> ajax = new HashMap<>();
@@ -69,7 +64,6 @@ public class TokenController {
      * @param xcxCode 小程序code
      * @return 结果
      */
-    @ApiOperation("小程序登录(示例)")
     @PostMapping("/xcxLogin")
     public R<Map<String, Object>> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) {
         Map<String, Object> ajax = new HashMap<>();
@@ -79,14 +73,18 @@ public class TokenController {
         return R.ok(ajax);
     }
 
-    @ApiOperation("登出方法")
+    /**
+     * 登出方法
+     */
     @DeleteMapping("logout")
     public R<Void> logout() {
         sysLoginService.logout();
         return R.ok();
     }
 
-    @ApiOperation("用户注册")
+    /**
+     * 用户注册
+     */
     @PostMapping("register")
     public R<Void> register(@RequestBody RegisterBody registerBody) {
         // 用户注册

ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java

@@ -1,8 +1,6 @@
 package com.ruoyi.auth.form;
 
 import com.ruoyi.common.core.constant.UserConstants;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;
@@ -16,7 +14,6 @@ import javax.validation.constraints.NotBlank;
  */
 @Data
 @NoArgsConstructor
-@ApiModel("用户登录对象")
 public class LoginBody {
 
     /**
@@ -24,7 +21,6 @@ public class LoginBody {
      */
     @NotBlank(message = "{user.username.not.blank}")
     @Length(min = UserConstants.USERNAME_MIN_LENGTH, max = UserConstants.USERNAME_MAX_LENGTH, message = "{user.username.length.valid}")
-    @ApiModelProperty(value = "用户名")
     private String username;
 
     /**
@@ -32,7 +28,6 @@ public class LoginBody {
      */
     @NotBlank(message = "{user.password.not.blank}")
     @Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}")
-    @ApiModelProperty(value = "用户密码")
     private String password;
 
 }

ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java

@@ -1,7 +1,5 @@
 package com.ruoyi.auth.form;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -12,10 +10,8 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("用户注册对象")
 public class RegisterBody extends LoginBody {
 
-    @ApiModelProperty(value = "用户类型")
     private String userType;
 
 }

ruoyi-auth/src/main/java/com/ruoyi/auth/form/SmsLoginBody.java

@@ -1,7 +1,5 @@
 package com.ruoyi.auth.form;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -13,21 +11,18 @@ import javax.validation.constraints.NotBlank;
  */
 
 @Data
-@ApiModel("短信登录对象")
 public class SmsLoginBody {
 
     /**
      * 用户名
      */
     @NotBlank(message = "{user.phonenumber.not.blank}")
-    @ApiModelProperty(value = "用户手机号")
     private String phonenumber;
 
     /**
      * 用户密码
      */
     @NotBlank(message = "{sms.code.not.blank}")
-    @ApiModelProperty(value = "短信验证码")
     private String smsCode;
 
 }

ruoyi-common/pom.xml

@@ -16,7 +16,6 @@
         <module>ruoyi-common-excel</module>
         <module>ruoyi-common-core</module>
         <module>ruoyi-common-redis</module>
-        <module>ruoyi-common-swagger</module>
         <module>ruoyi-common-security</module>
         <module>ruoyi-common-satoken</module>
         <module>ruoyi-common-web</module>

ruoyi-common/ruoyi-common-bom/pom.xml

@@ -22,13 +22,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <!-- 接口模块 -->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-common-swagger</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
             <!-- 安全模块 -->
             <dependency>
                 <groupId>com.ruoyi</groupId>

ruoyi-common/ruoyi-common-core/pom.xml

@@ -73,12 +73,6 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
-        <!-- Swagger -->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java

@@ -1,8 +1,6 @@
 package com.ruoyi.common.core.domain;
 
 import com.ruoyi.common.core.constant.Constants;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -15,7 +13,6 @@ import java.io.Serializable;
  */
 @Data
 @NoArgsConstructor
-@ApiModel("请求响应对象")
 public class R<T> implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -29,13 +26,19 @@ public class R<T> implements Serializable {
      */
     public static final int FAIL = Constants.FAIL;
 
-    @ApiModelProperty("消息状态码")
+    /**
+     * 消息状态码
+     */
     private int code;
 
-    @ApiModelProperty("消息内容")
+    /**
+     * 消息内容
+     */
     private String msg;
 
-    @ApiModelProperty("数据对象")
+    /**
+     * 数据对象
+     */
     private T data;
 
     public static <T> R<T> ok() {

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java

@@ -2,7 +2,6 @@ package com.ruoyi.common.core.web.domain;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -24,42 +23,36 @@ public class BaseEntity implements Serializable {
     /**
      * 搜索值
      */
-    @ApiModelProperty(value = "搜索值")
     @TableField(exist = false)
     private String searchValue;
 
     /**
      * 创建者
      */
-    @ApiModelProperty(value = "创建者")
     @TableField(fill = FieldFill.INSERT)
     private String createBy;
 
     /**
      * 创建时间
      */
-    @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /**
      * 更新者
      */
-    @ApiModelProperty(value = "更新者")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private String updateBy;
 
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
     /**
      * 请求参数
      */
-    @ApiModelProperty(value = "请求参数")
     @TableField(exist = false)
     private Map<String, Object> params = new HashMap<>();
 

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java

@@ -1,7 +1,6 @@
 package com.ruoyi.common.core.web.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -24,20 +23,17 @@ public class TreeEntity<T> extends BaseEntity {
      * 父菜单名称
      */
     @TableField(exist = false)
-    @ApiModelProperty(value = "父菜单名称")
     private String parentName;
 
     /**
      * 父菜单ID
      */
-    @ApiModelProperty(value = "父菜单ID")
     private Long parentId;
 
     /**
      * 子部门
      */
     @TableField(exist = false)
-    @ApiModelProperty(value = "子部门")
     private List<T> children = new ArrayList<>();
 
 }

ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/page/PageQuery.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.sql.SqlUtil;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -24,25 +23,21 @@ public class PageQuery implements Serializable {
     /**
      * 分页大小
      */
-    @ApiModelProperty("分页大小")
     private Integer pageSize;
 
     /**
      * 当前页数
      */
-    @ApiModelProperty("当前页数")
     private Integer pageNum;
 
     /**
      * 排序列
      */
-    @ApiModelProperty("排序列")
     private String orderByColumn;
 
     /**
      * 排序的方向desc或者asc
      */
-    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
     private String isAsc;
 
     /**

ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/page/TableDataInfo.java

@@ -2,8 +2,6 @@ package com.ruoyi.common.mybatis.core.page;
 
 import cn.hutool.http.HttpStatus;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -18,32 +16,27 @@ import java.util.List;
 
 @Data
 @NoArgsConstructor
-@ApiModel("分页响应对象")
 public class TableDataInfo<T> implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
      * 总记录数
      */
-    @ApiModelProperty("总记录数")
     private long total;
 
     /**
      * 列表数据
      */
-    @ApiModelProperty("列表数据")
     private List<T> rows;
 
     /**
      * 消息状态码
      */
-    @ApiModelProperty("消息状态码")
     private int code;
 
     /**
      * 消息内容
      */
-    @ApiModelProperty("消息内容")
     private String msg;
 
     /**

ruoyi-common/ruoyi-common-swagger/pom.xml

@@ -29,12 +29,6 @@
             <artifactId>ruoyi-common-web</artifactId>
         </dependency>
 
-        <!-- knife4j -->
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-micro-spring-boot-starter</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-core</artifactId>

ruoyi-example/ruoyi-demo/pom.xml

@@ -52,12 +52,6 @@
             <artifactId>ruoyi-common-log</artifactId>
         </dependency>
 
-        <!-- RuoYi Common Swagger -->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-swagger</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-web</artifactId>

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java

@@ -2,9 +2,6 @@ package com.ruoyi.demo.controller;
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.mail.utils.MailUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,27 +17,34 @@ import java.io.File;
  * @author Michelle.Chung
  */
 @Validated
-@Api(value = "邮件发送案例", tags = {"邮件发送案例"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/demo/mail")
 public class MailController {
 
-    @ApiOperation("发送邮件")
+    /**
+     * 发送邮件
+     *
+     * @param to 接收人
+     * @param subject 标题
+     * @param text 内容
+     */
     @GetMapping("/sendSimpleMessage")
-    public R<Void> sendSimpleMessage(@ApiParam("接收人") String to,
+    public R<Void> sendSimpleMessage(String to, String subject, String text) {
-                                     @ApiParam("标题") String subject,
-                                     @ApiParam("内容") String text) {
         MailUtils.sendText(to, subject, text);
         return R.ok();
     }
 
-    @ApiOperation("发送邮件（带附件）")
+    /**
+     * 发送邮件（带附件）
+     *
+     * @param to 接收人
+     * @param subject 标题
+     * @param text 内容
+     * @param filePath 附件路径
+     */
     @GetMapping("/sendMessageWithAttachment")
-    public R<Void> sendMessageWithAttachment(@ApiParam("接收人") String to,
+    public R<Void> sendMessageWithAttachment(String to, String subject, String text, String filePath) {
-                                             @ApiParam("标题") String subject,
-                                             @ApiParam("内容") String text,
-                                             @ApiParam("附件路径") String filePath) {
         MailUtils.sendText(to, subject, text, new File(filePath));
         return R.ok();
     }

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java

@@ -2,8 +2,6 @@ package com.ruoyi.demo.controller;
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.redis.utils.RedisUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CachePut;
@@ -21,7 +19,6 @@ import java.time.Duration;
  */
 // 类级别 缓存统一配置
 //@CacheConfig(cacheNames = "redissonCacheMap")
-@Api(value = "spring-cache 演示案例", tags = {"spring-cache 演示案例"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/demo/cache")
@@ -41,7 +38,6 @@ public class RedisCacheController {
      * <p>
      * cacheNames 为配置文件内 groupId
      */
-    @ApiOperation("测试 @Cacheable")
     @Cacheable(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null")
     @GetMapping("/test1")
     public R<String> test1(String key, String value) {
@@ -56,7 +52,6 @@ public class RedisCacheController {
      * <p>
      * cacheNames 为 配置文件内 groupId
      */
-    @ApiOperation("测试 @CachePut")
     @CachePut(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null")
     @GetMapping("/test2")
     public R<String> test2(String key, String value) {
@@ -71,7 +66,6 @@ public class RedisCacheController {
      * <p>
      * cacheNames 为 配置文件内 groupId
      */
-    @ApiOperation("测试 @CacheEvict")
     @CacheEvict(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null")
     @GetMapping("/test3")
     public R<String> test3(String key, String value) {
@@ -83,7 +77,6 @@ public class RedisCacheController {
      * 手动设置过期时间10秒
      * 11秒后获取 判断是否相等
      */
-    @ApiOperation("测试设置过期时间")
     @GetMapping("/test6")
     public R<Boolean> test6(String key, String value) {
         RedisUtils.setCacheObject(key, value);

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java

@@ -5,8 +5,6 @@ import com.baomidou.lock.LockTemplate;
 import com.baomidou.lock.annotation.Lock4j;
 import com.baomidou.lock.executor.RedissonLockExecutor;
 import com.ruoyi.common.core.domain.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -21,7 +19,6 @@ import java.time.LocalTime;
  *
  * @author shenxinquan
  */
-@Api(value = "测试分布式锁的样例", tags = {"测试分布式锁的样例"})
 @Slf4j
 @RestController
 @RequestMapping("/demo/redisLock")
@@ -33,7 +30,6 @@ public class RedisLockController {
     /**
      * 测试lock4j 注解
      */
-    @ApiOperation("测试lock4j 注解")
     @Lock4j(keys = {"#key"})
     @GetMapping("/testLock4j")
     public R<String> testLock4j(String key, String value) {
@@ -50,7 +46,6 @@ public class RedisLockController {
     /**
      * 测试lock4j 工具
      */
-    @ApiOperation("测试lock4j 工具")
     @GetMapping("/testLock4jLockTemplate")
     public R<String> testLock4jLockTemplate(String key, String value) {
         final LockInfo lockInfo = lockTemplate.lock(key, 30000L, 5000L, RedissonLockExecutor.class);

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java

@@ -2,9 +2,6 @@ package com.ruoyi.demo.controller;
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.redis.utils.RedisUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,24 +12,32 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author Lion Li
  */
-@Api(value = "Redis发布订阅 演示案例", tags = {"Redis发布订阅"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/demo/redis/pubsub")
 public class RedisPubSubController {
 
-    @ApiOperation("发布消息")
+    /**
+     * 发布消息
+     *
+     * @param key 通道Key
+     * @param value 发送内容
+     */
     @GetMapping("/pub")
-    public R<Void> pub(@ApiParam("通道Key") String key, @ApiParam("发送内容") String value) {
+    public R<Void> pub(String key, String value) {
         RedisUtils.publish(key, value, consumer -> {
             System.out.println("发布通道 => " + key + ", 发送值 => " + value);
         });
         return R.ok("操作成功");
     }
 
-    @ApiOperation("订阅消息")
+    /**
+     * 订阅消息
+     *
+     * @param key 通道Key
+     */
     @GetMapping("/sub")
-    public R<Void> sub(@ApiParam("通道Key") String key) {
+    public R<Void> sub(String key) {
         RedisUtils.subscribe(key, String.class, msg -> {
             System.out.println("订阅通道 => " + key + ", 接收值 => " + msg);
         });

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java

@@ -4,9 +4,6 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.sms.config.properties.SmsProperties;
 import com.ruoyi.common.sms.core.SmsTemplate;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -24,7 +21,6 @@ import java.util.Map;
  * @version 4.2.0
  */
 @Validated
-@Api(value = "短信演示案例", tags = {"短信演示案例"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/demo/sms")
@@ -34,10 +30,14 @@ public class SmsController {
 //    private final SmsTemplate smsTemplate; // 可以使用spring注入
 //    private final AliyunSmsTemplate smsTemplate; // 也可以注入某个厂家的模板工具
 
-    @ApiOperation("发送短信Aliyun")
+    /**
+     * 发送短信Aliyun
+     *
+     * @param phones 电话号
+     * @param templateId 模板ID
+     */
     @GetMapping("/sendAliyun")
-    public R<Object> sendAliyun(@ApiParam("电话号") String phones,
+    public R<Object> sendAliyun(String phones, String templateId) {
-                                     @ApiParam("模板ID") String templateId) {
         if (!smsProperties.getEnabled()) {
             return R.fail("当前系统没有开启短信功能！");
         }
@@ -51,10 +51,14 @@ public class SmsController {
         return R.ok(send);
     }
 
-    @ApiOperation("发送短信Tencent")
+    /**
+     * 发送短信Tencent
+     *
+     * @param phones 电话号
+     * @param templateId 模板ID
+     */
     @GetMapping("/sendTencent")
-    public R<Object> sendTencent(@ApiParam("电话号") String phones,
+    public R<Object> sendTencent(String phones, String templateId) {
-                                             @ApiParam("模板ID") String templateId) {
         if (!smsProperties.getEnabled()) {
             return R.fail("当前系统没有开启短信功能！");
         }

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java

@@ -1,24 +1,18 @@
 package com.ruoyi.demo.controller;
 
 import com.ruoyi.common.core.domain.R;
-import io.swagger.annotations.Api;
+import org.springframework.http.MediaType;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
-
 /**
  * swagger3 用法示例
  *
  * @author Lion Li
  */
-@Api(value = "演示swagger3控制器", tags = {"演示swagger3接口"})
 @RestController
 @RequestMapping("/swagger/demo")
 public class Swagger3DemoController {
@@ -26,12 +20,10 @@ public class Swagger3DemoController {
     /**
      * 上传请求
      * 必须使用 @RequestPart 注解标注为文件
+     *
+     * @param file 文件
      */
-    @ApiOperation(value = "通用上传请求")
+    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "file", value = "文件", paramType = "query", dataTypeClass = File.class, required = true)
-    })
-    @PostMapping(value = "/upload")
     public R<String> upload(@RequestPart("file") MultipartFile file) {
         return R.ok("操作成功", file.getOriginalFilename());
     }

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java

@@ -5,8 +5,6 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.demo.domain.TestDemo;
 import com.ruoyi.demo.mapper.TestDemoMapper;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,7 +20,6 @@ import java.util.List;
  * @author Lion Li
  * @date 2021-05-30
  */
-@Api(value = "测试批量方法", tags = {"测试批量方法"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/demo/batch")
@@ -38,7 +35,6 @@ public class TestBatchController extends BaseController {
      * <p>
      * 3.5.0 版本 增加 rewriteBatchedStatements=true 批处理参数 使 MP 原生批处理可以达到同样的速度
      */
-    @ApiOperation(value = "新增批量方法")
     @PostMapping("/add")
 //    @DS("slave")
     public R<Void> add() {
@@ -58,7 +54,6 @@ public class TestBatchController extends BaseController {
      * <p>
      * 3.5.0 版本 增加 rewriteBatchedStatements=true 批处理参数 使 MP 原生批处理可以达到同样的速度
      */
-    @ApiOperation(value = "新增或更新批量方法")
     @PostMapping("/addOrUpdate")
 //    @DS("slave")
     public R<Void> addOrUpdate() {
@@ -84,7 +79,6 @@ public class TestBatchController extends BaseController {
     /**
      * 删除批量方法
      */
-    @ApiOperation(value = "删除批量方法")
     @DeleteMapping()
 //    @DS("slave")
     public R<Void> remove() {

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java

@@ -20,10 +20,8 @@ import com.ruoyi.demo.domain.bo.TestDemoBo;
 import com.ruoyi.demo.domain.bo.TestDemoImportVo;
 import com.ruoyi.demo.domain.vo.TestDemoVo;
 import com.ruoyi.demo.service.ITestDemoService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -42,7 +40,6 @@ import java.util.concurrent.TimeUnit;
  * @date 2021-07-26
  */
 @Validated
-@Api(value = "测试单表控制器", tags = {"测试单表管理"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/demo/demo")
@@ -53,28 +50,30 @@ public class TestDemoController extends BaseController {
     /**
      * 查询测试单表列表
      */
-    @ApiOperation("查询测试单表列表")
     @SaCheckPermission("demo:demo:list")
     @GetMapping("/list")
-    public TableDataInfo<TestDemoVo> list(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) {
+    public TableDataInfo<TestDemoVo> list(TestDemoBo bo, PageQuery pageQuery) {
         return iTestDemoService.queryPageList(bo, pageQuery);
     }
 
     /**
      * 自定义分页查询
      */
-    @ApiOperation("自定义分页查询")
     @SaCheckPermission("demo:demo:list")
     @GetMapping("/page")
     public TableDataInfo<TestDemoVo> page(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) {
         return iTestDemoService.customPageList(bo, pageQuery);
     }
 
-    @ApiOperation("导入测试-校验")
+    /**
+     * 导入测试-校验
+     *
+     * @param file 导入文件
+     */
     @Log(title = "测试单表", businessType = BusinessType.IMPORT)
     @SaCheckPermission("demo:demo:import")
-    @PostMapping("/importData")
+    @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public R<Void> importData(@ApiParam("导入文件") @RequestPart("file") MultipartFile file) throws Exception {
+    public R<Void> importData(@RequestPart("file") MultipartFile file) throws Exception {
         ExcelResult<TestDemoImportVo> excelResult = ExcelUtil.importExcel(file.getInputStream(), TestDemoImportVo.class, true);
         List<TestDemoImportVo> volist = excelResult.getList();
         List<TestDemo> list = BeanUtil.copyToList(volist, TestDemo.class);
@@ -85,7 +84,6 @@ public class TestDemoController extends BaseController {
     /**
      * 导出测试单表列表
      */
-    @ApiOperation("导出测试单表列表")
     @SaCheckPermission("demo:demo:export")
     @Log(title = "测试单表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -100,20 +98,18 @@ public class TestDemoController extends BaseController {
 
     /**
      * 获取测试单表详细信息
+     *
+     * @param id 测试ID
      */
-    @ApiOperation("获取测试单表详细信息")
     @SaCheckPermission("demo:demo:query")
     @GetMapping("/{id}")
-    public R<TestDemoVo> getInfo(@ApiParam("测试ID")
+    public R<TestDemoVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) {
-                                          @NotNull(message = "主键不能为空")
-                                          @PathVariable("id") Long id) {
         return R.ok(iTestDemoService.queryById(id));
     }
 
     /**
      * 新增测试单表
      */
-    @ApiOperation("新增测试单表")
     @SaCheckPermission("demo:demo:add")
     @Log(title = "测试单表", businessType = BusinessType.INSERT)
     @RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS, message = "{repeat.submit.message}")
@@ -128,7 +124,6 @@ public class TestDemoController extends BaseController {
     /**
      * 修改测试单表
      */
-    @ApiOperation("修改测试单表")
     @SaCheckPermission("demo:demo:edit")
     @Log(title = "测试单表", businessType = BusinessType.UPDATE)
     @RepeatSubmit
@@ -139,14 +134,13 @@ public class TestDemoController extends BaseController {
 
     /**
      * 删除测试单表
+     *
+     * @param ids 测试ID串
      */
-    @ApiOperation("删除测试单表")
     @SaCheckPermission("demo:demo:remove")
     @Log(title = "测试单表", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public R<Void> remove(@ApiParam("测试ID串")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
-                                   @NotEmpty(message = "主键不能为空")
-                                   @PathVariable Long[] ids) {
         return toAjax(iTestDemoService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
 }

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java

@@ -2,8 +2,6 @@ package com.ruoyi.demo.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import com.ruoyi.common.excel.utils.ExcelUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -21,7 +19,6 @@ import java.util.Map;
  *
  * @author Lion Li
  */
-@Api(value = "测试Excel功能", tags = {"测试Excel功能"})
 @RestController
 @RequestMapping("/demo/excel")
 public class TestExcelController {
@@ -29,7 +26,6 @@ public class TestExcelController {
     /**
      * 单列表多数据
      */
-    @ApiOperation(value = "单列表多数据")
     @GetMapping("/exportTemplateOne")
     public void exportTemplateOne(HttpServletResponse response) {
         Map<String,String> map = new HashMap<>();
@@ -49,7 +45,6 @@ public class TestExcelController {
     /**
      * 多列表多数据
      */
-    @ApiOperation(value = "多列表多数据")
     @GetMapping("/exportTemplateMuliti")
     public void exportTemplateMuliti(HttpServletResponse response) {
         Map<String,String> map = new HashMap<>();

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java

@@ -2,9 +2,6 @@ package com.ruoyi.demo.controller;
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.MessageUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import org.hibernate.validator.constraints.Range;
 import org.springframework.validation.annotation.Validated;
@@ -22,7 +19,6 @@ import javax.validation.constraints.NotNull;
  * @author Lion Li
  */
 @Validated
-@Api(value = "测试国际化控制器", tags = {"测试国际化管理"})
 @RestController
 @RequestMapping("/demo/i18n")
 public class TestI18nController {
@@ -32,10 +28,11 @@ public class TestI18nController {
      * code为 messages.properties 中的 key
      * <p>
      * 测试使用 user.register.success
+     *
+     * @param code 国际化code
      */
-    @ApiOperation("通过code获取国际化内容")
     @GetMapping()
-    public R<Void> get(@ApiParam("国际化code") String code) {
+    public R<Void> get(String code) {
         return R.ok(MessageUtils.message(code));
     }
 
@@ -45,7 +42,6 @@ public class TestI18nController {
      * <p>
      * 测试使用 not.null
      */
-    @ApiOperation("Validator 校验国际化")
     @GetMapping("/test1")
     public R<Void> test1(@NotBlank(message = "{not.null}") String str) {
         return R.ok(str);
@@ -57,7 +53,6 @@ public class TestI18nController {
      * <p>
      * 测试使用 not.null
      */
-    @ApiOperation("Bean 校验国际化")
     @GetMapping("/test2")
     public R<TestI18nBo> test2(@Validated TestI18nBo bo) {
         return R.ok(bo);

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java

@@ -4,8 +4,6 @@ import com.ruoyi.common.core.annotation.Sensitive;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.enums.SensitiveStrategy;
 import com.ruoyi.common.core.web.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @version 3.6.0
  * @see com.ruoyi.common.core.service.SensitiveService
  */
-@Api(value = "测试数据脱敏控制器", tags = {"测试数据脱敏管理"})
 @RestController
 @RequestMapping("/demo/sensitive")
 public class TestSensitiveController extends BaseController {
@@ -29,7 +26,6 @@ public class TestSensitiveController extends BaseController {
     /**
      * 测试数据脱敏
      */
-    @ApiOperation("查询测试单表列表")
     @GetMapping("/test")
     public R<TestSensitive> test() {
         TestSensitive testSensitive = new TestSensitive();

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java

@@ -4,7 +4,6 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.excel.utils.ExcelUtil;
 import com.ruoyi.common.idempotent.annotation.RepeatSubmit;
@@ -13,9 +12,6 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.demo.domain.bo.TestTreeBo;
 import com.ruoyi.demo.domain.vo.TestTreeVo;
 import com.ruoyi.demo.service.ITestTreeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -33,7 +29,6 @@ import java.util.List;
  * @date 2021-07-26
  */
 @Validated
-@Api(value = "测试树表控制器", tags = {"测试树表管理"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/demo/tree")
@@ -44,10 +39,9 @@ public class TestTreeController extends BaseController {
     /**
      * 查询测试树表列表
      */
-    @ApiOperation("查询测试树表列表")
     @SaCheckPermission("demo:tree:list")
     @GetMapping("/list")
-    public R<List<TestTreeVo>> list(@Validated(QueryGroup.class) TestTreeBo bo) {
+    public R<List<TestTreeVo>> list(TestTreeBo bo) {
         List<TestTreeVo> list = iTestTreeService.queryList(bo);
         return R.ok(list);
     }
@@ -55,7 +49,6 @@ public class TestTreeController extends BaseController {
     /**
      * 导出测试树表列表
      */
-    @ApiOperation("导出测试树表列表")
     @SaCheckPermission("demo:tree:export")
     @Log(title = "测试树表", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
@@ -66,20 +59,18 @@ public class TestTreeController extends BaseController {
 
     /**
      * 获取测试树表详细信息
+     *
+     * @param id 测试树ID
      */
-    @ApiOperation("获取测试树表详细信息")
     @SaCheckPermission("demo:tree:query")
     @GetMapping("/{id}")
-    public R<TestTreeVo> getInfo(@ApiParam("测试树ID")
+    public R<TestTreeVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) {
-                                          @NotNull(message = "主键不能为空")
-                                          @PathVariable("id") Long id) {
         return R.ok(iTestTreeService.queryById(id));
     }
 
     /**
      * 新增测试树表
      */
-    @ApiOperation("新增测试树表")
     @SaCheckPermission("demo:tree:add")
     @Log(title = "测试树表", businessType = BusinessType.INSERT)
     @RepeatSubmit
@@ -91,7 +82,6 @@ public class TestTreeController extends BaseController {
     /**
      * 修改测试树表
      */
-    @ApiOperation("修改测试树表")
     @SaCheckPermission("demo:tree:edit")
     @Log(title = "测试树表", businessType = BusinessType.UPDATE)
     @RepeatSubmit
@@ -102,14 +92,13 @@ public class TestTreeController extends BaseController {
 
     /**
      * 删除测试树表
+     *
+     * @param ids 测试树ID串
      */
-    @ApiOperation("删除测试树表")
     @SaCheckPermission("demo:tree:remove")
     @Log(title = "测试树表", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public R<Void> remove(@ApiParam("测试树ID串")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
-                                   @NotEmpty(message = "主键不能为空")
-                                   @PathVariable Long[] ids) {
         return toAjax(iTestTreeService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
 }

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java

@@ -3,8 +3,6 @@ package com.ruoyi.demo.domain.bo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.web.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -20,48 +18,41 @@ import javax.validation.constraints.NotNull;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("测试单表业务对象")
 public class TestDemoBo extends BaseEntity {
 
     /**
      * 主键
      */
-    @ApiModelProperty("主键")
     @NotNull(message = "主键不能为空", groups = {EditGroup.class})
     private Long id;
 
     /**
      * 部门id
      */
-    @ApiModelProperty("部门id")
     @NotNull(message = "部门id不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long deptId;
 
     /**
      * 用户id
      */
-    @ApiModelProperty("用户id")
     @NotNull(message = "用户id不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long userId;
 
     /**
      * 排序号
      */
-    @ApiModelProperty("排序号")
     @NotNull(message = "排序号不能为空", groups = {AddGroup.class, EditGroup.class})
     private Integer orderNum;
 
     /**
      * key键
      */
-    @ApiModelProperty("key键")
     @NotBlank(message = "key键不能为空", groups = {AddGroup.class, EditGroup.class})
     private String testKey;
 
     /**
      * 值
      */
-    @ApiModelProperty("值")
     @NotBlank(message = "值不能为空", groups = {AddGroup.class, EditGroup.class})
     private String value;
 

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java

@@ -1,8 +1,6 @@
 package com.ruoyi.demo.domain.bo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -15,13 +13,11 @@ import javax.validation.constraints.NotNull;
  * @date 2021-07-26
  */
 @Data
-@ApiModel("测试单表业务对象")
 public class TestDemoImportVo {
 
     /**
      * 部门id
      */
-    @ApiModelProperty("部门id")
     @NotNull(message = "部门id不能为空")
     @ExcelProperty(value = "部门id")
     private Long deptId;
@@ -29,7 +25,6 @@ public class TestDemoImportVo {
     /**
      * 用户id
      */
-    @ApiModelProperty("用户id")
     @NotNull(message = "用户id不能为空")
     @ExcelProperty(value = "用户id")
     private Long userId;
@@ -37,7 +32,6 @@ public class TestDemoImportVo {
     /**
      * 排序号
      */
-    @ApiModelProperty("排序号")
     @NotNull(message = "排序号不能为空")
     @ExcelProperty(value = "排序号")
     private Long orderNum;
@@ -45,7 +39,6 @@ public class TestDemoImportVo {
     /**
      * key键
      */
-    @ApiModelProperty("key键")
     @NotBlank(message = "key键不能为空")
     @ExcelProperty(value = "key键")
     private String testKey;
@@ -53,7 +46,6 @@ public class TestDemoImportVo {
     /**
      * 值
      */
-    @ApiModelProperty("值")
     @NotBlank(message = "值不能为空")
     @ExcelProperty(value = "值")
     private String value;

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java

@@ -3,8 +3,6 @@ package com.ruoyi.demo.domain.bo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.web.domain.TreeEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -20,34 +18,29 @@ import javax.validation.constraints.NotNull;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("测试树表业务对象")
 public class TestTreeBo extends TreeEntity<TestTreeBo> {
 
     /**
      * 主键
      */
-    @ApiModelProperty("主键")
     @NotNull(message = "主键不能为空", groups = {EditGroup.class})
     private Long id;
 
     /**
      * 部门id
      */
-    @ApiModelProperty("部门id")
     @NotNull(message = "部门id不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long deptId;
 
     /**
      * 用户id
      */
-    @ApiModelProperty("用户id")
     @NotNull(message = "用户id不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long userId;
 
     /**
      * 树节点名
      */
-    @ApiModelProperty("树节点名")
     @NotBlank(message = "树节点名不能为空", groups = {AddGroup.class, EditGroup.class})
     private String treeName;
 

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java

@@ -2,8 +2,6 @@ package com.ruoyi.demo.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -16,7 +14,6 @@ import java.util.Date;
  * @date 2021-07-26
  */
 @Data
-@ApiModel("测试单表视图对象")
 @ExcelIgnoreUnannotated
 public class TestDemoVo {
 
@@ -26,70 +23,60 @@ public class TestDemoVo {
      * 主键
      */
     @ExcelProperty(value = "主键")
-    @ApiModelProperty("主键")
     private Long id;
 
     /**
      * 部门id
      */
     @ExcelProperty(value = "部门id")
-    @ApiModelProperty("部门id")
     private Long deptId;
 
     /**
      * 用户id
      */
     @ExcelProperty(value = "用户id")
-    @ApiModelProperty("用户id")
     private Long userId;
 
     /**
      * 排序号
      */
     @ExcelProperty(value = "排序号")
-    @ApiModelProperty("排序号")
     private Integer orderNum;
 
     /**
      * key键
      */
     @ExcelProperty(value = "key键")
-    @ApiModelProperty("key键")
     private String testKey;
 
     /**
      * 值
      */
     @ExcelProperty(value = "值")
-    @ApiModelProperty("值")
     private String value;
 
     /**
      * 创建时间
      */
     @ExcelProperty(value = "创建时间")
-    @ApiModelProperty("创建时间")
     private Date createTime;
 
     /**
      * 创建人
      */
     @ExcelProperty(value = "创建人")
-    @ApiModelProperty("创建人")
     private String createBy;
 
     /**
      * 更新时间
      */
     @ExcelProperty(value = "更新时间")
-    @ApiModelProperty("更新时间")
     private Date updateTime;
 
     /**
      * 更新人
      */
     @ExcelProperty(value = "更新人")
-    @ApiModelProperty("更新人")
     private String updateBy;
 
 

ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java

@@ -2,8 +2,6 @@ package com.ruoyi.demo.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -16,7 +14,6 @@ import java.util.Date;
  * @date 2021-07-26
  */
 @Data
-@ApiModel("测试树表视图对象")
 @ExcelIgnoreUnannotated
 public class TestTreeVo {
 
@@ -25,42 +22,36 @@ public class TestTreeVo {
     /**
      * 主键
      */
-    @ApiModelProperty("主键")
     private Long id;
 
     /**
      * 父id
      */
     @ExcelProperty(value = "父id")
-    @ApiModelProperty("父id")
     private Long parentId;
 
     /**
      * 部门id
      */
     @ExcelProperty(value = "部门id")
-    @ApiModelProperty("部门id")
     private Long deptId;
 
     /**
      * 用户id
      */
     @ExcelProperty(value = "用户id")
-    @ApiModelProperty("用户id")
     private Long userId;
 
     /**
      * 树节点名
      */
     @ExcelProperty(value = "树节点名")
-    @ApiModelProperty("树节点名")
     private String treeName;
 
     /**
      * 创建时间
      */
     @ExcelProperty(value = "创建时间")
-    @ApiModelProperty("创建时间")
     private Date createTime;
 
 

ruoyi-example/ruoyi-stream-mq/pom.xml

@@ -61,12 +61,6 @@
             <artifactId>ruoyi-common-security</artifactId>
         </dependency>
 
-        <!-- RuoYi Common Swagger -->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-swagger</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-web</artifactId>

ruoyi-example/ruoyi-stream-mq/src/main/java/com/ruoyi/stream/controller/TestMqController.java

@@ -1,50 +1,58 @@
 package com.ruoyi.stream.controller;
 
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.stream.mq.producer.DelayProducer;
 import com.ruoyi.stream.mq.producer.LogStreamProducer;
 import com.ruoyi.stream.mq.producer.TestStreamProducer;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * 测试mq
+ */
 @Slf4j
 @RestController
 @AllArgsConstructor
 @RequestMapping("/test-mq")
-@Api(value = "测试mq", tags = "测试mq")
 public class TestMqController {
 
     private final DelayProducer delayProducer;
     private final TestStreamProducer testStreamProducer;
     private final LogStreamProducer logStreamProducer;
 
+    /**
+     * 发送消息Rabbitmq
+     *
+     * @param msg 消息内容
+     * @param delay 延时时间
+     */
     @GetMapping("/sendRabbitmq")
-    @ApiOperationSupport(order = 1)
+    public R<Void> sendRabbitmq(String msg, Long delay) {
-    @ApiOperation(value = "发送消息Rabbitmq", notes = "发送消息")
-    public R<Void> sendRabbitmq(@ApiParam("消息内容") String msg, @ApiParam("延时时间") Long delay) {
         delayProducer.sendMsg(msg, delay);
         return R.ok();
     }
 
+    /**
+     * 发送消息Rocketmq
+     *
+     * @param msg 消息内容
+     */
     @GetMapping("/sendRocketmq")
-    @ApiOperationSupport(order = 2)
+    public R<Void> sendRocketmq(String msg) {
-    @ApiOperation(value = "发送消息Rocketmq", notes = "发送消息")
-    public R<Void> sendRocketmq(@ApiParam("消息内容") String msg) {
         testStreamProducer.streamTestMsg(msg);
         return R.ok();
     }
 
+    /**
+     * 发送消息Kafka
+     *
+     * @param msg 消息内容
+     */
     @GetMapping("/sendKafka")
-    @ApiOperationSupport(order = 3)
+    public R<Void> sendKafka(String msg) {
-    @ApiOperation(value = "发送消息Kafka", notes = "发送消息")
-    public R<Void> sendKafka(@ApiParam("消息内容") String msg) {
         logStreamProducer.streamLogMsg(msg);
         return R.ok();
     }

ruoyi-modules/ruoyi-gen/pom.xml

@@ -59,12 +59,6 @@
             <artifactId>ruoyi-common-log</artifactId>
         </dependency>
 
-        <!-- RuoYi Common Swagger -->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-swagger</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-web</artifactId>

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java

@@ -12,8 +12,6 @@ import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.gen.domain.GenTable;
 import com.ruoyi.gen.domain.GenTableColumn;
 import com.ruoyi.gen.service.IGenTableService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -30,7 +28,6 @@ import java.util.Map;
  * @author Lion Li
  */
 @Validated
-@Api(value = "代码生成", tags = {"代码生成管理"})
 @RequiredArgsConstructor
 @RequestMapping("/gen")
 @RestController
@@ -41,7 +38,6 @@ public class GenController extends BaseController {
     /**
      * 查询代码生成列表
      */
-    @ApiOperation("查询代码生成列表")
     @SaCheckPermission("tool:gen:list")
     @GetMapping("/list")
     public TableDataInfo<GenTable> genList(GenTable genTable, PageQuery pageQuery) {
@@ -50,8 +46,9 @@ public class GenController extends BaseController {
 
     /**
      * 修改代码生成业务
+     *
+     * @param tableId 表主键
      */
-    @ApiOperation("修改代码生成业务")
     @SaCheckPermission("tool:gen:query")
     @GetMapping(value = "/{tableId}")
     public R<Map<String, Object>> getInfo(@PathVariable Long tableId) {
@@ -68,7 +65,6 @@ public class GenController extends BaseController {
     /**
      * 查询数据库列表
      */
-    @ApiOperation("查询数据库列表")
     @SaCheckPermission("tool:gen:list")
     @GetMapping("/db/list")
     public TableDataInfo<GenTable> dataList(GenTable genTable, PageQuery pageQuery) {
@@ -77,8 +73,9 @@ public class GenController extends BaseController {
 
     /**
      * 查询数据表字段列表
+     *
+     * @param tableId 表主键
      */
-    @ApiOperation("查询数据表字段列表")
     @GetMapping(value = "/column/{tableId}")
     public TableDataInfo<GenTableColumn> columnList(Long tableId) {
         TableDataInfo<GenTableColumn> dataInfo = new TableDataInfo<>();
@@ -90,8 +87,9 @@ public class GenController extends BaseController {
 
     /**
      * 导入表结构（保存）
+     *
+     * @param tables 表名串
      */
-    @ApiOperation("导入表结构（保存）")
     @SaCheckPermission("tool:gen:import")
     @Log(title = "代码生成", businessType = BusinessType.IMPORT)
     @PostMapping("/importTable")
@@ -106,7 +104,6 @@ public class GenController extends BaseController {
     /**
      * 修改保存代码生成业务
      */
-    @ApiOperation("修改保存代码生成业务")
     @SaCheckPermission("tool:gen:edit")
     @Log(title = "代码生成", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -118,8 +115,9 @@ public class GenController extends BaseController {
 
     /**
      * 删除代码生成
+     *
+     * @param tableIds 表主键串
      */
-    @ApiOperation("删除代码生成")
     @SaCheckPermission("tool:gen:remove")
     @Log(title = "代码生成", businessType = BusinessType.DELETE)
     @DeleteMapping("/{tableIds}")
@@ -130,8 +128,9 @@ public class GenController extends BaseController {
 
     /**
      * 预览代码
+     *
+     * @param tableId 表主键
      */
-    @ApiOperation("预览代码")
     @SaCheckPermission("tool:gen:preview")
     @GetMapping("/preview/{tableId}")
     public R<Map<String, String>> preview(@PathVariable("tableId") Long tableId) throws IOException {
@@ -141,8 +140,9 @@ public class GenController extends BaseController {
 
     /**
      * 生成代码（下载方式）
+     *
+     * @param tableName 表名
      */
-    @ApiOperation("生成代码（下载方式）")
     @SaCheckPermission("tool:gen:code")
     @Log(title = "代码生成", businessType = BusinessType.GENCODE)
     @GetMapping("/download/{tableName}")
@@ -153,8 +153,9 @@ public class GenController extends BaseController {
 
     /**
      * 生成代码（自定义路径）
+     *
+     * @param tableName 表名
      */
-    @ApiOperation("生成代码（自定义路径）")
     @SaCheckPermission("tool:gen:code")
     @Log(title = "代码生成", businessType = BusinessType.GENCODE)
     @GetMapping("/genCode/{tableName}")
@@ -165,8 +166,9 @@ public class GenController extends BaseController {
 
     /**
      * 同步数据库
+     *
+     * @param tableName 表名
      */
-    @ApiOperation("同步数据库")
     @SaCheckPermission("tool:gen:edit")
     @Log(title = "代码生成", businessType = BusinessType.UPDATE)
     @GetMapping("/synchDb/{tableName}")
@@ -177,8 +179,9 @@ public class GenController extends BaseController {
 
     /**
      * 批量生成代码
+     *
+     * @param tables 表名串
      */
-    @ApiOperation("批量生成代码")
     @SaCheckPermission("tool:gen:code")
     @Log(title = "代码生成", businessType = BusinessType.GENCODE)
     @GetMapping("/batchGenCode")

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java

@@ -354,9 +354,8 @@ public class GenTableServiceImpl implements IGenTableService {
                     column.setQueryType(prevColumn.getQueryType());
                 }
                 if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk()
-                        && (column.isInsert() || column.isEdit())
+                    && (column.isInsert() || column.isEdit())
-                        && ((column.isUsableColumn()) || (!column.isSuperColumn())))
+                    && ((column.isUsableColumn()) || (!column.isSuperColumn()))) {
-                {
                     // 如果是(新增/修改&非主键/非忽略及父属性)，继续保留必填/显示类型选项
                     column.setIsRequired(prevColumn.getIsRequired());
                     column.setHtmlType(prevColumn.getHtmlType());

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java

@@ -107,7 +107,7 @@ public class GenUtils {
         }
         // 类型&性别字段设置下拉框
         else if (StringUtils.endsWithIgnoreCase(columnName, "type")
-                || StringUtils.endsWithIgnoreCase(columnName, "sex")) {
+            || StringUtils.endsWithIgnoreCase(columnName, "sex")) {
             column.setHtmlType(GenConstants.HTML_SELECT);
         }
         // 图片字段设置图片上传控件

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java

@@ -257,14 +257,14 @@ public class VelocityUtils {
     /**
      * 添加字典列表
      *
-     * @param dicts 字典列表
+     * @param dicts   字典列表
      * @param columns 列集合
      */
     public static void addDicts(Set<String> dicts, List<GenTableColumn> columns) {
         for (GenTableColumn column : columns) {
             if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny(
                 column.getHtmlType(),
-                new String[] { GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX })) {
+                new String[]{GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX})) {
                 dicts.add("'" + column.getDictType() + "'");
             }
         }

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/bo.java.vm

@@ -2,8 +2,6 @@ package ${packageName}.domain.bo;
 
 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.*;
@@ -20,7 +18,7 @@ import com.ruoyi.common.core.web.domain.TreeEntity;
 #end
 
 /**
- * ${functionName}业务对象 ${tableName}
+ * ${functionName}业务对象
  *
  * @author ${author}
  * @date ${datetime}
@@ -33,7 +31,6 @@ import com.ruoyi.common.core.web.domain.TreeEntity;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("${functionName}业务对象")
 public class ${ClassName}Bo extends ${Entity} {
 
 #foreach ($column in $columns)
@@ -49,14 +46,11 @@ public class ${ClassName}Bo extends ${Entity} {
 #set($Group="EditGroup.class")
 #end
 #if($column.isRequired == 1)
-    @ApiModelProperty(value = "$column.columnComment", required = true)
 #if($column.javaType == 'String')
     @NotBlank(message = "$column.columnComment不能为空", groups = { $Group })
 #else
     @NotNull(message = "$column.columnComment不能为空", groups = { $Group })
 #end
-#else
-    @ApiModelProperty(value = "$column.columnComment")
 #end
     private $column.javaType $column.javaField;
 

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm

@@ -10,9 +10,6 @@ import com.ruoyi.common.excel.utils.ExcelUtil;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.mybatis.core.page.PageQuery;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -32,13 +29,13 @@ import javax.validation.constraints.NotNull;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * ${functionName}Controller
+ * ${functionName}控制器
  * 前端访问路由地址为:/${moduleName}/${businessName}
+ *
  * @author ${author}
  * @date ${datetime}
  */
 @Validated
-@Api(value = "${functionName}控制器", tags = {"${functionName}管理"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/${businessName}")
@@ -49,7 +46,6 @@ public class ${ClassName}Controller extends BaseController {
     /**
      * 查询${functionName}列表
      */
-    @ApiOperation("查询${functionName}列表")
     @SaCheckPermission("${permissionPrefix}:list")
     @GetMapping("/list")
 #if($table.crud || $table.sub)
@@ -66,7 +62,6 @@ public class ${ClassName}Controller extends BaseController {
     /**
      * 导出${functionName}列表
      */
-    @ApiOperation("导出${functionName}列表")
     @SaCheckPermission("${permissionPrefix}:export")
     @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -77,20 +72,18 @@ public class ${ClassName}Controller extends BaseController {
 
     /**
      * 获取${functionName}详细信息
+     *
+     * @param ${pkColumn.javaField} 主键
      */
-    @ApiOperation("获取${functionName}详细信息")
     @SaCheckPermission("${permissionPrefix}:query")
     @GetMapping("/{${pkColumn.javaField}}")
-    public R<${ClassName}Vo> getInfo(@ApiParam("主键")
+    public R<${ClassName}Vo> getInfo(@NotNull(message = "主键不能为空") @PathVariable ${pkColumn.javaType} ${pkColumn.javaField}) {
-                                     @NotNull(message = "主键不能为空")
-                                     @PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) {
         return R.ok(i${ClassName}Service.queryById(${pkColumn.javaField}));
     }
 
     /**
      * 新增${functionName}
      */
-    @ApiOperation("新增${functionName}")
     @SaCheckPermission("${permissionPrefix}:add")
     @Log(title = "${functionName}", businessType = BusinessType.INSERT)
     @PostMapping()
@@ -101,7 +94,6 @@ public class ${ClassName}Controller extends BaseController {
     /**
      * 修改${functionName}
      */
-    @ApiOperation("修改${functionName}")
     @SaCheckPermission("${permissionPrefix}:edit")
     @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
     @PutMapping()
@@ -111,14 +103,13 @@ public class ${ClassName}Controller extends BaseController {
 
     /**
      * 删除${functionName}
+     *
+     * @param ${pkColumn.javaField}s 主键串
      */
-    @ApiOperation("删除${functionName}")
     @SaCheckPermission("${permissionPrefix}:remove")
     @Log(title = "${functionName}", businessType = BusinessType.DELETE)
     @DeleteMapping("/{${pkColumn.javaField}s}")
-    public R<Void> remove(@ApiParam("主键串")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
-                          @NotEmpty(message = "主键不能为空")
-                          @PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
         return toAjax(i${ClassName}Service.deleteWithValidByIds(Arrays.asList(${pkColumn.javaField}s), true) ? 1 : 0);
     }
 }

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm

@@ -33,7 +33,7 @@ import com.ruoyi.common.core.web.domain.TreeEntity;
 @TableName("${tableName}")
 public class ${ClassName} extends ${Entity} {
 
-private static final long serialVersionUID=1L;
+    private static final long serialVersionUID=1L;
 
 #foreach ($column in $columns)
 #if(!$table.isSuperColumn($column.javaField))
@@ -41,13 +41,13 @@ private static final long serialVersionUID=1L;
      * $column.columnComment
      */
 #if($column.javaField=='delFlag')
-     @TableLogic
+    @TableLogic
 #end
 #if($column.javaField=='version')
-     @Version
+    @Version
 #end
 #if($column.isPk==1)
-     @TableId(value = "$column.columnName")
+    @TableId(value = "$column.columnName")
 #end
     private $column.javaType $column.javaField;
 #end

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/vo.java.vm

@@ -7,21 +7,18 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.excel.annotation.ExcelDictFormat;
 import com.ruoyi.common.excel.convert.ExcelDictConvert;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
 
 
 
 /**
- * ${functionName}视图对象 ${tableName}
+ * ${functionName}视图对象
  *
  * @author ${author}
  * @date ${datetime}
  */
 @Data
-@ApiModel("${functionName}视图对象")
 @ExcelIgnoreUnannotated
 public class ${ClassName}Vo {
 
@@ -47,7 +44,6 @@ public class ${ClassName}Vo {
 #else
     @ExcelProperty(value = "${comment}")
 #end
-    @ApiModelProperty("$column.columnComment")
     private $column.javaType $column.javaField;
 
 #end

ruoyi-modules/ruoyi-resource/pom.xml

@@ -47,12 +47,6 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
-        <!-- RuoYi Common Swagger -->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-swagger</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-dubbo</artifactId>

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/controller/SysOssConfigController.java

@@ -13,9 +13,6 @@ import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.resource.domain.bo.SysOssConfigBo;
 import com.ruoyi.resource.domain.vo.SysOssConfigVo;
 import com.ruoyi.resource.service.ISysOssConfigService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -32,7 +29,6 @@ import java.util.Arrays;
  * @date 2021-08-13
  */
 @Validated
-@Api(value = "对象存储配置控制器", tags = {"对象存储配置管理"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/oss/config")
@@ -43,7 +39,6 @@ public class SysOssConfigController extends BaseController {
     /**
      * 查询对象存储配置列表
      */
-    @ApiOperation("查询对象存储配置列表")
     @SaCheckPermission("system:oss:list")
     @GetMapping("/list")
     public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) {
@@ -52,20 +47,18 @@ public class SysOssConfigController extends BaseController {
 
     /**
      * 获取对象存储配置详细信息
+     *
+     * @param ossConfigId OSS配置ID
      */
-    @ApiOperation("获取对象存储配置详细信息")
     @SaCheckPermission("system:oss:query")
     @GetMapping("/{ossConfigId}")
-    public R<SysOssConfigVo> getInfo(@ApiParam("OSS配置ID")
+    public R<SysOssConfigVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable("ossConfigId") Long ossConfigId) {
-                                              @NotNull(message = "主键不能为空")
-                                              @PathVariable("ossConfigId") Long ossConfigId) {
         return R.ok(iSysOssConfigService.queryById(ossConfigId));
     }
 
     /**
      * 新增对象存储配置
      */
-    @ApiOperation("新增对象存储配置")
     @SaCheckPermission("system:oss:add")
     @Log(title = "对象存储配置", businessType = BusinessType.INSERT)
     @PostMapping()
@@ -76,7 +69,6 @@ public class SysOssConfigController extends BaseController {
     /**
      * 修改对象存储配置
      */
-    @ApiOperation("修改对象存储配置")
     @SaCheckPermission("system:oss:edit")
     @Log(title = "对象存储配置", businessType = BusinessType.UPDATE)
     @PutMapping()
@@ -86,21 +78,19 @@ public class SysOssConfigController extends BaseController {
 
     /**
      * 删除对象存储配置
+     *
+     * @param ossConfigIds OSS配置ID串
      */
-    @ApiOperation("删除对象存储配置")
     @SaCheckPermission("system:oss:remove")
     @Log(title = "对象存储配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ossConfigIds}")
-    public R<Void> remove(@ApiParam("OSS配置ID串")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ossConfigIds) {
-                                   @NotEmpty(message = "主键不能为空")
-                                   @PathVariable Long[] ossConfigIds) {
         return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true) ? 1 : 0);
     }
 
     /**
      * 状态修改
      */
-    @ApiOperation("状态修改")
     @SaCheckPermission("system:oss:edit")
     @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/controller/SysOssController.java

@@ -19,7 +19,6 @@ import com.ruoyi.resource.domain.SysOss;
 import com.ruoyi.resource.domain.bo.SysOssBo;
 import com.ruoyi.resource.domain.vo.SysOssVo;
 import com.ruoyi.resource.service.ISysOssService;
-import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
@@ -28,7 +27,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
-import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -41,7 +39,6 @@ import java.util.Map;
  * @author Lion Li
  */
 @Validated
-@Api(value = "对象存储控制器", tags = {"对象存储管理"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/oss")
@@ -52,7 +49,6 @@ public class SysOssController extends BaseController {
     /**
      * 查询OSS对象存储列表
      */
-    @ApiOperation("查询OSS对象存储列表")
     @SaCheckPermission("system:oss:list")
     @GetMapping("/list")
     public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
@@ -61,27 +57,24 @@ public class SysOssController extends BaseController {
 
     /**
      * 查询OSS对象基于id串
+     *
+     * @param ossIds OSS对象ID串
      */
-    @ApiOperation("查询OSS对象基于ID")
     @SaCheckPermission("system:oss:list")
     @GetMapping("/listByIds/{ossIds}")
-    public R<List<SysOssVo>> listByIds(@ApiParam("OSS对象ID串")
+    public R<List<SysOssVo>> listByIds(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ossIds) {
-                                       @NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] ossIds) {
         List<SysOssVo> list = iSysOssService.listByIds(Arrays.asList(ossIds));
         return R.ok(list);
     }
 
     /**
      * 上传OSS对象存储
+     *
+     * @param file 文件
      */
-    @ApiOperation("上传OSS对象存储")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "file", value = "文件", paramType = "query", dataTypeClass = File.class, required = true)
-    })
     @SaCheckPermission("system:oss:upload")
     @Log(title = "OSS对象存储", businessType = BusinessType.INSERT)
-    @PostMapping("/upload")
+    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public R<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
         if (ObjectUtil.isNull(file)) {
             throw new ServiceException("上传文件不能为空");
@@ -94,10 +87,14 @@ public class SysOssController extends BaseController {
         return R.ok(map);
     }
 
-    @ApiOperation("下载OSS对象存储")
+    /**
+     * 下载OSS对象存储
+     *
+     * @param ossId OSS对象ID
+     */
     @SaCheckPermission("system:oss:download")
     @GetMapping("/download/{ossId}")
-    public void download(@ApiParam("OSS对象ID") @PathVariable Long ossId, HttpServletResponse response) throws IOException {
+    public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
         SysOss sysOss = iSysOssService.getById(ossId);
         if (ObjectUtil.isNull(sysOss)) {
             throw new ServiceException("文件数据不存在!");
@@ -120,14 +117,13 @@ public class SysOssController extends BaseController {
 
     /**
      * 删除OSS对象存储
+     *
+     * @param ossIds OSS对象ID串
      */
-    @ApiOperation("删除OSS对象存储")
     @SaCheckPermission("system:oss:remove")
     @Log(title = "OSS对象存储", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ossIds}")
-    public R<Void> remove(@ApiParam("OSS对象ID串")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ossIds) {
-                                   @NotEmpty(message = "主键不能为空")
-                                   @PathVariable Long[] ossIds) {
         return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true) ? 1 : 0);
     }
 

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/controller/SysSmsController.java

@@ -10,9 +10,6 @@ import com.ruoyi.common.redis.utils.RedisUtils;
 import com.ruoyi.common.sms.config.properties.SmsProperties;
 import com.ruoyi.common.sms.core.SmsTemplate;
 import com.ruoyi.common.sms.entity.SmsResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
@@ -32,7 +29,6 @@ import java.util.Map;
  */
 @Slf4j
 @Validated
-@Api(value = "短信功能控制器", tags = {"短信功能管理"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/sms")
@@ -42,12 +38,11 @@ public class SysSmsController extends BaseController {
 
     /**
      * 短信验证码
+     *
+     * @param phonenumber 用户手机号
      */
-    @ApiOperation("短信验证码")
     @GetMapping("/code")
-    public R<Void> smsCaptcha(@ApiParam("用户手机号")
+    public R<Void> smsCaptcha(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) {
-                              @NotBlank(message = "{user.phonenumber.not.blank}")
-                              String phonenumber) {
         if (smsProperties.getEnabled()) {
             R.fail("当前系统没有开启短信功能！");
         }

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/domain/bo/SysOssBo.java

@@ -1,8 +1,6 @@
 package com.ruoyi.resource.domain.bo;
 
 import com.ruoyi.common.core.web.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -13,33 +11,27 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("OSS对象存储分页查询对象")
 public class SysOssBo extends BaseEntity {
 
     /**
      * 文件名
      */
-    @ApiModelProperty("文件名")
     private String fileName;
     /**
      * 原名
      */
-    @ApiModelProperty("原名")
     private String originalName;
     /**
      * 文件后缀名
      */
-    @ApiModelProperty("文件后缀名")
     private String fileSuffix;
     /**
      * URL地址
      */
-    @ApiModelProperty("URL地址")
     private String url;
     /**
      * 服务商
      */
-    @ApiModelProperty("服务商")
     private String service;
 
 }

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/domain/bo/SysOssConfigBo.java

@@ -3,8 +3,6 @@ package com.ruoyi.resource.domain.bo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.web.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -22,20 +20,17 @@ import javax.validation.constraints.Size;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("对象存储配置业务对象")
 public class SysOssConfigBo extends BaseEntity {
 
     /**
      * 主建
      */
-    @ApiModelProperty(value = "主建", required = true)
     @NotNull(message = "主建不能为空", groups = {EditGroup.class})
     private Long ossConfigId;
 
     /**
      * 配置key
      */
-    @ApiModelProperty(value = "配置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 +38,6 @@ public class SysOssConfigBo extends BaseEntity {
     /**
      * 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;
@@ -51,7 +45,6 @@ public class SysOssConfigBo extends BaseEntity {
     /**
      * 秘钥
      */
-    @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;
@@ -59,7 +52,6 @@ public class SysOssConfigBo extends BaseEntity {
     /**
      * 桶名称
      */
-    @ApiModelProperty(value = "桶名称", required = true)
     @NotBlank(message = "桶名称不能为空", groups = {AddGroup.class, EditGroup.class})
     @Size(min = 2, max = 100, message = "bucketName长度必须介于2和100之间")
     private String bucketName;
@@ -67,13 +59,11 @@ public class SysOssConfigBo extends BaseEntity {
     /**
      * 前缀
      */
-    @ApiModelProperty(value = "前缀")
     private String prefix;
 
     /**
      * 访问站点
      */
-    @ApiModelProperty(value = "访问站点", required = true)
     @NotBlank(message = "访问站点不能为空", groups = {AddGroup.class, EditGroup.class})
     @Size(min = 2, max = 100, message = "endpoint长度必须介于2和100之间")
     private String endpoint;
@@ -81,37 +71,31 @@ public class SysOssConfigBo extends BaseEntity {
     /**
      * 自定义域名
      */
-    @ApiModelProperty("自定义域名")
     private String domain;
 
     /**
      * 是否https（Y=是,N=否）
      */
-    @ApiModelProperty("是否https（Y=是,N=否）")
     private String isHttps;
 
     /**
      * 状态（0=正常,1=停用）
      */
-    @ApiModelProperty("状态（0=正常,1=停用）")
     private String status;
 
     /**
      * 域
      */
-    @ApiModelProperty(value = "域")
     private String region;
 
     /**
      * 扩展字段
      */
-    @ApiModelProperty(value = "扩展字段")
     private String ext1;
 
     /**
      * 备注
      */
-    @ApiModelProperty(value = "备注")
     private String remark;
 
 }

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/domain/vo/SysOssConfigVo.java

@@ -1,7 +1,5 @@
 package com.ruoyi.resource.domain.vo;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
@@ -13,7 +11,6 @@ import lombok.Data;
  * @date 2021-08-13
  */
 @Data
-@ApiModel("对象存储配置视图对象")
 public class SysOssConfigVo {
 
     private static final long serialVersionUID = 1L;
@@ -21,79 +18,66 @@ public class SysOssConfigVo {
     /**
      * 主建
      */
-    @ApiModelProperty("主建")
     private Long ossConfigId;
 
     /**
      * 配置key
      */
-    @ApiModelProperty("配置key")
     private String configKey;
 
     /**
      * accessKey
      */
-    @ApiModelProperty("accessKey")
     private String accessKey;
 
     /**
      * 秘钥
      */
-    @ApiModelProperty("secretKey")
     private String secretKey;
 
     /**
      * 桶名称
      */
-    @ApiModelProperty("桶名称")
     private String bucketName;
 
     /**
      * 前缀
      */
-    @ApiModelProperty("前缀")
     private String prefix;
 
     /**
      * 访问站点
      */
-    @ApiModelProperty("访问站点")
     private String endpoint;
 
     /**
      * 自定义域名
      */
-    @ApiModelProperty("自定义域名")
     private String domain;
 
     /**
      * 是否https（Y=是,N=否）
      */
-    @ApiModelProperty("是否https（Y=是,N=否）")
     private String isHttps;
 
     /**
      * 域
      */
-    @ApiModelProperty("域")
     private String region;
 
     /**
      * 状态（0=正常,1=停用）
      */
-    @ApiModelProperty("状态（0=正常,1=停用）")
     private String status;
 
     /**
      * 扩展字段
      */
-    @ApiModelProperty("扩展字段")
     private String ext1;
 
     /**
      * 备注
      */
-    @ApiModelProperty("备注")
     private String remark;
 
 }

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/domain/vo/SysOssVo.java

@@ -1,7 +1,5 @@
 package com.ruoyi.resource.domain.vo;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -12,7 +10,6 @@ import java.util.Date;
  * @author Lion Li
  */
 @Data
-@ApiModel("OSS对象存储视图对象")
 public class SysOssVo {
 
     private static final long serialVersionUID = 1L;
@@ -20,49 +17,41 @@ public class SysOssVo {
     /**
      * 对象存储主键
      */
-    @ApiModelProperty("对象存储主键")
     private Long ossId;
 
     /**
      * 文件名
      */
-    @ApiModelProperty("文件名")
     private String fileName;
 
     /**
      * 原名
      */
-    @ApiModelProperty("原名")
     private String originalName;
 
     /**
      * 文件后缀名
      */
-    @ApiModelProperty("文件后缀名")
     private String fileSuffix;
 
     /**
      * URL地址
      */
-    @ApiModelProperty("URL地址")
     private String url;
 
     /**
      * 创建时间
      */
-    @ApiModelProperty("创建时间")
     private Date createTime;
 
     /**
      * 上传人
      */
-    @ApiModelProperty("上传人")
     private String createBy;
 
     /**
      * 服务商
      */
-    @ApiModelProperty("服务商")
     private String service;
 
 

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/dubbo/RemoteMailServiceImpl.java

@@ -2,9 +2,7 @@ package com.ruoyi.resource.dubbo;
 
 import cn.hutool.core.util.ArrayUtil;
 import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.mail.config.properties.MailProperties;
 import com.ruoyi.common.mail.utils.MailUtils;
-import com.ruoyi.common.sms.config.properties.SmsProperties;
 import com.ruoyi.resource.api.RemoteMailService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

ruoyi-modules/ruoyi-system/pom.xml

@@ -58,12 +58,6 @@
             <artifactId>ruoyi-common-dict</artifactId>
         </dependency>
 
-        <!-- RuoYi Common Swagger -->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-swagger</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-web</artifactId>

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java

@@ -11,8 +11,6 @@ import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.service.ISysConfigService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -26,7 +24,6 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@Api(value = "参数配置控制器", tags = {"参数配置管理"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/config")
@@ -37,14 +34,15 @@ public class SysConfigController extends BaseController {
     /**
      * 获取参数配置列表
      */
-    @ApiOperation("获取参数配置列表")
     @SaCheckPermission("system:config:list")
     @GetMapping("/list")
     public TableDataInfo<SysConfig> list(SysConfig config, PageQuery pageQuery) {
         return configService.selectPageConfigList(config, pageQuery);
     }
 
-    @ApiOperation("导出参数配置列表")
+    /**
+     * 导出参数配置
+     */
     @Log(title = "参数管理", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:config:export")
     @PostMapping("/export")
@@ -55,8 +53,9 @@ public class SysConfigController extends BaseController {
 
     /**
      * 根据参数编号获取详细信息
+     *
+     * @param configId 配置ID
      */
-    @ApiOperation("根据参数编号获取详细信息")
     @GetMapping(value = "/{configId}")
     public R<SysConfig> getInfo(@PathVariable Long configId) {
         return R.ok(configService.selectConfigById(configId));
@@ -64,8 +63,9 @@ public class SysConfigController extends BaseController {
 
     /**
      * 根据参数键名查询参数值
+     *
+     * @param configKey 配置key
      */
-    @ApiOperation("根据参数键名查询参数值")
     @GetMapping(value = "/configKey/{configKey}")
     public R<Void> getConfigKey(@PathVariable String configKey) {
         return R.ok(configService.selectConfigByKey(configKey));
@@ -74,7 +74,6 @@ public class SysConfigController extends BaseController {
     /**
      * 新增参数配置
      */
-    @ApiOperation("新增参数配置")
     @SaCheckPermission("system:config:add")
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -88,7 +87,6 @@ public class SysConfigController extends BaseController {
     /**
      * 修改参数配置
      */
-    @ApiOperation("修改参数配置")
     @SaCheckPermission("system:config:edit")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -102,7 +100,6 @@ public class SysConfigController extends BaseController {
     /**
      * 根据参数键名修改参数配置
      */
-    @ApiOperation("根据参数键名修改参数配置")
     @SaCheckPermission("system:config:edit")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping("/updateByKey")
@@ -112,8 +109,9 @@ public class SysConfigController extends BaseController {
 
     /**
      * 删除参数配置
+     *
+     * @param configIds 配置ID串
      */
-    @ApiOperation("删除参数配置")
     @SaCheckPermission("system:config:remove")
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{configIds}")
@@ -125,7 +123,6 @@ public class SysConfigController extends BaseController {
     /**
      * 刷新参数缓存
      */
-    @ApiOperation("刷新参数缓存")
     @SaCheckPermission("system:config:remove")
     @Log(title = "参数管理", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java

@@ -11,8 +11,6 @@ import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.system.api.domain.SysDept;
 import com.ruoyi.system.service.ISysDeptService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -27,7 +25,6 @@ import java.util.Map;
  * @author Lion Li
  */
 @Validated
-@Api(value = "部门控制器", tags = {"部门管理"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/dept")
@@ -38,7 +35,6 @@ public class SysDeptController extends BaseController {
     /**
      * 获取部门列表
      */
-    @ApiOperation("获取部门列表")
     @SaCheckPermission("system:dept:list")
     @GetMapping("/list")
     public R<List<SysDept>> list(SysDept dept) {
@@ -48,8 +44,9 @@ public class SysDeptController extends BaseController {
 
     /**
      * 查询部门列表（排除节点）
+     *
+     * @param deptId 部门ID
      */
-    @ApiOperation("查询部门列表（排除节点）")
     @SaCheckPermission("system:dept:list")
     @GetMapping("/list/exclude/{deptId}")
     public R<List<SysDept>> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
@@ -61,8 +58,9 @@ public class SysDeptController extends BaseController {
 
     /**
      * 根据部门编号获取详细信息
+     *
+     * @param deptId 部门ID
      */
-    @ApiOperation("根据部门编号获取详细信息")
     @SaCheckPermission("system:dept:query")
     @GetMapping(value = "/{deptId}")
     public R<SysDept> getInfo(@PathVariable Long deptId) {
@@ -73,7 +71,6 @@ public class SysDeptController extends BaseController {
     /**
      * 获取部门下拉树列表
      */
-    @ApiOperation("获取部门下拉树列表")
     @GetMapping("/treeselect")
     public R<List<Tree<Long>>> treeselect(SysDept dept) {
         List<SysDept> depts = deptService.selectDeptList(dept);
@@ -82,8 +79,9 @@ public class SysDeptController extends BaseController {
 
     /**
      * 加载对应角色部门列表树
+     *
+     * @param roleId 角色ID
      */
-    @ApiOperation("加载对应角色部门列表树")
     @GetMapping(value = "/roleDeptTreeselect/{roleId}")
     public R<Map<String, Object>> roleDeptTreeselect(@PathVariable("roleId") Long roleId) {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
@@ -96,7 +94,6 @@ public class SysDeptController extends BaseController {
     /**
      * 新增部门
      */
-    @ApiOperation("新增部门")
     @SaCheckPermission("system:dept:add")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -110,7 +107,6 @@ public class SysDeptController extends BaseController {
     /**
      * 修改部门
      */
-    @ApiOperation("修改部门")
     @SaCheckPermission("system:dept:edit")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -122,7 +118,7 @@ public class SysDeptController extends BaseController {
         } else if (dept.getParentId().equals(deptId)) {
             return R.fail("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
         } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
-                && deptService.selectNormalChildrenDeptById(deptId) > 0) {
+            && deptService.selectNormalChildrenDeptById(deptId) > 0) {
             return R.fail("该部门包含未停用的子部门！");
         }
         return toAjax(deptService.updateDept(dept));
@@ -131,7 +127,6 @@ public class SysDeptController extends BaseController {
     /**
      * 删除部门
      */
-    @ApiOperation("删除部门")
     @SaCheckPermission("system:dept:remove")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java

@@ -12,8 +12,6 @@ import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.system.api.domain.SysDictData;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysDictTypeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -28,7 +26,6 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/dict/data")
@@ -37,14 +34,18 @@ public class SysDictDataController extends BaseController {
     private final ISysDictDataService dictDataService;
     private final ISysDictTypeService dictTypeService;
 
-    @ApiOperation("查询字典数据列表")
+    /**
+     * 查询字典数据列表
+     */
     @SaCheckPermission("system:dict:list")
     @GetMapping("/list")
     public TableDataInfo<SysDictData> list(SysDictData dictData, PageQuery pageQuery) {
         return dictDataService.selectPageDictDataList(dictData, pageQuery);
     }
 
-    @ApiOperation("导出字典数据列表")
+    /**
+     * 导出字典数据列表
+     */
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:dict:export")
     @PostMapping("/export")
@@ -55,8 +56,9 @@ public class SysDictDataController extends BaseController {
 
     /**
      * 查询字典数据详细
+     *
+     * @param dictCode 字典code
      */
-    @ApiOperation("查询字典数据详细")
     @SaCheckPermission("system:dict:query")
     @GetMapping(value = "/{dictCode}")
     public R<SysDictData> getInfo(@PathVariable Long dictCode) {
@@ -65,8 +67,9 @@ public class SysDictDataController extends BaseController {
 
     /**
      * 根据字典类型查询字典数据信息
+     *
+     * @param dictType 字典类型
      */
-    @ApiOperation("根据字典类型查询字典数据信息")
     @GetMapping(value = "/type/{dictType}")
     public R<List<SysDictData>> dictType(@PathVariable String dictType) {
         List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
@@ -79,7 +82,6 @@ public class SysDictDataController extends BaseController {
     /**
      * 新增字典类型
      */
-    @ApiOperation("新增字典类型")
     @SaCheckPermission("system:dict:add")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping
@@ -90,7 +92,6 @@ public class SysDictDataController extends BaseController {
     /**
      * 修改保存字典类型
      */
-    @ApiOperation("修改保存字典类型")
     @SaCheckPermission("system:dict:edit")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -100,8 +101,9 @@ public class SysDictDataController extends BaseController {
 
     /**
      * 删除字典类型
+     *
+     * @param dictCodes 字典Code串
      */
-    @ApiOperation("删除字典类型")
     @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictCodes}")

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java

@@ -11,8 +11,6 @@ import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.system.api.domain.SysDictType;
 import com.ruoyi.system.service.ISysDictTypeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -26,7 +24,6 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/dict/type")
@@ -34,14 +31,18 @@ public class SysDictTypeController extends BaseController {
 
     private final ISysDictTypeService dictTypeService;
 
-    @ApiOperation("查询字典类型列表")
+    /**
+     * 查询字典类型列表
+     */
     @SaCheckPermission("system:dict:list")
     @GetMapping("/list")
     public TableDataInfo<SysDictType> list(SysDictType dictType, PageQuery pageQuery) {
         return dictTypeService.selectPageDictTypeList(dictType, pageQuery);
     }
 
-    @ApiOperation("导出字典类型列表")
+    /**
+     * 导出字典类型列表
+     */
     @Log(title = "字典类型", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:dict:export")
     @PostMapping("/export")
@@ -52,8 +53,9 @@ public class SysDictTypeController extends BaseController {
 
     /**
      * 查询字典类型详细
+     *
+     * @param dictId 字典ID
      */
-    @ApiOperation("查询字典类型详细")
     @SaCheckPermission("system:dict:query")
     @GetMapping(value = "/{dictId}")
     public R<SysDictType> getInfo(@PathVariable Long dictId) {
@@ -63,7 +65,6 @@ public class SysDictTypeController extends BaseController {
     /**
      * 新增字典类型
      */
-    @ApiOperation("新增字典类型")
     @SaCheckPermission("system:dict:add")
     @Log(title = "字典类型", businessType = BusinessType.INSERT)
     @PostMapping
@@ -77,7 +78,6 @@ public class SysDictTypeController extends BaseController {
     /**
      * 修改字典类型
      */
-    @ApiOperation("修改字典类型")
     @SaCheckPermission("system:dict:edit")
     @Log(title = "字典类型", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -90,8 +90,9 @@ public class SysDictTypeController extends BaseController {
 
     /**
      * 删除字典类型
+     *
+     * @param dictIds 字典ID串
      */
-    @ApiOperation("删除字典类型")
     @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictIds}")
@@ -103,7 +104,6 @@ public class SysDictTypeController extends BaseController {
     /**
      * 刷新字典缓存
      */
-    @ApiOperation("刷新字典缓存")
     @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java

@@ -10,8 +10,6 @@ import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.system.api.domain.SysLogininfor;
 import com.ruoyi.system.service.ISysLogininforService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -25,7 +23,6 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@Api(value = "系统访问记录", tags = {"系统访问记录管理"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/logininfor")
@@ -33,14 +30,18 @@ public class SysLogininforController extends BaseController {
 
     private final ISysLogininforService logininforService;
 
-    @ApiOperation("查询系统访问记录列表")
+    /**
+     * 查询系统访问记录列表
+     */
     @SaCheckPermission("system:logininfor:list")
     @GetMapping("/list")
     public TableDataInfo<SysLogininfor> list(SysLogininfor logininfor, PageQuery pageQuery) {
         return logininforService.selectPageLogininforList(logininfor, pageQuery);
     }
 
-    @ApiOperation("导出系统访问记录列表")
+    /**
+     * 导出系统访问记录列表
+     */
     @Log(title = "登录日志", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:logininfor:export")
     @PostMapping("/export")
@@ -49,7 +50,11 @@ public class SysLogininforController extends BaseController {
         ExcelUtil.exportExcel(list, "登录日志", SysLogininfor.class, response);
     }
 
-    @ApiOperation("删除系统访问记录")
+    /**
+     * 删除系统访问记录
+     *
+     * @param infoIds 记录ID串
+     */
     @SaCheckPermission("system:logininfor:remove")
     @Log(title = "登录日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/{infoIds}")
@@ -57,7 +62,9 @@ public class SysLogininforController extends BaseController {
         return toAjax(logininforService.deleteLogininforByIds(infoIds));
     }
 
-    @ApiOperation("清空系统访问记录")
+    /**
+     * 清空系统访问记录
+     */
     @SaCheckPermission("system:logininfor:remove")
     @Log(title = "登录日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/clean")

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java

@@ -12,8 +12,6 @@ import com.ruoyi.common.satoken.utils.LoginHelper;
 import com.ruoyi.system.domain.SysMenu;
 import com.ruoyi.system.domain.vo.RouterVo;
 import com.ruoyi.system.service.ISysMenuService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -28,7 +26,6 @@ import java.util.Map;
  * @author Lion Li
  */
 @Validated
-@Api(value = "菜单信息控制器", tags = {"菜单信息管理"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/menu")
@@ -39,7 +36,6 @@ public class SysMenuController extends BaseController {
     /**
      * 获取菜单列表
      */
-    @ApiOperation("获取菜单列表")
     @SaCheckPermission("system:menu:list")
     @GetMapping("/list")
     public R<List<SysMenu>> list(SysMenu menu) {
@@ -50,8 +46,9 @@ public class SysMenuController extends BaseController {
 
     /**
      * 根据菜单编号获取详细信息
+     *
+     * @param menuId 菜单ID
      */
-    @ApiOperation("根据菜单编号获取详细信息")
     @SaCheckPermission("system:menu:query")
     @GetMapping(value = "/{menuId}")
     public R<SysMenu> getInfo(@PathVariable Long menuId) {
@@ -61,7 +58,6 @@ public class SysMenuController extends BaseController {
     /**
      * 获取菜单下拉树列表
      */
-    @ApiOperation("获取菜单下拉树列表")
     @GetMapping("/treeselect")
     public R<List<Tree<Long>>> treeselect(SysMenu menu) {
         Long userId = LoginHelper.getUserId();
@@ -71,8 +67,9 @@ public class SysMenuController extends BaseController {
 
     /**
      * 加载对应角色菜单列表树
+     *
+     * @param roleId 角色ID
      */
-    @ApiOperation("加载对应角色菜单列表树")
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
     public R<Map<String, Object>> roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
         Long userId = LoginHelper.getUserId();
@@ -86,7 +83,6 @@ public class SysMenuController extends BaseController {
     /**
      * 新增菜单
      */
-    @ApiOperation("新增菜单")
     @SaCheckPermission("system:menu:add")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -102,7 +98,6 @@ public class SysMenuController extends BaseController {
     /**
      * 修改菜单
      */
-    @ApiOperation("修改菜单")
     @SaCheckPermission("system:menu:edit")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -119,8 +114,9 @@ public class SysMenuController extends BaseController {
 
     /**
      * 删除菜单
+     *
+     * @param menuId 菜单ID
      */
-    @ApiOperation("删除菜单")
     @SaCheckPermission("system:menu:remove")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
@@ -139,7 +135,6 @@ public class SysMenuController extends BaseController {
      *
      * @return 路由信息
      */
-    @ApiOperation("获取路由信息")
     @GetMapping("getRouters")
     public R<List<RouterVo>> getRouters() {
         Long userId = LoginHelper.getUserId();

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java

@@ -9,8 +9,6 @@ import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -21,7 +19,6 @@ import org.springframework.web.bind.annotation.*;
  * @author Lion Li
  */
 @Validated
-@Api(value = "公告信息控制器", tags = {"公告信息管理"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/notice")
@@ -32,7 +29,6 @@ public class SysNoticeController extends BaseController {
     /**
      * 获取通知公告列表
      */
-    @ApiOperation("获取通知公告列表")
     @SaCheckPermission("system:notice:list")
     @GetMapping("/list")
     public TableDataInfo<SysNotice> list(SysNotice notice, PageQuery pageQuery) {
@@ -41,8 +37,9 @@ public class SysNoticeController extends BaseController {
 
     /**
      * 根据通知公告编号获取详细信息
+     *
+     * @param noticeId 通知ID
      */
-    @ApiOperation("根据通知公告编号获取详细信息")
     @SaCheckPermission("system:notice:query")
     @GetMapping(value = "/{noticeId}")
     public R<SysNotice> getInfo(@PathVariable Long noticeId) {
@@ -52,7 +49,6 @@ public class SysNoticeController extends BaseController {
     /**
      * 新增通知公告
      */
-    @ApiOperation("新增通知公告")
     @SaCheckPermission("system:notice:add")
     @Log(title = "通知公告", businessType = BusinessType.INSERT)
     @PostMapping
@@ -63,7 +59,6 @@ public class SysNoticeController extends BaseController {
     /**
      * 修改通知公告
      */
-    @ApiOperation("修改通知公告")
     @SaCheckPermission("system:notice:edit")
     @Log(title = "通知公告", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -73,8 +68,9 @@ public class SysNoticeController extends BaseController {
 
     /**
      * 删除通知公告
+     *
+     * @param noticeIds 通知ID串
      */
-    @ApiOperation("删除通知公告")
     @SaCheckPermission("system:notice:remove")
     @Log(title = "通知公告", businessType = BusinessType.DELETE)
     @DeleteMapping("/{noticeIds}")

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java

@@ -10,8 +10,6 @@ import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.system.api.domain.SysOperLog;
 import com.ruoyi.system.service.ISysOperLogService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -25,7 +23,6 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@Api(value = "操作日志记录", tags = {"操作日志记录管理"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/operlog")
@@ -33,14 +30,18 @@ public class SysOperlogController extends BaseController {
 
     private final ISysOperLogService operLogService;
 
-    @ApiOperation("查询操作日志记录列表")
+    /**
+     * 查询操作日志记录列表
+     */
     @SaCheckPermission("system:operlog:list")
     @GetMapping("/list")
     public TableDataInfo<SysOperLog> list(SysOperLog operLog, PageQuery pageQuery) {
         return operLogService.selectPageOperLogList(operLog, pageQuery);
     }
 
-    @ApiOperation("导出操作日志记录列表")
+    /**
+     * 导出操作日志记录列表
+     */
     @Log(title = "操作日志", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:operlog:export")
     @PostMapping("/export")
@@ -49,7 +50,11 @@ public class SysOperlogController extends BaseController {
         ExcelUtil.exportExcel(list, "操作日志", SysOperLog.class, response);
     }
 
-    @ApiOperation("删除操作日志记录")
+    /**
+     * 删除操作日志记录
+     *
+     * @param operIds 操作日志ID串
+     */
     @Log(title = "操作日志", businessType = BusinessType.DELETE)
     @SaCheckPermission("system:operlog:remove")
     @DeleteMapping("/{operIds}")
@@ -57,7 +62,9 @@ public class SysOperlogController extends BaseController {
         return toAjax(operLogService.deleteOperLogByIds(operIds));
     }
 
-    @ApiOperation("清空操作日志记录")
+    /**
+     * 清空操作日志记录
+     */
     @SaCheckPermission("system:operlog:remove")
     @Log(title = "操作日志", businessType = BusinessType.CLEAN)
     @DeleteMapping("/clean")

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java

@@ -11,8 +11,6 @@ import com.ruoyi.common.mybatis.core.page.PageQuery;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.system.domain.SysPost;
 import com.ruoyi.system.service.ISysPostService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -26,7 +24,6 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@Api(value = "岗位信息控制器", tags = {"岗位信息管理"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/post")
@@ -37,14 +34,12 @@ public class SysPostController extends BaseController {
     /**
      * 获取岗位列表
      */
-    @ApiOperation("获取岗位列表")
     @SaCheckPermission("system:post:list")
     @GetMapping("/list")
     public TableDataInfo<SysPost> list(SysPost post, PageQuery pageQuery) {
         return postService.selectPagePostList(post, pageQuery);
     }
 
-    @ApiOperation("导出岗位列表")
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:post:export")
     @PostMapping("/export")
@@ -55,8 +50,9 @@ public class SysPostController extends BaseController {
 
     /**
      * 根据岗位编号获取详细信息
+     *
+     * @param postId 岗位ID
      */
-    @ApiOperation("根据岗位编号获取详细信息")
     @SaCheckPermission("system:post:query")
     @GetMapping(value = "/{postId}")
     public R<SysPost> getInfo(@PathVariable Long postId) {
@@ -66,7 +62,6 @@ public class SysPostController extends BaseController {
     /**
      * 新增岗位
      */
-    @ApiOperation("新增岗位")
     @SaCheckPermission("system:post:add")
     @Log(title = "岗位管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -82,7 +77,6 @@ public class SysPostController extends BaseController {
     /**
      * 修改岗位
      */
-    @ApiOperation("修改岗位")
     @SaCheckPermission("system:post:edit")
     @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -97,8 +91,9 @@ public class SysPostController extends BaseController {
 
     /**
      * 删除岗位
+     *
+     * @param postIds 岗位ID串
      */
-    @ApiOperation("删除岗位")
     @SaCheckPermission("system:post:remove")
     @Log(title = "岗位管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{postIds}")
@@ -109,7 +104,6 @@ public class SysPostController extends BaseController {
     /**
      * 获取岗位选择框列表
      */
-    @ApiOperation("获取岗位选择框列表")
     @GetMapping("/optionselect")
     public R<List<SysPost>> optionselect() {
         List<SysPost> posts = postService.selectPostAll();

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java

@@ -16,17 +16,13 @@ import com.ruoyi.resource.api.domain.SysFile;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.service.ISysUserService;
 import io.seata.spring.annotation.GlobalTransactional;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -38,7 +34,6 @@ import java.util.Map;
  * @author Lion Li
  */
 @Validated
-@Api(value = "个人信息控制器", tags = {"个人信息管理"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/user/profile")
@@ -52,7 +47,6 @@ public class SysProfileController extends BaseController {
     /**
      * 个人信息
      */
-    @ApiOperation("个人信息")
     @GetMapping
     public R<Map<String, Object>> profile() {
         String username = LoginHelper.getUsername();
@@ -67,15 +61,14 @@ public class SysProfileController extends BaseController {
     /**
      * 修改用户
      */
-    @ApiOperation("修改用户")
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public R<Void> updateProfile(@RequestBody SysUser user) {
         if (StringUtils.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+            && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
             return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
         } else if (StringUtils.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
+            && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
             return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setUserId(LoginHelper.getUserId());
@@ -89,12 +82,10 @@ public class SysProfileController extends BaseController {
 
     /**
      * 重置密码
+     *
+     * @param oldPassword 旧密码
+     * @param newPassword 新密码
      */
-    @ApiOperation("重置密码")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "oldPassword", value = "旧密码", paramType = "query", dataTypeClass = String.class),
-        @ApiImplicitParam(name = "newPassword", value = "新密码", paramType = "query", dataTypeClass = String.class)
-    })
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
     public R<Void> updatePwd(String oldPassword, String newPassword) {
@@ -114,21 +105,19 @@ public class SysProfileController extends BaseController {
 
     /**
      * 头像上传
+     *
+     * @param avatarfile 用户头像
      */
     @GlobalTransactional(rollbackFor = Exception.class)
-    @ApiOperation("头像上传")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "avatarfile", value = "用户头像", paramType = "query", dataTypeClass = File.class, required = true)
-    })
     @Log(title = "用户头像", businessType = BusinessType.UPDATE)
-    @PostMapping("/avatar")
+    @PostMapping(value = "/avatar", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public R<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile file) throws IOException {
+    public R<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile avatarfile) throws IOException {
-        if (!file.isEmpty()) {
+        if (!avatarfile.isEmpty()) {
-            String extension = FileUtil.extName(file.getOriginalFilename());
+            String extension = FileUtil.extName(avatarfile.getOriginalFilename());
             if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) {
                 return R.fail("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式");
             }
-            SysFile sysFile = remoteFileService.upload(file.getName(), file.getOriginalFilename(), file.getContentType(), file.getBytes());
+            SysFile sysFile = remoteFileService.upload(avatarfile.getName(), avatarfile.getOriginalFilename(), avatarfile.getContentType(), avatarfile.getBytes());
             if (ObjectUtil.isNull(sysFile)) {
                 return R.fail("文件服务异常，请联系管理员");
             }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java

@@ -17,10 +17,6 @@ import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.service.ISysPermissionService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -34,7 +30,6 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@Api(value = "角色信息控制器", tags = {"角色信息管理"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/role")
@@ -44,14 +39,18 @@ public class SysRoleController extends BaseController {
     private final ISysUserService userService;
     private final ISysPermissionService permissionService;
 
-    @ApiOperation("查询角色信息列表")
+    /**
+     * 查询角色信息列表
+     */
     @SaCheckPermission("system:role:list")
     @GetMapping("/list")
     public TableDataInfo<SysRole> list(SysRole role, PageQuery pageQuery) {
         return roleService.selectPageRoleList(role, pageQuery);
     }
 
-    @ApiOperation("导出角色信息列表")
+    /**
+     * 导出角色信息列表
+     */
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:role:export")
     @PostMapping("/export")
@@ -62,8 +61,9 @@ public class SysRoleController extends BaseController {
 
     /**
      * 根据角色编号获取详细信息
+     *
+     * @param roleId 角色ID
      */
-    @ApiOperation("根据角色编号获取详细信息")
     @SaCheckPermission("system:role:query")
     @GetMapping(value = "/{roleId}")
     public R<SysRole> getInfo(@PathVariable Long roleId) {
@@ -74,7 +74,6 @@ public class SysRoleController extends BaseController {
     /**
      * 新增角色
      */
-    @ApiOperation("新增角色")
     @SaCheckPermission("system:role:add")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -91,7 +90,6 @@ public class SysRoleController extends BaseController {
     /**
      * 修改保存角色
      */
-    @ApiOperation("修改保存角色")
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -119,7 +117,6 @@ public class SysRoleController extends BaseController {
     /**
      * 修改保存数据权限
      */
-    @ApiOperation("修改保存数据权限")
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/dataScope")
@@ -132,7 +129,6 @@ public class SysRoleController extends BaseController {
     /**
      * 状态修改
      */
-    @ApiOperation("状态修改")
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
@@ -144,8 +140,9 @@ public class SysRoleController extends BaseController {
 
     /**
      * 删除角色
+     *
+     * @param roleIds 角色ID串
      */
-    @ApiOperation("删除角色")
     @SaCheckPermission("system:role:remove")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{roleIds}")
@@ -165,7 +162,6 @@ public class SysRoleController extends BaseController {
     /**
      * 查询已分配用户角色列表
      */
-    @ApiOperation("查询已分配用户角色列表")
     @SaCheckPermission("system:role:list")
     @GetMapping("/authUser/allocatedList")
     public TableDataInfo<SysUser> allocatedList(SysUser user, PageQuery pageQuery) {
@@ -175,7 +171,6 @@ public class SysRoleController extends BaseController {
     /**
      * 查询未分配用户角色列表
      */
-    @ApiOperation("查询未分配用户角色列表")
     @SaCheckPermission("system:role:list")
     @GetMapping("/authUser/unallocatedList")
     public TableDataInfo<SysUser> unallocatedList(SysUser user, PageQuery pageQuery) {
@@ -185,7 +180,6 @@ public class SysRoleController extends BaseController {
     /**
      * 取消授权用户
      */
-    @ApiOperation("取消授权用户")
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancel")
@@ -195,12 +189,10 @@ public class SysRoleController extends BaseController {
 
     /**
      * 批量取消授权用户
+     *
+     * @param roleId  角色ID
+     * @param userIds 用户ID串
      */
-    @ApiOperation("批量取消授权用户")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "roleId", value = "角色ID", paramType = "query", dataTypeClass = String.class),
-        @ApiImplicitParam(name = "userIds", value = "用户ID串", paramType = "query", dataTypeClass = String.class)
-    })
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancelAll")
@@ -210,12 +202,10 @@ public class SysRoleController extends BaseController {
 
     /**
      * 批量选择用户授权
+     *
+     * @param roleId  角色ID
+     * @param userIds 用户ID串
      */
-    @ApiOperation("批量选择用户授权")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "roleId", value = "角色ID", paramType = "query", dataTypeClass = String.class),
-        @ApiImplicitParam(name = "userIds", value = "用户ID串", paramType = "query", dataTypeClass = String.class)
-    })
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/selectAll")

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -26,12 +26,9 @@ import com.ruoyi.system.service.ISysPermissionService;
 import com.ruoyi.system.service.ISysPostService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -46,7 +43,6 @@ import java.util.*;
  * @author Lion Li
  */
 @Validated
-@Api(value = "用户信息控制器", tags = {"用户信息管理"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/user")
@@ -60,14 +56,15 @@ public class SysUserController extends BaseController {
     /**
      * 获取用户列表
      */
-    @ApiOperation("获取用户列表")
     @SaCheckPermission("system:user:list")
     @GetMapping("/list")
     public TableDataInfo<SysUser> list(SysUser user, PageQuery pageQuery) {
         return userService.selectPageUserList(user, pageQuery);
     }
 
-    @ApiOperation("导出用户列表")
+    /**
+     * 导出用户列表
+     */
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:user:export")
     @PostMapping("/export")
@@ -85,19 +82,23 @@ public class SysUserController extends BaseController {
         ExcelUtil.exportExcel(listVo, "用户数据", SysUserExportVo.class, response);
     }
 
-    @ApiOperation("导入用户列表")
+    /**
-    @ApiImplicitParams({
+     * 导入用户列表
-        @ApiImplicitParam(name = "file", value = "导入文件", dataType = "java.io.File", required = true),
+     *
-    })
+     * @param file          导入文件
+     * @param updateSupport 更新已有数据
+     */
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
     @SaCheckPermission("system:user:import")
-    @PostMapping("/importData")
+    @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public R<Void> importData(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelResult<SysUserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport));
         return R.ok(result.getAnalysis());
     }
 
-    @ApiOperation("下载导入模板")
+    /**
+     * 下载导入模板
+     */
     @PostMapping("/importTemplate")
     public void importTemplate(HttpServletResponse response) throws IOException {
         ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", SysUserImportVo.class, response);
@@ -108,7 +109,6 @@ public class SysUserController extends BaseController {
      *
      * @return 用户信息
      */
-    @ApiOperation("根据用户编号获取详细信息")
     @GetMapping("getInfo")
     public R<Map<String, Object>> getInfo() {
         Long userId = LoginHelper.getUserId();
@@ -125,8 +125,9 @@ public class SysUserController extends BaseController {
 
     /**
      * 根据用户编号获取详细信息
+     *
+     * @param userId 用户ID
      */
-    @ApiOperation("根据用户编号获取详细信息")
     @SaCheckPermission("system:user:query")
     @GetMapping(value = {"/", "/{userId}"})
     public R<Map<String, Object>> getInfo(@PathVariable(value = "userId", required = false) Long userId) {
@@ -147,7 +148,6 @@ public class SysUserController extends BaseController {
     /**
      * 新增用户
      */
-    @ApiOperation("新增用户")
     @SaCheckPermission("system:user:add")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -155,10 +155,10 @@ public class SysUserController extends BaseController {
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
             return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
         } else if (StringUtils.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+            && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
             return R.fail("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
         } else if (StringUtils.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
+            && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
             return R.fail("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setPassword(BCrypt.hashpw(user.getPassword()));
@@ -168,7 +168,6 @@ public class SysUserController extends BaseController {
     /**
      * 修改用户
      */
-    @ApiOperation("修改用户")
     @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -176,10 +175,10 @@ public class SysUserController extends BaseController {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
         if (StringUtils.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+            && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
             return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
         } else if (StringUtils.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
+            && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
             return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         return toAjax(userService.updateUser(user));
@@ -187,8 +186,9 @@ public class SysUserController extends BaseController {
 
     /**
      * 删除用户
+     *
+     * @param userIds 用户ID串
      */
-    @ApiOperation("删除用户")
     @SaCheckPermission("system:user:remove")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
@@ -202,7 +202,6 @@ public class SysUserController extends BaseController {
     /**
      * 重置密码
      */
-    @ApiOperation("重置密码")
     @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
@@ -216,7 +215,6 @@ public class SysUserController extends BaseController {
     /**
      * 状态修改
      */
-    @ApiOperation("状态修改")
     @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
@@ -228,8 +226,9 @@ public class SysUserController extends BaseController {
 
     /**
      * 根据用户编号获取授权角色
+     *
+     * @param userId 用户ID
      */
-    @ApiOperation("根据用户编号获取授权角色")
     @SaCheckPermission("system:user:query")
     @GetMapping("/authRole/{userId}")
     public R<Map<String, Object>> authRole(@PathVariable("userId") Long userId) {
@@ -243,12 +242,10 @@ public class SysUserController extends BaseController {
 
     /**
      * 用户授权角色
+     *
+     * @param userId  用户Id
+     * @param roleIds 角色ID串
      */
-    @ApiOperation("用户授权角色")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "userId", value = "用户Id", paramType = "query", dataTypeClass = String.class),
-        @ApiImplicitParam(name = "roleIds", value = "角色ID串", paramType = "query", dataTypeClass = String.class)
-    })
     @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java

@@ -13,8 +13,6 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.mybatis.core.page.TableDataInfo;
 import com.ruoyi.common.redis.utils.RedisUtils;
 import com.ruoyi.system.api.domain.SysUserOnline;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,13 +25,17 @@ import java.util.List;
  *
  * @author Lion Li
  */
-@Api(value = "在线用户监控", tags = {"在线用户监控管理"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/online")
 public class SysUserOnlineController extends BaseController {
 
-    @ApiOperation("在线用户列表")
+    /**
+     * 在线用户列表
+     *
+     * @param ipaddr   ip地址
+     * @param userName 用户名
+     */
     @SaCheckPermission("monitor:online:list")
     @GetMapping("/list")
     public TableDataInfo<SysUserOnline> list(String ipaddr, String userName) {
@@ -55,7 +57,7 @@ public class SysUserOnlineController extends BaseController {
             );
         } else if (StringUtils.isNotEmpty(ipaddr)) {
             userOnlineList = StreamUtils.filter(userOnlineList, userOnline ->
-                    StringUtils.equals(ipaddr, userOnline.getIpaddr())
+                StringUtils.equals(ipaddr, userOnline.getIpaddr())
             );
         } else if (StringUtils.isNotEmpty(userName)) {
             userOnlineList = StreamUtils.filter(userOnlineList, userOnline ->
@@ -70,7 +72,6 @@ public class SysUserOnlineController extends BaseController {
     /**
      * 强退用户
      */
-    @ApiOperation("强退用户")
     @SaCheckPermission("monitor:online:forceLogout")
     @Log(title = "在线用户", businessType = BusinessType.FORCE)
     @DeleteMapping("/{tokenId}")

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java

@@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.common.excel.annotation.ExcelDictFormat;
 import com.ruoyi.common.excel.convert.ExcelDictConvert;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -27,13 +25,11 @@ import javax.validation.constraints.Size;
 @NoArgsConstructor
 @TableName("sys_config")
 @ExcelIgnoreUnannotated
-@ApiModel("参数配置业务对象")
 public class SysConfig extends BaseEntity {
 
     /**
      * 参数主键
      */
-    @ApiModelProperty(value = "参数主键")
     @ExcelProperty(value = "参数主键")
     @TableId(value = "config_id")
     private Long configId;
@@ -41,7 +37,6 @@ public class SysConfig extends BaseEntity {
     /**
      * 参数名称
      */
-    @ApiModelProperty(value = "参数名称")
     @ExcelProperty(value = "参数名称")
     @NotBlank(message = "参数名称不能为空")
     @Size(min = 0, max = 100, message = "参数名称不能超过100个字符")
@@ -50,7 +45,6 @@ public class SysConfig extends BaseEntity {
     /**
      * 参数键名
      */
-    @ApiModelProperty(value = "参数键名")
     @ExcelProperty(value = "参数键名")
     @NotBlank(message = "参数键名长度不能为空")
     @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符")
@@ -59,7 +53,6 @@ public class SysConfig extends BaseEntity {
     /**
      * 参数键值
      */
-    @ApiModelProperty(value = "参数键值")
     @ExcelProperty(value = "参数键值")
     @NotBlank(message = "参数键值不能为空")
     @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符")
@@ -68,7 +61,6 @@ public class SysConfig extends BaseEntity {
     /**
      * 系统内置（Y是 N否）
      */
-    @ApiModelProperty(value = "系统内置（Y是 N否）")
     @ExcelProperty(value = "系统内置", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_yes_no")
     private String configType;
@@ -76,7 +68,6 @@ public class SysConfig extends BaseEntity {
     /**
      * 备注
      */
-    @ApiModelProperty(value = "备注")
     private String remark;
 
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.ruoyi.common.core.web.domain.TreeEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -24,20 +22,17 @@ import javax.validation.constraints.Size;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @TableName("sys_menu")
-@ApiModel("菜单权限业务对象")
 public class SysMenu extends TreeEntity<SysMenu> {
 
     /**
      * 菜单ID
      */
-    @ApiModelProperty(value = "菜单ID")
     @TableId(value = "menu_id")
     private Long menuId;
 
     /**
      * 菜单名称
      */
-    @ApiModelProperty(value = "菜单名称")
     @NotBlank(message = "菜单名称不能为空")
     @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
     private String menuName;
@@ -45,65 +40,55 @@ public class SysMenu extends TreeEntity<SysMenu> {
     /**
      * 显示顺序
      */
-    @ApiModelProperty(value = "显示顺序")
     @NotNull(message = "显示顺序不能为空")
     private Integer orderNum;
 
     /**
      * 路由地址
      */
-    @ApiModelProperty(value = "路由地址")
     @Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
     private String path;
 
     /**
      * 组件路径
      */
-    @ApiModelProperty(value = "组件路径")
     @Size(min = 0, max = 200, message = "组件路径不能超过255个字符")
     private String component;
 
     /**
      * 路由参数
      */
-    @ApiModelProperty(value = "路由参数")
     private String queryParam;
 
     /**
      * 是否为外链（0是 1否）
      */
-    @ApiModelProperty(value = "是否为外链（0是 1否）")
     private String isFrame;
 
     /**
      * 是否缓存（0缓存 1不缓存）
      */
-    @ApiModelProperty(value = "是否缓存（0缓存 1不缓存）")
     private String isCache;
 
     /**
      * 类型（M目录 C菜单 F按钮）
      */
-    @ApiModelProperty(value = "类型（M目录 C菜单 F按钮）")
     @NotBlank(message = "菜单类型不能为空")
     private String menuType;
 
     /**
      * 显示状态（0显示 1隐藏）
      */
-    @ApiModelProperty(value = "显示状态（0显示 1隐藏）")
     private String visible;
 
     /**
      * 菜单状态（0显示 1隐藏）
      */
-    @ApiModelProperty(value = "菜单状态（0显示 1隐藏）")
     private String status;
 
     /**
      * 权限字符串
      */
-    @ApiModelProperty(value = "权限字符串")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
     private String perms;
@@ -111,13 +96,11 @@ public class SysMenu extends TreeEntity<SysMenu> {
     /**
      * 菜单图标
      */
-    @ApiModelProperty(value = "菜单图标")
     private String icon;
 
     /**
      * 备注
      */
-    @ApiModelProperty(value = "备注")
     private String remark;
 
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.common.core.xss.Xss;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -27,7 +26,6 @@ public class SysNotice extends BaseEntity {
     /**
      * 公告ID
      */
-    @ApiModelProperty(value = "公告ID")
     @TableId(value = "notice_id")
     private Long noticeId;
 
@@ -35,7 +33,6 @@ public class SysNotice extends BaseEntity {
      * 公告标题
      */
     @Xss(message = "公告标题不能包含脚本字符")
-    @ApiModelProperty(value = "公告标题")
     @NotBlank(message = "公告标题不能为空")
     @Size(min = 0, max = 50, message = "公告标题不能超过50个字符")
     private String noticeTitle;
@@ -43,25 +40,21 @@ public class SysNotice extends BaseEntity {
     /**
      * 公告类型（1通知 2公告）
      */
-    @ApiModelProperty(value = "公告类型（1通知 2公告）")
     private String noticeType;
 
     /**
      * 公告内容
      */
-    @ApiModelProperty(value = "公告内容")
     private String noticeContent;
 
     /**
      * 公告状态（0正常 1关闭）
      */
-    @ApiModelProperty(value = "公告状态（0正常 1关闭）")
     private String status;
 
     /**
      * 备注
      */
-    @ApiModelProperty(value = "备注")
     private String remark;
 
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java

@@ -8,8 +8,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.common.excel.annotation.ExcelDictFormat;
 import com.ruoyi.common.excel.convert.ExcelDictConvert;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -29,13 +27,11 @@ import javax.validation.constraints.Size;
 @NoArgsConstructor
 @TableName("sys_post")
 @ExcelIgnoreUnannotated
-@ApiModel("岗位信息业务对象")
 public class SysPost extends BaseEntity {
 
     /**
      * 岗位序号
      */
-    @ApiModelProperty(value = "岗位序号")
     @ExcelProperty(value = "岗位序号")
     @TableId(value = "post_id")
     private Long postId;
@@ -43,7 +39,6 @@ public class SysPost extends BaseEntity {
     /**
      * 岗位编码
      */
-    @ApiModelProperty(value = "岗位编码")
     @ExcelProperty(value = "岗位编码")
     @NotBlank(message = "岗位编码不能为空")
     @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符")
@@ -52,7 +47,6 @@ public class SysPost extends BaseEntity {
     /**
      * 岗位名称
      */
-    @ApiModelProperty(value = "岗位名称")
     @ExcelProperty(value = "岗位名称")
     @NotBlank(message = "岗位名称不能为空")
     @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符")
@@ -61,7 +55,6 @@ public class SysPost extends BaseEntity {
     /**
      * 岗位排序
      */
-    @ApiModelProperty(value = "岗位排序")
     @ExcelProperty(value = "岗位排序")
     @NotNull(message = "显示顺序不能为空")
     private Integer postSort;
@@ -69,7 +62,6 @@ public class SysPost extends BaseEntity {
     /**
      * 状态（0正常 1停用）
      */
-    @ApiModelProperty(value = "状态（0正常 1停用）")
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_common_status")
     private String status;
@@ -77,13 +69,11 @@ public class SysPost extends BaseEntity {
     /**
      * 备注
      */
-    @ApiModelProperty(value = "备注")
     private String remark;
 
     /**
      * 用户是否存在此岗位标识 默认不存在
      */
-    @ApiModelProperty(value = "用户是否存在此岗位标识 默认不存在")
     @TableField(exist = false)
     private boolean flag = false;
 

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java

@@ -3,8 +3,6 @@ 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 lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,20 +15,17 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @TableName("sys_role_dept")
-@ApiModel("角色和部门关联")
 public class SysRoleDept {
 
     /**
      * 角色ID
      */
     @TableId(type = IdType.INPUT)
-    @ApiModelProperty(value = "角色ID")
     private Long roleId;
 
     /**
      * 部门ID
      */
-    @ApiModelProperty(value = "部门ID")
     private Long deptId;
 
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java

@@ -3,8 +3,6 @@ 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 lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,20 +15,17 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @TableName("sys_role_menu")
-@ApiModel("角色和菜单关联")
 public class SysRoleMenu {
 
     /**
      * 角色ID
      */
     @TableId(type = IdType.INPUT)
-    @ApiModelProperty(value = "角色ID")
     private Long roleId;
 
     /**
      * 菜单ID
      */
-    @ApiModelProperty(value = "角色ID")
     private Long menuId;
 
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java

@@ -3,8 +3,6 @@ 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 lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,20 +15,17 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @TableName("sys_user_post")
-@ApiModel("用户和岗位关联")
 public class SysUserPost {
 
     /**
      * 用户ID
      */
     @TableId(type = IdType.INPUT)
-    @ApiModelProperty(value = "用户ID")
     private Long userId;
 
     /**
      * 岗位ID
      */
-    @ApiModelProperty(value = "岗位ID")
     private Long postId;
 
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java

@@ -3,8 +3,6 @@ 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 lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,20 +15,17 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @TableName("sys_user_role")
-@ApiModel("用户和角色关联")
 public class SysUserRole {
 
     /**
      * 用户ID
      */
     @TableId(type = IdType.INPUT)
-    @ApiModelProperty(value = "用户ID")
     private Long userId;
 
     /**
      * 角色ID
      */
-    @ApiModelProperty(value = "角色ID")
     private Long roleId;
 
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java

@@ -3,7 +3,6 @@ package com.ruoyi.system.domain.vo;
 import com.ruoyi.common.core.utils.StringUtils;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
 
 /**
  * 路由显示信息

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java

@@ -3,7 +3,6 @@ package com.ruoyi.system.domain.vo;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java

@@ -5,7 +5,6 @@ import com.ruoyi.common.excel.annotation.ExcelDictFormat;
 import com.ruoyi.common.excel.convert.ExcelDictConvert;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.Date;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java

@@ -17,7 +17,6 @@ import com.ruoyi.system.service.ISysConfigService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -309,7 +309,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
         }
         // 非外链并且是一级目录（类型为目录）
         if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType())
-                && UserConstants.NO_FRAME.equals(menu.getIsFrame())) {
+            && UserConstants.NO_FRAME.equals(menu.getIsFrame())) {
             routerPath = "/" + menu.getPath();
         }
         // 非外链并且是一级目录（类型为菜单）
@@ -345,7 +345,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
      */
     public boolean isMenuFrame(SysMenu menu) {
         return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType())
-                && menu.getIsFrame().equals(UserConstants.NO_FRAME);
+            && menu.getIsFrame().equals(UserConstants.NO_FRAME);
     }
 
     /**
@@ -431,6 +431,6 @@ public class SysMenuServiceImpl implements ISysMenuService {
      */
     public String innerLinkReplaceEach(String path) {
         return StringUtils.replaceEach(path, new String[]{Constants.HTTP, Constants.HTTPS},
-                new String[]{"", ""});
+            new String[]{"", ""});
     }
 }

ruoyi-visual/pom.xml

@@ -11,7 +11,6 @@
     <modules>
         <module>ruoyi-monitor</module>
         <module>ruoyi-xxl-job-admin</module>
-        <module>ruoyi-doc</module>
         <module>ruoyi-sentinel-dashboard</module>
         <module>ruoyi-seata-server</module>
     </modules>

ruoyi-visual/ruoyi-doc/Dockerfile

@@ -1,14 +0,0 @@
-FROM anapsix/alpine-java:8_server-jre_unlimited
-
-MAINTAINER Lion Li
-
-RUN mkdir -p /ruoyi/doc
-RUN mkdir -p /ruoyi/doc/logs
-
-WORKDIR /ruoyi/doc
-
-EXPOSE 18000
-
-ADD ./target/ruoyi-doc.jar ./app.jar
-
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]

ruoyi-visual/ruoyi-doc/pom.xml

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>ruoyi-visual</artifactId>
-        <version>1.1.0</version>
-    </parent>
-    <artifactId>ruoyi-doc</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-
-    </properties>
-    <dependencies>
-
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <!-- knife4j -->
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-aggregation-spring-boot-starter</artifactId>
-            <version>${knife4j-aggregation.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-web</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring-boot.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

ruoyi-visual/ruoyi-doc/src/main/java/com/ruoyi/doc/RuoyiDocApplication.java

@@ -1,19 +0,0 @@
-package com.ruoyi.doc;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-/**
- * 文档服务
- *
- * @author Lion Li
- */
-@SpringBootApplication
-public class RuoyiDocApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(RuoyiDocApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  文档中心 启动成功   ლ(´ڡ`ლ)ﾞ  ");
-    }
-
-}

ruoyi-visual/ruoyi-doc/src/main/resources/application.yml

@@ -1,61 +0,0 @@
-# Tomcat
-server:
-  port: 18000
-
-# Spring
-spring:
-  application:
-    # 应用名称
-    name: ruoyi-doc
-  profiles:
-    # 环境配置
-    active: @profiles.active@
-
---- # nacos 配置
-spring:
-  cloud:
-    nacos:
-      # nacos 服务地址
-      server-addr: @nacos.server@
-      discovery:
-        # 注册组
-        group: @nacos.discovery.group@
-        namespace: ${spring.profiles.active}
-      config:
-        # 配置组
-        group: @nacos.config.group@
-        namespace: ${spring.profiles.active}
-  config:
-    import:
-      - optional:nacos:application-common.yml
-      - optional:nacos:${spring.application.name}.yml
-
---- # knife4j聚合配置
-knife4j:
-  enableAggregation: true
-  # cloud模式
-  cloud:
-    # 是否启用
-    enable: true
-    # 网关地址
-    gatewayUri: 127.0.0.1:8080
-    # 需要聚合的服务集合
-    routes:
-      - name: 系统服务
-        uri: ${knife4j.cloud.gatewayUri}
-        location: /system/v3/api-docs
-      - name: 代码生成
-        uri: ${knife4j.cloud.gatewayUri}
-        location: /code/v3/api-docs
-      - name: 资源服务
-        uri: ${knife4j.cloud.gatewayUri}
-        location: /resource/v3/api-docs
-      - name: 认证服务
-        uri: ${knife4j.cloud.gatewayUri}
-        location: /auth/v3/api-docs
-      - name: 演示服务
-        uri: ${knife4j.cloud.gatewayUri}
-        location: /demo/v3/api-docs
-      - name: MQ演示服务
-        uri: ${knife4j.cloud.gatewayUri}
-        location: /stream-mq/v3/api-docs

ruoyi-visual/ruoyi-doc/src/main/resources/banner.txt

@@ -1,10 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
-                        _           _
-                       (_)         | |
- _ __ _   _  ___  _   _ _ ______ __| | ___   ___
-| '__| | | |/ _ \| | | | |______/ _` |/ _ \ / __|
-| |  | |_| | (_) | |_| | |     | (_| | (_) | (__
-|_|   \__,_|\___/ \__, |_|      \__,_|\___/ \___|
-                   __/ |
-                  |___/

ruoyi-visual/ruoyi-doc/src/main/resources/logback.xml

@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/${project.artifactId}"/>
-    <!-- 日志输出格式 -->
-    <property name="console.log.pattern"
-              value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
-    <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${console.log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-    </appender>
-
-    <!-- 控制台输出 -->
-    <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/console.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大 1天 -->
-            <maxHistory>1</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-        </filter>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- info异步输出 -->
-    <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender">
-        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
-        <discardingThreshold>0</discardingThreshold>
-        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
-        <queueSize>512</queueSize>
-        <!-- 添加附加的appender,最多只能添加一个 -->
-        <appender-ref ref="file_info"/>
-    </appender>
-
-    <!-- error异步输出 -->
-    <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender">
-        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
-        <discardingThreshold>0</discardingThreshold>
-        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
-        <queueSize>512</queueSize>
-        <!-- 添加附加的appender,最多只能添加一个 -->
-        <appender-ref ref="file_error"/>
-    </appender>
-
-    <include resource="logback-logstash.xml" />
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="console"/>
-        <appender-ref ref="async_info"/>
-        <appender-ref ref="async_error"/>
-        <appender-ref ref="file_console"/>
-    </root>
-</configuration>