add 整合 springdoc 移除 knife4j

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -19,9 +19,9 @@ import com.ruoyi.sms.config.properties.SmsProperties;
 import com.ruoyi.sms.core.SmsTemplate;
 import com.ruoyi.sms.entity.SmsResult;
 import com.ruoyi.system.service.ISysConfigService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
@@ -41,7 +41,7 @@ import java.util.Map;
 @Anonymous
 @Slf4j
 @Validated
-@Api(value = "验证码操作处理", tags = {"验证码管理"})
+@Tag(name ="验证码操作处理", description = "验证码管理")
 @RequiredArgsConstructor
 @RestController
 public class CaptchaController {
@@ -53,9 +53,9 @@ public class CaptchaController {
     /**
      * 短信验证码
      */
-    @ApiOperation("短信验证码")
+    @Operation(summary = "短信验证码")
     @GetMapping("/captchaSms")
-    public R<Void> smsCaptcha(@ApiParam("用户手机号")
+    public R<Void> smsCaptcha(@Parameter(name = "用户手机号")
                               @NotBlank(message = "{user.phonenumber.not.blank}")
                               String phonenumber) {
         if (smsProperties.getEnabled()) {
@@ -80,7 +80,7 @@ public class CaptchaController {
     /**
      * 生成验证码
      */
-    @ApiOperation("生成验证码")
+    @Operation(summary = "生成验证码")
     @GetMapping("/captchaImage")
     public R<Map<String, Object>> getCode() {
         Map<String, Object> ajax = new HashMap<>();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java

@@ -5,8 +5,8 @@ import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.SysCache;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.connection.RedisServerCommands;
 import org.springframework.data.redis.core.RedisCallback;
@@ -20,7 +20,7 @@ import java.util.*;
  *
  * @author Lion Li
  */
-@Api(value = "缓存监控", tags = {"缓存监控管理"})
+@Tag(name ="缓存监控", description = "缓存监控管理")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/monitor/cache")
@@ -41,7 +41,7 @@ public class CacheController {
         CACHES.add(new SysCache(CacheConstants.RATE_LIMIT_KEY, "限流处理"));
     }
 
-    @ApiOperation("获取缓存监控详细信息")
+    @Operation(summary = "获取缓存监控详细信息")
     @SaCheckPermission("monitor:cache:list")
     @GetMapping()
     public R<Map<String, Object>> getInfo() throws Exception {
@@ -67,14 +67,14 @@ public class CacheController {
         return R.ok(result);
     }
 
-    @ApiOperation("获取缓存名称列表")
+    @Operation(summary = "获取缓存名称列表")
     @SaCheckPermission("monitor:cache:list")
     @GetMapping("/getNames")
     public R<List<SysCache>> cache() {
         return R.ok(CACHES);
     }
 
-    @ApiOperation("获取KEYS基于缓存名")
+    @Operation(summary = "获取KEYS基于缓存名")
     @SaCheckPermission("monitor:cache:list")
     @GetMapping("/getKeys/{cacheName}")
     public R<Set<String>> getCacheKeys(@PathVariable String cacheName) {
@@ -82,7 +82,7 @@ public class CacheController {
         return R.ok(cacheKyes);
     }
 
-    @ApiOperation("获取值基于缓存名与KEY")
+    @Operation(summary = "获取值基于缓存名与KEY")
     @SaCheckPermission("monitor:cache:list")
     @GetMapping("/getValue/{cacheName}/{cacheKey}")
     public R<SysCache> getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey) {
@@ -91,7 +91,7 @@ public class CacheController {
         return R.ok(sysCache);
     }
 
-    @ApiOperation("清空缓存名")
+    @Operation(summary = "清空缓存名")
     @SaCheckPermission("monitor:cache:list")
     @DeleteMapping("/clearCacheName/{cacheName}")
     public R<Void> clearCacheName(@PathVariable String cacheName) {
@@ -100,7 +100,7 @@ public class CacheController {
         return R.ok();
     }
 
-    @ApiOperation("清空缓存KEY")
+    @Operation(summary = "清空缓存KEY")
     @SaCheckPermission("monitor:cache:list")
     @DeleteMapping("/clearCacheKey/{cacheKey}")
     public R<Void> clearCacheKey(@PathVariable String cacheKey) {
@@ -108,7 +108,7 @@ public class CacheController {
         return R.ok();
     }
 
-    @ApiOperation("清空所有缓存")
+    @Operation(summary = "清空所有缓存")
     @SaCheckPermission("monitor:cache:list")
     @DeleteMapping("/clearCacheAll")
     public R<Void> clearCacheAll() {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java

@@ -3,15 +3,15 @@ package com.ruoyi.web.controller.monitor;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysLogininfor;
 import com.ruoyi.system.service.ISysLogininforService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -25,7 +25,7 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@Api(value = "系统访问记录", tags = {"系统访问记录管理"})
+@Tag(name ="系统访问记录", description = "系统访问记录管理")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/monitor/logininfor")
@@ -33,14 +33,14 @@ public class SysLogininforController extends BaseController {
 
     private final ISysLogininforService logininforService;
 
-    @ApiOperation("查询系统访问记录列表")
+    @Operation(summary = "查询系统访问记录列表")
     @SaCheckPermission("monitor:logininfor:list")
     @GetMapping("/list")
     public TableDataInfo<SysLogininfor> list(SysLogininfor logininfor, PageQuery pageQuery) {
         return logininforService.selectPageLogininforList(logininfor, pageQuery);
     }
 
-    @ApiOperation("导出系统访问记录列表")
+    @Operation(summary = "导出系统访问记录列表")
     @Log(title = "登录日志", businessType = BusinessType.EXPORT)
     @SaCheckPermission("monitor:logininfor:export")
     @PostMapping("/export")
@@ -49,7 +49,7 @@ public class SysLogininforController extends BaseController {
         ExcelUtil.exportExcel(list, "登录日志", SysLogininfor.class, response);
     }
 
-    @ApiOperation("删除系统访问记录")
+    @Operation(summary = "删除系统访问记录")
     @SaCheckPermission("monitor:logininfor:remove")
     @Log(title = "登录日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/{infoIds}")
@@ -57,7 +57,7 @@ public class SysLogininforController extends BaseController {
         return toAjax(logininforService.deleteLogininforByIds(infoIds));
     }
 
-    @ApiOperation("清空系统访问记录")
+    @Operation(summary = "清空系统访问记录")
     @SaCheckPermission("monitor:logininfor:remove")
     @Log(title = "登录日志", businessType = BusinessType.CLEAN)
     @DeleteMapping("/clean")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java

@@ -3,15 +3,15 @@ package com.ruoyi.web.controller.monitor;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysOperLog;
 import com.ruoyi.system.service.ISysOperLogService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -25,7 +25,7 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@Api(value = "操作日志记录", tags = {"操作日志记录管理"})
+@Tag(name ="操作日志记录", description = "操作日志记录管理")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/monitor/operlog")
@@ -33,14 +33,14 @@ public class SysOperlogController extends BaseController {
 
     private final ISysOperLogService operLogService;
 
-    @ApiOperation("查询操作日志记录列表")
+    @Operation(summary = "查询操作日志记录列表")
     @SaCheckPermission("monitor:operlog:list")
     @GetMapping("/list")
     public TableDataInfo<SysOperLog> list(SysOperLog operLog, PageQuery pageQuery) {
         return operLogService.selectPageOperLogList(operLog, pageQuery);
     }
 
-    @ApiOperation("导出操作日志记录列表")
+    @Operation(summary = "导出操作日志记录列表")
     @Log(title = "操作日志", businessType = BusinessType.EXPORT)
     @SaCheckPermission("monitor:operlog:export")
     @PostMapping("/export")
@@ -49,7 +49,7 @@ public class SysOperlogController extends BaseController {
         ExcelUtil.exportExcel(list, "操作日志", SysOperLog.class, response);
     }
 
-    @ApiOperation("删除操作日志记录")
+    @Operation(summary = "删除操作日志记录")
     @Log(title = "操作日志", businessType = BusinessType.DELETE)
     @SaCheckPermission("monitor:operlog:remove")
     @DeleteMapping("/{operIds}")
@@ -57,7 +57,7 @@ public class SysOperlogController extends BaseController {
         return toAjax(operLogService.deleteOperLogByIds(operIds));
     }
 
-    @ApiOperation("清空操作日志记录")
+    @Operation(summary = "清空操作日志记录")
     @Log(title = "操作日志", businessType = BusinessType.CLEAN)
     @SaCheckPermission("monitor:operlog:remove")
     @DeleteMapping("/clean")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java

@@ -15,8 +15,8 @@ import com.ruoyi.common.utils.StreamUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.redis.RedisUtils;
 import com.ruoyi.system.domain.SysUserOnline;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -29,13 +29,13 @@ import java.util.List;
  *
  * @author Lion Li
  */
-@Api(value = "在线用户监控", tags = {"在线用户监控管理"})
+@Tag(name ="在线用户监控", description = "在线用户监控管理")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/monitor/online")
 public class SysUserOnlineController extends BaseController {
 
-    @ApiOperation("在线用户列表")
+    @Operation(summary = "在线用户列表")
     @SaCheckPermission("monitor:online:list")
     @GetMapping("/list")
     public TableDataInfo<SysUserOnline> list(String ipaddr, String userName) {
@@ -73,7 +73,7 @@ public class SysUserOnlineController extends BaseController {
     /**
      * 强退用户
      */
-    @ApiOperation("强退用户")
+    @Operation(summary = "强退用户")
     @SaCheckPermission("monitor:online:forceLogout")
     @Log(title = "在线用户", businessType = BusinessType.FORCE)
     @DeleteMapping("/{tokenId}")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java

@@ -4,16 +4,16 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.service.ISysConfigService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -27,7 +27,7 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@Api(value = "参数配置控制器", tags = {"参数配置管理"})
+@Tag(name ="参数配置控制器", description = "参数配置管理")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/config")
@@ -38,14 +38,14 @@ public class SysConfigController extends BaseController {
     /**
      * 获取参数配置列表
      */
-    @ApiOperation("获取参数配置列表")
+    @Operation(summary = "获取参数配置列表")
     @SaCheckPermission("system:config:list")
     @GetMapping("/list")
     public TableDataInfo<SysConfig> list(SysConfig config, PageQuery pageQuery) {
         return configService.selectPageConfigList(config, pageQuery);
     }
 
-    @ApiOperation("导出参数配置列表")
+    @Operation(summary = "导出参数配置列表")
     @Log(title = "参数管理", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:config:export")
     @PostMapping("/export")
@@ -57,26 +57,26 @@ public class SysConfigController extends BaseController {
     /**
      * 根据参数编号获取详细信息
      */
-    @ApiOperation("根据参数编号获取详细信息")
+    @Operation(summary = "根据参数编号获取详细信息")
     @SaCheckPermission("system:config:query")
     @GetMapping(value = "/{configId}")
-    public R<SysConfig> getInfo(@ApiParam("参数ID") @PathVariable Long configId) {
+    public R<SysConfig> getInfo(@Parameter(name = "参数ID") @PathVariable Long configId) {
         return R.ok(configService.selectConfigById(configId));
     }
 
     /**
      * 根据参数键名查询参数值
      */
-    @ApiOperation("根据参数键名查询参数值")
+    @Operation(summary = "根据参数键名查询参数值")
     @GetMapping(value = "/configKey/{configKey}")
-    public R<Void> getConfigKey(@ApiParam("参数Key") @PathVariable String configKey) {
+    public R<Void> getConfigKey(@Parameter(name = "参数Key") @PathVariable String configKey) {
         return R.ok(configService.selectConfigByKey(configKey));
     }
 
     /**
      * 新增参数配置
      */
-    @ApiOperation("新增参数配置")
+    @Operation(summary = "新增参数配置")
     @SaCheckPermission("system:config:add")
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -90,7 +90,7 @@ public class SysConfigController extends BaseController {
     /**
      * 修改参数配置
      */
-    @ApiOperation("修改参数配置")
+    @Operation(summary = "修改参数配置")
     @SaCheckPermission("system:config:edit")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -104,7 +104,7 @@ public class SysConfigController extends BaseController {
     /**
      * 根据参数键名修改参数配置
      */
-    @ApiOperation("根据参数键名修改参数配置")
+    @Operation(summary = "根据参数键名修改参数配置")
     @SaCheckPermission("system:config:edit")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping("/updateByKey")
@@ -115,11 +115,11 @@ public class SysConfigController extends BaseController {
     /**
      * 删除参数配置
      */
-    @ApiOperation("删除参数配置")
+    @Operation(summary = "删除参数配置")
     @SaCheckPermission("system:config:remove")
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{configIds}")
-    public R<Void> remove(@ApiParam("参数ID串") @PathVariable Long[] configIds) {
+    public R<Void> remove(@Parameter(name = "参数ID串") @PathVariable Long[] configIds) {
         configService.deleteConfigByIds(configIds);
         return R.ok();
     }
@@ -127,7 +127,7 @@ public class SysConfigController extends BaseController {
     /**
      * 刷新参数缓存
      */
-    @ApiOperation("刷新参数缓存")
+    @Operation(summary = "刷新参数缓存")
     @SaCheckPermission("system:config:remove")
     @Log(title = "参数管理", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -11,9 +11,9 @@ import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysDeptService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -28,7 +28,7 @@ import java.util.Map;
  * @author Lion Li
  */
 @Validated
-@Api(value = "部门控制器", tags = {"部门管理"})
+@Tag(name ="部门控制器", description = "部门管理")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/dept")
@@ -39,7 +39,7 @@ public class SysDeptController extends BaseController {
     /**
      * 获取部门列表
      */
-    @ApiOperation("获取部门列表")
+    @Operation(summary = "获取部门列表")
     @SaCheckPermission("system:dept:list")
     @GetMapping("/list")
     public R<List<SysDept>> list(SysDept dept) {
@@ -50,10 +50,10 @@ public class SysDeptController extends BaseController {
     /**
      * 查询部门列表（排除节点）
      */
-    @ApiOperation("查询部门列表（排除节点）")
+    @Operation(summary = "查询部门列表（排除节点）")
     @SaCheckPermission("system:dept:list")
     @GetMapping("/list/exclude/{deptId}")
-    public R<List<SysDept>> excludeChild(@ApiParam("部门ID") @PathVariable(value = "deptId", required = false) Long deptId) {
+    public R<List<SysDept>> excludeChild(@Parameter(name = "部门ID") @PathVariable(value = "deptId", required = false) Long deptId) {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
         depts.removeIf(d -> d.getDeptId().equals(deptId)
             || ArrayUtil.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
@@ -63,10 +63,10 @@ public class SysDeptController extends BaseController {
     /**
      * 根据部门编号获取详细信息
      */
-    @ApiOperation("根据部门编号获取详细信息")
+    @Operation(summary = "根据部门编号获取详细信息")
     @SaCheckPermission("system:dept:query")
     @GetMapping(value = "/{deptId}")
-    public R<SysDept> getInfo(@ApiParam("部门ID") @PathVariable Long deptId) {
+    public R<SysDept> getInfo(@Parameter(name = "部门ID") @PathVariable Long deptId) {
         deptService.checkDeptDataScope(deptId);
         return R.ok(deptService.selectDeptById(deptId));
     }
@@ -74,7 +74,7 @@ public class SysDeptController extends BaseController {
     /**
      * 获取部门下拉树列表
      */
-    @ApiOperation("获取部门下拉树列表")
+    @Operation(summary = "获取部门下拉树列表")
     @GetMapping("/treeselect")
     public R<List<Tree<Long>>> treeselect(SysDept dept) {
         List<SysDept> depts = deptService.selectDeptList(dept);
@@ -84,9 +84,9 @@ public class SysDeptController extends BaseController {
     /**
      * 加载对应角色部门列表树
      */
-    @ApiOperation("加载对应角色部门列表树")
+    @Operation(summary = "加载对应角色部门列表树")
     @GetMapping(value = "/roleDeptTreeselect/{roleId}")
-    public R<Map<String, Object>> roleDeptTreeselect(@ApiParam("角色ID") @PathVariable("roleId") Long roleId) {
+    public R<Map<String, Object>> roleDeptTreeselect(@Parameter(name = "角色ID") @PathVariable("roleId") Long roleId) {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
         Map<String, Object> ajax = new HashMap<>();
         ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
@@ -97,7 +97,7 @@ public class SysDeptController extends BaseController {
     /**
      * 新增部门
      */
-    @ApiOperation("新增部门")
+    @Operation(summary = "新增部门")
     @SaCheckPermission("system:dept:add")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -111,7 +111,7 @@ public class SysDeptController extends BaseController {
     /**
      * 修改部门
      */
-    @ApiOperation("修改部门")
+    @Operation(summary = "修改部门")
     @SaCheckPermission("system:dept:edit")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -132,11 +132,11 @@ public class SysDeptController extends BaseController {
     /**
      * 删除部门
      */
-    @ApiOperation("删除部门")
+    @Operation(summary = "删除部门")
     @SaCheckPermission("system:dept:remove")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
-    public R<Void> remove(@ApiParam("部门ID串") @PathVariable Long deptId) {
+    public R<Void> remove(@Parameter(name = "部门ID串") @PathVariable Long deptId) {
         if (deptService.hasChildByDeptId(deptId)) {
             return R.fail("存在下级部门,不允许删除");
         }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -4,17 +4,17 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysDictTypeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -29,7 +29,7 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
+@Tag(name ="数据字典信息控制器", description = "数据字典信息管理")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/dict/data")
@@ -38,14 +38,14 @@ public class SysDictDataController extends BaseController {
     private final ISysDictDataService dictDataService;
     private final ISysDictTypeService dictTypeService;
 
-    @ApiOperation("查询字典数据列表")
+    @Operation(summary = "查询字典数据列表")
     @SaCheckPermission("system:dict:list")
     @GetMapping("/list")
     public TableDataInfo<SysDictData> list(SysDictData dictData, PageQuery pageQuery) {
         return dictDataService.selectPageDictDataList(dictData, pageQuery);
     }
 
-    @ApiOperation("导出字典数据列表")
+    @Operation(summary = "导出字典数据列表")
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:dict:export")
     @PostMapping("/export")
@@ -57,19 +57,19 @@ public class SysDictDataController extends BaseController {
     /**
      * 查询字典数据详细
      */
-    @ApiOperation("查询字典数据详细")
+    @Operation(summary = "查询字典数据详细")
     @SaCheckPermission("system:dict:query")
     @GetMapping(value = "/{dictCode}")
-    public R<SysDictData> getInfo(@ApiParam("字典code") @PathVariable Long dictCode) {
+    public R<SysDictData> getInfo(@Parameter(name = "字典code") @PathVariable Long dictCode) {
         return R.ok(dictDataService.selectDictDataById(dictCode));
     }
 
     /**
      * 根据字典类型查询字典数据信息
      */
-    @ApiOperation("根据字典类型查询字典数据信息")
+    @Operation(summary = "根据字典类型查询字典数据信息")
     @GetMapping(value = "/type/{dictType}")
-    public R<List<SysDictData>> dictType(@ApiParam("字典类型") @PathVariable String dictType) {
+    public R<List<SysDictData>> dictType(@Parameter(name = "字典类型") @PathVariable String dictType) {
         List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
         if (ObjectUtil.isNull(data)) {
             data = new ArrayList<>();
@@ -80,7 +80,7 @@ public class SysDictDataController extends BaseController {
     /**
      * 新增字典类型
      */
-    @ApiOperation("新增字典类型")
+    @Operation(summary = "新增字典类型")
     @SaCheckPermission("system:dict:add")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping
@@ -91,7 +91,7 @@ public class SysDictDataController extends BaseController {
     /**
      * 修改保存字典类型
      */
-    @ApiOperation("修改保存字典类型")
+    @Operation(summary = "修改保存字典类型")
     @SaCheckPermission("system:dict:edit")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -102,11 +102,11 @@ public class SysDictDataController extends BaseController {
     /**
      * 删除字典类型
      */
-    @ApiOperation("删除字典类型")
+    @Operation(summary = "删除字典类型")
     @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictCodes}")
-    public R<Void> remove(@ApiParam("字典code串") @PathVariable Long[] dictCodes) {
+    public R<Void> remove(@Parameter(name = "字典code串") @PathVariable Long[] dictCodes) {
         dictDataService.deleteDictDataByIds(dictCodes);
         return R.ok();
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java

@@ -4,16 +4,16 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.entity.SysDictType;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDictTypeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -27,7 +27,7 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
+@Tag(name ="数据字典信息控制器", description = "数据字典信息管理")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/dict/type")
@@ -35,14 +35,14 @@ public class SysDictTypeController extends BaseController {
 
     private final ISysDictTypeService dictTypeService;
 
-    @ApiOperation("查询字典类型列表")
+    @Operation(summary = "查询字典类型列表")
     @SaCheckPermission("system:dict:list")
     @GetMapping("/list")
     public TableDataInfo<SysDictType> list(SysDictType dictType, PageQuery pageQuery) {
         return dictTypeService.selectPageDictTypeList(dictType, pageQuery);
     }
 
-    @ApiOperation("导出字典类型列表")
+    @Operation(summary = "导出字典类型列表")
     @Log(title = "字典类型", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:dict:export")
     @PostMapping("/export")
@@ -54,17 +54,17 @@ public class SysDictTypeController extends BaseController {
     /**
      * 查询字典类型详细
      */
-    @ApiOperation("查询字典类型详细")
+    @Operation(summary = "查询字典类型详细")
     @SaCheckPermission("system:dict:query")
     @GetMapping(value = "/{dictId}")
-    public R<SysDictType> getInfo(@ApiParam("字典ID") @PathVariable Long dictId) {
+    public R<SysDictType> getInfo(@Parameter(name = "字典ID") @PathVariable Long dictId) {
         return R.ok(dictTypeService.selectDictTypeById(dictId));
     }
 
     /**
      * 新增字典类型
      */
-    @ApiOperation("新增字典类型")
+    @Operation(summary = "新增字典类型")
     @SaCheckPermission("system:dict:add")
     @Log(title = "字典类型", businessType = BusinessType.INSERT)
     @PostMapping
@@ -78,7 +78,7 @@ public class SysDictTypeController extends BaseController {
     /**
      * 修改字典类型
      */
-    @ApiOperation("修改字典类型")
+    @Operation(summary = "修改字典类型")
     @SaCheckPermission("system:dict:edit")
     @Log(title = "字典类型", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -92,11 +92,11 @@ public class SysDictTypeController extends BaseController {
     /**
      * 删除字典类型
      */
-    @ApiOperation("删除字典类型")
+    @Operation(summary = "删除字典类型")
     @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictIds}")
-    public R<Void> remove(@ApiParam("字典ID串") @PathVariable Long[] dictIds) {
+    public R<Void> remove(@Parameter(name = "字典ID串") @PathVariable Long[] dictIds) {
         dictTypeService.deleteDictTypeByIds(dictIds);
         return R.ok();
     }
@@ -104,7 +104,7 @@ public class SysDictTypeController extends BaseController {
     /**
      * 刷新字典缓存
      */
-    @ApiOperation("刷新字典缓存")
+    @Operation(summary = "刷新字典缓存")
     @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
@@ -116,7 +116,7 @@ public class SysDictTypeController extends BaseController {
     /**
      * 获取字典选择框列表
      */
-    @ApiOperation("获取字典选择框列表")
+    @Operation(summary = "获取字典选择框列表")
     @GetMapping("/optionselect")
     public R<List<SysDictType>> optionselect() {
         List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java

@@ -2,8 +2,8 @@ package com.ruoyi.web.controller.system;
 
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.utils.StringUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author Lion Li
  */
-@Api(value = "首页控制器", tags = {"首页管理"})
+@Tag(name ="首页控制器", description = "首页管理")
 @RequiredArgsConstructor
 @RestController
 public class SysIndexController {
@@ -26,7 +26,7 @@ public class SysIndexController {
     /**
      * 访问首页，提示语
      */
-    @ApiOperation("访问首页，提示语")
+    @Operation(summary = "访问首页，提示语")
     @GetMapping("/")
     public String index() {
         return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion());

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -13,8 +13,8 @@ import com.ruoyi.system.service.ISysMenuService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.service.SysLoginService;
 import com.ruoyi.system.service.SysPermissionService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,7 +34,7 @@ import java.util.Set;
  * @author Lion Li
  */
 @Validated
-@Api(value = "登录验证控制器", tags = {"登录验证管理"})
+@Tag(name ="登录验证控制器", description = "登录验证管理")
 @RequiredArgsConstructor
 @RestController
 public class SysLoginController {
@@ -51,7 +51,7 @@ public class SysLoginController {
      * @return 结果
      */
     @Anonymous
-    @ApiOperation("登录方法")
+    @Operation(summary = "登录方法")
     @PostMapping("/login")
     public R<Map<String, Object>> login(@Validated @RequestBody LoginBody loginBody) {
         Map<String, Object> ajax = new HashMap<>();
@@ -69,7 +69,7 @@ public class SysLoginController {
      * @return 结果
      */
     @Anonymous
-    @ApiOperation("短信登录(示例)")
+    @Operation(summary = "短信登录(示例)")
     @PostMapping("/smsLogin")
     public R<Map<String, Object>> smsLogin(@Validated @RequestBody SmsLoginBody smsLoginBody) {
         Map<String, Object> ajax = new HashMap<>();
@@ -86,7 +86,7 @@ public class SysLoginController {
      * @return 结果
      */
     @Anonymous
-    @ApiOperation("小程序登录(示例)")
+    @Operation(summary = "小程序登录(示例)")
     @PostMapping("/xcxLogin")
     public R<Map<String, Object>> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) {
         Map<String, Object> ajax = new HashMap<>();
@@ -97,7 +97,7 @@ public class SysLoginController {
     }
 
     @Anonymous
-    @ApiOperation("登出方法")
+    @Operation(summary = "登出方法")
     @PostMapping("/logout")
     public R<Void> logout() {
         loginService.logout();
@@ -109,7 +109,7 @@ public class SysLoginController {
      *
      * @return 用户信息
      */
-    @ApiOperation("获取用户信息")
+    @Operation(summary = "获取用户信息")
     @GetMapping("getInfo")
     public R<Map<String, Object>> getInfo() {
         SysUser user = userService.selectUserById(LoginHelper.getUserId());
@@ -129,7 +129,7 @@ public class SysLoginController {
      *
      * @return 路由信息
      */
-    @ApiOperation("获取路由信息")
+    @Operation(summary = "获取路由信息")
     @GetMapping("getRouters")
     public R<List<RouterVo>> getRouters() {
         Long userId = LoginHelper.getUserId();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -10,9 +10,9 @@ import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysMenuService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -27,7 +27,7 @@ import java.util.Map;
  * @author Lion Li
  */
 @Validated
-@Api(value = "菜单信息控制器", tags = {"菜单信息管理"})
+@Tag(name ="菜单信息控制器", description = "菜单信息管理")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/menu")
@@ -38,7 +38,7 @@ public class SysMenuController extends BaseController {
     /**
      * 获取菜单列表
      */
-    @ApiOperation("获取菜单列表")
+    @Operation(summary = "获取菜单列表")
     @SaCheckPermission("system:menu:list")
     @GetMapping("/list")
     public R<List<SysMenu>> list(SysMenu menu) {
@@ -49,17 +49,17 @@ public class SysMenuController extends BaseController {
     /**
      * 根据菜单编号获取详细信息
      */
-    @ApiOperation("根据菜单编号获取详细信息")
+    @Operation(summary = "根据菜单编号获取详细信息")
     @SaCheckPermission("system:menu:query")
     @GetMapping(value = "/{menuId}")
-    public R<SysMenu> getInfo(@ApiParam("菜单ID") @PathVariable Long menuId) {
+    public R<SysMenu> getInfo(@Parameter(name = "菜单ID") @PathVariable Long menuId) {
         return R.ok(menuService.selectMenuById(menuId));
     }
 
     /**
      * 获取菜单下拉树列表
      */
-    @ApiOperation("获取菜单下拉树列表")
+    @Operation(summary = "获取菜单下拉树列表")
     @GetMapping("/treeselect")
     public R<List<Tree<Long>>> treeselect(SysMenu menu) {
         List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
@@ -69,9 +69,9 @@ public class SysMenuController extends BaseController {
     /**
      * 加载对应角色菜单列表树
      */
-    @ApiOperation("加载对应角色菜单列表树")
+    @Operation(summary = "加载对应角色菜单列表树")
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
-    public R<Map<String, Object>> roleMenuTreeselect(@ApiParam("角色ID") @PathVariable("roleId") Long roleId) {
+    public R<Map<String, Object>> roleMenuTreeselect(@Parameter(name = "角色ID") @PathVariable("roleId") Long roleId) {
         List<SysMenu> menus = menuService.selectMenuList(getUserId());
         Map<String, Object> ajax = new HashMap<>();
         ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
@@ -82,7 +82,7 @@ public class SysMenuController extends BaseController {
     /**
      * 新增菜单
      */
-    @ApiOperation("新增菜单")
+    @Operation(summary = "新增菜单")
     @SaCheckPermission("system:menu:add")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -98,7 +98,7 @@ public class SysMenuController extends BaseController {
     /**
      * 修改菜单
      */
-    @ApiOperation("修改菜单")
+    @Operation(summary = "修改菜单")
     @SaCheckPermission("system:menu:edit")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -116,11 +116,11 @@ public class SysMenuController extends BaseController {
     /**
      * 删除菜单
      */
-    @ApiOperation("删除菜单")
+    @Operation(summary = "删除菜单")
     @SaCheckPermission("system:menu:remove")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
-    public R<Void> remove(@ApiParam("菜单ID") @PathVariable("menuId") Long menuId) {
+    public R<Void> remove(@Parameter(name = "菜单ID") @PathVariable("menuId") Long menuId) {
         if (menuService.hasChildByMenuId(menuId)) {
             return R.fail("存在子菜单,不允许删除");
         }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -3,15 +3,15 @@ package com.ruoyi.web.controller.system;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
  * @author Lion Li
  */
 @Validated
-@Api(value = "公告信息控制器", tags = {"公告信息管理"})
+@Tag(name ="公告信息控制器", description = "公告信息管理")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/notice")
@@ -33,7 +33,7 @@ public class SysNoticeController extends BaseController {
     /**
      * 获取通知公告列表
      */
-    @ApiOperation("获取通知公告列表")
+    @Operation(summary = "获取通知公告列表")
     @SaCheckPermission("system:notice:list")
     @GetMapping("/list")
     public TableDataInfo<SysNotice> list(SysNotice notice, PageQuery pageQuery) {
@@ -43,17 +43,17 @@ public class SysNoticeController extends BaseController {
     /**
      * 根据通知公告编号获取详细信息
      */
-    @ApiOperation("根据通知公告编号获取详细信息")
+    @Operation(summary = "根据通知公告编号获取详细信息")
     @SaCheckPermission("system:notice:query")
     @GetMapping(value = "/{noticeId}")
-    public R<SysNotice> getInfo(@ApiParam("公告ID") @PathVariable Long noticeId) {
+    public R<SysNotice> getInfo(@Parameter(name = "公告ID") @PathVariable Long noticeId) {
         return R.ok(noticeService.selectNoticeById(noticeId));
     }
 
     /**
      * 新增通知公告
      */
-    @ApiOperation("新增通知公告")
+    @Operation(summary = "新增通知公告")
     @SaCheckPermission("system:notice:add")
     @Log(title = "通知公告", businessType = BusinessType.INSERT)
     @PostMapping
@@ -64,7 +64,7 @@ public class SysNoticeController extends BaseController {
     /**
      * 修改通知公告
      */
-    @ApiOperation("修改通知公告")
+    @Operation(summary = "修改通知公告")
     @SaCheckPermission("system:notice:edit")
     @Log(title = "通知公告", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -75,11 +75,11 @@ public class SysNoticeController extends BaseController {
     /**
      * 删除通知公告
      */
-    @ApiOperation("删除通知公告")
+    @Operation(summary = "删除通知公告")
     @SaCheckPermission("system:notice:remove")
     @Log(title = "通知公告", businessType = BusinessType.DELETE)
     @DeleteMapping("/{noticeIds}")
-    public R<Void> remove(@ApiParam("公告ID串") @PathVariable Long[] noticeIds) {
+    public R<Void> remove(@Parameter(name = "公告ID串") @PathVariable Long[] noticeIds) {
         return toAjax(noticeService.deleteNoticeByIds(noticeIds));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java

@@ -4,8 +4,8 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
@@ -14,9 +14,9 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.bo.SysOssConfigBo;
 import com.ruoyi.system.domain.vo.SysOssConfigVo;
 import com.ruoyi.system.service.ISysOssConfigService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -33,7 +33,7 @@ import java.util.Arrays;
  * @date 2021-08-13
  */
 @Validated
-@Api(value = "对象存储配置控制器", tags = {"对象存储配置管理"})
+@Tag(name ="对象存储配置控制器", description = "对象存储配置管理")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/oss/config")
@@ -44,7 +44,7 @@ public class SysOssConfigController extends BaseController {
     /**
      * 查询对象存储配置列表
      */
-    @ApiOperation("查询对象存储配置列表")
+    @Operation(summary = "查询对象存储配置列表")
     @SaCheckPermission("system:oss:list")
     @GetMapping("/list")
     public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) {
@@ -54,10 +54,10 @@ public class SysOssConfigController extends BaseController {
     /**
      * 获取对象存储配置详细信息
      */
-    @ApiOperation("获取对象存储配置详细信息")
+    @Operation(summary = "获取对象存储配置详细信息")
     @SaCheckPermission("system:oss:query")
     @GetMapping("/{ossConfigId}")
-    public R<SysOssConfigVo> getInfo(@ApiParam("OSS配置ID")
+    public R<SysOssConfigVo> getInfo(@Parameter(name = "OSS配置ID")
                                               @NotNull(message = "主键不能为空")
                                               @PathVariable("ossConfigId") Long ossConfigId) {
         return R.ok(iSysOssConfigService.queryById(ossConfigId));
@@ -66,7 +66,7 @@ public class SysOssConfigController extends BaseController {
     /**
      * 新增对象存储配置
      */
-    @ApiOperation("新增对象存储配置")
+    @Operation(summary = "新增对象存储配置")
     @SaCheckPermission("system:oss:add")
     @Log(title = "对象存储配置", businessType = BusinessType.INSERT)
     @RepeatSubmit()
@@ -78,7 +78,7 @@ public class SysOssConfigController extends BaseController {
     /**
      * 修改对象存储配置
      */
-    @ApiOperation("修改对象存储配置")
+    @Operation(summary = "修改对象存储配置")
     @SaCheckPermission("system:oss:edit")
     @Log(title = "对象存储配置", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
@@ -90,11 +90,11 @@ public class SysOssConfigController extends BaseController {
     /**
      * 删除对象存储配置
      */
-    @ApiOperation("删除对象存储配置")
+    @Operation(summary = "删除对象存储配置")
     @SaCheckPermission("system:oss:remove")
     @Log(title = "对象存储配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ossConfigIds}")
-    public R<Void> remove(@ApiParam("OSS配置ID串")
+    public R<Void> remove(@Parameter(name = "OSS配置ID串")
                                    @NotEmpty(message = "主键不能为空")
                                    @PathVariable Long[] ossConfigIds) {
         return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true) ? 1 : 0);
@@ -103,7 +103,7 @@ public class SysOssConfigController extends BaseController {
     /**
      * 状态修改
      */
-    @ApiOperation("状态修改")
+    @Operation(summary = "状态修改")
     @SaCheckPermission("system:oss:edit")
     @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java

@@ -19,7 +19,11 @@ import com.ruoyi.system.domain.SysOss;
 import com.ruoyi.system.domain.bo.SysOssBo;
 import com.ruoyi.system.domain.vo.SysOssVo;
 import com.ruoyi.system.service.ISysOssService;
-import io.swagger.annotations.*;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
@@ -28,7 +32,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 +44,7 @@ import java.util.Map;
  * @author Lion Li
  */
 @Validated
-@Api(value = "对象存储控制器", tags = {"对象存储管理"})
+@Tag(name ="对象存储控制器", description = "对象存储管理")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/oss")
@@ -52,7 +55,7 @@ public class SysOssController extends BaseController {
     /**
      * 查询OSS对象存储列表
      */
-    @ApiOperation("查询OSS对象存储列表")
+    @Operation(summary = "查询OSS对象存储列表")
     @SaCheckPermission("system:oss:list")
     @GetMapping("/list")
     public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
@@ -62,10 +65,10 @@ public class SysOssController extends BaseController {
     /**
      * 查询OSS对象基于id串
      */
-    @ApiOperation("查询OSS对象基于ID")
+    @Operation(summary = "查询OSS对象基于ID")
     @SaCheckPermission("system:oss:list")
     @GetMapping("/listByIds/{ossIds}")
-    public R<List<SysOssVo>> listByIds(@ApiParam("OSS对象ID串")
+    public R<List<SysOssVo>> listByIds(@Parameter(name = "OSS对象ID串")
                                      @NotEmpty(message = "主键不能为空")
                                      @PathVariable Long[] ossIds) {
         List<SysOssVo> list = iSysOssService.listByIds(Arrays.asList(ossIds));
@@ -75,9 +78,9 @@ public class SysOssController extends BaseController {
     /**
      * 上传OSS对象存储
      */
-    @ApiOperation("上传OSS对象存储")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "file", value = "文件", paramType = "query", dataTypeClass = File.class, required = true)
+    @Operation(summary = "上传OSS对象存储")
+    @Parameters({
+        @Parameter(name = "file", description = "文件", in = ParameterIn.QUERY, required = true)
     })
     @SaCheckPermission("system:oss:upload")
     @Log(title = "OSS对象存储", businessType = BusinessType.INSERT)
@@ -94,10 +97,10 @@ public class SysOssController extends BaseController {
         return R.ok(map);
     }
 
-    @ApiOperation("下载OSS对象存储")
+    @Operation(summary = "下载OSS对象存储")
     @SaCheckPermission("system:oss:download")
     @GetMapping("/download/{ossId}")
-    public void download(@ApiParam("OSS对象ID") @PathVariable Long ossId, HttpServletResponse response) throws IOException {
+    public void download(@Parameter(name = "OSS对象ID") @PathVariable Long ossId, HttpServletResponse response) throws IOException {
         SysOss sysOss = iSysOssService.getById(ossId);
         if (ObjectUtil.isNull(sysOss)) {
             throw new ServiceException("文件数据不存在!");
@@ -121,11 +124,11 @@ public class SysOssController extends BaseController {
     /**
      * 删除OSS对象存储
      */
-    @ApiOperation("删除OSS对象存储")
+    @Operation(summary = "删除OSS对象存储")
     @SaCheckPermission("system:oss:remove")
     @Log(title = "OSS对象存储", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ossIds}")
-    public R<Void> remove(@ApiParam("OSS对象ID串")
+    public R<Void> remove(@Parameter(name = "OSS对象ID串")
                                    @NotEmpty(message = "主键不能为空")
                                    @PathVariable Long[] ossIds) {
         return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true) ? 1 : 0);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -4,16 +4,16 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysPost;
 import com.ruoyi.system.service.ISysPostService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -27,7 +27,7 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@Api(value = "岗位信息控制器", tags = {"岗位信息管理"})
+@Tag(name ="岗位信息控制器", description = "岗位信息管理")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/post")
@@ -38,14 +38,14 @@ public class SysPostController extends BaseController {
     /**
      * 获取岗位列表
      */
-    @ApiOperation("获取岗位列表")
+    @Operation(summary = "获取岗位列表")
     @SaCheckPermission("system:post:list")
     @GetMapping("/list")
     public TableDataInfo<SysPost> list(SysPost post, PageQuery pageQuery) {
         return postService.selectPagePostList(post, pageQuery);
     }
 
-    @ApiOperation("导出岗位列表")
+    @Operation(summary = "导出岗位列表")
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:post:export")
     @PostMapping("/export")
@@ -57,17 +57,17 @@ public class SysPostController extends BaseController {
     /**
      * 根据岗位编号获取详细信息
      */
-    @ApiOperation("根据岗位编号获取详细信息")
+    @Operation(summary = "根据岗位编号获取详细信息")
     @SaCheckPermission("system:post:query")
     @GetMapping(value = "/{postId}")
-    public R<SysPost> getInfo(@ApiParam("岗位ID") @PathVariable Long postId) {
+    public R<SysPost> getInfo(@Parameter(name = "岗位ID") @PathVariable Long postId) {
         return R.ok(postService.selectPostById(postId));
     }
 
     /**
      * 新增岗位
      */
-    @ApiOperation("新增岗位")
+    @Operation(summary = "新增岗位")
     @SaCheckPermission("system:post:add")
     @Log(title = "岗位管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -83,7 +83,7 @@ public class SysPostController extends BaseController {
     /**
      * 修改岗位
      */
-    @ApiOperation("修改岗位")
+    @Operation(summary = "修改岗位")
     @SaCheckPermission("system:post:edit")
     @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -99,18 +99,18 @@ public class SysPostController extends BaseController {
     /**
      * 删除岗位
      */
-    @ApiOperation("删除岗位")
+    @Operation(summary = "删除岗位")
     @SaCheckPermission("system:post:remove")
     @Log(title = "岗位管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{postIds}")
-    public R<Void> remove(@ApiParam("岗位ID串") @PathVariable Long[] postIds) {
+    public R<Void> remove(@Parameter(name = "岗位ID串") @PathVariable Long[] postIds) {
         return toAjax(postService.deletePostByIds(postIds));
     }
 
     /**
      * 获取岗位选择框列表
      */
-    @ApiOperation("获取岗位选择框列表")
+    @Operation(summary = "获取岗位选择框列表")
     @GetMapping("/optionselect")
     public R<List<SysPost>> optionselect() {
         List<SysPost> posts = postService.selectPostAll();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -14,16 +14,16 @@ import com.ruoyi.common.utils.file.MimeTypeUtils;
 import com.ruoyi.system.domain.SysOss;
 import com.ruoyi.system.service.ISysOssService;
 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 io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -34,7 +34,7 @@ import java.util.Map;
  * @author Lion Li
  */
 @Validated
-@Api(value = "个人信息控制器", tags = {"个人信息管理"})
+@Tag(name ="个人信息控制器", description = "个人信息管理")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/user/profile")
@@ -46,7 +46,7 @@ public class SysProfileController extends BaseController {
     /**
      * 个人信息
      */
-    @ApiOperation("个人信息")
+    @Operation(summary = "个人信息")
     @GetMapping
     public R<Map<String, Object>> profile() {
         SysUser user = userService.selectUserById(getUserId());
@@ -60,7 +60,7 @@ public class SysProfileController extends BaseController {
     /**
      * 修改用户
      */
-    @ApiOperation("修改用户")
+    @Operation(summary = "修改用户")
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public R<Void> updateProfile(@RequestBody SysUser user) {
@@ -84,10 +84,10 @@ public class SysProfileController extends BaseController {
     /**
      * 重置密码
      */
-    @ApiOperation("重置密码")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "oldPassword", value = "旧密码", paramType = "query", dataTypeClass = String.class),
-        @ApiImplicitParam(name = "newPassword", value = "新密码", paramType = "query", dataTypeClass = String.class)
+    @Operation(summary = "重置密码")
+    @Parameters({
+        @Parameter(name = "oldPassword", description = "旧密码", in = ParameterIn.QUERY),
+        @Parameter(name = "newPassword", description = "新密码", in = ParameterIn.QUERY)
     })
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
@@ -111,9 +111,9 @@ public class SysProfileController extends BaseController {
     /**
      * 头像上传
      */
-    @ApiOperation("头像上传")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "avatarfile", value = "用户头像", paramType = "query", dataTypeClass = File.class, required = true)
+    @Operation(summary = "头像上传")
+    @Parameters({
+        @Parameter(name = "avatarfile", description = "用户头像", in = ParameterIn.QUERY, required = true)
     })
     @Log(title = "用户头像", businessType = BusinessType.UPDATE)
     @PostMapping("/avatar")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java

@@ -6,8 +6,8 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.model.RegisterBody;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.SysRegisterService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author Lion Li
  */
 @Validated
-@Api(value = "注册验证控制器", tags = {"注册验证管理"})
+@Tag(name ="注册验证控制器", description = "注册验证管理")
 @RequiredArgsConstructor
 @RestController
 public class SysRegisterController extends BaseController {
@@ -29,7 +29,7 @@ public class SysRegisterController extends BaseController {
     private final ISysConfigService configService;
 
     @Anonymous
-    @ApiOperation("用户注册")
+    @Operation(summary = "用户注册")
     @PostMapping("/register")
     public R<Void> register(@Validated @RequestBody RegisterBody user) {
         if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -5,8 +5,8 @@ import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
@@ -18,7 +18,11 @@ import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.service.SysPermissionService;
-import io.swagger.annotations.*;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -32,7 +36,7 @@ import java.util.List;
  * @author Lion Li
  */
 @Validated
-@Api(value = "角色信息控制器", tags = {"角色信息管理"})
+@Tag(name ="角色信息控制器", description = "角色信息管理")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/role")
@@ -42,14 +46,14 @@ public class SysRoleController extends BaseController {
     private final ISysUserService userService;
     private final SysPermissionService permissionService;
 
-    @ApiOperation("查询角色信息列表")
+    @Operation(summary = "查询角色信息列表")
     @SaCheckPermission("system:role:list")
     @GetMapping("/list")
     public TableDataInfo<SysRole> list(SysRole role, PageQuery pageQuery) {
         return roleService.selectPageRoleList(role, pageQuery);
     }
 
-    @ApiOperation("导出角色信息列表")
+    @Operation(summary = "导出角色信息列表")
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:role:export")
     @PostMapping("/export")
@@ -61,10 +65,10 @@ public class SysRoleController extends BaseController {
     /**
      * 根据角色编号获取详细信息
      */
-    @ApiOperation("根据角色编号获取详细信息")
+    @Operation(summary = "根据角色编号获取详细信息")
     @SaCheckPermission("system:role:query")
     @GetMapping(value = "/{roleId}")
-    public R<SysRole> getInfo(@ApiParam("角色ID") @PathVariable Long roleId) {
+    public R<SysRole> getInfo(@Parameter(name = "角色ID") @PathVariable Long roleId) {
         roleService.checkRoleDataScope(roleId);
         return R.ok(roleService.selectRoleById(roleId));
     }
@@ -72,7 +76,7 @@ public class SysRoleController extends BaseController {
     /**
      * 新增角色
      */
-    @ApiOperation("新增角色")
+    @Operation(summary = "新增角色")
     @SaCheckPermission("system:role:add")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -89,7 +93,7 @@ public class SysRoleController extends BaseController {
     /**
      * 修改保存角色
      */
-    @ApiOperation("修改保存角色")
+    @Operation(summary = "修改保存角色")
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -118,7 +122,7 @@ public class SysRoleController extends BaseController {
     /**
      * 修改保存数据权限
      */
-    @ApiOperation("修改保存数据权限")
+    @Operation(summary = "修改保存数据权限")
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/dataScope")
@@ -131,7 +135,7 @@ public class SysRoleController extends BaseController {
     /**
      * 状态修改
      */
-    @ApiOperation("状态修改")
+    @Operation(summary = "状态修改")
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
@@ -144,18 +148,18 @@ public class SysRoleController extends BaseController {
     /**
      * 删除角色
      */
-    @ApiOperation("删除角色")
+    @Operation(summary = "删除角色")
     @SaCheckPermission("system:role:remove")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{roleIds}")
-    public R<Void> remove(@ApiParam("角色ID串") @PathVariable Long[] roleIds) {
+    public R<Void> remove(@Parameter(name = "角色ID串") @PathVariable Long[] roleIds) {
         return toAjax(roleService.deleteRoleByIds(roleIds));
     }
 
     /**
      * 获取角色选择框列表
      */
-    @ApiOperation("获取角色选择框列表")
+    @Operation(summary = "获取角色选择框列表")
     @SaCheckPermission("system:role:query")
     @GetMapping("/optionselect")
     public R<List<SysRole>> optionselect() {
@@ -165,7 +169,7 @@ public class SysRoleController extends BaseController {
     /**
      * 查询已分配用户角色列表
      */
-    @ApiOperation("查询已分配用户角色列表")
+    @Operation(summary = "查询已分配用户角色列表")
     @SaCheckPermission("system:role:list")
     @GetMapping("/authUser/allocatedList")
     public TableDataInfo<SysUser> allocatedList(SysUser user, PageQuery pageQuery) {
@@ -175,7 +179,7 @@ public class SysRoleController extends BaseController {
     /**
      * 查询未分配用户角色列表
      */
-    @ApiOperation("查询未分配用户角色列表")
+    @Operation(summary = "查询未分配用户角色列表")
     @SaCheckPermission("system:role:list")
     @GetMapping("/authUser/unallocatedList")
     public TableDataInfo<SysUser> unallocatedList(SysUser user, PageQuery pageQuery) {
@@ -185,7 +189,7 @@ public class SysRoleController extends BaseController {
     /**
      * 取消授权用户
      */
-    @ApiOperation("取消授权用户")
+    @Operation(summary = "取消授权用户")
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancel")
@@ -196,10 +200,10 @@ public class SysRoleController extends BaseController {
     /**
      * 批量取消授权用户
      */
-    @ApiOperation("批量取消授权用户")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "roleId", value = "角色ID", paramType = "query", dataTypeClass = String.class),
-        @ApiImplicitParam(name = "userIds", value = "用户ID串", paramType = "query", dataTypeClass = String.class)
+    @Operation(summary = "批量取消授权用户")
+    @Parameters({
+        @Parameter(name = "roleId", description = "角色ID", in = ParameterIn.QUERY),
+        @Parameter(name = "userIds", description = "用户ID串", in = ParameterIn.QUERY)
     })
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
@@ -211,10 +215,10 @@ public class SysRoleController extends BaseController {
     /**
      * 批量选择用户授权
      */
-    @ApiOperation("批量选择用户授权")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "roleId", value = "角色ID", paramType = "query", dataTypeClass = String.class),
-        @ApiImplicitParam(name = "userIds", value = "用户ID串", paramType = "query", dataTypeClass = String.class)
+    @Operation(summary = "批量选择用户授权")
+    @Parameters({
+        @Parameter(name = "roleId", description = "角色ID", in = ParameterIn.QUERY),
+        @Parameter(name = "userIds", description = "用户ID串", in = ParameterIn.QUERY)
     })
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -26,7 +26,11 @@ import com.ruoyi.system.listener.SysUserImportListener;
 import com.ruoyi.system.service.ISysPostService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
-import io.swagger.annotations.*;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -44,7 +48,7 @@ import java.util.Map;
  * @author Lion Li
  */
 @Validated
-@Api(value = "用户信息控制器", tags = {"用户信息管理"})
+@Tag(name ="用户信息控制器", description = "用户信息管理")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/user")
@@ -57,14 +61,14 @@ public class SysUserController extends BaseController {
     /**
      * 获取用户列表
      */
-    @ApiOperation("获取用户列表")
+    @Operation(summary = "获取用户列表")
     @SaCheckPermission("system:user:list")
     @GetMapping("/list")
     public TableDataInfo<SysUser> list(SysUser user, PageQuery pageQuery) {
         return userService.selectPageUserList(user, pageQuery);
     }
 
-    @ApiOperation("导出用户列表")
+    @Operation(summary = "导出用户列表")
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:user:export")
     @PostMapping("/export")
@@ -82,9 +86,9 @@ public class SysUserController extends BaseController {
         ExcelUtil.exportExcel(listVo, "用户数据", SysUserExportVo.class, response);
     }
 
-    @ApiOperation("导入用户列表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "file", value = "导入文件", dataType = "java.io.File", required = true),
+    @Operation(summary = "导入用户列表")
+    @Parameters({
+        @Parameter(name = "file", description = "导入文件", required = true),
     })
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
     @SaCheckPermission("system:user:import")
@@ -94,7 +98,7 @@ public class SysUserController extends BaseController {
         return R.ok(result.getAnalysis());
     }
 
-    @ApiOperation("下载导入模板")
+    @Operation(summary = "下载导入模板")
     @PostMapping("/importTemplate")
     public void importTemplate(HttpServletResponse response) {
         ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", SysUserImportVo.class, response);
@@ -103,10 +107,10 @@ public class SysUserController extends BaseController {
     /**
      * 根据用户编号获取详细信息
      */
-    @ApiOperation("根据用户编号获取详细信息")
+    @Operation(summary = "根据用户编号获取详细信息")
     @SaCheckPermission("system:user:query")
     @GetMapping(value = {"/", "/{userId}"})
-    public R<Map<String, Object>> getInfo(@ApiParam("用户ID") @PathVariable(value = "userId", required = false) Long userId) {
+    public R<Map<String, Object>> getInfo(@Parameter(name = "用户ID") @PathVariable(value = "userId", required = false) Long userId) {
         userService.checkUserDataScope(userId);
         Map<String, Object> ajax = new HashMap<>();
         List<SysRole> roles = roleService.selectRoleAll();
@@ -124,7 +128,7 @@ public class SysUserController extends BaseController {
     /**
      * 新增用户
      */
-    @ApiOperation("新增用户")
+    @Operation(summary = "新增用户")
     @SaCheckPermission("system:user:add")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -145,7 +149,7 @@ public class SysUserController extends BaseController {
     /**
      * 修改用户
      */
-    @ApiOperation("修改用户")
+    @Operation(summary = "修改用户")
     @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -165,11 +169,11 @@ public class SysUserController extends BaseController {
     /**
      * 删除用户
      */
-    @ApiOperation("删除用户")
+    @Operation(summary = "删除用户")
     @SaCheckPermission("system:user:remove")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
-    public R<Void> remove(@ApiParam("角色ID串") @PathVariable Long[] userIds) {
+    public R<Void> remove(@Parameter(name = "角色ID串") @PathVariable Long[] userIds) {
         if (ArrayUtil.contains(userIds, getUserId())) {
             return R.fail("当前用户不能删除");
         }
@@ -179,7 +183,7 @@ public class SysUserController extends BaseController {
     /**
      * 重置密码
      */
-    @ApiOperation("重置密码")
+    @Operation(summary = "重置密码")
     @SaCheckPermission("system:user:resetPwd")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
@@ -193,7 +197,7 @@ public class SysUserController extends BaseController {
     /**
      * 状态修改
      */
-    @ApiOperation("状态修改")
+    @Operation(summary = "状态修改")
     @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
@@ -206,10 +210,10 @@ public class SysUserController extends BaseController {
     /**
      * 根据用户编号获取授权角色
      */
-    @ApiOperation("根据用户编号获取授权角色")
+    @Operation(summary = "根据用户编号获取授权角色")
     @SaCheckPermission("system:user:query")
     @GetMapping("/authRole/{userId}")
-    public R<Map<String, Object>> authRole(@ApiParam("用户ID") @PathVariable("userId") Long userId) {
+    public R<Map<String, Object>> authRole(@Parameter(name = "用户ID") @PathVariable("userId") Long userId) {
         SysUser user = userService.selectUserById(userId);
         List<SysRole> roles = roleService.selectRolesByUserId(userId);
         Map<String, Object> ajax = new HashMap<>();
@@ -221,10 +225,10 @@ public class SysUserController extends BaseController {
     /**
      * 用户授权角色
      */
-    @ApiOperation("用户授权角色")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "userId", value = "用户Id", paramType = "query", dataTypeClass = String.class),
-        @ApiImplicitParam(name = "roleIds", value = "角色ID串", paramType = "query", dataTypeClass = String.class)
+    @Operation(summary = "用户授权角色")
+    @Parameters({
+        @Parameter(name = "userId", description = "用户Id", in = ParameterIn.QUERY),
+        @Parameter(name = "roleIds", description = "角色ID串", in = ParameterIn.QUERY)
     })
     @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)

ruoyi-admin/src/main/resources/application.yml

@@ -126,9 +126,8 @@ security:
     # swagger 文档配置
     - /favicon.ico
     - /doc.html
-    - /swagger-resources/**
-    - /webjars/**
-    - /*/api-docs
+    - /swagger-ui/**
+    - /*/api-docs/**
     # druid 监控配置
     - /druid/**
     # actuator 监控配置
@@ -183,46 +182,45 @@ mybatis-plus:
 swagger:
   # 是否开启swagger
   enabled: true
-  # 请求前缀
-  pathMapping: /dev-api
-  # 标题
-  title: '标题：${ruoyi.name}后台管理系统_接口文档'
-  # 描述
-  description: '描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...'
-  # 版本
-  version: '版本号: ${ruoyi-vue-plus.version}'
-  # 作者信息
-  contact:
-    name: Lion Li
-    email: crazylionli@163.com
-    url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
-  groups:
-    - name: 1.演示案例
-      basePackage: com.ruoyi.demo
-    - name: 2.系统模块
-      basePackage: com.ruoyi.web
-    - name: 3.代码生成模块
-      basePackage: com.ruoyi.generator
+  info:
+    # 标题
+    title: '标题：${ruoyi.name}后台管理系统_接口文档'
+    # 描述
+    description: '描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...'
+    # 版本
+    version: '版本号: ${ruoyi-vue-plus.version}'
+    # 作者信息
+    contact:
+      name: Lion Li
+      email: crazylionli@163.com
+      url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
+  components:
+    # 鉴权方式配置
+    security-schemes:
+      apiKey:
+        type: APIKEY
+        in: HEADER
+        name: ${sa-token.token-name}
 
-knife4j:
-  # 是否开启Knife4j增强模式
-  enable: true
-  # 是否开启生产环境保护策略
-  production: @knife4j.production@
-  basic:
-    enable: true
-    username: ruoyi
-    password: 123456
-  # 前端Ui的个性化配置属性
-  setting:
-    # 默认语言
-    language: zh-CN
-    # 是否显示Footer
-    enableFooter: false
-    # 是否开启动态参数调试功能
-    enableDynamicParameter: true
-    # 是否在每个Debug调试栏后显示刷新变量按钮
-    enableReloadCacheParameter: true
+springdoc:
+  swagger-ui:
+    # 修改Swagger UI路径
+    path: /doc.html
+    # 开启Swagger UI界面
+    enabled: true
+  api-docs:
+    # 修改api-docs路径
+    path: /v3/api-docs
+    # 开启api-docs
+    enabled: true
+  #这里定义了两个分组，可定义多个，也可以不定义
+  group-configs:
+    - group: 演示模块
+      packages-to-scan: com.ruoyi.demo
+    - group: 系统模块
+      packages-to-scan: com.ruoyi.web
+    - group: 代码生成模块
+      packages-to-scan: com.ruoyi.generator
 
 # 防止XSS攻击
 xss: