From d9e54388e7fde2462e8b7e0165c5e7da3f202593 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 07 七月 2022 19:07:59 +0800
Subject: [PATCH] add 整合 springdoc-openapi-javadoc 基于代码注释生成文档
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java | 11 -
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java | 7
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 7
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java | 8
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java | 8
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java | 5
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java | 12 -
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java | 13 -
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java | 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 7
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java | 11 -
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java | 3
ruoyi-generator/src/main/resources/vm/java/controller.java.vm | 7
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 23 --
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java | 3
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java | 15 -
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java | 3
ruoyi-generator/src/main/resources/vm/java/bo.java.vm | 3
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java | 4
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java | 7
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java | 15 -
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java | 10 -
ruoyi-admin/src/main/resources/application.yml | 6
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java | 3
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java | 8
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java | 6
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java | 3
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java | 4
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java | 10 -
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java | 5
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java | 4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java | 16 -
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java | 4
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java | 6
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java | 3
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java | 7
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java | 20 --
pom.xml | 18 +
ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java | 8
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java | 9
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java | 12 -
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java | 2
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java | 4
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java | 6
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 13 -
ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java | 15 -
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java | 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java | 4
ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java | 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java | 8
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java | 4
ruoyi-common/pom.xml | 5
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java | 12 -
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java | 7
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java | 2
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 15 -
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java | 9
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java | 9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java | 8
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java | 6
ruoyi-generator/src/main/resources/vm/java/vo.java.vm | 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java | 6
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java | 3
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java | 9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java | 6
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java | 5
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java | 10 -
79 files changed, 26 insertions(+), 548 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9aa357e..8d9a17f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,12 @@
</dependency>
<dependency>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-javadoc</artifactId>
+ <version>1.6.9</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>${poi.version}</version>
@@ -326,6 +332,18 @@
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>com.github.therapi</groupId>
+ <artifactId>therapi-runtime-javadoc-scribe</artifactId>
+ <version>0.13.0</version>
+ </path>
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.18.24</version>
+ </path>
+ </annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
index 6865d16..c80315f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
@@ -19,7 +19,6 @@
import com.ruoyi.sms.core.SmsTemplate;
import com.ruoyi.sms.entity.SmsResult;
import com.ruoyi.system.service.ISysConfigService;
-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;
@@ -53,7 +52,6 @@
/**
* 鐭俊楠岃瘉鐮�
*/
- @Operation(summary = "鐭俊楠岃瘉鐮�")
@GetMapping("/captchaSms")
public R<Void> smsCaptcha(@Parameter(name = "鐢ㄦ埛鎵嬫満鍙�")
@NotBlank(message = "{user.phonenumber.not.blank}")
@@ -80,7 +78,6 @@
/**
* 鐢熸垚楠岃瘉鐮�
*/
- @Operation(summary = "鐢熸垚楠岃瘉鐮�")
@GetMapping("/captchaImage")
public R<Map<String, Object>> getCode() {
Map<String, Object> ajax = new HashMap<>();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
index e0dad9f..b394412 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
@@ -5,7 +5,6 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysCache;
-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;
@@ -41,7 +40,6 @@
CACHES.add(new SysCache(CacheConstants.RATE_LIMIT_KEY, "闄愭祦澶勭悊"));
}
- @Operation(summary = "鑾峰彇缂撳瓨鐩戞帶璇︾粏淇℃伅")
@SaCheckPermission("monitor:cache:list")
@GetMapping()
public R<Map<String, Object>> getInfo() throws Exception {
@@ -67,14 +65,12 @@
return R.ok(result);
}
- @Operation(summary = "鑾峰彇缂撳瓨鍚嶇О鍒楄〃")
@SaCheckPermission("monitor:cache:list")
@GetMapping("/getNames")
public R<List<SysCache>> cache() {
return R.ok(CACHES);
}
- @Operation(summary = "鑾峰彇KEYS鍩轰簬缂撳瓨鍚�")
@SaCheckPermission("monitor:cache:list")
@GetMapping("/getKeys/{cacheName}")
public R<Set<String>> getCacheKeys(@PathVariable String cacheName) {
@@ -82,7 +78,6 @@
return R.ok(cacheKyes);
}
- @Operation(summary = "鑾峰彇鍊煎熀浜庣紦瀛樺悕涓嶬EY")
@SaCheckPermission("monitor:cache:list")
@GetMapping("/getValue/{cacheName}/{cacheKey}")
public R<SysCache> getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey) {
@@ -91,7 +86,6 @@
return R.ok(sysCache);
}
- @Operation(summary = "娓呯┖缂撳瓨鍚�")
@SaCheckPermission("monitor:cache:list")
@DeleteMapping("/clearCacheName/{cacheName}")
public R<Void> clearCacheName(@PathVariable String cacheName) {
@@ -100,7 +94,6 @@
return R.ok();
}
- @Operation(summary = "娓呯┖缂撳瓨KEY")
@SaCheckPermission("monitor:cache:list")
@DeleteMapping("/clearCacheKey/{cacheKey}")
public R<Void> clearCacheKey(@PathVariable String cacheKey) {
@@ -108,7 +101,6 @@
return R.ok();
}
- @Operation(summary = "娓呯┖鎵�鏈夌紦瀛�")
@SaCheckPermission("monitor:cache:list")
@DeleteMapping("/clearCacheAll")
public R<Void> clearCacheAll() {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
index 6e2eaae..4b82b4a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
@@ -10,7 +10,6 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.system.service.ISysLogininforService;
-import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -33,14 +32,12 @@
private final ISysLogininforService logininforService;
- @Operation(summary = "鏌ヨ绯荤粺璁块棶璁板綍鍒楄〃")
@SaCheckPermission("monitor:logininfor:list")
@GetMapping("/list")
public TableDataInfo<SysLogininfor> list(SysLogininfor logininfor, PageQuery pageQuery) {
return logininforService.selectPageLogininforList(logininfor, pageQuery);
}
- @Operation(summary = "瀵煎嚭绯荤粺璁块棶璁板綍鍒楄〃")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.EXPORT)
@SaCheckPermission("monitor:logininfor:export")
@PostMapping("/export")
@@ -49,7 +46,6 @@
ExcelUtil.exportExcel(list, "鐧诲綍鏃ュ織", SysLogininfor.class, response);
}
- @Operation(summary = "鍒犻櫎绯荤粺璁块棶璁板綍")
@SaCheckPermission("monitor:logininfor:remove")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.DELETE)
@DeleteMapping("/{infoIds}")
@@ -57,7 +53,6 @@
return toAjax(logininforService.deleteLogininforByIds(infoIds));
}
- @Operation(summary = "娓呯┖绯荤粺璁块棶璁板綍")
@SaCheckPermission("monitor:logininfor:remove")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
index 290c6e4..d7dcff4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
@@ -10,7 +10,6 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.service.ISysOperLogService;
-import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -33,14 +32,12 @@
private final ISysOperLogService operLogService;
- @Operation(summary = "鏌ヨ鎿嶄綔鏃ュ織璁板綍鍒楄〃")
@SaCheckPermission("monitor:operlog:list")
@GetMapping("/list")
public TableDataInfo<SysOperLog> list(SysOperLog operLog, PageQuery pageQuery) {
return operLogService.selectPageOperLogList(operLog, pageQuery);
}
- @Operation(summary = "瀵煎嚭鎿嶄綔鏃ュ織璁板綍鍒楄〃")
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.EXPORT)
@SaCheckPermission("monitor:operlog:export")
@PostMapping("/export")
@@ -49,7 +46,6 @@
ExcelUtil.exportExcel(list, "鎿嶄綔鏃ュ織", SysOperLog.class, response);
}
- @Operation(summary = "鍒犻櫎鎿嶄綔鏃ュ織璁板綍")
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.DELETE)
@SaCheckPermission("monitor:operlog:remove")
@DeleteMapping("/{operIds}")
@@ -57,7 +53,6 @@
return toAjax(operLogService.deleteOperLogByIds(operIds));
}
- @Operation(summary = "娓呯┖鎿嶄綔鏃ュ織璁板綍")
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.CLEAN)
@SaCheckPermission("monitor:operlog:remove")
@DeleteMapping("/clean")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
index d5bcc13..f35549c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
@@ -15,7 +15,6 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.redis.RedisUtils;
import com.ruoyi.system.domain.SysUserOnline;
-import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -35,7 +34,6 @@
@RequestMapping("/monitor/online")
public class SysUserOnlineController extends BaseController {
- @Operation(summary = "鍦ㄧ嚎鐢ㄦ埛鍒楄〃")
@SaCheckPermission("monitor:online:list")
@GetMapping("/list")
public TableDataInfo<SysUserOnline> list(String ipaddr, String userName) {
@@ -73,7 +71,6 @@
/**
* 寮洪��鐢ㄦ埛
*/
- @Operation(summary = "寮洪��鐢ㄦ埛")
@SaCheckPermission("monitor:online:forceLogout")
@Log(title = "鍦ㄧ嚎鐢ㄦ埛", businessType = BusinessType.FORCE)
@DeleteMapping("/{tokenId}")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
index ce73439..3e26979 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
@@ -11,7 +11,6 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
-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;
@@ -38,14 +37,12 @@
/**
* 鑾峰彇鍙傛暟閰嶇疆鍒楄〃
*/
- @Operation(summary = "鑾峰彇鍙傛暟閰嶇疆鍒楄〃")
@SaCheckPermission("system:config:list")
@GetMapping("/list")
public TableDataInfo<SysConfig> list(SysConfig config, PageQuery pageQuery) {
return configService.selectPageConfigList(config, pageQuery);
}
- @Operation(summary = "瀵煎嚭鍙傛暟閰嶇疆鍒楄〃")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.EXPORT)
@SaCheckPermission("system:config:export")
@PostMapping("/export")
@@ -57,7 +54,6 @@
/**
* 鏍规嵁鍙傛暟缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @Operation(summary = "鏍规嵁鍙傛暟缂栧彿鑾峰彇璇︾粏淇℃伅")
@SaCheckPermission("system:config:query")
@GetMapping(value = "/{configId}")
public R<SysConfig> getInfo(@Parameter(name = "鍙傛暟ID") @PathVariable Long configId) {
@@ -67,7 +63,6 @@
/**
* 鏍规嵁鍙傛暟閿悕鏌ヨ鍙傛暟鍊�
*/
- @Operation(summary = "鏍规嵁鍙傛暟閿悕鏌ヨ鍙傛暟鍊�")
@GetMapping(value = "/configKey/{configKey}")
public R<Void> getConfigKey(@Parameter(name = "鍙傛暟Key") @PathVariable String configKey) {
return R.ok(configService.selectConfigByKey(configKey));
@@ -76,7 +71,6 @@
/**
* 鏂板鍙傛暟閰嶇疆
*/
- @Operation(summary = "鏂板鍙傛暟閰嶇疆")
@SaCheckPermission("system:config:add")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
@@ -90,7 +84,6 @@
/**
* 淇敼鍙傛暟閰嶇疆
*/
- @Operation(summary = "淇敼鍙傛暟閰嶇疆")
@SaCheckPermission("system:config:edit")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
@@ -104,7 +97,6 @@
/**
* 鏍规嵁鍙傛暟閿悕淇敼鍙傛暟閰嶇疆
*/
- @Operation(summary = "鏍规嵁鍙傛暟閿悕淇敼鍙傛暟閰嶇疆")
@SaCheckPermission("system:config:edit")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/updateByKey")
@@ -115,7 +107,6 @@
/**
* 鍒犻櫎鍙傛暟閰嶇疆
*/
- @Operation(summary = "鍒犻櫎鍙傛暟閰嶇疆")
@SaCheckPermission("system:config:remove")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{configIds}")
@@ -127,7 +118,6 @@
/**
* 鍒锋柊鍙傛暟缂撳瓨
*/
- @Operation(summary = "鍒锋柊鍙傛暟缂撳瓨")
@SaCheckPermission("system:config:remove")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.CLEAN)
@DeleteMapping("/refreshCache")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
index e99e330..3dedb11 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
@@ -11,7 +11,6 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysDeptService;
-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;
@@ -39,7 +38,6 @@
/**
* 鑾峰彇閮ㄩ棬鍒楄〃
*/
- @Operation(summary = "鑾峰彇閮ㄩ棬鍒楄〃")
@SaCheckPermission("system:dept:list")
@GetMapping("/list")
public R<List<SysDept>> list(SysDept dept) {
@@ -50,7 +48,6 @@
/**
* 鏌ヨ閮ㄩ棬鍒楄〃锛堟帓闄よ妭鐐癸級
*/
- @Operation(summary = "鏌ヨ閮ㄩ棬鍒楄〃锛堟帓闄よ妭鐐癸級")
@SaCheckPermission("system:dept:list")
@GetMapping("/list/exclude/{deptId}")
public R<List<SysDept>> excludeChild(@Parameter(name = "閮ㄩ棬ID") @PathVariable(value = "deptId", required = false) Long deptId) {
@@ -63,7 +60,6 @@
/**
* 鏍规嵁閮ㄩ棬缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @Operation(summary = "鏍规嵁閮ㄩ棬缂栧彿鑾峰彇璇︾粏淇℃伅")
@SaCheckPermission("system:dept:query")
@GetMapping(value = "/{deptId}")
public R<SysDept> getInfo(@Parameter(name = "閮ㄩ棬ID") @PathVariable Long deptId) {
@@ -74,7 +70,6 @@
/**
* 鑾峰彇閮ㄩ棬涓嬫媺鏍戝垪琛�
*/
- @Operation(summary = "鑾峰彇閮ㄩ棬涓嬫媺鏍戝垪琛�")
@GetMapping("/treeselect")
public R<List<Tree<Long>>> treeselect(SysDept dept) {
List<SysDept> depts = deptService.selectDeptList(dept);
@@ -84,7 +79,6 @@
/**
* 鍔犺浇瀵瑰簲瑙掕壊閮ㄩ棬鍒楄〃鏍�
*/
- @Operation(summary = "鍔犺浇瀵瑰簲瑙掕壊閮ㄩ棬鍒楄〃鏍�")
@GetMapping(value = "/roleDeptTreeselect/{roleId}")
public R<Map<String, Object>> roleDeptTreeselect(@Parameter(name = "瑙掕壊ID") @PathVariable("roleId") Long roleId) {
List<SysDept> depts = deptService.selectDeptList(new SysDept());
@@ -97,7 +91,6 @@
/**
* 鏂板閮ㄩ棬
*/
- @Operation(summary = "鏂板閮ㄩ棬")
@SaCheckPermission("system:dept:add")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
@@ -111,7 +104,6 @@
/**
* 淇敼閮ㄩ棬
*/
- @Operation(summary = "淇敼閮ㄩ棬")
@SaCheckPermission("system:dept:edit")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
@@ -132,7 +124,6 @@
/**
* 鍒犻櫎閮ㄩ棬
*/
- @Operation(summary = "鍒犻櫎閮ㄩ棬")
@SaCheckPermission("system:dept:remove")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{deptId}")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
index a6ef304..a659f6d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
@@ -12,7 +12,6 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysDictTypeService;
-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;
@@ -38,14 +37,12 @@
private final ISysDictDataService dictDataService;
private final ISysDictTypeService dictTypeService;
- @Operation(summary = "鏌ヨ瀛楀吀鏁版嵁鍒楄〃")
@SaCheckPermission("system:dict:list")
@GetMapping("/list")
public TableDataInfo<SysDictData> list(SysDictData dictData, PageQuery pageQuery) {
return dictDataService.selectPageDictDataList(dictData, pageQuery);
}
- @Operation(summary = "瀵煎嚭瀛楀吀鏁版嵁鍒楄〃")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.EXPORT)
@SaCheckPermission("system:dict:export")
@PostMapping("/export")
@@ -57,7 +54,6 @@
/**
* 鏌ヨ瀛楀吀鏁版嵁璇︾粏
*/
- @Operation(summary = "鏌ヨ瀛楀吀鏁版嵁璇︾粏")
@SaCheckPermission("system:dict:query")
@GetMapping(value = "/{dictCode}")
public R<SysDictData> getInfo(@Parameter(name = "瀛楀吀code") @PathVariable Long dictCode) {
@@ -67,7 +63,6 @@
/**
* 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅
*/
- @Operation(summary = "鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅")
@GetMapping(value = "/type/{dictType}")
public R<List<SysDictData>> dictType(@Parameter(name = "瀛楀吀绫诲瀷") @PathVariable String dictType) {
List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
@@ -80,7 +75,6 @@
/**
* 鏂板瀛楀吀绫诲瀷
*/
- @Operation(summary = "鏂板瀛楀吀绫诲瀷")
@SaCheckPermission("system:dict:add")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.INSERT)
@PostMapping
@@ -91,7 +85,6 @@
/**
* 淇敼淇濆瓨瀛楀吀绫诲瀷
*/
- @Operation(summary = "淇敼淇濆瓨瀛楀吀绫诲瀷")
@SaCheckPermission("system:dict:edit")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.UPDATE)
@PutMapping
@@ -102,7 +95,6 @@
/**
* 鍒犻櫎瀛楀吀绫诲瀷
*/
- @Operation(summary = "鍒犻櫎瀛楀吀绫诲瀷")
@SaCheckPermission("system:dict:remove")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictCodes}")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
index b5b28f2..5cabe85 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
@@ -11,7 +11,6 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictTypeService;
-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;
@@ -35,14 +34,12 @@
private final ISysDictTypeService dictTypeService;
- @Operation(summary = "鏌ヨ瀛楀吀绫诲瀷鍒楄〃")
@SaCheckPermission("system:dict:list")
@GetMapping("/list")
public TableDataInfo<SysDictType> list(SysDictType dictType, PageQuery pageQuery) {
return dictTypeService.selectPageDictTypeList(dictType, pageQuery);
}
- @Operation(summary = "瀵煎嚭瀛楀吀绫诲瀷鍒楄〃")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.EXPORT)
@SaCheckPermission("system:dict:export")
@PostMapping("/export")
@@ -54,7 +51,6 @@
/**
* 鏌ヨ瀛楀吀绫诲瀷璇︾粏
*/
- @Operation(summary = "鏌ヨ瀛楀吀绫诲瀷璇︾粏")
@SaCheckPermission("system:dict:query")
@GetMapping(value = "/{dictId}")
public R<SysDictType> getInfo(@Parameter(name = "瀛楀吀ID") @PathVariable Long dictId) {
@@ -64,7 +60,6 @@
/**
* 鏂板瀛楀吀绫诲瀷
*/
- @Operation(summary = "鏂板瀛楀吀绫诲瀷")
@SaCheckPermission("system:dict:add")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.INSERT)
@PostMapping
@@ -78,7 +73,6 @@
/**
* 淇敼瀛楀吀绫诲瀷
*/
- @Operation(summary = "淇敼瀛楀吀绫诲瀷")
@SaCheckPermission("system:dict:edit")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.UPDATE)
@PutMapping
@@ -92,7 +86,6 @@
/**
* 鍒犻櫎瀛楀吀绫诲瀷
*/
- @Operation(summary = "鍒犻櫎瀛楀吀绫诲瀷")
@SaCheckPermission("system:dict:remove")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictIds}")
@@ -104,7 +97,6 @@
/**
* 鍒锋柊瀛楀吀缂撳瓨
*/
- @Operation(summary = "鍒锋柊瀛楀吀缂撳瓨")
@SaCheckPermission("system:dict:remove")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.CLEAN)
@DeleteMapping("/refreshCache")
@@ -116,7 +108,6 @@
/**
* 鑾峰彇瀛楀吀閫夋嫨妗嗗垪琛�
*/
- @Operation(summary = "鑾峰彇瀛楀吀閫夋嫨妗嗗垪琛�")
@GetMapping("/optionselect")
public R<List<SysDictType>> optionselect() {
List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
index db2c7ae..11d0d50 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
@@ -2,7 +2,6 @@
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.utils.StringUtils;
-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;
@@ -26,7 +25,6 @@
/**
* 璁块棶棣栭〉锛屾彁绀鸿
*/
- @Operation(summary = "璁块棶棣栭〉锛屾彁绀鸿")
@GetMapping("/")
public String index() {
return StringUtils.format("娆㈣繋浣跨敤{}鍚庡彴绠＄悊妗嗘灦锛屽綋鍓嶇増鏈細v{}锛岃閫氳繃鍓嶇鍦板潃璁块棶銆�", ruoyiConfig.getName(), ruoyiConfig.getVersion());
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index d0b3152..4cd9053 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -13,7 +13,6 @@
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.SysLoginService;
import com.ruoyi.system.service.SysPermissionService;
-import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -51,7 +50,6 @@
* @return 缁撴灉
*/
@Anonymous
- @Operation(summary = "鐧诲綍鏂规硶")
@PostMapping("/login")
public R<Map<String, Object>> login(@Validated @RequestBody LoginBody loginBody) {
Map<String, Object> ajax = new HashMap<>();
@@ -69,7 +67,6 @@
* @return 缁撴灉
*/
@Anonymous
- @Operation(summary = "鐭俊鐧诲綍(绀轰緥)")
@PostMapping("/smsLogin")
public R<Map<String, Object>> smsLogin(@Validated @RequestBody SmsLoginBody smsLoginBody) {
Map<String, Object> ajax = new HashMap<>();
@@ -86,7 +83,6 @@
* @return 缁撴灉
*/
@Anonymous
- @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 +93,6 @@
}
@Anonymous
- @Operation(summary = "鐧诲嚭鏂规硶")
@PostMapping("/logout")
public R<Void> logout() {
loginService.logout();
@@ -109,7 +104,6 @@
*
* @return 鐢ㄦ埛淇℃伅
*/
- @Operation(summary = "鑾峰彇鐢ㄦ埛淇℃伅")
@GetMapping("getInfo")
public R<Map<String, Object>> getInfo() {
SysUser user = userService.selectUserById(LoginHelper.getUserId());
@@ -129,7 +123,6 @@
*
* @return 璺敱淇℃伅
*/
- @Operation(summary = "鑾峰彇璺敱淇℃伅")
@GetMapping("getRouters")
public R<List<RouterVo>> getRouters() {
Long userId = LoginHelper.getUserId();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
index 40c03d1..1e87e67 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
@@ -10,7 +10,6 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysMenuService;
-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;
@@ -38,7 +37,6 @@
/**
* 鑾峰彇鑿滃崟鍒楄〃
*/
- @Operation(summary = "鑾峰彇鑿滃崟鍒楄〃")
@SaCheckPermission("system:menu:list")
@GetMapping("/list")
public R<List<SysMenu>> list(SysMenu menu) {
@@ -49,7 +47,6 @@
/**
* 鏍规嵁鑿滃崟缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @Operation(summary = "鏍规嵁鑿滃崟缂栧彿鑾峰彇璇︾粏淇℃伅")
@SaCheckPermission("system:menu:query")
@GetMapping(value = "/{menuId}")
public R<SysMenu> getInfo(@Parameter(name = "鑿滃崟ID") @PathVariable Long menuId) {
@@ -59,7 +56,6 @@
/**
* 鑾峰彇鑿滃崟涓嬫媺鏍戝垪琛�
*/
- @Operation(summary = "鑾峰彇鑿滃崟涓嬫媺鏍戝垪琛�")
@GetMapping("/treeselect")
public R<List<Tree<Long>>> treeselect(SysMenu menu) {
List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
@@ -69,7 +65,6 @@
/**
* 鍔犺浇瀵瑰簲瑙掕壊鑿滃崟鍒楄〃鏍�
*/
- @Operation(summary = "鍔犺浇瀵瑰簲瑙掕壊鑿滃崟鍒楄〃鏍�")
@GetMapping(value = "/roleMenuTreeselect/{roleId}")
public R<Map<String, Object>> roleMenuTreeselect(@Parameter(name = "瑙掕壊ID") @PathVariable("roleId") Long roleId) {
List<SysMenu> menus = menuService.selectMenuList(getUserId());
@@ -82,7 +77,6 @@
/**
* 鏂板鑿滃崟
*/
- @Operation(summary = "鏂板鑿滃崟")
@SaCheckPermission("system:menu:add")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
@@ -98,7 +92,6 @@
/**
* 淇敼鑿滃崟
*/
- @Operation(summary = "淇敼鑿滃崟")
@SaCheckPermission("system:menu:edit")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
@@ -116,7 +109,6 @@
/**
* 鍒犻櫎鑿滃崟
*/
- @Operation(summary = "鍒犻櫎鑿滃崟")
@SaCheckPermission("system:menu:remove")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{menuId}")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
index de804cf..10a8371 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
@@ -9,7 +9,6 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.SysNotice;
import com.ruoyi.system.service.ISysNoticeService;
-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;
@@ -33,7 +32,6 @@
/**
* 鑾峰彇閫氱煡鍏憡鍒楄〃
*/
- @Operation(summary = "鑾峰彇閫氱煡鍏憡鍒楄〃")
@SaCheckPermission("system:notice:list")
@GetMapping("/list")
public TableDataInfo<SysNotice> list(SysNotice notice, PageQuery pageQuery) {
@@ -43,7 +41,6 @@
/**
* 鏍规嵁閫氱煡鍏憡缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @Operation(summary = "鏍规嵁閫氱煡鍏憡缂栧彿鑾峰彇璇︾粏淇℃伅")
@SaCheckPermission("system:notice:query")
@GetMapping(value = "/{noticeId}")
public R<SysNotice> getInfo(@Parameter(name = "鍏憡ID") @PathVariable Long noticeId) {
@@ -53,7 +50,6 @@
/**
* 鏂板閫氱煡鍏憡
*/
- @Operation(summary = "鏂板閫氱煡鍏憡")
@SaCheckPermission("system:notice:add")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.INSERT)
@PostMapping
@@ -64,7 +60,6 @@
/**
* 淇敼閫氱煡鍏憡
*/
- @Operation(summary = "淇敼閫氱煡鍏憡")
@SaCheckPermission("system:notice:edit")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.UPDATE)
@PutMapping
@@ -75,7 +70,6 @@
/**
* 鍒犻櫎閫氱煡鍏憡
*/
- @Operation(summary = "鍒犻櫎閫氱煡鍏憡")
@SaCheckPermission("system:notice:remove")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.DELETE)
@DeleteMapping("/{noticeIds}")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
index bb27c84..023f349 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
@@ -14,7 +14,6 @@
import com.ruoyi.system.domain.bo.SysOssConfigBo;
import com.ruoyi.system.domain.vo.SysOssConfigVo;
import com.ruoyi.system.service.ISysOssConfigService;
-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;
@@ -44,7 +43,6 @@
/**
* 鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃
*/
- @Operation(summary = "鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃")
@SaCheckPermission("system:oss:list")
@GetMapping("/list")
public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) {
@@ -54,7 +52,6 @@
/**
* 鑾峰彇瀵硅薄瀛樺偍閰嶇疆璇︾粏淇℃伅
*/
- @Operation(summary = "鑾峰彇瀵硅薄瀛樺偍閰嶇疆璇︾粏淇℃伅")
@SaCheckPermission("system:oss:query")
@GetMapping("/{ossConfigId}")
public R<SysOssConfigVo> getInfo(@Parameter(name = "OSS閰嶇疆ID")
@@ -66,7 +63,6 @@
/**
* 鏂板瀵硅薄瀛樺偍閰嶇疆
*/
- @Operation(summary = "鏂板瀵硅薄瀛樺偍閰嶇疆")
@SaCheckPermission("system:oss:add")
@Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.INSERT)
@RepeatSubmit()
@@ -78,7 +74,6 @@
/**
* 淇敼瀵硅薄瀛樺偍閰嶇疆
*/
- @Operation(summary = "淇敼瀵硅薄瀛樺偍閰嶇疆")
@SaCheckPermission("system:oss:edit")
@Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@@ -90,7 +85,6 @@
/**
* 鍒犻櫎瀵硅薄瀛樺偍閰嶇疆
*/
- @Operation(summary = "鍒犻櫎瀵硅薄瀛樺偍閰嶇疆")
@SaCheckPermission("system:oss:remove")
@Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.DELETE)
@DeleteMapping("/{ossConfigIds}")
@@ -103,7 +97,6 @@
/**
* 鐘舵�佷慨鏀�
*/
- @Operation(summary = "鐘舵�佷慨鏀�")
@SaCheckPermission("system:oss:edit")
@Log(title = "瀵硅薄瀛樺偍鐘舵�佷慨鏀�", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
index e71ef9f..e40c2f5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
@@ -19,7 +19,6 @@
import com.ruoyi.system.domain.bo.SysOssBo;
import com.ruoyi.system.domain.vo.SysOssVo;
import com.ruoyi.system.service.ISysOssService;
-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;
@@ -55,7 +54,6 @@
/**
* 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃
*/
- @Operation(summary = "鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃")
@SaCheckPermission("system:oss:list")
@GetMapping("/list")
public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
@@ -65,7 +63,6 @@
/**
* 鏌ヨOSS瀵硅薄鍩轰簬id涓�
*/
- @Operation(summary = "鏌ヨOSS瀵硅薄鍩轰簬ID")
@SaCheckPermission("system:oss:list")
@GetMapping("/listByIds/{ossIds}")
public R<List<SysOssVo>> listByIds(@Parameter(name = "OSS瀵硅薄ID涓�")
@@ -78,7 +75,6 @@
/**
* 涓婁紶OSS瀵硅薄瀛樺偍
*/
- @Operation(summary = "涓婁紶OSS瀵硅薄瀛樺偍")
@Parameters({
@Parameter(name = "file", description = "鏂囦欢", in = ParameterIn.QUERY, required = true)
})
@@ -97,7 +93,6 @@
return R.ok(map);
}
- @Operation(summary = "涓嬭浇OSS瀵硅薄瀛樺偍")
@SaCheckPermission("system:oss:download")
@GetMapping("/download/{ossId}")
public void download(@Parameter(name = "OSS瀵硅薄ID") @PathVariable Long ossId, HttpServletResponse response) throws IOException {
@@ -124,7 +119,6 @@
/**
* 鍒犻櫎OSS瀵硅薄瀛樺偍
*/
- @Operation(summary = "鍒犻櫎OSS瀵硅薄瀛樺偍")
@SaCheckPermission("system:oss:remove")
@Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.DELETE)
@DeleteMapping("/{ossIds}")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
index 559e6ca..a78ac4b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
@@ -11,7 +11,6 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.service.ISysPostService;
-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;
@@ -38,14 +37,12 @@
/**
* 鑾峰彇宀椾綅鍒楄〃
*/
- @Operation(summary = "鑾峰彇宀椾綅鍒楄〃")
@SaCheckPermission("system:post:list")
@GetMapping("/list")
public TableDataInfo<SysPost> list(SysPost post, PageQuery pageQuery) {
return postService.selectPagePostList(post, pageQuery);
}
- @Operation(summary = "瀵煎嚭宀椾綅鍒楄〃")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.EXPORT)
@SaCheckPermission("system:post:export")
@PostMapping("/export")
@@ -57,7 +54,6 @@
/**
* 鏍规嵁宀椾綅缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @Operation(summary = "鏍规嵁宀椾綅缂栧彿鑾峰彇璇︾粏淇℃伅")
@SaCheckPermission("system:post:query")
@GetMapping(value = "/{postId}")
public R<SysPost> getInfo(@Parameter(name = "宀椾綅ID") @PathVariable Long postId) {
@@ -67,7 +63,6 @@
/**
* 鏂板宀椾綅
*/
- @Operation(summary = "鏂板宀椾綅")
@SaCheckPermission("system:post:add")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
@@ -83,7 +78,6 @@
/**
* 淇敼宀椾綅
*/
- @Operation(summary = "淇敼宀椾綅")
@SaCheckPermission("system:post:edit")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
@@ -99,7 +93,6 @@
/**
* 鍒犻櫎宀椾綅
*/
- @Operation(summary = "鍒犻櫎宀椾綅")
@SaCheckPermission("system:post:remove")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{postIds}")
@@ -110,7 +103,6 @@
/**
* 鑾峰彇宀椾綅閫夋嫨妗嗗垪琛�
*/
- @Operation(summary = "鑾峰彇宀椾綅閫夋嫨妗嗗垪琛�")
@GetMapping("/optionselect")
public R<List<SysPost>> optionselect() {
List<SysPost> posts = postService.selectPostAll();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
index 0710e8b..bb63b07 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
@@ -14,7 +14,6 @@
import com.ruoyi.system.domain.SysOss;
import com.ruoyi.system.service.ISysOssService;
import com.ruoyi.system.service.ISysUserService;
-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;
@@ -46,7 +45,6 @@
/**
* 涓汉淇℃伅
*/
- @Operation(summary = "涓汉淇℃伅")
@GetMapping
public R<Map<String, Object>> profile() {
SysUser user = userService.selectUserById(getUserId());
@@ -60,7 +58,6 @@
/**
* 淇敼鐢ㄦ埛
*/
- @Operation(summary = "淇敼鐢ㄦ埛")
@Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> updateProfile(@RequestBody SysUser user) {
@@ -84,7 +81,6 @@
/**
* 閲嶇疆瀵嗙爜
*/
- @Operation(summary = "閲嶇疆瀵嗙爜")
@Parameters({
@Parameter(name = "oldPassword", description = "鏃у瘑鐮�", in = ParameterIn.QUERY),
@Parameter(name = "newPassword", description = "鏂板瘑鐮�", in = ParameterIn.QUERY)
@@ -111,7 +107,6 @@
/**
* 澶村儚涓婁紶
*/
- @Operation(summary = "澶村儚涓婁紶")
@Parameters({
@Parameter(name = "avatarfile", description = "鐢ㄦ埛澶村儚", in = ParameterIn.QUERY, required = true)
})
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
index 5e90ebd..cc05960 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
@@ -6,7 +6,6 @@
import com.ruoyi.common.core.domain.model.RegisterBody;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.SysRegisterService;
-import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -29,7 +28,6 @@
private final ISysConfigService configService;
@Anonymous
- @Operation(summary = "鐢ㄦ埛娉ㄥ唽")
@PostMapping("/register")
public R<Void> register(@Validated @RequestBody RegisterBody user) {
if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
index 967635e..fc0e5a7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -18,7 +18,6 @@
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.SysPermissionService;
-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;
@@ -46,14 +45,12 @@
private final ISysUserService userService;
private final SysPermissionService permissionService;
- @Operation(summary = "鏌ヨ瑙掕壊淇℃伅鍒楄〃")
@SaCheckPermission("system:role:list")
@GetMapping("/list")
public TableDataInfo<SysRole> list(SysRole role, PageQuery pageQuery) {
return roleService.selectPageRoleList(role, pageQuery);
}
- @Operation(summary = "瀵煎嚭瑙掕壊淇℃伅鍒楄〃")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.EXPORT)
@SaCheckPermission("system:role:export")
@PostMapping("/export")
@@ -65,7 +62,6 @@
/**
* 鏍规嵁瑙掕壊缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @Operation(summary = "鏍规嵁瑙掕壊缂栧彿鑾峰彇璇︾粏淇℃伅")
@SaCheckPermission("system:role:query")
@GetMapping(value = "/{roleId}")
public R<SysRole> getInfo(@Parameter(name = "瑙掕壊ID") @PathVariable Long roleId) {
@@ -76,7 +72,6 @@
/**
* 鏂板瑙掕壊
*/
- @Operation(summary = "鏂板瑙掕壊")
@SaCheckPermission("system:role:add")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
@@ -93,7 +88,6 @@
/**
* 淇敼淇濆瓨瑙掕壊
*/
- @Operation(summary = "淇敼淇濆瓨瑙掕壊")
@SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
@@ -122,7 +116,6 @@
/**
* 淇敼淇濆瓨鏁版嵁鏉冮檺
*/
- @Operation(summary = "淇敼淇濆瓨鏁版嵁鏉冮檺")
@SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/dataScope")
@@ -135,7 +128,6 @@
/**
* 鐘舵�佷慨鏀�
*/
- @Operation(summary = "鐘舵�佷慨鏀�")
@SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
@@ -148,7 +140,6 @@
/**
* 鍒犻櫎瑙掕壊
*/
- @Operation(summary = "鍒犻櫎瑙掕壊")
@SaCheckPermission("system:role:remove")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{roleIds}")
@@ -159,7 +150,6 @@
/**
* 鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�
*/
- @Operation(summary = "鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�")
@SaCheckPermission("system:role:query")
@GetMapping("/optionselect")
public R<List<SysRole>> optionselect() {
@@ -169,7 +159,6 @@
/**
* 鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�
*/
- @Operation(summary = "鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�")
@SaCheckPermission("system:role:list")
@GetMapping("/authUser/allocatedList")
public TableDataInfo<SysUser> allocatedList(SysUser user, PageQuery pageQuery) {
@@ -179,7 +168,6 @@
/**
* 鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�
*/
- @Operation(summary = "鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�")
@SaCheckPermission("system:role:list")
@GetMapping("/authUser/unallocatedList")
public TableDataInfo<SysUser> unallocatedList(SysUser user, PageQuery pageQuery) {
@@ -189,7 +177,6 @@
/**
* 鍙栨秷鎺堟潈鐢ㄦ埛
*/
- @Operation(summary = "鍙栨秷鎺堟潈鐢ㄦ埛")
@SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancel")
@@ -200,7 +187,6 @@
/**
* 鎵归噺鍙栨秷鎺堟潈鐢ㄦ埛
*/
- @Operation(summary = "鎵归噺鍙栨秷鎺堟潈鐢ㄦ埛")
@Parameters({
@Parameter(name = "roleId", description = "瑙掕壊ID", in = ParameterIn.QUERY),
@Parameter(name = "userIds", description = "鐢ㄦ埛ID涓�", in = ParameterIn.QUERY)
@@ -215,7 +201,6 @@
/**
* 鎵归噺閫夋嫨鐢ㄦ埛鎺堟潈
*/
- @Operation(summary = "鎵归噺閫夋嫨鐢ㄦ埛鎺堟潈")
@Parameters({
@Parameter(name = "roleId", description = "瑙掕壊ID", in = ParameterIn.QUERY),
@Parameter(name = "userIds", description = "鐢ㄦ埛ID涓�", in = ParameterIn.QUERY)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index f40c659..cb564b6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -26,7 +26,6 @@
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
-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;
@@ -61,14 +60,12 @@
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃
*/
- @Operation(summary = "鑾峰彇鐢ㄦ埛鍒楄〃")
@SaCheckPermission("system:user:list")
@GetMapping("/list")
public TableDataInfo<SysUser> list(SysUser user, PageQuery pageQuery) {
return userService.selectPageUserList(user, pageQuery);
}
- @Operation(summary = "瀵煎嚭鐢ㄦ埛鍒楄〃")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.EXPORT)
@SaCheckPermission("system:user:export")
@PostMapping("/export")
@@ -86,7 +83,6 @@
ExcelUtil.exportExcel(listVo, "鐢ㄦ埛鏁版嵁", SysUserExportVo.class, response);
}
- @Operation(summary = "瀵煎叆鐢ㄦ埛鍒楄〃")
@Parameters({
@Parameter(name = "file", description = "瀵煎叆鏂囦欢", required = true),
})
@@ -98,7 +94,6 @@
return R.ok(result.getAnalysis());
}
- @Operation(summary = "涓嬭浇瀵煎叆妯℃澘")
@PostMapping("/importTemplate")
public void importTemplate(HttpServletResponse response) {
ExcelUtil.exportExcel(new ArrayList<>(), "鐢ㄦ埛鏁版嵁", SysUserImportVo.class, response);
@@ -107,7 +102,6 @@
/**
* 鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇璇︾粏淇℃伅
*/
- @Operation(summary = "鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇璇︾粏淇℃伅")
@SaCheckPermission("system:user:query")
@GetMapping(value = {"/", "/{userId}"})
public R<Map<String, Object>> getInfo(@Parameter(name = "鐢ㄦ埛ID") @PathVariable(value = "userId", required = false) Long userId) {
@@ -128,7 +122,6 @@
/**
* 鏂板鐢ㄦ埛
*/
- @Operation(summary = "鏂板鐢ㄦ埛")
@SaCheckPermission("system:user:add")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
@@ -149,7 +142,6 @@
/**
* 淇敼鐢ㄦ埛
*/
- @Operation(summary = "淇敼鐢ㄦ埛")
@SaCheckPermission("system:user:edit")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
@@ -169,7 +161,6 @@
/**
* 鍒犻櫎鐢ㄦ埛
*/
- @Operation(summary = "鍒犻櫎鐢ㄦ埛")
@SaCheckPermission("system:user:remove")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{userIds}")
@@ -183,7 +174,6 @@
/**
* 閲嶇疆瀵嗙爜
*/
- @Operation(summary = "閲嶇疆瀵嗙爜")
@SaCheckPermission("system:user:resetPwd")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/resetPwd")
@@ -197,7 +187,6 @@
/**
* 鐘舵�佷慨鏀�
*/
- @Operation(summary = "鐘舵�佷慨鏀�")
@SaCheckPermission("system:user:edit")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
@@ -210,7 +199,6 @@
/**
* 鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇鎺堟潈瑙掕壊
*/
- @Operation(summary = "鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇鎺堟潈瑙掕壊")
@SaCheckPermission("system:user:query")
@GetMapping("/authRole/{userId}")
public R<Map<String, Object>> authRole(@Parameter(name = "鐢ㄦ埛ID") @PathVariable("userId") Long userId) {
@@ -225,7 +213,6 @@
/**
* 鐢ㄦ埛鎺堟潈瑙掕壊
*/
- @Operation(summary = "鐢ㄦ埛鎺堟潈瑙掕壊")
@Parameters({
@Parameter(name = "userId", description = "鐢ㄦ埛Id", in = ParameterIn.QUERY),
@Parameter(name = "roleIds", description = "瑙掕壊ID涓�", in = ParameterIn.QUERY)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 017b5df..3c11d01 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -215,11 +215,11 @@
enabled: true
#杩欓噷瀹氫箟浜嗕袱涓垎缁勶紝鍙畾涔夊涓紝涔熷彲浠ヤ笉瀹氫箟
group-configs:
- - group: 婕旂ず妯″潡
+ - group: 1.婕旂ず妯″潡
packages-to-scan: com.ruoyi.demo
- - group: 绯荤粺妯″潡
+ - group: 2.绯荤粺妯″潡
packages-to-scan: com.ruoyi.web
- - group: 浠ｇ爜鐢熸垚妯″潡
+ - group: 3.浠ｇ爜鐢熸垚妯″潡
packages-to-scan: com.ruoyi.generator
# 闃叉XSS鏀诲嚮
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index e55dc50..78ad596 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -130,6 +130,11 @@
<artifactId>springdoc-openapi-ui</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-javadoc</artifactId>
+ </dependency>
+
<!-- 鑷姩鐢熸垚YML閰嶇疆鍏宠仈JSON鏂囦欢 -->
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
index 1d12b4e..5a20f9d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -24,42 +23,36 @@
/**
* 鎼滅储鍊�
*/
- @Schema(name = "鎼滅储鍊�")
@TableField(exist = false)
private String searchValue;
/**
* 鍒涘缓鑰�
*/
- @Schema(name = "鍒涘缓鑰�")
@TableField(fill = FieldFill.INSERT)
private String createBy;
/**
* 鍒涘缓鏃堕棿
*/
- @Schema(name = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private Date createTime;
/**
* 鏇存柊鑰�
*/
- @Schema(name = "鏇存柊鑰�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/**
* 鏇存柊鏃堕棿
*/
- @Schema(name = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
/**
* 璇锋眰鍙傛暟
*/
- @Schema(name = "璇锋眰鍙傛暟")
@TableField(exist = false)
private Map<String, Object> params = new HashMap<>();
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java
index 533ca79..f3e2c4a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.sql.SqlUtil;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -24,25 +23,21 @@
/**
* 鍒嗛〉澶у皬
*/
- @Schema(name = "鍒嗛〉澶у皬")
private Integer pageSize;
/**
* 褰撳墠椤垫暟
*/
- @Schema(name = "褰撳墠椤垫暟")
private Integer pageNum;
/**
* 鎺掑簭鍒�
*/
- @Schema(name = "鎺掑簭鍒�")
private String orderByColumn;
/**
* 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc
*/
- @Schema(name = "鎺掑簭鐨勬柟鍚�", example = "asc,desc")
private String isAsc;
/**
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
index 999974d..70584c6 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
@@ -1,6 +1,5 @@
package com.ruoyi.common.core.domain;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -13,7 +12,6 @@
*/
@Data
@NoArgsConstructor
-@Schema(name = "璇锋眰鍝嶅簲瀵硅薄")
public class R<T> implements Serializable {
private static final long serialVersionUID = 1L;
@@ -27,13 +25,10 @@
*/
public static final int FAIL = 500;
- @Schema(name = "娑堟伅鐘舵�佺爜")
private int code;
- @Schema(name = "娑堟伅鍐呭")
private String msg;
- @Schema(name = "鏁版嵁瀵硅薄")
private T data;
public static <T> R<T> ok() {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
index 0d28291..c7bb9b4 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
@@ -1,7 +1,6 @@
package com.ruoyi.common.core.domain;
import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -24,20 +23,17 @@
* 鐖惰彍鍗曞悕绉�
*/
@TableField(exist = false)
- @Schema(name = "鐖惰彍鍗曞悕绉�")
private String parentName;
/**
* 鐖惰彍鍗旾D
*/
- @Schema(name = "鐖惰彍鍗旾D")
private Long parentId;
/**
* 瀛愰儴闂�
*/
@TableField(exist = false)
- @Schema(name = "瀛愰儴闂�")
private List<T> children = new ArrayList<>();
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
index fcf2e4a..857f9b8 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.TreeEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -22,21 +21,18 @@
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sys_dept")
-@Schema(name = "閮ㄩ棬涓氬姟瀵硅薄")
public class SysDept extends TreeEntity<SysDept> {
private static final long serialVersionUID = 1L;
/**
* 閮ㄩ棬ID
*/
- @Schema(name = "閮ㄩ棬id")
@TableId(value = "dept_id")
private Long deptId;
/**
* 閮ㄩ棬鍚嶇О
*/
- @Schema(name = "閮ㄩ棬鍚嶇О")
@NotBlank(message = "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 30, message = "閮ㄩ棬鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
private String deptName;
@@ -44,27 +40,23 @@
/**
* 鏄剧ず椤哄簭
*/
- @Schema(name = "鏄剧ず椤哄簭")
@NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
private Integer orderNum;
/**
* 璐熻矗浜�
*/
- @Schema(name = "璐熻矗浜�")
private String leader;
/**
* 鑱旂郴鐢佃瘽
*/
- @Schema(name = "鑱旂郴鐢佃瘽")
@Size(min = 0, max = 11, message = "鑱旂郴鐢佃瘽闀垮害涓嶈兘瓒呰繃11涓瓧绗�")
private String phone;
/**
* 閭
*/
- @Schema(name = "閭")
@Email(message = "閭鏍煎紡涓嶆纭�")
@Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
private String email;
@@ -72,20 +64,17 @@
/**
* 閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤
*/
- @Schema(name = "閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤")
private String status;
/**
* 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
*/
- @Schema(name = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�")
@TableLogic
private String delFlag;
/**
* 绁栫骇鍒楄〃
*/
- @Schema(name = "绁栫骇鍒楄〃")
private String ancestors;
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
index 4b02138..e20f96a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
@@ -8,7 +8,6 @@
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.convert.ExcelDictConvert;
import com.ruoyi.common.core.domain.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -25,13 +24,11 @@
@EqualsAndHashCode(callSuper = true)
@TableName("sys_dict_data")
@ExcelIgnoreUnannotated
-@Schema(name = "瀛楀吀鏁版嵁涓氬姟瀵硅薄")
public class SysDictData extends BaseEntity {
/**
* 瀛楀吀缂栫爜
*/
- @Schema(name = "瀛楀吀缂栫爜")
@ExcelProperty(value = "瀛楀吀缂栫爜")
@TableId(value = "dict_code")
private Long dictCode;
@@ -39,14 +36,12 @@
/**
* 瀛楀吀鎺掑簭
*/
- @Schema(name = "瀛楀吀鎺掑簭")
@ExcelProperty(value = "瀛楀吀鎺掑簭")
private Integer dictSort;
/**
* 瀛楀吀鏍囩
*/
- @Schema(name = "瀛楀吀鏍囩")
@ExcelProperty(value = "瀛楀吀鏍囩")
@NotBlank(message = "瀛楀吀鏍囩涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "瀛楀吀鏍囩闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
@@ -55,7 +50,6 @@
/**
* 瀛楀吀閿��
*/
- @Schema(name = "瀛楀吀閿��")
@ExcelProperty(value = "瀛楀吀閿��")
@NotBlank(message = "瀛楀吀閿�间笉鑳戒负绌�")
@Size(min = 0, max = 100, message = "瀛楀吀閿�奸暱搴︿笉鑳借秴杩�100涓瓧绗�")
@@ -64,7 +58,6 @@
/**
* 瀛楀吀绫诲瀷
*/
- @Schema(name = "瀛楀吀绫诲瀷")
@ExcelProperty(value = "瀛楀吀绫诲瀷")
@NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
@@ -73,20 +66,17 @@
/**
* 鏍峰紡灞炴�э紙鍏朵粬鏍峰紡鎵╁睍锛�
*/
- @Schema(name = "鏍峰紡灞炴�э紙鍏朵粬鏍峰紡鎵╁睍锛�")
@Size(min = 0, max = 100, message = "鏍峰紡灞炴�ч暱搴︿笉鑳借秴杩�100涓瓧绗�")
private String cssClass;
/**
* 琛ㄦ牸瀛楀吀鏍峰紡
*/
- @Schema(name = "琛ㄦ牸瀛楀吀鏍峰紡")
private String listClass;
/**
* 鏄惁榛樿锛圷鏄� N鍚︼級
*/
- @Schema(name = "鏄惁榛樿锛圷鏄� N鍚︼級")
@ExcelProperty(value = "鏄惁榛樿", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_yes_no")
private String isDefault;
@@ -94,7 +84,6 @@
/**
* 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @Schema(name = "鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�")
@ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_normal_disable")
private String status;
@@ -102,7 +91,6 @@
/**
* 澶囨敞
*/
- @Schema(name = "澶囨敞")
private String remark;
public boolean getDefault() {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
index 095aba0..36e38a9 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
@@ -7,7 +7,6 @@
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import com.ruoyi.common.core.domain.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -25,13 +24,11 @@
@EqualsAndHashCode(callSuper = true)
@TableName("sys_dict_type")
@ExcelIgnoreUnannotated
-@Schema(name = "瀛楀吀绫诲瀷涓氬姟瀵硅薄")
public class SysDictType extends BaseEntity {
/**
* 瀛楀吀涓婚敭
*/
- @Schema(name = "瀛楀吀涓婚敭")
@ExcelProperty(value = "瀛楀吀涓婚敭")
@TableId(value = "dict_id")
private Long dictId;
@@ -39,7 +36,6 @@
/**
* 瀛楀吀鍚嶇О
*/
- @Schema(name = "瀛楀吀鍚嶇О")
@ExcelProperty(value = "瀛楀吀鍚嶇О")
@NotBlank(message = "瀛楀吀鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷鍚嶇О闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
@@ -48,7 +44,6 @@
/**
* 瀛楀吀绫诲瀷
*/
- @Schema(name = "瀛楀吀绫诲瀷")
@ExcelProperty(value = "瀛楀吀绫诲瀷")
@NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
@@ -58,7 +53,6 @@
/**
* 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @Schema(name = "鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�")
@ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_normal_disable")
private String status;
@@ -66,7 +60,6 @@
/**
* 澶囨敞
*/
- @Schema(name = "澶囨敞")
private String remark;
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
index 554bc3a..6e366a7 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.domain.TreeEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -21,20 +20,17 @@
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sys_menu")
-@Schema(name = "鑿滃崟鏉冮檺涓氬姟瀵硅薄")
public class SysMenu extends TreeEntity<SysMenu> {
/**
* 鑿滃崟ID
*/
- @Schema(name = "鑿滃崟ID")
@TableId(value = "menu_id")
private Long menuId;
/**
* 鑿滃崟鍚嶇О
*/
- @Schema(name = "鑿滃崟鍚嶇О")
@NotBlank(message = "鑿滃崟鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 50, message = "鑿滃崟鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
private String menuName;
@@ -42,65 +38,55 @@
/**
* 鏄剧ず椤哄簭
*/
- @Schema(name = "鏄剧ず椤哄簭")
@NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
private Integer orderNum;
/**
* 璺敱鍦板潃
*/
- @Schema(name = "璺敱鍦板潃")
@Size(min = 0, max = 200, message = "璺敱鍦板潃涓嶈兘瓒呰繃200涓瓧绗�")
private String path;
/**
* 缁勪欢璺緞
*/
- @Schema(name = "缁勪欢璺緞")
@Size(min = 0, max = 200, message = "缁勪欢璺緞涓嶈兘瓒呰繃255涓瓧绗�")
private String component;
/**
* 璺敱鍙傛暟
*/
- @Schema(name = "璺敱鍙傛暟")
private String queryParam;
/**
* 鏄惁涓哄閾撅紙0鏄� 1鍚︼級
*/
- @Schema(name = "鏄惁涓哄閾撅紙0鏄� 1鍚︼級")
private String isFrame;
/**
* 鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級
*/
- @Schema(name = "鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級")
private String isCache;
/**
* 绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛�
*/
- @Schema(name = "绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛�")
@NotBlank(message = "鑿滃崟绫诲瀷涓嶈兘涓虹┖")
private String menuType;
/**
* 鏄剧ず鐘舵�侊紙0鏄剧ず 1闅愯棌锛�
*/
- @Schema(name = "鏄剧ず鐘舵�侊紙0鏄剧ず 1闅愯棌锛�")
private String visible;
/**
* 鑿滃崟鐘舵�侊紙0鏄剧ず 1闅愯棌锛�
*/
- @Schema(name = "鑿滃崟鐘舵�侊紙0鏄剧ず 1闅愯棌锛�")
private String status;
/**
* 鏉冮檺瀛楃涓�
*/
- @Schema(name = "鏉冮檺瀛楃涓�")
@JsonInclude(JsonInclude.Include.NON_NULL)
@Size(min = 0, max = 100, message = "鏉冮檺鏍囪瘑闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
private String perms;
@@ -108,13 +94,11 @@
/**
* 鑿滃崟鍥炬爣
*/
- @Schema(name = "鑿滃崟鍥炬爣")
private String icon;
/**
* 澶囨敞
*/
- @Schema(name = "澶囨敞")
private String remark;
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
index 3955a59..b7caaea 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
@@ -10,7 +10,6 @@
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.convert.ExcelDictConvert;
import com.ruoyi.common.core.domain.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
@@ -35,7 +34,6 @@
/**
* 瑙掕壊ID
*/
- @Schema(name = "瑙掕壊ID")
@ExcelProperty(value = "瑙掕壊搴忓彿")
@TableId(value = "role_id")
private Long roleId;
@@ -43,7 +41,6 @@
/**
* 瑙掕壊鍚嶇О
*/
- @Schema(name = "瑙掕壊鍚嶇О")
@ExcelProperty(value = "瑙掕壊鍚嶇О")
@NotBlank(message = "瑙掕壊鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 30, message = "瑙掕壊鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
@@ -52,7 +49,6 @@
/**
* 瑙掕壊鏉冮檺
*/
- @Schema(name = "瑙掕壊鏉冮檺")
@ExcelProperty(value = "瑙掕壊鏉冮檺")
@NotBlank(message = "鏉冮檺瀛楃涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "鏉冮檺瀛楃闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
@@ -61,7 +57,6 @@
/**
* 瑙掕壊鎺掑簭
*/
- @Schema(name = "瑙掕壊鎺掑簭")
@ExcelProperty(value = "瑙掕壊鎺掑簭")
@NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
private Integer roleSort;
@@ -69,7 +64,6 @@
/**
* 鏁版嵁鑼冨洿锛�1锛氭墍鏈夋暟鎹潈闄愶紱2锛氳嚜瀹氫箟鏁版嵁鏉冮檺锛�3锛氭湰閮ㄩ棬鏁版嵁鏉冮檺锛�4锛氭湰閮ㄩ棬鍙婁互涓嬫暟鎹潈闄愶紱5锛氫粎鏈汉鏁版嵁鏉冮檺锛�
*/
- @Schema(name = "鏁版嵁鑼冨洿锛�1锛氭墍鏈夋暟鎹潈闄愶紱2锛氳嚜瀹氫箟鏁版嵁鏉冮檺锛�3锛氭湰閮ㄩ棬鏁版嵁鏉冮檺锛�4锛氭湰閮ㄩ棬鍙婁互涓嬫暟鎹潈闄愶紱5锛氫粎鏈汉鏁版嵁鏉冮檺锛�")
@ExcelProperty(value = "鏁版嵁鑼冨洿", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "1=鎵�鏈夋暟鎹潈闄�,2=鑷畾涔夋暟鎹潈闄�,3=鏈儴闂ㄦ暟鎹潈闄�,4=鏈儴闂ㄥ強浠ヤ笅鏁版嵁鏉冮檺,5=浠呮湰浜烘暟鎹潈闄�")
private String dataScope;
@@ -77,19 +71,16 @@
/**
* 鑿滃崟鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙 0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀猴級
*/
- @Schema(name = "鑿滃崟鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙 0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀猴級")
private Boolean menuCheckStrictly;
/**
* 閮ㄩ棬鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀� 锛�
*/
- @Schema(name = "閮ㄩ棬鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀� 锛�")
private Boolean deptCheckStrictly;
/**
* 瑙掕壊鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @Schema(name = "瑙掕壊鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�")
@ExcelProperty(value = "瑙掕壊鐘舵��", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_common_status")
private String status;
@@ -97,34 +88,29 @@
/**
* 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
*/
- @Schema(name = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�")
@TableLogic
private String delFlag;
/**
* 澶囨敞
*/
- @Schema(name = "澶囨敞")
private String remark;
/**
* 鐢ㄦ埛鏄惁瀛樺湪姝よ鑹叉爣璇� 榛樿涓嶅瓨鍦�
*/
- @Schema(name = "鐢ㄦ埛鏄惁瀛樺湪姝よ鑹叉爣璇� 榛樿涓嶅瓨鍦�")
@TableField(exist = false)
private boolean flag = false;
/**
* 鑿滃崟缁�
*/
- @Schema(name = "鑿滃崟缁�")
@TableField(exist = false)
private Long[] menuIds;
/**
* 閮ㄩ棬缁勶紙鏁版嵁鏉冮檺锛�
*/
- @Schema(name = "閮ㄩ棬缁勶紙鏁版嵁鏉冮檺锛�")
@TableField(exist = false)
private Long[] deptIds;
@@ -132,7 +118,6 @@
this.roleId = roleId;
}
- @Schema(name = "鏄惁绠＄悊鍛�")
public boolean isAdmin() {
return UserConstants.ADMIN_ID.equals(this.roleId);
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 3a35916..f2d961b 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -6,7 +6,6 @@
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.enums.SensitiveStrategy;
import com.ruoyi.common.xss.Xss;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
@@ -27,26 +26,22 @@
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
@TableName("sys_user")
-@Schema(name = "鐢ㄦ埛淇℃伅涓氬姟瀵硅薄")
public class SysUser extends BaseEntity {
/**
* 鐢ㄦ埛ID
*/
- @Schema(name = "鐢ㄦ埛ID")
@TableId(value = "user_id")
private Long userId;
/**
* 閮ㄩ棬ID
*/
- @Schema(name = "閮ㄩ棬ID")
private Long deptId;
/**
* 鐢ㄦ埛璐﹀彿
*/
- @Schema(name = "鐢ㄦ埛璐﹀彿")
@Xss(message = "鐢ㄦ埛璐﹀彿涓嶈兘鍖呭惈鑴氭湰瀛楃")
@NotBlank(message = "鐢ㄦ埛璐﹀彿涓嶈兘涓虹┖")
@Size(min = 0, max = 30, message = "鐢ㄦ埛璐﹀彿闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
@@ -55,7 +50,6 @@
/**
* 鐢ㄦ埛鏄电О
*/
- @Schema(name = "鐢ㄦ埛鏄电О")
@Xss(message = "鐢ㄦ埛鏄电О涓嶈兘鍖呭惈鑴氭湰瀛楃")
@Size(min = 0, max = 30, message = "鐢ㄦ埛鏄电О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
private String nickName;
@@ -63,14 +57,12 @@
/**
* 鐢ㄦ埛绫诲瀷锛坰ys_user绯荤粺鐢ㄦ埛锛�
*/
- @Schema(name = "鐢ㄦ埛绫诲瀷")
private String userType;
/**
* 鐢ㄦ埛閭
*/
@Sensitive(strategy = SensitiveStrategy.EMAIL)
- @Schema(name = "鐢ㄦ埛閭")
@Email(message = "閭鏍煎紡涓嶆纭�")
@Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
private String email;
@@ -79,25 +71,21 @@
* 鎵嬫満鍙风爜
*/
@Sensitive(strategy = SensitiveStrategy.PHONE)
- @Schema(name = "鎵嬫満鍙风爜")
private String phonenumber;
/**
* 鐢ㄦ埛鎬у埆
*/
- @Schema(name = "鐢ㄦ埛鎬у埆")
private String sex;
/**
* 鐢ㄦ埛澶村儚
*/
- @Schema(name = "鐢ㄦ埛澶村儚")
private String avatar;
/**
* 瀵嗙爜
*/
- @Schema(name = "瀵嗙爜")
@TableField(
insertStrategy = FieldStrategy.NOT_EMPTY,
updateStrategy = FieldStrategy.NOT_EMPTY,
@@ -108,66 +96,56 @@
/**
* 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @Schema(name = "甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�")
private String status;
/**
* 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
*/
- @Schema(name = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�")
@TableLogic
private String delFlag;
/**
* 鏈�鍚庣櫥褰旾P
*/
- @Schema(name = "鏈�鍚庣櫥褰旾P")
private String loginIp;
/**
* 鏈�鍚庣櫥褰曟椂闂�
*/
- @Schema(name = "鏈�鍚庣櫥褰曟椂闂�")
private Date loginDate;
/**
* 澶囨敞
*/
- @Schema(name = "澶囨敞")
private String remark;
/**
* 閮ㄩ棬瀵硅薄
*/
- @Schema(name = "閮ㄩ棬瀵硅薄")
@TableField(exist = false)
private SysDept dept;
/**
* 瑙掕壊瀵硅薄
*/
- @Schema(name = "瑙掕壊瀵硅薄")
@TableField(exist = false)
private List<SysRole> roles;
/**
* 瑙掕壊缁�
*/
- @Schema(name = "瑙掕壊缁�")
@TableField(exist = false)
private Long[] roleIds;
/**
* 宀椾綅缁�
*/
- @Schema(name = "宀椾綅缁�")
@TableField(exist = false)
private Long[] postIds;
/**
* 鏁版嵁鏉冮檺 褰撳墠瑙掕壊ID
*/
- @Schema(name = "瑙掕壊ID")
@TableField(exist = false)
private Long roleId;
@@ -175,7 +153,6 @@
this.userId = userId;
}
- @Schema(name = "鏄惁绠＄悊鍛�")
public boolean isAdmin() {
return UserConstants.ADMIN_ID.equals(this.userId);
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
index 18c37a9..4a4cfb5 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
@@ -1,7 +1,6 @@
package com.ruoyi.common.core.domain.model;
import com.ruoyi.common.constant.UserConstants;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
@@ -14,7 +13,6 @@
*/
@Data
-@Schema(name = "鐢ㄦ埛鐧诲綍瀵硅薄")
public class LoginBody {
/**
@@ -22,7 +20,6 @@
*/
@NotBlank(message = "{user.username.not.blank}")
@Length(min = UserConstants.USERNAME_MIN_LENGTH, max = UserConstants.USERNAME_MAX_LENGTH, message = "{user.username.length.valid}")
- @Schema(name = "鐢ㄦ埛鍚�")
private String username;
/**
@@ -30,19 +27,16 @@
*/
@NotBlank(message = "{user.password.not.blank}")
@Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}")
- @Schema(name = "鐢ㄦ埛瀵嗙爜")
private String password;
/**
* 楠岃瘉鐮�
*/
- @Schema(name = "楠岃瘉鐮�")
private String code;
/**
* 鍞竴鏍囪瘑
*/
- @Schema(name = "鍞竴鏍囪瘑")
private String uuid;
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
index 37f52a7..88367e7 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
@@ -1,6 +1,5 @@
package com.ruoyi.common.core.domain.model;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,10 +10,8 @@
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@Schema(name = "鐢ㄦ埛娉ㄥ唽瀵硅薄")
public class RegisterBody extends LoginBody {
- @Schema(name = "鐢ㄦ埛绫诲瀷")
private String userType;
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java
index d89a8c1..ce774ac 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java
@@ -1,6 +1,5 @@
package com.ruoyi.common.core.domain.model;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@@ -12,21 +11,18 @@
*/
@Data
-@Schema(name = "鐭俊鐧诲綍瀵硅薄")
public class SmsLoginBody {
/**
* 鐢ㄦ埛鍚�
*/
@NotBlank(message = "{user.phonenumber.not.blank}")
- @Schema(name = "鐢ㄦ埛鎵嬫満鍙�")
private String phonenumber;
/**
* 鐢ㄦ埛瀵嗙爜
*/
@NotBlank(message = "{sms.code.not.blank}")
- @Schema(name = "鐭俊楠岃瘉鐮�")
private String smsCode;
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
index b44175a..5f3f2d1 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
@@ -2,7 +2,6 @@
import cn.hutool.http.HttpStatus;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -17,32 +16,27 @@
@Data
@NoArgsConstructor
-@Schema(name = "鍒嗛〉鍝嶅簲瀵硅薄")
public class TableDataInfo<T> implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 鎬昏褰曟暟
*/
- @Schema(name = "鎬昏褰曟暟")
private long total;
/**
* 鍒楄〃鏁版嵁
*/
- @Schema(name = "鍒楄〃鏁版嵁")
private List<T> rows;
/**
* 娑堟伅鐘舵�佺爜
*/
- @Schema(name = "娑堟伅鐘舵�佺爜")
private int code;
/**
* 娑堟伅鍐呭
*/
- @Schema(name = "娑堟伅鍐呭")
private String msg;
/**
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java
index c88baec..d86289d 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java
@@ -2,7 +2,6 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.email.MailUtils;
-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;
@@ -26,7 +25,6 @@
@RequestMapping("/demo/mail")
public class MailController {
- @Operation(summary = "鍙戦�侀偖浠�")
@GetMapping("/sendSimpleMessage")
public R<Void> sendSimpleMessage(@Parameter(name = "鎺ユ敹浜�") String to,
@Parameter(name = "鏍囬") String subject,
@@ -35,7 +33,6 @@
return R.ok();
}
- @Operation(summary = "鍙戦�侀偖浠讹紙甯﹂檮浠讹級")
@GetMapping("/sendMessageWithAttachment")
public R<Void> sendMessageWithAttachment(@Parameter(name = "鎺ユ敹浜�") String to,
@Parameter(name = "鏍囬") String subject,
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java
index b80a9a8..c2baa71 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java
@@ -41,7 +41,6 @@
* <p>
* cacheNames 涓洪厤缃枃浠跺唴 groupId
*/
- @Operation(summary = "娴嬭瘯 @Cacheable")
@Cacheable(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null")
@GetMapping("/test1")
public R<String> test1(String key, String value) {
@@ -56,7 +55,6 @@
* <p>
* cacheNames 涓� 閰嶇疆鏂囦欢鍐� groupId
*/
- @Operation(summary = "娴嬭瘯 @CachePut")
@CachePut(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null")
@GetMapping("/test2")
public R<String> test2(String key, String value) {
@@ -71,7 +69,6 @@
* <p>
* cacheNames 涓� 閰嶇疆鏂囦欢鍐� groupId
*/
- @Operation(summary = "娴嬭瘯 @CacheEvict")
@CacheEvict(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null")
@GetMapping("/test3")
public R<String> test3(String key, String value) {
@@ -83,7 +80,6 @@
* 鎵嬪姩璁剧疆杩囨湡鏃堕棿10绉�
* 11绉掑悗鑾峰彇 鍒ゆ柇鏄惁鐩哥瓑
*/
- @Operation(summary = "娴嬭瘯璁剧疆杩囨湡鏃堕棿")
@GetMapping("/test6")
public R<Boolean> test6(String key, String value) {
RedisUtils.setCacheObject(key, value);
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java
index f9803c6..0e1bb84 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java
@@ -5,7 +5,6 @@
import com.baomidou.lock.annotation.Lock4j;
import com.baomidou.lock.executor.RedissonLockExecutor;
import com.ruoyi.common.core.domain.R;
-import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +32,6 @@
/**
* 娴嬭瘯lock4j 娉ㄨВ
*/
- @Operation(summary = "娴嬭瘯lock4j 娉ㄨВ")
@Lock4j(keys = {"#key"})
@GetMapping("/testLock4j")
public R<String> testLock4j(String key, String value) {
@@ -50,7 +48,6 @@
/**
* 娴嬭瘯lock4j 宸ュ叿
*/
- @Operation(summary = "娴嬭瘯lock4j 宸ュ叿")
@GetMapping("/testLock4jLockTemplate")
public R<String> testLock4jLockTemplate(String key, String value) {
final LockInfo lockInfo = lockTemplate.lock(key, 30000L, 5000L, RedissonLockExecutor.class);
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java
index da8522b..344abc1 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java
@@ -2,7 +2,6 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.redis.RedisUtils;
-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;
@@ -21,7 +20,6 @@
@RequestMapping("/demo/redis/pubsub")
public class RedisPubSubController {
- @Operation(summary = "鍙戝竷娑堟伅")
@GetMapping("/pub")
public R<Void> pub(@Parameter(name = "閫氶亾Key") String key, @Parameter(name = "鍙戦�佸唴瀹�") String value) {
RedisUtils.publish(key, value, consumer -> {
@@ -30,7 +28,6 @@
return R.ok("鎿嶄綔鎴愬姛");
}
- @Operation(summary = "璁㈤槄娑堟伅")
@GetMapping("/sub")
public R<Void> sub(@Parameter(name = "閫氶亾Key") String key) {
RedisUtils.subscribe(key, String.class, msg -> {
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java
index 80cf073..abb59ac 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java
@@ -3,7 +3,6 @@
import com.ruoyi.common.annotation.RateLimiter;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.LimitType;
-import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
@@ -26,7 +25,6 @@
* 娴嬭瘯鍏ㄥ眬闄愭祦
* 鍏ㄥ眬褰卞搷
*/
- @Operation(summary = "娴嬭瘯鍏ㄥ眬闄愭祦")
@RateLimiter(count = 2, time = 10)
@GetMapping("/test")
public R<String> test(String value) {
@@ -37,7 +35,6 @@
* 娴嬭瘯璇锋眰IP闄愭祦
* 鍚屼竴IP璇锋眰鍙楀奖鍝�
*/
- @Operation(summary = "娴嬭瘯璇锋眰IP闄愭祦")
@RateLimiter(count = 2, time = 10, limitType = LimitType.IP)
@GetMapping("/testip")
public R<String> testip(String value) {
@@ -48,7 +45,6 @@
* 娴嬭瘯闆嗙兢瀹炰緥闄愭祦
* 鍚姩涓や釜鍚庣鏈嶅姟浜掍笉褰卞搷
*/
- @Operation(summary = "娴嬭瘯闆嗙兢瀹炰緥闄愭祦")
@RateLimiter(count = 2, time = 10, limitType = LimitType.CLUSTER)
@GetMapping("/testcluster")
public R<String> testcluster(String value) {
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java
index c9e51b1..a9c8061 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java
@@ -4,7 +4,6 @@
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.sms.config.properties.SmsProperties;
import com.ruoyi.sms.core.SmsTemplate;
-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;
@@ -34,7 +33,6 @@
// private final SmsTemplate smsTemplate; // 鍙互浣跨敤spring娉ㄥ叆
// private final AliyunSmsTemplate smsTemplate; // 涔熷彲浠ユ敞鍏ユ煇涓巶瀹剁殑妯℃澘宸ュ叿
- @Operation(summary = "鍙戦�佺煭淇liyun")
@GetMapping("/sendAliyun")
public R<Object> sendAliyun(@Parameter(name = "鐢佃瘽鍙�") String phones,
@Parameter(name = "妯℃澘ID") String templateId) {
@@ -51,7 +49,6 @@
return R.ok(send);
}
- @Operation(summary = "鍙戦�佺煭淇encent")
@GetMapping("/sendTencent")
public R<Object> sendTencent(@Parameter(name = "鐢佃瘽鍙�") String phones,
@Parameter(name = "妯℃澘ID") String templateId) {
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java
index c538e2c..af0e104 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java
@@ -1,7 +1,6 @@
package com.ruoyi.demo.controller;
import com.ruoyi.common.core.domain.R;
-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;
@@ -26,7 +25,6 @@
* 涓婁紶璇锋眰
* 蹇呴』浣跨敤 @RequestPart 娉ㄨВ鏍囨敞涓烘枃浠�
*/
- @Operation(summary = "閫氱敤涓婁紶璇锋眰")
@Parameters({
@Parameter(name = "file", description = "鏂囦欢", in = ParameterIn.QUERY, required = true)
})
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java
index 1824ae4..e821eaa 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java
@@ -5,7 +5,6 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.demo.domain.TestDemo;
import com.ruoyi.demo.mapper.TestDemoMapper;
-import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -38,7 +37,6 @@
* <p>
* 3.5.0 鐗堟湰 澧炲姞 rewriteBatchedStatements=true 鎵瑰鐞嗗弬鏁� 浣� MP 鍘熺敓鎵瑰鐞嗗彲浠ヨ揪鍒板悓鏍风殑閫熷害
*/
- @Operation(summary = "鏂板鎵归噺鏂规硶")
@PostMapping("/add")
// @DS("slave")
public R<Void> add() {
@@ -58,7 +56,6 @@
* <p>
* 3.5.0 鐗堟湰 澧炲姞 rewriteBatchedStatements=true 鎵瑰鐞嗗弬鏁� 浣� MP 鍘熺敓鎵瑰鐞嗗彲浠ヨ揪鍒板悓鏍风殑閫熷害
*/
- @Operation(summary = "鏂板鎴栨洿鏂版壒閲忔柟娉�")
@PostMapping("/addOrUpdate")
// @DS("slave")
public R<Void> addOrUpdate() {
@@ -84,7 +81,6 @@
/**
* 鍒犻櫎鎵归噺鏂规硶
*/
- @Operation(summary = "鍒犻櫎鎵归噺鏂规硶")
@DeleteMapping()
// @DS("slave")
public R<Void> remove() {
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
index d63c317..50bcbd0 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
@@ -20,7 +20,6 @@
import com.ruoyi.demo.domain.bo.TestDemoImportVo;
import com.ruoyi.demo.domain.vo.TestDemoVo;
import com.ruoyi.demo.service.ITestDemoService;
-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;
@@ -55,7 +54,6 @@
/**
* 鏌ヨ娴嬭瘯鍗曡〃鍒楄〃
*/
- @Operation(summary = "鏌ヨ娴嬭瘯鍗曡〃鍒楄〃")
@SaCheckPermission("demo:demo:list")
@GetMapping("/list")
public TableDataInfo<TestDemoVo> list(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) {
@@ -65,14 +63,12 @@
/**
* 鑷畾涔夊垎椤垫煡璇�
*/
- @Operation(summary = "鑷畾涔夊垎椤垫煡璇�")
@SaCheckPermission("demo:demo:list")
@GetMapping("/page")
public TableDataInfo<TestDemoVo> page(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) {
return iTestDemoService.customPageList(bo, pageQuery);
}
- @Operation(summary = "瀵煎叆娴嬭瘯-鏍￠獙")
@Parameters({
@Parameter(name = "file", description = "瀵煎叆鏂囦欢", in = ParameterIn.QUERY, required = true),
})
@@ -90,7 +86,6 @@
/**
* 瀵煎嚭娴嬭瘯鍗曡〃鍒楄〃
*/
- @Operation(summary = "瀵煎嚭娴嬭瘯鍗曡〃鍒楄〃")
@SaCheckPermission("demo:demo:export")
@Log(title = "娴嬭瘯鍗曡〃", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@@ -106,7 +101,6 @@
/**
* 鑾峰彇娴嬭瘯鍗曡〃璇︾粏淇℃伅
*/
- @Operation(summary = "鑾峰彇娴嬭瘯鍗曡〃璇︾粏淇℃伅")
@SaCheckPermission("demo:demo:query")
@GetMapping("/{id}")
public R<TestDemoVo> getInfo(@Parameter(name = "娴嬭瘯ID")
@@ -118,7 +112,6 @@
/**
* 鏂板娴嬭瘯鍗曡〃
*/
- @Operation(summary = "鏂板娴嬭瘯鍗曡〃")
@SaCheckPermission("demo:demo:add")
@Log(title = "娴嬭瘯鍗曡〃", businessType = BusinessType.INSERT)
@RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS, message = "{repeat.submit.message}")
@@ -133,7 +126,6 @@
/**
* 淇敼娴嬭瘯鍗曡〃
*/
- @Operation(summary = "淇敼娴嬭瘯鍗曡〃")
@SaCheckPermission("demo:demo:edit")
@Log(title = "娴嬭瘯鍗曡〃", businessType = BusinessType.UPDATE)
@RepeatSubmit
@@ -145,7 +137,6 @@
/**
* 鍒犻櫎娴嬭瘯鍗曡〃
*/
- @Operation(summary = "鍒犻櫎娴嬭瘯鍗曡〃")
@SaCheckPermission("demo:demo:remove")
@Log(title = "娴嬭瘯鍗曡〃", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java
index cc67ca4..b241cc8 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java
@@ -2,7 +2,6 @@
import cn.hutool.core.collection.CollUtil;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -29,7 +28,6 @@
/**
* 鍗曞垪琛ㄥ鏁版嵁
*/
- @Operation(summary = "鍗曞垪琛ㄥ鏁版嵁")
@GetMapping("/exportTemplateOne")
public void exportTemplateOne(HttpServletResponse response) {
Map<String,String> map = new HashMap<>();
@@ -49,7 +47,6 @@
/**
* 澶氬垪琛ㄥ鏁版嵁
*/
- @Operation(summary = "澶氬垪琛ㄥ鏁版嵁")
@GetMapping("/exportTemplateMuliti")
public void exportTemplateMuliti(HttpServletResponse response) {
Map<String,String> map = new HashMap<>();
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java
index 6c76866..a004463 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java
@@ -2,7 +2,6 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.MessageUtils;
-import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.Data;
@@ -33,7 +32,6 @@
* <p>
* 娴嬭瘯浣跨敤 user.register.success
*/
- @Operation(summary = "閫氳繃code鑾峰彇鍥介檯鍖栧唴瀹�")
@GetMapping()
public R<Void> get(@Parameter(name = "鍥介檯鍖朿ode") String code) {
return R.ok(MessageUtils.message(code));
@@ -45,7 +43,6 @@
* <p>
* 娴嬭瘯浣跨敤 not.null
*/
- @Operation(summary = "Validator 鏍￠獙鍥介檯鍖�")
@GetMapping("/test1")
public R<Void> test1(@NotBlank(message = "{not.null}") String str) {
return R.ok(str);
@@ -57,7 +54,6 @@
* <p>
* 娴嬭瘯浣跨敤 not.null
*/
- @Operation(summary = "Bean 鏍￠獙鍥介檯鍖�")
@GetMapping("/test2")
public R<TestI18nBo> test2(@Validated TestI18nBo bo) {
return R.ok(bo);
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java
index 54a1913..9b7f34a 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java
@@ -4,7 +4,6 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.SensitiveStrategy;
-import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.Data;
import org.springframework.web.bind.annotation.GetMapping;
@@ -29,7 +28,6 @@
/**
* 娴嬭瘯鏁版嵁鑴辨晱
*/
- @Operation(summary = "鏌ヨ娴嬭瘯鍗曡〃鍒楄〃")
@GetMapping("/test")
public R<TestSensitive> test() {
TestSensitive testSensitive = new TestSensitive();
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
index 4f0b4af..c6bad67 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
@@ -13,7 +13,6 @@
import com.ruoyi.demo.domain.bo.TestTreeBo;
import com.ruoyi.demo.domain.vo.TestTreeVo;
import com.ruoyi.demo.service.ITestTreeService;
-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;
@@ -44,7 +43,6 @@
/**
* 鏌ヨ娴嬭瘯鏍戣〃鍒楄〃
*/
- @Operation(summary = "鏌ヨ娴嬭瘯鏍戣〃鍒楄〃")
@SaCheckPermission("demo:tree:list")
@GetMapping("/list")
public R<List<TestTreeVo>> list(@Validated(QueryGroup.class) TestTreeBo bo) {
@@ -55,7 +53,6 @@
/**
* 瀵煎嚭娴嬭瘯鏍戣〃鍒楄〃
*/
- @Operation(summary = "瀵煎嚭娴嬭瘯鏍戣〃鍒楄〃")
@SaCheckPermission("demo:tree:export")
@Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.EXPORT)
@GetMapping("/export")
@@ -67,7 +64,6 @@
/**
* 鑾峰彇娴嬭瘯鏍戣〃璇︾粏淇℃伅
*/
- @Operation(summary = "鑾峰彇娴嬭瘯鏍戣〃璇︾粏淇℃伅")
@SaCheckPermission("demo:tree:query")
@GetMapping("/{id}")
public R<TestTreeVo> getInfo(@Parameter(name = "娴嬭瘯鏍慖D")
@@ -79,7 +75,6 @@
/**
* 鏂板娴嬭瘯鏍戣〃
*/
- @Operation(summary = "鏂板娴嬭瘯鏍戣〃")
@SaCheckPermission("demo:tree:add")
@Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.INSERT)
@RepeatSubmit
@@ -91,7 +86,6 @@
/**
* 淇敼娴嬭瘯鏍戣〃
*/
- @Operation(summary = "淇敼娴嬭瘯鏍戣〃")
@SaCheckPermission("demo:tree:edit")
@Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.UPDATE)
@RepeatSubmit
@@ -103,7 +97,6 @@
/**
* 鍒犻櫎娴嬭瘯鏍戣〃
*/
- @Operation(summary = "鍒犻櫎娴嬭瘯鏍戣〃")
@SaCheckPermission("demo:tree:remove")
@Log(title = "娴嬭瘯鏍戣〃", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java
index d41f87e..a940c2c 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java
@@ -2,7 +2,6 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.redis.QueueUtils;
-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;
@@ -30,7 +29,6 @@
public class BoundedQueueController {
- @Operation(summary = "娣诲姞闃熷垪鏁版嵁")
@GetMapping("/add")
public R<Void> add(@Parameter(name = "闃熷垪鍚�") String queueName,
@Parameter(name = "瀹归噺") int capacity) {
@@ -56,7 +54,6 @@
return R.ok("鎿嶄綔鎴愬姛");
}
- @Operation(summary = "鍒犻櫎闃熷垪鏁版嵁")
@GetMapping("/remove")
public R<Void> remove(@Parameter(name = "闃熷垪鍚�") String queueName) {
String data = "data-" + 5;
@@ -68,7 +65,6 @@
return R.ok("鎿嶄綔鎴愬姛");
}
- @Operation(summary = "鑾峰彇闃熷垪鏁版嵁")
@GetMapping("/get")
public R<Void> get(@Parameter(name = "闃熷垪鍚�") String queueName) {
String data;
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java
index 5958824..0abcc4b 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java
@@ -2,7 +2,6 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.redis.QueueUtils;
-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;
@@ -32,7 +31,6 @@
@RequestMapping("/demo/queue/delayed")
public class DelayedQueueController {
- @Operation(summary = "璁㈤槄闃熷垪")
@GetMapping("/subscribe")
public R<Void> subscribe(@Parameter(name = "闃熷垪鍚�") String queueName) {
log.info("閫氶亾: {} 鐩戝惉涓�......", queueName);
@@ -44,7 +42,6 @@
return R.ok("鎿嶄綔鎴愬姛");
}
- @Operation(summary = "娣诲姞闃熷垪鏁版嵁")
@GetMapping("/add")
public R<Void> add(@Parameter(name = "闃熷垪鍚�") String queueName,
@Parameter(name = "璁㈠崟鍙�") String orderNum,
@@ -55,7 +52,6 @@
return R.ok("鎿嶄綔鎴愬姛");
}
- @Operation(summary = "鍒犻櫎闃熷垪鏁版嵁")
@GetMapping("/remove")
public R<Void> remove(@Parameter(name = "闃熷垪鍚�") String queueName,
@Parameter(name = "璁㈠崟鍙�") String orderNum) {
@@ -67,7 +63,6 @@
return R.ok("鎿嶄綔鎴愬姛");
}
- @Operation(summary = "閿�姣侀槦鍒�")
@GetMapping("/destroy")
public R<Void> destroy(@Parameter(name = "闃熷垪鍚�") String queueName) {
// 鐢ㄥ畬浜嗕竴瀹氳閿�姣� 鍚﹀垯浼氫竴鐩村瓨鍦�
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java
index 6d11e15..1651631 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java
@@ -3,7 +3,6 @@
import cn.hutool.core.util.RandomUtil;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.redis.QueueUtils;
-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;
@@ -30,7 +29,6 @@
@RequestMapping("/demo/queue/priority")
public class PriorityQueueController {
- @Operation(summary = "娣诲姞闃熷垪鏁版嵁")
@GetMapping("/add")
public R<Void> add(@Parameter(name = "闃熷垪鍚�") String queueName) {
// 鐢ㄥ畬浜嗕竴瀹氳閿�姣� 鍚﹀垯浼氫竴鐩村瓨鍦�
@@ -58,7 +56,6 @@
return R.ok("鎿嶄綔鎴愬姛");
}
- @Operation(summary = "鍒犻櫎闃熷垪鏁版嵁")
@GetMapping("/remove")
public R<Void> remove(@Parameter(name = "闃熷垪鍚�") String queueName,
@Parameter(name = "瀵硅薄鍚�") String name,
@@ -74,7 +71,6 @@
return R.ok("鎿嶄綔鎴愬姛");
}
- @Operation(summary = "鑾峰彇闃熷垪鏁版嵁")
@GetMapping("/get")
public R<Void> get(@Parameter(name = "闃熷垪鍚�") String queueName) {
PriorityDemo data;
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java
index e569466..54ecae1 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java
@@ -3,7 +3,6 @@
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -19,48 +18,41 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Schema(name = "娴嬭瘯鍗曡〃涓氬姟瀵硅薄")
public class TestDemoBo extends BaseEntity {
/**
* 涓婚敭
*/
- @Schema(name = "涓婚敭")
@NotNull(message = "涓婚敭涓嶈兘涓虹┖", groups = {EditGroup.class})
private Long id;
/**
* 閮ㄩ棬id
*/
- @Schema(name = "閮ㄩ棬id")
@NotNull(message = "閮ㄩ棬id涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
private Long deptId;
/**
* 鐢ㄦ埛id
*/
- @Schema(name = "鐢ㄦ埛id")
@NotNull(message = "鐢ㄦ埛id涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
private Long userId;
/**
* 鎺掑簭鍙�
*/
- @Schema(name = "鎺掑簭鍙�")
@NotNull(message = "鎺掑簭鍙蜂笉鑳戒负绌�", groups = {AddGroup.class, EditGroup.class})
private Integer orderNum;
/**
* key閿�
*/
- @Schema(name = "key閿�")
@NotBlank(message = "key閿笉鑳戒负绌�", groups = {AddGroup.class, EditGroup.class})
private String testKey;
/**
* 鍊�
*/
- @Schema(name = "鍊�")
@NotBlank(message = "鍊间笉鑳戒负绌�", groups = {AddGroup.class, EditGroup.class})
private String value;
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java
index 269188a..8f417fb 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java
@@ -1,7 +1,6 @@
package com.ruoyi.demo.domain.bo;
import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@@ -14,13 +13,11 @@
* @date 2021-07-26
*/
@Data
-@Schema(name = "娴嬭瘯鍗曡〃涓氬姟瀵硅薄")
public class TestDemoImportVo {
/**
* 閮ㄩ棬id
*/
- @Schema(name = "閮ㄩ棬id")
@NotNull(message = "閮ㄩ棬id涓嶈兘涓虹┖")
@ExcelProperty(value = "閮ㄩ棬id")
private Long deptId;
@@ -28,7 +25,6 @@
/**
* 鐢ㄦ埛id
*/
- @Schema(name = "鐢ㄦ埛id")
@NotNull(message = "鐢ㄦ埛id涓嶈兘涓虹┖")
@ExcelProperty(value = "鐢ㄦ埛id")
private Long userId;
@@ -36,7 +32,6 @@
/**
* 鎺掑簭鍙�
*/
- @Schema(name = "鎺掑簭鍙�")
@NotNull(message = "鎺掑簭鍙蜂笉鑳戒负绌�")
@ExcelProperty(value = "鎺掑簭鍙�")
private Long orderNum;
@@ -44,7 +39,6 @@
/**
* key閿�
*/
- @Schema(name = "key閿�")
@NotBlank(message = "key閿笉鑳戒负绌�")
@ExcelProperty(value = "key閿�")
private String testKey;
@@ -52,7 +46,6 @@
/**
* 鍊�
*/
- @Schema(name = "鍊�")
@NotBlank(message = "鍊间笉鑳戒负绌�")
@ExcelProperty(value = "鍊�")
private String value;
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java
index a4f9143..a51b3fe 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java
@@ -3,7 +3,6 @@
import com.ruoyi.common.core.domain.TreeEntity;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -19,34 +18,29 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Schema(name = "娴嬭瘯鏍戣〃涓氬姟瀵硅薄")
public class TestTreeBo extends TreeEntity<TestTreeBo> {
/**
* 涓婚敭
*/
- @Schema(name = "涓婚敭")
@NotNull(message = "涓婚敭涓嶈兘涓虹┖", groups = {EditGroup.class})
private Long id;
/**
* 閮ㄩ棬id
*/
- @Schema(name = "閮ㄩ棬id")
@NotNull(message = "閮ㄩ棬id涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
private Long deptId;
/**
* 鐢ㄦ埛id
*/
- @Schema(name = "鐢ㄦ埛id")
@NotNull(message = "鐢ㄦ埛id涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
private Long userId;
/**
* 鏍戣妭鐐瑰悕
*/
- @Schema(name = "鏍戣妭鐐瑰悕")
@NotBlank(message = "鏍戣妭鐐瑰悕涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
private String treeName;
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java
index 561d208..c4a46ed 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java
@@ -2,7 +2,6 @@
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.Date;
@@ -15,7 +14,6 @@
* @date 2021-07-26
*/
@Data
-@Schema(name = "娴嬭瘯鍗曡〃瑙嗗浘瀵硅薄")
@ExcelIgnoreUnannotated
public class TestDemoVo {
@@ -25,70 +23,60 @@
* 涓婚敭
*/
@ExcelProperty(value = "涓婚敭")
- @Schema(name = "涓婚敭")
private Long id;
/**
* 閮ㄩ棬id
*/
@ExcelProperty(value = "閮ㄩ棬id")
- @Schema(name = "閮ㄩ棬id")
private Long deptId;
/**
* 鐢ㄦ埛id
*/
@ExcelProperty(value = "鐢ㄦ埛id")
- @Schema(name = "鐢ㄦ埛id")
private Long userId;
/**
* 鎺掑簭鍙�
*/
@ExcelProperty(value = "鎺掑簭鍙�")
- @Schema(name = "鎺掑簭鍙�")
private Integer orderNum;
/**
* key閿�
*/
@ExcelProperty(value = "key閿�")
- @Schema(name = "key閿�")
private String testKey;
/**
* 鍊�
*/
@ExcelProperty(value = "鍊�")
- @Schema(name = "鍊�")
private String value;
/**
* 鍒涘缓鏃堕棿
*/
@ExcelProperty(value = "鍒涘缓鏃堕棿")
- @Schema(name = "鍒涘缓鏃堕棿")
private Date createTime;
/**
* 鍒涘缓浜�
*/
@ExcelProperty(value = "鍒涘缓浜�")
- @Schema(name = "鍒涘缓浜�")
private String createBy;
/**
* 鏇存柊鏃堕棿
*/
@ExcelProperty(value = "鏇存柊鏃堕棿")
- @Schema(name = "鏇存柊鏃堕棿")
private Date updateTime;
/**
* 鏇存柊浜�
*/
@ExcelProperty(value = "鏇存柊浜�")
- @Schema(name = "鏇存柊浜�")
private String updateBy;
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java
index f0eadfc..6836c06 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java
@@ -2,7 +2,6 @@
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.Date;
@@ -15,7 +14,6 @@
* @date 2021-07-26
*/
@Data
-@Schema(name = "娴嬭瘯鏍戣〃瑙嗗浘瀵硅薄")
@ExcelIgnoreUnannotated
public class TestTreeVo {
@@ -24,42 +22,36 @@
/**
* 涓婚敭
*/
- @Schema(name = "涓婚敭")
private Long id;
/**
* 鐖秈d
*/
@ExcelProperty(value = "鐖秈d")
- @Schema(name = "鐖秈d")
private Long parentId;
/**
* 閮ㄩ棬id
*/
@ExcelProperty(value = "閮ㄩ棬id")
- @Schema(name = "閮ㄩ棬id")
private Long deptId;
/**
* 鐢ㄦ埛id
*/
@ExcelProperty(value = "鐢ㄦ埛id")
- @Schema(name = "鐢ㄦ埛id")
private Long userId;
/**
* 鏍戣妭鐐瑰悕
*/
@ExcelProperty(value = "鏍戣妭鐐瑰悕")
- @Schema(name = "鏍戣妭鐐瑰悕")
private String treeName;
/**
* 鍒涘缓鏃堕棿
*/
@ExcelProperty(value = "鍒涘缓鏃堕棿")
- @Schema(name = "鍒涘缓鏃堕棿")
private Date createTime;
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
index d003ca8..d8c405e 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
@@ -12,7 +12,6 @@
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
import com.ruoyi.generator.service.IGenTableService;
-import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -41,7 +40,6 @@
/**
* 鏌ヨ浠ｇ爜鐢熸垚鍒楄〃
*/
- @Operation(summary = "鏌ヨ浠ｇ爜鐢熸垚鍒楄〃")
@SaCheckPermission("tool:gen:list")
@GetMapping("/list")
public TableDataInfo<GenTable> genList(GenTable genTable, PageQuery pageQuery) {
@@ -51,7 +49,6 @@
/**
* 淇敼浠ｇ爜鐢熸垚涓氬姟
*/
- @Operation(summary = "淇敼浠ｇ爜鐢熸垚涓氬姟")
@SaCheckPermission("tool:gen:query")
@GetMapping(value = "/{tableId}")
public R<Map<String, Object>> getInfo(@PathVariable Long tableId) {
@@ -68,7 +65,6 @@
/**
* 鏌ヨ鏁版嵁搴撳垪琛�
*/
- @Operation(summary = "鏌ヨ鏁版嵁搴撳垪琛�")
@SaCheckPermission("tool:gen:list")
@GetMapping("/db/list")
public TableDataInfo<GenTable> dataList(GenTable genTable, PageQuery pageQuery) {
@@ -78,7 +74,6 @@
/**
* 鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛�
*/
- @Operation(summary = "鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛�")
@SaCheckPermission("tool:gen:list")
@GetMapping(value = "/column/{tableId}")
public TableDataInfo<GenTableColumn> columnList(Long tableId) {
@@ -92,7 +87,6 @@
/**
* 瀵煎叆琛ㄧ粨鏋勶紙淇濆瓨锛�
*/
- @Operation(summary = "瀵煎叆琛ㄧ粨鏋勶紙淇濆瓨锛�")
@SaCheckPermission("tool:gen:import")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.IMPORT)
@PostMapping("/importTable")
@@ -107,7 +101,6 @@
/**
* 淇敼淇濆瓨浠ｇ爜鐢熸垚涓氬姟
*/
- @Operation(summary = "淇敼淇濆瓨浠ｇ爜鐢熸垚涓氬姟")
@SaCheckPermission("tool:gen:edit")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
@PutMapping
@@ -120,7 +113,6 @@
/**
* 鍒犻櫎浠ｇ爜鐢熸垚
*/
- @Operation(summary = "鍒犻櫎浠ｇ爜鐢熸垚")
@SaCheckPermission("tool:gen:remove")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.DELETE)
@DeleteMapping("/{tableIds}")
@@ -132,7 +124,6 @@
/**
* 棰勮浠ｇ爜
*/
- @Operation(summary = "棰勮浠ｇ爜")
@SaCheckPermission("tool:gen:preview")
@GetMapping("/preview/{tableId}")
public R<Map<String, String>> preview(@PathVariable("tableId") Long tableId) throws IOException {
@@ -143,7 +134,6 @@
/**
* 鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級
*/
- @Operation(summary = "鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級")
@SaCheckPermission("tool:gen:code")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@GetMapping("/download/{tableName}")
@@ -155,7 +145,6 @@
/**
* 鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�
*/
- @Operation(summary = "鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�")
@SaCheckPermission("tool:gen:code")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@GetMapping("/genCode/{tableName}")
@@ -167,7 +156,6 @@
/**
* 鍚屾鏁版嵁搴�
*/
- @Operation(summary = "鍚屾鏁版嵁搴�")
@SaCheckPermission("tool:gen:edit")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
@GetMapping("/synchDb/{tableName}")
@@ -179,7 +167,6 @@
/**
* 鎵归噺鐢熸垚浠ｇ爜
*/
- @Operation(summary = "鎵归噺鐢熸垚浠ｇ爜")
@SaCheckPermission("tool:gen:code")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@GetMapping("/batchGenCode")
diff --git a/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/ruoyi-generator/src/main/resources/vm/java/bo.java.vm
index 0d0af36..fab95ca 100644
--- a/ruoyi-generator/src/main/resources/vm/java/bo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/bo.java.vm
@@ -33,7 +33,6 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Schema(name = "${functionName}涓氬姟瀵硅薄")
public class ${ClassName}Bo extends ${Entity} {
#foreach ($column in $columns)
@@ -49,14 +48,12 @@
#set($Group="EditGroup.class")
#end
#if($column.isRequired == 1)
- @Schema(name = "$column.columnComment", required = true)
#if($column.javaType == 'String')
@NotBlank(message = "$column.columnComment涓嶈兘涓虹┖", groups = { $Group })
#else
@NotNull(message = "$column.columnComment涓嶈兘涓虹┖", groups = { $Group })
#end
#else
- @Schema(name = "$column.columnComment")
#end
private $column.javaType $column.javaField;
diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
index 9ea772f..5b30764 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -27,7 +27,6 @@
import com.ruoyi.common.core.page.TableDataInfo;
#elseif($table.tree)
#end
-import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
/**
@@ -48,7 +47,6 @@
/**
* 鏌ヨ${functionName}鍒楄〃
*/
- @Operation(summary = "鏌ヨ${functionName}鍒楄〃")
@SaCheckPermission("${permissionPrefix}:list")
@GetMapping("/list")
#if($table.crud || $table.sub)
@@ -65,7 +63,6 @@
/**
* 瀵煎嚭${functionName}鍒楄〃
*/
- @Operation(summary = "瀵煎嚭${functionName}鍒楄〃")
@SaCheckPermission("${permissionPrefix}:export")
@Log(title = "${functionName}", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@@ -77,7 +74,6 @@
/**
* 鑾峰彇${functionName}璇︾粏淇℃伅
*/
- @Operation(summary = "鑾峰彇${functionName}璇︾粏淇℃伅")
@SaCheckPermission("${permissionPrefix}:query")
@GetMapping("/{${pkColumn.javaField}}")
public R<${ClassName}Vo> getInfo(@Parameter(name = "涓婚敭")
@@ -89,7 +85,6 @@
/**
* 鏂板${functionName}
*/
- @Operation(summary = "鏂板${functionName}")
@SaCheckPermission("${permissionPrefix}:add")
@Log(title = "${functionName}", businessType = BusinessType.INSERT)
@RepeatSubmit()
@@ -101,7 +96,6 @@
/**
* 淇敼${functionName}
*/
- @Operation(summary = "淇敼${functionName}")
@SaCheckPermission("${permissionPrefix}:edit")
@Log(title = "${functionName}", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@@ -113,7 +107,6 @@
/**
* 鍒犻櫎${functionName}
*/
- @Operation(summary = "鍒犻櫎${functionName}")
@SaCheckPermission("${permissionPrefix}:remove")
@Log(title = "${functionName}", businessType = BusinessType.DELETE)
@DeleteMapping("/{${pkColumn.javaField}s}")
diff --git a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
index 1fc974d..c6d8b24 100644
--- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
@@ -21,7 +21,6 @@
* @date ${datetime}
*/
@Data
-@Schema(name = "${functionName}瑙嗗浘瀵硅薄")
@ExcelIgnoreUnannotated
public class ${ClassName}Vo {
@@ -47,7 +46,6 @@
#else
@ExcelProperty(value = "${comment}")
#end
- @Schema(name = "$column.columnComment")
private $column.javaType $column.javaField;
#end
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java
index b42eb3d..974019d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java
@@ -1,7 +1,6 @@
package com.ruoyi.system.domain;
import com.ruoyi.common.utils.StringUtils;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -12,31 +11,26 @@
*/
@Data
@NoArgsConstructor
-@Schema(name = "缂撳瓨淇℃伅")
public class SysCache {
/**
* 缂撳瓨鍚嶇О
*/
- @Schema(name = "缂撳瓨鍚嶇О")
private String cacheName = "";
/**
* 缂撳瓨閿悕
*/
- @Schema(name = "缂撳瓨閿悕")
private String cacheKey = "";
/**
* 缂撳瓨鍐呭
*/
- @Schema(name = "缂撳瓨鍐呭")
private String cacheValue = "";
/**
* 澶囨敞
*/
- @Schema(name = "澶囨敞")
private String remark = "";
public SysCache(String cacheName, String remark) {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
index 9462557..40bc282 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
@@ -7,7 +7,6 @@
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import com.ruoyi.common.core.domain.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -24,13 +23,11 @@
@EqualsAndHashCode(callSuper = true)
@TableName("sys_config")
@ExcelIgnoreUnannotated
-@Schema(name = "鍙傛暟閰嶇疆涓氬姟瀵硅薄")
public class SysConfig extends BaseEntity {
/**
* 鍙傛暟涓婚敭
*/
- @Schema(name = "鍙傛暟涓婚敭")
@ExcelProperty(value = "鍙傛暟涓婚敭")
@TableId(value = "config_id")
private Long configId;
@@ -38,7 +35,6 @@
/**
* 鍙傛暟鍚嶇О
*/
- @Schema(name = "鍙傛暟鍚嶇О")
@ExcelProperty(value = "鍙傛暟鍚嶇О")
@NotBlank(message = "鍙傛暟鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "鍙傛暟鍚嶇О涓嶈兘瓒呰繃100涓瓧绗�")
@@ -47,7 +43,6 @@
/**
* 鍙傛暟閿悕
*/
- @Schema(name = "鍙傛暟閿悕")
@ExcelProperty(value = "鍙傛暟閿悕")
@NotBlank(message = "鍙傛暟閿悕闀垮害涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "鍙傛暟閿悕闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
@@ -56,7 +51,6 @@
/**
* 鍙傛暟閿��
*/
- @Schema(name = "鍙傛暟閿��")
@ExcelProperty(value = "鍙傛暟閿��")
@NotBlank(message = "鍙傛暟閿�间笉鑳戒负绌�")
@Size(min = 0, max = 500, message = "鍙傛暟閿�奸暱搴︿笉鑳借秴杩�500涓瓧绗�")
@@ -65,7 +59,6 @@
/**
* 绯荤粺鍐呯疆锛圷鏄� N鍚︼級
*/
- @Schema(name = "绯荤粺鍐呯疆锛圷鏄� N鍚︼級")
@ExcelProperty(value = "绯荤粺鍐呯疆", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_yes_no")
private String configType;
@@ -73,7 +66,6 @@
/**
* 澶囨敞
*/
- @Schema(name = "澶囨敞")
private String remark;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
index d878006..f95b332 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
@@ -7,7 +7,6 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -24,14 +23,12 @@
@Data
@TableName("sys_logininfor")
@ExcelIgnoreUnannotated
-@Schema(name = "绯荤粺璁块棶璁板綍涓氬姟瀵硅薄")
public class SysLogininfor implements Serializable {
private static final long serialVersionUID = 1L;
/**
* ID
*/
- @Schema(name = "璁块棶ID")
@ExcelProperty(value = "搴忓彿")
@TableId(value = "info_id")
private Long infoId;
@@ -39,14 +36,12 @@
/**
* 鐢ㄦ埛璐﹀彿
*/
- @Schema(name = "鐢ㄦ埛璐﹀彿")
@ExcelProperty(value = "鐢ㄦ埛璐﹀彿")
private String userName;
/**
* 鐧诲綍鐘舵�� 0鎴愬姛 1澶辫触
*/
- @Schema(name = "鐧诲綍鐘舵�� 0鎴愬姛 1澶辫触")
@ExcelProperty(value = "鐧诲綍鐘舵��", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_common_status")
private String status;
@@ -54,49 +49,42 @@
/**
* 鐧诲綍IP鍦板潃
*/
- @Schema(name = "鐧诲綍IP鍦板潃")
@ExcelProperty(value = "鐧诲綍鍦板潃")
private String ipaddr;
/**
* 鐧诲綍鍦扮偣
*/
- @Schema(name = "鐧诲綍鍦扮偣")
@ExcelProperty(value = "鐧诲綍鍦扮偣")
private String loginLocation;
/**
* 娴忚鍣ㄧ被鍨�
*/
- @Schema(name = "娴忚鍣ㄧ被鍨�")
@ExcelProperty(value = "娴忚鍣�")
private String browser;
/**
* 鎿嶄綔绯荤粺
*/
- @Schema(name = "鎿嶄綔绯荤粺")
@ExcelProperty(value = "鎿嶄綔绯荤粺")
private String os;
/**
* 鎻愮ず娑堟伅
*/
- @Schema(name = "鎻愮ず娑堟伅")
@ExcelProperty(value = "鎻愮ず娑堟伅")
private String msg;
/**
* 璁块棶鏃堕棿
*/
- @Schema(name = "璁块棶鏃堕棿")
@ExcelProperty(value = "璁块棶鏃堕棿")
private Date loginTime;
/**
* 璇锋眰鍙傛暟
*/
- @Schema(name = "璇锋眰鍙傛暟")
@TableField(exist = false)
private Map<String, Object> params = new HashMap<>();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
index 36177c8..f945740 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.xss.Xss;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -25,7 +24,6 @@
/**
* 鍏憡ID
*/
- @Schema(name = "鍏憡ID")
@TableId(value = "notice_id")
private Long noticeId;
@@ -33,7 +31,6 @@
* 鍏憡鏍囬
*/
@Xss(message = "鍏憡鏍囬涓嶈兘鍖呭惈鑴氭湰瀛楃")
- @Schema(name = "鍏憡鏍囬")
@NotBlank(message = "鍏憡鏍囬涓嶈兘涓虹┖")
@Size(min = 0, max = 50, message = "鍏憡鏍囬涓嶈兘瓒呰繃50涓瓧绗�")
private String noticeTitle;
@@ -41,25 +38,21 @@
/**
* 鍏憡绫诲瀷锛�1閫氱煡 2鍏憡锛�
*/
- @Schema(name = "鍏憡绫诲瀷锛�1閫氱煡 2鍏憡锛�")
private String noticeType;
/**
* 鍏憡鍐呭
*/
- @Schema(name = "鍏憡鍐呭")
private String noticeContent;
/**
* 鍏憡鐘舵�侊紙0姝ｅ父 1鍏抽棴锛�
*/
- @Schema(name = "鍏憡鐘舵�侊紙0姝ｅ父 1鍏抽棴锛�")
private String status;
/**
* 澶囨敞
*/
- @Schema(name = "澶囨敞")
private String remark;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
index ebb3a4b..84af07b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
@@ -7,7 +7,6 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -24,7 +23,6 @@
@Data
@TableName("sys_oper_log")
@ExcelIgnoreUnannotated
-@Schema(name = "鎿嶄綔鏃ュ織璁板綍涓氬姟瀵硅薄")
public class SysOperLog implements Serializable {
private static final long serialVersionUID = 1L;
@@ -32,7 +30,6 @@
/**
* 鏃ュ織涓婚敭
*/
- @Schema(name = "鏃ュ織涓婚敭")
@ExcelProperty(value = "鏃ュ織涓婚敭")
@TableId(value = "oper_id")
private Long operId;
@@ -40,14 +37,12 @@
/**
* 鎿嶄綔妯″潡
*/
- @Schema(name = "鎿嶄綔妯″潡")
@ExcelProperty(value = "鎿嶄綔妯″潡")
private String title;
/**
* 涓氬姟绫诲瀷锛�0鍏跺畠 1鏂板 2淇敼 3鍒犻櫎锛�
*/
- @Schema(name = "涓氬姟绫诲瀷锛�0鍏跺畠 1鏂板 2淇敼 3鍒犻櫎锛�")
@ExcelProperty(value = "涓氬姟绫诲瀷", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_oper_type")
private Integer businessType;
@@ -55,28 +50,24 @@
/**
* 涓氬姟绫诲瀷鏁扮粍
*/
- @Schema(name = "涓氬姟绫诲瀷鏁扮粍")
@TableField(exist = false)
private Integer[] businessTypes;
/**
* 璇锋眰鏂规硶
*/
- @Schema(name = "璇锋眰鏂规硶")
@ExcelProperty(value = "璇锋眰鏂规硶")
private String method;
/**
* 璇锋眰鏂瑰紡
*/
- @Schema(name = "璇锋眰鏂瑰紡")
@ExcelProperty(value = "璇锋眰鏂瑰紡")
private String requestMethod;
/**
* 鎿嶄綔绫诲埆锛�0鍏跺畠 1鍚庡彴鐢ㄦ埛 2鎵嬫満绔敤鎴凤級
*/
- @Schema(name = "鎿嶄綔绫诲埆锛�0鍏跺畠 1鍚庡彴鐢ㄦ埛 2鎵嬫満绔敤鎴凤級")
@ExcelProperty(value = "鎿嶄綔绫诲埆", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=鍏跺畠,1=鍚庡彴鐢ㄦ埛,2=鎵嬫満绔敤鎴�")
private Integer operatorType;
@@ -84,56 +75,48 @@
/**
* 鎿嶄綔浜哄憳
*/
- @Schema(name = "鎿嶄綔浜哄憳")
@ExcelProperty(value = "鎿嶄綔浜哄憳")
private String operName;
/**
* 閮ㄩ棬鍚嶇О
*/
- @Schema(name = "閮ㄩ棬鍚嶇О")
@ExcelProperty(value = "閮ㄩ棬鍚嶇О")
private String deptName;
/**
* 璇锋眰url
*/
- @Schema(name = "璇锋眰url")
@ExcelProperty(value = "璇锋眰鍦板潃")
private String operUrl;
/**
* 鎿嶄綔鍦板潃
*/
- @Schema(name = "鎿嶄綔鍦板潃")
@ExcelProperty(value = "鎿嶄綔鍦板潃")
private String operIp;
/**
* 鎿嶄綔鍦扮偣
*/
- @Schema(name = "鎿嶄綔鍦扮偣")
@ExcelProperty(value = "鎿嶄綔鍦扮偣")
private String operLocation;
/**
* 璇锋眰鍙傛暟
*/
- @Schema(name = "璇锋眰鍙傛暟")
@ExcelProperty(value = "璇锋眰鍙傛暟")
private String operParam;
/**
* 杩斿洖鍙傛暟
*/
- @Schema(name = "杩斿洖鍙傛暟")
@ExcelProperty(value = "杩斿洖鍙傛暟")
private String jsonResult;
/**
* 鎿嶄綔鐘舵�侊紙0姝ｅ父 1寮傚父锛�
*/
- @Schema(name = "鎿嶄綔鐘舵�侊紙0姝ｅ父 1寮傚父锛�")
@ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_common_status")
private Integer status;
@@ -141,21 +124,18 @@
/**
* 閿欒娑堟伅
*/
- @Schema(name = "閿欒娑堟伅")
@ExcelProperty(value = "閿欒娑堟伅")
private String errorMsg;
/**
* 鎿嶄綔鏃堕棿
*/
- @Schema(name = "鎿嶄綔鏃堕棿")
@ExcelProperty(value = "鎿嶄綔鏃堕棿")
private Date operTime;
/**
* 璇锋眰鍙傛暟
*/
- @Schema(name = "璇锋眰鍙傛暟")
@TableField(exist = false)
private Map<String, Object> params = new HashMap<>();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
index f479a88..2fde8fc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
@@ -8,7 +8,6 @@
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import com.ruoyi.common.core.domain.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -26,13 +25,11 @@
@EqualsAndHashCode(callSuper = true)
@TableName("sys_post")
@ExcelIgnoreUnannotated
-@Schema(name = "宀椾綅淇℃伅涓氬姟瀵硅薄")
public class SysPost extends BaseEntity {
/**
* 宀椾綅搴忓彿
*/
- @Schema(name = "宀椾綅搴忓彿")
@ExcelProperty(value = "宀椾綅搴忓彿")
@TableId(value = "post_id")
private Long postId;
@@ -40,7 +37,6 @@
/**
* 宀椾綅缂栫爜
*/
- @Schema(name = "宀椾綅缂栫爜")
@ExcelProperty(value = "宀椾綅缂栫爜")
@NotBlank(message = "宀椾綅缂栫爜涓嶈兘涓虹┖")
@Size(min = 0, max = 64, message = "宀椾綅缂栫爜闀垮害涓嶈兘瓒呰繃64涓瓧绗�")
@@ -49,7 +45,6 @@
/**
* 宀椾綅鍚嶇О
*/
- @Schema(name = "宀椾綅鍚嶇О")
@ExcelProperty(value = "宀椾綅鍚嶇О")
@NotBlank(message = "宀椾綅鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 50, message = "宀椾綅鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
@@ -58,7 +53,6 @@
/**
* 宀椾綅鎺掑簭
*/
- @Schema(name = "宀椾綅鎺掑簭")
@ExcelProperty(value = "宀椾綅鎺掑簭")
@NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
private Integer postSort;
@@ -66,7 +60,6 @@
/**
* 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @Schema(name = "鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�")
@ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_common_status")
private String status;
@@ -74,13 +67,11 @@
/**
* 澶囨敞
*/
- @Schema(name = "澶囨敞")
private String remark;
/**
* 鐢ㄦ埛鏄惁瀛樺湪姝ゅ矖浣嶆爣璇� 榛樿涓嶅瓨鍦�
*/
- @Schema(name = "鐢ㄦ埛鏄惁瀛樺湪姝ゅ矖浣嶆爣璇� 榛樿涓嶅瓨鍦�")
@TableField(exist = false)
private boolean flag = false;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
index a0497c8..38e7048 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -14,20 +13,17 @@
@Data
@TableName("sys_role_dept")
-@Schema(name = "瑙掕壊鍜岄儴闂ㄥ叧鑱�")
public class SysRoleDept {
/**
* 瑙掕壊ID
*/
@TableId(type = IdType.INPUT)
- @Schema(name = "瑙掕壊ID")
private Long roleId;
/**
* 閮ㄩ棬ID
*/
- @Schema(name = "閮ㄩ棬ID")
private Long deptId;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
index 5c99a0e..dd359c4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -14,20 +13,17 @@
@Data
@TableName("sys_role_menu")
-@Schema(name = "瑙掕壊鍜岃彍鍗曞叧鑱�")
public class SysRoleMenu {
/**
* 瑙掕壊ID
*/
@TableId(type = IdType.INPUT)
- @Schema(name = "瑙掕壊ID")
private Long roleId;
/**
* 鑿滃崟ID
*/
- @Schema(name = "瑙掕壊ID")
private Long menuId;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
index 4473d3b..e8fa5bf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
@@ -1,6 +1,5 @@
package com.ruoyi.system.domain;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -10,55 +9,46 @@
*/
@Data
-@Schema(name = "褰撳墠鍦ㄧ嚎浼氳瘽涓氬姟瀵硅薄")
public class SysUserOnline {
/**
* 浼氳瘽缂栧彿
*/
- @Schema(name = "浼氳瘽缂栧彿")
private String tokenId;
/**
* 閮ㄩ棬鍚嶇О
*/
- @Schema(name = "閮ㄩ棬鍚嶇О")
private String deptName;
/**
* 鐢ㄦ埛鍚嶇О
*/
- @Schema(name = "鐢ㄦ埛鍚嶇О")
private String userName;
/**
* 鐧诲綍IP鍦板潃
*/
- @Schema(name = "鐧诲綍IP鍦板潃")
private String ipaddr;
/**
* 鐧诲綍鍦板潃
*/
- @Schema(name = "鐧诲綍鍦板潃")
private String loginLocation;
/**
* 娴忚鍣ㄧ被鍨�
*/
- @Schema(name = "娴忚鍣ㄧ被鍨�")
private String browser;
/**
* 鎿嶄綔绯荤粺
*/
- @Schema(name = "鎿嶄綔绯荤粺")
private String os;
/**
* 鐧诲綍鏃堕棿
*/
- @Schema(name = "鐧诲綍鏃堕棿")
private Long loginTime;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
index 6a5f43c..a698055 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -14,20 +13,17 @@
@Data
@TableName("sys_user_post")
-@Schema(name = "鐢ㄦ埛鍜屽矖浣嶅叧鑱�")
public class SysUserPost {
/**
* 鐢ㄦ埛ID
*/
@TableId(type = IdType.INPUT)
- @Schema(name = "鐢ㄦ埛ID")
private Long userId;
/**
* 宀椾綅ID
*/
- @Schema(name = "宀椾綅ID")
private Long postId;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
index 4be15f8..8d35437 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -14,20 +13,17 @@
@Data
@TableName("sys_user_role")
-@Schema(name = "鐢ㄦ埛鍜岃鑹插叧鑱�")
public class SysUserRole {
/**
* 鐢ㄦ埛ID
*/
@TableId(type = IdType.INPUT)
- @Schema(name = "鐢ㄦ埛ID")
private Long userId;
/**
* 瑙掕壊ID
*/
- @Schema(name = "瑙掕壊ID")
private Long roleId;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java
index bc1d296..3f5ab4a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java
@@ -1,7 +1,6 @@
package com.ruoyi.system.domain.bo;
import com.ruoyi.common.core.domain.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -12,33 +11,27 @@
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@Schema(name = "OSS瀵硅薄瀛樺偍鍒嗛〉鏌ヨ瀵硅薄")
public class SysOssBo extends BaseEntity {
/**
* 鏂囦欢鍚�
*/
- @Schema(name = "鏂囦欢鍚�")
private String fileName;
/**
* 鍘熷悕
*/
- @Schema(name = "鍘熷悕")
private String originalName;
/**
* 鏂囦欢鍚庣紑鍚�
*/
- @Schema(name = "鏂囦欢鍚庣紑鍚�")
private String fileSuffix;
/**
* URL鍦板潃
*/
- @Schema(name = "URL鍦板潃")
private String url;
/**
* 鏈嶅姟鍟�
*/
- @Schema(name = "鏈嶅姟鍟�")
private String service;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java
index b45a378..e9f481d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java
@@ -3,7 +3,6 @@
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -21,20 +20,17 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Schema(name = "瀵硅薄瀛樺偍閰嶇疆涓氬姟瀵硅薄")
public class SysOssConfigBo extends BaseEntity {
/**
* 涓诲缓
*/
- @Schema(name = "涓诲缓", required = true)
@NotNull(message = "涓诲缓涓嶈兘涓虹┖", groups = {EditGroup.class})
private Long ossConfigId;
/**
* 閰嶇疆key
*/
- @Schema(name = "閰嶇疆key", required = true)
@NotBlank(message = "閰嶇疆key涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
@Size(min = 2, max = 100, message = "configKey闀垮害蹇呴』浠嬩簬2鍜�20 涔嬮棿")
private String configKey;
@@ -42,7 +38,6 @@
/**
* accessKey
*/
- @Schema(name = "accessKey", required = true)
@NotBlank(message = "accessKey涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
@Size(min = 2, max = 100, message = "accessKey闀垮害蹇呴』浠嬩簬2鍜�100 涔嬮棿")
private String accessKey;
@@ -50,7 +45,6 @@
/**
* 绉橀挜
*/
- @Schema(name = "secretKey", required = true)
@NotBlank(message = "secretKey涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
@Size(min = 2, max = 100, message = "secretKey闀垮害蹇呴』浠嬩簬2鍜�100 涔嬮棿")
private String secretKey;
@@ -58,7 +52,6 @@
/**
* 妗跺悕绉�
*/
- @Schema(name = "妗跺悕绉�", required = true)
@NotBlank(message = "妗跺悕绉颁笉鑳戒负绌�", groups = {AddGroup.class, EditGroup.class})
@Size(min = 2, max = 100, message = "bucketName闀垮害蹇呴』浠嬩簬2鍜�100涔嬮棿")
private String bucketName;
@@ -66,13 +59,11 @@
/**
* 鍓嶇紑
*/
- @Schema(name = "鍓嶇紑")
private String prefix;
/**
* 璁块棶绔欑偣
*/
- @Schema(name = "璁块棶绔欑偣", required = true)
@NotBlank(message = "璁块棶绔欑偣涓嶈兘涓虹┖", groups = {AddGroup.class, EditGroup.class})
@Size(min = 2, max = 100, message = "endpoint闀垮害蹇呴』浠嬩簬2鍜�100涔嬮棿")
private String endpoint;
@@ -80,37 +71,31 @@
/**
* 鑷畾涔夊煙鍚�
*/
- @Schema(name = "鑷畾涔夊煙鍚�")
private String domain;
/**
* 鏄惁https锛圷=鏄�,N=鍚︼級
*/
- @Schema(name = "鏄惁https锛圷=鏄�,N=鍚︼級")
private String isHttps;
/**
* 鐘舵�侊紙0=姝ｅ父,1=鍋滅敤锛�
*/
- @Schema(name = "鐘舵�侊紙0=姝ｅ父,1=鍋滅敤锛�")
private String status;
/**
* 鍩�
*/
- @Schema(name = "鍩�")
private String region;
/**
* 鎵╁睍瀛楁
*/
- @Schema(name = "鎵╁睍瀛楁")
private String ext1;
/**
* 澶囨敞
*/
- @Schema(name = "澶囨敞")
private String remark;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
index 3b864da..ec1f02e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
@@ -1,7 +1,6 @@
package com.ruoyi.system.domain.vo;
import com.ruoyi.common.utils.StringUtils;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -11,31 +10,26 @@
*/
@Data
-@Schema(name = "璺敱鏄剧ず淇℃伅")
public class MetaVo {
/**
* 璁剧疆璇ヨ矾鐢卞湪渚ц竟鏍忓拰闈㈠寘灞戜腑灞曠ず鐨勫悕瀛�
*/
- @Schema(name = "璁剧疆璇ヨ矾鐢卞湪渚ц竟鏍忓拰闈㈠寘灞戜腑灞曠ず鐨勫悕瀛�")
private String title;
/**
* 璁剧疆璇ヨ矾鐢辩殑鍥炬爣锛屽搴旇矾寰剆rc/assets/icons/svg
*/
- @Schema(name = "璁剧疆璇ヨ矾鐢辩殑鍥炬爣锛屽搴旇矾寰剆rc/assets/icons/svg")
private String icon;
/**
* 璁剧疆涓簍rue锛屽垯涓嶄細琚� <keep-alive>缂撳瓨
*/
- @Schema(name = "璁剧疆涓簍rue锛屽垯涓嶄細琚� <keep-alive>缂撳瓨")
private boolean noCache;
/**
* 鍐呴摼鍦板潃锛坔ttp(s)://寮�澶达級
*/
- @Schema(name = "鍐呴摼鍦板潃锛坔ttp(s)://寮�澶达級")
private String link;
public MetaVo(String title, String icon) {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
index 7f961a7..8351f7c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
@@ -1,7 +1,6 @@
package com.ruoyi.system.domain.vo;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
@@ -13,61 +12,51 @@
*/
@Data
@JsonInclude(JsonInclude.Include.NON_EMPTY)
-@Schema(name = "璺敱閰嶇疆淇℃伅")
public class RouterVo {
/**
* 璺敱鍚嶅瓧
*/
- @Schema(name = "璺敱鍚嶅瓧")
private String name;
/**
* 璺敱鍦板潃
*/
- @Schema(name = "璺敱鍦板潃")
private String path;
/**
* 鏄惁闅愯棌璺敱锛屽綋璁剧疆 true 鐨勬椂鍊欒璺敱涓嶄細鍐嶄晶杈规爮鍑虹幇
*/
- @Schema(name = "鏄惁闅愯棌璺敱锛屽綋璁剧疆 true 鐨勬椂鍊欒璺敱涓嶄細鍐嶄晶杈规爮鍑虹幇")
private boolean hidden;
/**
* 閲嶅畾鍚戝湴鍧�锛屽綋璁剧疆 noRedirect 鐨勬椂鍊欒璺敱鍦ㄩ潰鍖呭睉瀵艰埅涓笉鍙鐐瑰嚮
*/
- @Schema(name = "閲嶅畾鍚戝湴鍧�锛屽綋璁剧疆 noRedirect 鐨勬椂鍊欒璺敱鍦ㄩ潰鍖呭睉瀵艰埅涓笉鍙鐐瑰嚮")
private String redirect;
/**
* 缁勪欢鍦板潃
*/
- @Schema(name = "缁勪欢鍦板潃")
private String component;
/**
* 璺敱鍙傛暟锛氬 {"id": 1, "name": "ry"}
*/
- @Schema(name = "璺敱鍙傛暟锛氬 {\"id\": 1, \"name\": \"ry\"}")
private String query;
/**
* 褰撲綘涓�涓矾鐢变笅闈㈢殑 children 澹版槑鐨勮矾鐢卞ぇ浜�1涓椂锛岃嚜鍔ㄤ細鍙樻垚宓屽鐨勬ā寮�--濡傜粍浠堕〉闈�
*/
- @Schema(name = "褰撲綘涓�涓矾鐢变笅闈㈢殑 children 澹版槑鐨勮矾鐢卞ぇ浜�1涓椂锛岃嚜鍔ㄤ細鍙樻垚宓屽鐨勬ā寮�--濡傜粍浠堕〉闈�")
private Boolean alwaysShow;
/**
* 鍏朵粬鍏冪礌
*/
- @Schema(name = "鍏朵粬鍏冪礌")
private MetaVo meta;
/**
* 瀛愯矾鐢�
*/
- @Schema(name = "瀛愯矾鐢�")
private List<RouterVo> children;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java
index 833dc3b..f8b31d6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java
@@ -1,7 +1,6 @@
package com.ruoyi.system.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -13,7 +12,6 @@
* @date 2021-08-13
*/
@Data
-@Schema(name = "瀵硅薄瀛樺偍閰嶇疆瑙嗗浘瀵硅薄")
@ExcelIgnoreUnannotated
public class SysOssConfigVo {
@@ -22,79 +20,66 @@
/**
* 涓诲缓
*/
- @Schema(name = "涓诲缓")
private Long ossConfigId;
/**
* 閰嶇疆key
*/
- @Schema(name = "閰嶇疆key")
private String configKey;
/**
* accessKey
*/
- @Schema(name = "accessKey")
private String accessKey;
/**
* 绉橀挜
*/
- @Schema(name = "secretKey")
private String secretKey;
/**
* 妗跺悕绉�
*/
- @Schema(name = "妗跺悕绉�")
private String bucketName;
/**
* 鍓嶇紑
*/
- @Schema(name = "鍓嶇紑")
private String prefix;
/**
* 璁块棶绔欑偣
*/
- @Schema(name = "璁块棶绔欑偣")
private String endpoint;
/**
* 鑷畾涔夊煙鍚�
*/
- @Schema(name = "鑷畾涔夊煙鍚�")
private String domain;
/**
* 鏄惁https锛圷=鏄�,N=鍚︼級
*/
- @Schema(name = "鏄惁https锛圷=鏄�,N=鍚︼級")
private String isHttps;
/**
* 鍩�
*/
- @Schema(name = "鍩�")
private String region;
/**
* 鐘舵�侊紙0=姝ｅ父,1=鍋滅敤锛�
*/
- @Schema(name = "鐘舵�侊紙0=姝ｅ父,1=鍋滅敤锛�")
private String status;
/**
* 鎵╁睍瀛楁
*/
- @Schema(name = "鎵╁睍瀛楁")
private String ext1;
/**
* 澶囨敞
*/
- @Schema(name = "澶囨敞")
private String remark;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java
index b0b8da3..53f5f8d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java
@@ -1,6 +1,5 @@
package com.ruoyi.system.domain.vo;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.Date;
@@ -11,7 +10,6 @@
* @author Lion Li
*/
@Data
-@Schema(name = "OSS瀵硅薄瀛樺偍瑙嗗浘瀵硅薄")
public class SysOssVo {
private static final long serialVersionUID = 1L;
@@ -19,49 +17,41 @@
/**
* 瀵硅薄瀛樺偍涓婚敭
*/
- @Schema(name = "瀵硅薄瀛樺偍涓婚敭")
private Long ossId;
/**
* 鏂囦欢鍚�
*/
- @Schema(name = "鏂囦欢鍚�")
private String fileName;
/**
* 鍘熷悕
*/
- @Schema(name = "鍘熷悕")
private String originalName;
/**
* 鏂囦欢鍚庣紑鍚�
*/
- @Schema(name = "鏂囦欢鍚庣紑鍚�")
private String fileSuffix;
/**
* URL鍦板潃
*/
- @Schema(name = "URL鍦板潃")
private String url;
/**
* 鍒涘缓鏃堕棿
*/
- @Schema(name = "鍒涘缓鏃堕棿")
private Date createTime;
/**
* 涓婁紶浜�
*/
- @Schema(name = "涓婁紶浜�")
private String createBy;
/**
* 鏈嶅姟鍟�
*/
- @Schema(name = "鏈嶅姟鍟�")
private String service;
--
Gitblit v1.9.3