Merge remote-tracking branch 'origin/dev' into dev

README.md

@@ -4,7 +4,7 @@
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/blob/master/LICENSE)
 [![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
 <br>
-[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-3.1.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
+[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-3.2.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
 [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.5-blue.svg)]()
 [![JDK-8+](https://img.shields.io/badge/JDK-8-green.svg)]()
 [![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]()
@@ -33,6 +33,7 @@ RuoYi-Vue-Plus 是基于 RuoYi-Vue 针对 `分布式集群` 场景升级(不兼
 | 分布式限流 | Redisson | [Redisson文档](https://github.com/redisson/redisson/wiki/%E7%9B%AE%E5%BD%95) | 全局、请求IP、集群ID 多种限流 |
 | 分布式锁 | Lock4j | [Lock4j官网](https://gitee.com/baomidou/lock4j) | 注解锁、工具锁 多种多样 |
 | 分布式幂等 | Lock4j | [Lock4j文档](https://gitee.com/baomidou/lock4j) | 基于分布式锁实现 |
+| 分布式日志 | TLog | [TLog文档](https://yomahub.com/tlog/docs) | 支持跟踪链路日志记录、性能分析、链路排查 |
 | 文件存储 | Minio | [Minio文档](https://docs.min.io/) | 本地存储 |
 | 文件存储 | 七牛、阿里、腾讯 | [OSS使用文档](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=4359146&doc_id=1469725) | 云存储 |
 | 监控框架 | SpringBoot-Admin | [SpringBoot-Admin文档](https://codecentric.github.io/spring-boot-admin/current/) | 全方位服务监控 |

docker/docker-compose.yml

@@ -103,7 +103,7 @@ services:
         ipv4_address: 172.30.0.54
 
   ruoyi-server1:
-    image: "ruoyi/ruoyi-server:3.1.0"
+    image: "ruoyi/ruoyi-server:3.2.0"
     container_name: ruoyi-server1
     environment:
       # 时区上海
@@ -118,7 +118,7 @@ services:
         ipv4_address: 172.30.0.60
 
   ruoyi-server2:
-    image: "ruoyi/ruoyi-server:3.1.0"
+    image: "ruoyi/ruoyi-server:3.2.0"
     container_name: ruoyi-server2
     environment:
       # 时区上海
@@ -133,7 +133,7 @@ services:
         ipv4_address: 172.30.0.61
 
   ruoyi-monitor-admin:
-    image: "ruoyi/ruoyi-monitor-admin:3.1.0"
+    image: "ruoyi/ruoyi-monitor-admin:3.2.0"
     container_name: ruoyi-monitor-admin
     environment:
       # 时区上海

pom.xml

@@ -6,20 +6,20 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi-vue-plus</artifactId>
-    <version>3.1.0</version>
+    <version>3.2.0</version>
 
     <name>RuoYi-Vue-Plus</name>
     <url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
     <description>RuoYi-Vue-Plus后台管理系统</description>
 
     <properties>
-        <ruoyi-vue-plus.version>3.1.0</ruoyi-vue-plus.version>
+        <ruoyi-vue-plus.version>3.2.0</ruoyi-vue-plus.version>
         <spring-boot.version>2.5.5</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
-        <druid.version>1.2.6</druid.version>
+        <druid.version>1.2.8</druid.version>
         <knife4j.version>3.0.3</knife4j.version>
         <swagger-annotations.version>1.5.22</swagger-annotations.version>
         <poi.version>4.1.2</poi.version>
@@ -32,10 +32,11 @@
         <feign.version>3.0.3</feign.version>
         <feign-okhttp.version>11.6</feign-okhttp.version>
         <okhttp.version>4.9.1</okhttp.version>
-        <spring-boot-admin.version>2.5.1</spring-boot-admin.version>
+        <spring-boot-admin.version>2.5.2</spring-boot-admin.version>
         <redisson.version>3.16.3</redisson.version>
         <lock4j.version>2.2.1</lock4j.version>
         <dynamic-ds.version>3.4.1</dynamic-ds.version>
+        <tlog.version>1.3.2</tlog.version>
 
         <!-- jdk11 缺失依赖 jaxb-->
         <jaxb.version>3.0.1</jaxb.version>
@@ -158,6 +159,7 @@
                 <version>${hutool.version}</version>
             </dependency>
 
+            <!-- @deprecated 由于使用人数较少 决定与 3.4.0 版本移除 -->
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-starter-openfeign</artifactId>
@@ -169,7 +171,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-
+            <!-- @deprecated 由于使用人数较少 决定与 3.4.0 版本移除 -->
             <dependency>
                 <groupId>io.github.openfeign</groupId>
                 <artifactId>feign-okhttp</artifactId>
@@ -204,7 +206,36 @@
                 <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
                 <version>${lock4j.version}</version>
             </dependency>
-            <!-- 定时任务-->
+
+            <dependency>
+                <groupId>com.yomahub</groupId>
+                <artifactId>tlog-spring-boot-configuration</artifactId>
+                <version>${tlog.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.yomahub</groupId>
+                <artifactId>tlog-webroot</artifactId>
+                <version>${tlog.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>javassist</artifactId>
+                        <groupId>org.javassist</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>guava</artifactId>
+                        <groupId>com.google.guava</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>com.yomahub</groupId>
+                <artifactId>tlog-feign</artifactId>
+                <version>${tlog.version}</version>
+            </dependency>
+
+            <!-- 定时任务 @deprecated 3.5.0删除 迁移至xxl-job -->
             <dependency>
                 <groupId>com.ruoyi</groupId>
                 <artifactId>ruoyi-quartz</artifactId>

ruoyi-admin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
@@ -41,7 +41,7 @@
             <artifactId>ruoyi-system</artifactId>
         </dependency>
 
-        <!-- 定时任务-->
+        <!-- 定时任务 @deprecated 3.5.0删除 迁移至xxl-job -->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-quartz</artifactId>
@@ -87,7 +87,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.0</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <warName>${project.artifactId}</warName>

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -10,12 +10,12 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  */
 
 @SpringBootApplication
-public class RuoYiApplication
+public class RuoYiApplication {
-{
+
-    public static void main(String[] args)
+    public static void main(String[] args) {
-    {
         System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
         System.out.println("(♥◠‿◠)ﾉﾞ  RuoYi-Vue-Plus启动成功   ლ(´ڡ`ლ)ﾞ");
     }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java

@@ -5,14 +5,14 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 
 /**
  * web容器中进行部署
- * 
+ *
  * @author ruoyi
  */
-public class RuoYiServletInitializer extends SpringBootServletInitializer
+public class RuoYiServletInitializer extends SpringBootServletInitializer {
-{
+
     @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-    {
         return application.sources(RuoYiApplication.class);
     }
+
 }

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

@@ -13,6 +13,9 @@ import com.ruoyi.common.utils.reflect.ReflectUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.config.properties.CaptchaProperties;
 import com.ruoyi.system.service.ISysConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -24,61 +27,61 @@ import java.util.concurrent.TimeUnit;
 /**
  * 验证码操作处理
  *
- * @author ruoyi
+ * @author Lion Li
  */
+@Api(value = "验证码操作处理", tags = {"验证码管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 public class CaptchaController {
 
-	@Autowired
+    private final CaptchaProperties captchaProperties;
-	private CaptchaProperties captchaProperties;
+    private final ISysConfigService configService;
 
-	@Autowired
+    /**
-	private ISysConfigService configService;
+     * 生成验证码
+     */
+    @ApiOperation("生成验证码")
+    @GetMapping("/captchaImage")
+    public AjaxResult<Map<String, Object>> getCode() {
+        Map<String, Object> ajax = new HashMap<>();
+        boolean captchaOnOff = configService.selectCaptchaOnOff();
+        ajax.put("captchaOnOff", captchaOnOff);
+        if (!captchaOnOff) {
+            return AjaxResult.success(ajax);
+        }
+        // 保存验证码信息
+        String uuid = IdUtil.simpleUUID();
+        String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
+        // 生成验证码
+        CaptchaType captchaType = captchaProperties.getType();
+        boolean isMath = CaptchaType.MATH == captchaType;
+        Integer length = isMath ? captchaProperties.getNumberLength() : captchaProperties.getCharLength();
+        CodeGenerator codeGenerator = ReflectUtils.newInstance(captchaType.getClazz(), length);
+        AbstractCaptcha captcha = SpringUtils.getBean(captchaProperties.getCategory().getClazz());
+        captcha.setGenerator(codeGenerator);
+        captcha.createCode();
+        String code = isMath ? getCodeResult(captcha.getCode()) : captcha.getCode();
+        RedisUtils.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
+        ajax.put("uuid", uuid);
+        ajax.put("img", captcha.getImageBase64());
+        return AjaxResult.success(ajax);
+    }
 
-	/**
+    private String getCodeResult(String capStr) {
-	 * 生成验证码
+        int numberLength = captchaProperties.getNumberLength();
-	 */
+        int a = Convert.toInt(StringUtils.substring(capStr, 0, numberLength).trim());
-	@GetMapping("/captchaImage")
+        char operator = capStr.charAt(numberLength);
-	public AjaxResult getCode() {
+        int b = Convert.toInt(StringUtils.substring(capStr, numberLength + 1, numberLength + 1 + numberLength).trim());
-		Map<String, Object> ajax = new HashMap<>();
+        switch (operator) {
-		boolean captchaOnOff = configService.selectCaptchaOnOff();
+            case '*':
-		ajax.put("captchaOnOff", captchaOnOff);
+                return Convert.toStr(a * b);
-		if (!captchaOnOff) {
+            case '+':
-			return AjaxResult.success(ajax);
+                return Convert.toStr(a + b);
-		}
+            case '-':
-		// 保存验证码信息
+                return Convert.toStr(a - b);
-		String uuid = IdUtil.simpleUUID();
+            default:
-		String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
+                return StringUtils.EMPTY;
-		// 生成验证码
+        }
-		CaptchaType captchaType = captchaProperties.getType();
+    }
-		boolean isMath = CaptchaType.MATH == captchaType;
-		Integer length = isMath ? captchaProperties.getNumberLength() : captchaProperties.getCharLength();
-		CodeGenerator codeGenerator = ReflectUtils.newInstance(captchaType.getClazz(), length);
-		AbstractCaptcha captcha = SpringUtils.getBean(captchaProperties.getCategory().getClazz());
-		captcha.setGenerator(codeGenerator);
-		captcha.createCode();
-		String code = isMath ? getCodeResult(captcha.getCode()) : captcha.getCode();
-		RedisUtils.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
-		ajax.put("uuid", uuid);
-		ajax.put("img", captcha.getImageBase64());
-		return AjaxResult.success(ajax);
-	}
-
-	private String getCodeResult(String capStr) {
-		int numberLength = captchaProperties.getNumberLength();
-		int a = Convert.toInt(StringUtils.substring(capStr, 0, numberLength).trim());
-		char operator = capStr.charAt(numberLength);
-		int b = Convert.toInt(StringUtils.substring(capStr, numberLength + 1, numberLength + 1 + numberLength).trim());
-		switch (operator) {
-			case '*':
-				return Convert.toStr(a * b);
-			case '+':
-				return Convert.toStr(a + b);
-			case '-':
-				return Convert.toStr(a - b);
-			default:
-				return StringUtils.EMPTY;
-		}
-	}
 
 }

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

@@ -1,8 +1,12 @@
 package com.ruoyi.web.controller.monitor;
 
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.connection.RedisServerCommands;
 import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -15,35 +19,38 @@ import java.util.*;
 /**
  * 缓存监控
  *
- * @author ruoyi
+ * @author Lion Li
  */
+@Api(value = "缓存监控", tags = {"缓存监控管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/monitor/cache")
-public class CacheController
+public class CacheController {
-{
-    @Autowired
-    private RedisTemplate<String, String> redisTemplate;
 
+    private final RedisTemplate<String, String> redisTemplate;
+
+    @ApiOperation("获取缓存监控详细信息")
     @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
     @GetMapping()
-    public AjaxResult getInfo() throws Exception
+    public AjaxResult<Map<String, Object>> getInfo() throws Exception {
-    {
+        Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::info);
-        Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info());
         Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
-        Object dbSize = redisTemplate.execute((RedisCallback<Object>) connection -> connection.dbSize());
+        Object dbSize = redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::dbSize);
 
         Map<String, Object> result = new HashMap<>(3);
         result.put("info", info);
         result.put("dbSize", dbSize);
 
         List<Map<String, String>> pieList = new ArrayList<>();
-        commandStats.stringPropertyNames().forEach(key -> {
+        if (commandStats != null) {
-            Map<String, String> data = new HashMap<>(2);
+            commandStats.stringPropertyNames().forEach(key -> {
-            String property = commandStats.getProperty(key);
+                Map<String, String> data = new HashMap<>(2);
-            data.put("name", StringUtils.removeStart(key, "cmdstat_"));
+                String property = commandStats.getProperty(key);
-            data.put("value", StringUtils.substringBetween(property, "calls=", ",usec"));
+                data.put("name", StringUtils.removeStart(key, "cmdstat_"));
-            pieList.add(data);
+                data.put("value", StringUtils.substringBetween(property, "calls=", ",usec"));
-        });
+                pieList.add(data);
+            });
+        }
         result.put("commandStats", pieList);
         return AjaxResult.success(result);
     }

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

@@ -8,8 +8,12 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysLogininfor;
 import com.ruoyi.system.service.ISysLogininforService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -18,44 +22,46 @@ import java.util.List;
 /**
  * 系统访问记录
  *
- * @author ruoyi
+ * @author Lion Li
  */
+@Validated
+@Api(value = "系统访问记录", tags = {"系统访问记录管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/monitor/logininfor")
-public class SysLogininforController extends BaseController
+public class SysLogininforController extends BaseController {
-{
-    @Autowired
-    private ISysLogininforService logininforService;
 
+    private final ISysLogininforService logininforService;
+
+    @ApiOperation("查询系统访问记录列表")
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysLogininfor logininfor)
+    public TableDataInfo<SysLogininfor> list(SysLogininfor logininfor) {
-    {
         return logininforService.selectPageLogininforList(logininfor);
     }
 
+    @ApiOperation("导出系统访问记录列表")
     @Log(title = "登录日志", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
     @GetMapping("/export")
-    public void export(SysLogininfor logininfor, HttpServletResponse response)
+    public void export(SysLogininfor logininfor, HttpServletResponse response) {
-    {
         List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
-		ExcelUtil.exportExcel(list, "登录日志", SysLogininfor.class, response);
+        ExcelUtil.exportExcel(list, "登录日志", SysLogininfor.class, response);
     }
 
+    @ApiOperation("删除系统访问记录")
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
     @Log(title = "登录日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/{infoIds}")
-    public AjaxResult remove(@PathVariable Long[] infoIds)
+    public AjaxResult<Void> remove(@PathVariable Long[] infoIds) {
-    {
         return toAjax(logininforService.deleteLogininforByIds(infoIds));
     }
 
+    @ApiOperation("清空系统访问记录")
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
     @Log(title = "登录日志", businessType = BusinessType.CLEAN)
     @DeleteMapping("/clean")
-    public AjaxResult clean()
+    public AjaxResult<Void> clean() {
-    {
         logininforService.cleanLogininfor();
         return AjaxResult.success();
     }

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

@@ -8,8 +8,12 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysOperLog;
 import com.ruoyi.system.service.ISysOperLogService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -18,44 +22,46 @@ import java.util.List;
 /**
  * 操作日志记录
  *
- * @author ruoyi
+ * @author Lion Li
  */
+@Validated
+@Api(value = "操作日志记录", tags = {"操作日志记录管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/monitor/operlog")
-public class SysOperlogController extends BaseController
+public class SysOperlogController extends BaseController {
-{
-    @Autowired
-    private ISysOperLogService operLogService;
 
+    private final ISysOperLogService operLogService;
+
+    @ApiOperation("查询操作日志记录列表")
     @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysOperLog operLog)
+    public TableDataInfo<SysOperLog> list(SysOperLog operLog) {
-    {
         return operLogService.selectPageOperLogList(operLog);
     }
 
+    @ApiOperation("导出操作日志记录列表")
     @Log(title = "操作日志", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
     @GetMapping("/export")
-    public void export(SysOperLog operLog, HttpServletResponse response)
+    public void export(SysOperLog operLog, HttpServletResponse response) {
-    {
         List<SysOperLog> list = operLogService.selectOperLogList(operLog);
-		ExcelUtil.exportExcel(list, "操作日志", SysOperLog.class, response);
+        ExcelUtil.exportExcel(list, "操作日志", SysOperLog.class, response);
     }
 
+    @ApiOperation("删除操作日志记录")
     @Log(title = "操作日志", businessType = BusinessType.DELETE)
     @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
     @DeleteMapping("/{operIds}")
-    public AjaxResult remove(@PathVariable Long[] operIds)
+    public AjaxResult<Void> remove(@PathVariable Long[] operIds) {
-    {
         return toAjax(operLogService.deleteOperLogByIds(operIds));
     }
 
+    @ApiOperation("清空操作日志记录")
     @Log(title = "操作日志", businessType = BusinessType.CLEAN)
     @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
     @DeleteMapping("/clean")
-    public AjaxResult clean()
+    public AjaxResult<Void> clean() {
-    {
         operLogService.cleanOperLog();
         return AjaxResult.success();
     }

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

@@ -12,6 +12,9 @@ import com.ruoyi.common.utils.RedisUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.SysUserOnline;
 import com.ruoyi.system.service.ISysUserOnlineService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -24,47 +27,37 @@ import java.util.List;
 /**
  * 在线用户监控
  *
- * @author ruoyi
+ * @author Lion Li
  */
+@Api(value = "在线用户监控", tags = {"在线用户监控管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/monitor/online")
-public class SysUserOnlineController extends BaseController
+public class SysUserOnlineController extends BaseController {
-{
-    @Autowired
-    private ISysUserOnlineService userOnlineService;
 
+    private final ISysUserOnlineService userOnlineService;
+
+    @ApiOperation("在线用户列表")
     @PreAuthorize("@ss.hasPermi('monitor:online:list')")
     @GetMapping("/list")
-    public TableDataInfo list(String ipaddr, String userName)
+    public TableDataInfo<SysUserOnline> list(String ipaddr, String userName) {
-    {
         Collection<String> keys = RedisUtils.keys(Constants.LOGIN_TOKEN_KEY + "*");
         List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
-        for (String key : keys)
+        for (String key : keys) {
-        {
             LoginUser user = RedisUtils.getCacheObject(key);
-            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
+            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) {
-            {
+                if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) {
-                if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
-                {
                     userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
                 }
-            }
+            } else if (StringUtils.isNotEmpty(ipaddr)) {
-            else if (StringUtils.isNotEmpty(ipaddr))
+                if (StringUtils.equals(ipaddr, user.getIpaddr())) {
-            {
-                if (StringUtils.equals(ipaddr, user.getIpaddr()))
-                {
                     userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
                 }
-            }
+            } else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser())) {
-            else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
+                if (StringUtils.equals(userName, user.getUsername())) {
-            {
-                if (StringUtils.equals(userName, user.getUsername()))
-                {
                     userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
                 }
-            }
+            } else {
-            else
-            {
                 userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
             }
         }
@@ -76,11 +69,11 @@ public class SysUserOnlineController extends BaseController
     /**
      * 强退用户
      */
+    @ApiOperation("强退用户")
     @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
     @Log(title = "在线用户", businessType = BusinessType.FORCE)
     @DeleteMapping("/{tokenId}")
-    public AjaxResult forceLogout(@PathVariable String tokenId)
+    public AjaxResult<Void> forceLogout(@PathVariable String tokenId) {
-    {
         RedisUtils.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
         return AjaxResult.success();
     }

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

@@ -10,6 +10,9 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.service.ISysConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -21,64 +24,65 @@ import java.util.List;
 /**
  * 参数配置 信息操作处理
  *
- * @author ruoyi
+ * @author Lion Li
  */
+@Validated
+@Api(value = "参数配置控制器", tags = {"参数配置管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/config")
-public class SysConfigController extends BaseController
+public class SysConfigController extends BaseController {
-{
+
-    @Autowired
+    private final ISysConfigService configService;
-    private ISysConfigService configService;
 
     /**
      * 获取参数配置列表
      */
+    @ApiOperation("获取参数配置列表")
     @PreAuthorize("@ss.hasPermi('system:config:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysConfig config)
+    public TableDataInfo<SysConfig> list(SysConfig config) {
-    {
         return configService.selectPageConfigList(config);
     }
 
+    @ApiOperation("导出参数配置列表")
     @Log(title = "参数管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:config:export')")
     @GetMapping("/export")
-    public void export(SysConfig config, HttpServletResponse response)
+    public void export(SysConfig config, HttpServletResponse response) {
-    {
         List<SysConfig> list = configService.selectConfigList(config);
-		ExcelUtil.exportExcel(list, "参数数据", SysConfig.class, response);
+        ExcelUtil.exportExcel(list, "参数数据", SysConfig.class, response);
     }
 
     /**
      * 根据参数编号获取详细信息
      */
+    @ApiOperation("根据参数编号获取详细信息")
     @PreAuthorize("@ss.hasPermi('system:config:query')")
     @GetMapping(value = "/{configId}")
-    public AjaxResult getInfo(@PathVariable Long configId)
+    public AjaxResult<SysConfig> getInfo(@PathVariable Long configId) {
-    {
         return AjaxResult.success(configService.selectConfigById(configId));
     }
 
     /**
      * 根据参数键名查询参数值
      */
+    @ApiOperation("根据参数键名查询参数值")
     @GetMapping(value = "/configKey/{configKey}")
-    public AjaxResult getConfigKey(@PathVariable String configKey)
+    public AjaxResult<Void> getConfigKey(@PathVariable String configKey) {
-    {
         return AjaxResult.success(configService.selectConfigByKey(configKey));
     }
 
     /**
      * 新增参数配置
      */
+    @ApiOperation("新增参数配置")
     @PreAuthorize("@ss.hasPermi('system:config:add')")
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @PostMapping
     @RepeatSubmit
-    public AjaxResult add(@Validated @RequestBody SysConfig config)
+    public AjaxResult<Void> add(@Validated @RequestBody SysConfig config) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
-        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
-        {
             return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
         config.setCreateBy(getUsername());
@@ -88,13 +92,12 @@ public class SysConfigController extends BaseController
     /**
      * 修改参数配置
      */
+    @ApiOperation("修改参数配置")
     @PreAuthorize("@ss.hasPermi('system:config:edit')")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysConfig config)
+    public AjaxResult<Void> edit(@Validated @RequestBody SysConfig config) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
-        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
-        {
             return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
         config.setUpdateBy(getUsername());
@@ -104,11 +107,11 @@ public class SysConfigController extends BaseController
     /**
      * 删除参数配置
      */
+    @ApiOperation("删除参数配置")
     @PreAuthorize("@ss.hasPermi('system:config:remove')")
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{configIds}")
-    public AjaxResult remove(@PathVariable Long[] configIds)
+    public AjaxResult<Void> remove(@PathVariable Long[] configIds) {
-    {
         configService.deleteConfigByIds(configIds);
         return success();
     }
@@ -116,11 +119,11 @@ public class SysConfigController extends BaseController
     /**
      * 刷新参数缓存
      */
+    @ApiOperation("刷新参数缓存")
     @PreAuthorize("@ss.hasPermi('system:config:remove')")
     @Log(title = "参数管理", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
-    public AjaxResult refreshCache()
+    public AjaxResult<Void> refreshCache() {
-    {
         configService.resetConfigCache();
         return AjaxResult.success();
     }

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

@@ -5,39 +5,44 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysDeptService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
 /**
  * 部门信息
  *
- * @author ruoyi
+ * @author Lion Li
  */
+@Validated
+@Api(value = "部门控制器", tags = {"部门管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/dept")
-public class SysDeptController extends BaseController
+public class SysDeptController extends BaseController {
-{
+
-    @Autowired
+    private final ISysDeptService deptService;
-    private ISysDeptService deptService;
 
     /**
      * 获取部门列表
      */
+    @ApiOperation("获取部门列表")
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list")
-    public AjaxResult list(SysDept dept)
+    public AjaxResult<List<SysDept>> list(SysDept dept) {
-    {
         List<SysDept> depts = deptService.selectDeptList(dept);
         return AjaxResult.success(depts);
     }
@@ -45,31 +50,23 @@ public class SysDeptController extends BaseController
     /**
      * 查询部门列表（排除节点）
      */
+    @ApiOperation("查询部门列表（排除节点）")
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list/exclude/{deptId}")
-    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
+    public AjaxResult<List<SysDept>> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
-    {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
-        Iterator<SysDept> it = depts.iterator();
+        depts.removeIf(d -> d.getDeptId().equals(deptId)
-        while (it.hasNext())
+                || ArrayUtil.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
-        {
-            SysDept d = (SysDept) it.next();
-            if (d.getDeptId().intValue() == deptId
-                    || ArrayUtil.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""))
-            {
-                it.remove();
-            }
-        }
         return AjaxResult.success(depts);
     }
 
     /**
      * 根据部门编号获取详细信息
      */
+    @ApiOperation("根据部门编号获取详细信息")
     @PreAuthorize("@ss.hasPermi('system:dept:query')")
     @GetMapping(value = "/{deptId}")
-    public AjaxResult getInfo(@PathVariable Long deptId)
+    public AjaxResult<SysDept> getInfo(@PathVariable Long deptId) {
-    {
         deptService.checkDeptDataScope(deptId);
         return AjaxResult.success(deptService.selectDeptById(deptId));
     }
@@ -77,9 +74,9 @@ public class SysDeptController extends BaseController
     /**
      * 获取部门下拉树列表
      */
+    @ApiOperation("获取部门下拉树列表")
     @GetMapping("/treeselect")
-    public AjaxResult treeselect(SysDept dept)
+    public AjaxResult<List<TreeSelect>> treeselect(SysDept dept) {
-    {
         List<SysDept> depts = deptService.selectDeptList(dept);
         return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
     }
@@ -87,11 +84,11 @@ public class SysDeptController extends BaseController
     /**
      * 加载对应角色部门列表树
      */
+    @ApiOperation("加载对应角色部门列表树")
     @GetMapping(value = "/roleDeptTreeselect/{roleId}")
-    public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId)
+    public AjaxResult<Map<String, Object>> roleDeptTreeselect(@PathVariable("roleId") Long roleId) {
-    {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
-		Map<String,Object> ajax = new HashMap<>();
+        Map<String, Object> ajax = new HashMap<>();
         ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
         ajax.put("depts", deptService.buildDeptTreeSelect(depts));
         return AjaxResult.success(ajax);
@@ -100,13 +97,12 @@ public class SysDeptController extends BaseController
     /**
      * 新增部门
      */
+    @ApiOperation("新增部门")
     @PreAuthorize("@ss.hasPermi('system:dept:add')")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysDept dept)
+    public AjaxResult<Void> add(@Validated @RequestBody SysDept dept) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
-        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
-        {
             return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
         dept.setCreateBy(getUsername());
@@ -116,22 +112,17 @@ public class SysDeptController extends BaseController
     /**
      * 修改部门
      */
+    @ApiOperation("修改部门")
     @PreAuthorize("@ss.hasPermi('system:dept:edit')")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysDept dept)
+    public AjaxResult<Void> edit(@Validated @RequestBody SysDept dept) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
-        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
-        {
             return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
-        }
+        } else if (dept.getParentId().equals(dept.getDeptId())) {
-        else if (dept.getParentId().equals(dept.getDeptId()))
-        {
             return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
-        }
+        } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
-        else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
+                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0) {
-                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
-        {
             return AjaxResult.error("该部门包含未停用的子部门！");
         }
         dept.setUpdateBy(getUsername());
@@ -141,17 +132,15 @@ public class SysDeptController extends BaseController
     /**
      * 删除部门
      */
+    @ApiOperation("删除部门")
     @PreAuthorize("@ss.hasPermi('system:dept:remove')")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
-    public AjaxResult remove(@PathVariable Long deptId)
+    public AjaxResult<Void> remove(@PathVariable Long deptId) {
-    {
+        if (deptService.hasChildByDeptId(deptId)) {
-        if (deptService.hasChildByDeptId(deptId))
-        {
             return AjaxResult.error("存在下级部门,不允许删除");
         }
-        if (deptService.checkDeptExistUser(deptId))
+        if (deptService.checkDeptExistUser(deptId)) {
-        {
             return AjaxResult.error("部门存在用户,不允许删除");
         }
         return toAjax(deptService.deleteDeptById(deptId));

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

@@ -10,6 +10,9 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysDictTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -22,54 +25,53 @@ import java.util.List;
 /**
  * 数据字典信息
  *
- * @author ruoyi
+ * @author Lion Li
  */
+@Validated
+@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/dict/data")
-public class SysDictDataController extends BaseController
+public class SysDictDataController extends BaseController {
-{
-    @Autowired
-    private ISysDictDataService dictDataService;
 
-    @Autowired
+    private final ISysDictDataService dictDataService;
-    private ISysDictTypeService dictTypeService;
+    private final ISysDictTypeService dictTypeService;
 
+    @ApiOperation("查询字典数据列表")
     @PreAuthorize("@ss.hasPermi('system:dict:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysDictData dictData)
+    public TableDataInfo<SysDictData> list(SysDictData dictData) {
-    {
         return dictDataService.selectPageDictDataList(dictData);
     }
 
+    @ApiOperation("导出字典数据列表")
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @GetMapping("/export")
-    public void export(SysDictData dictData, HttpServletResponse response)
+    public void export(SysDictData dictData, HttpServletResponse response) {
-    {
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
-		ExcelUtil.exportExcel(list, "字典数据", SysDictData.class, response);
+        ExcelUtil.exportExcel(list, "字典数据", SysDictData.class, response);
     }
 
     /**
      * 查询字典数据详细
      */
+    @ApiOperation("查询字典数据详细")
     @PreAuthorize("@ss.hasPermi('system:dict:query')")
     @GetMapping(value = "/{dictCode}")
-    public AjaxResult getInfo(@PathVariable Long dictCode)
+    public AjaxResult<SysDictData> getInfo(@PathVariable Long dictCode) {
-    {
         return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
     }
 
     /**
      * 根据字典类型查询字典数据信息
      */
+    @ApiOperation("根据字典类型查询字典数据信息")
     @GetMapping(value = "/type/{dictType}")
-    public AjaxResult dictType(@PathVariable String dictType)
+    public AjaxResult<List<SysDictData>> dictType(@PathVariable String dictType) {
-    {
         List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
-        if (StringUtils.isNull(data))
+        if (StringUtils.isNull(data)) {
-        {
+            data = new ArrayList<>();
-            data = new ArrayList<SysDictData>();
         }
         return AjaxResult.success(data);
     }
@@ -77,11 +79,11 @@ public class SysDictDataController extends BaseController
     /**
      * 新增字典类型
      */
+    @ApiOperation("新增字典类型")
     @PreAuthorize("@ss.hasPermi('system:dict:add')")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysDictData dict)
+    public AjaxResult<Void> add(@Validated @RequestBody SysDictData dict) {
-    {
         dict.setCreateBy(getUsername());
         return toAjax(dictDataService.insertDictData(dict));
     }
@@ -89,11 +91,11 @@ public class SysDictDataController extends BaseController
     /**
      * 修改保存字典类型
      */
+    @ApiOperation("修改保存字典类型")
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysDictData dict)
+    public AjaxResult<Void> edit(@Validated @RequestBody SysDictData dict) {
-    {
         dict.setUpdateBy(getUsername());
         return toAjax(dictDataService.updateDictData(dict));
     }
@@ -101,11 +103,11 @@ public class SysDictDataController extends BaseController
     /**
      * 删除字典类型
      */
+    @ApiOperation("删除字典类型")
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictCodes}")
-    public AjaxResult remove(@PathVariable Long[] dictCodes)
+    public AjaxResult<Void> remove(@PathVariable Long[] dictCodes) {
-    {
         dictDataService.deleteDictDataByIds(dictCodes);
         return success();
     }

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

@@ -9,6 +9,9 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDictTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -20,51 +23,52 @@ import java.util.List;
 /**
  * 数据字典信息
  *
- * @author ruoyi
+ * @author Lion Li
  */
+@Validated
+@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/dict/type")
-public class SysDictTypeController extends BaseController
+public class SysDictTypeController extends BaseController {
-{
-    @Autowired
-    private ISysDictTypeService dictTypeService;
 
+    private final ISysDictTypeService dictTypeService;
+
+    @ApiOperation("查询字典类型列表")
     @PreAuthorize("@ss.hasPermi('system:dict:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysDictType dictType)
+    public TableDataInfo<SysDictType> list(SysDictType dictType) {
-    {
         return dictTypeService.selectPageDictTypeList(dictType);
     }
 
+    @ApiOperation("导出字典类型列表")
     @Log(title = "字典类型", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @GetMapping("/export")
-    public void export(SysDictType dictType, HttpServletResponse response)
+    public void export(SysDictType dictType, HttpServletResponse response) {
-    {
         List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
-		ExcelUtil.exportExcel(list, "字典类型", SysDictType.class, response);
+        ExcelUtil.exportExcel(list, "字典类型", SysDictType.class, response);
     }
 
     /**
      * 查询字典类型详细
      */
+    @ApiOperation("查询字典类型详细")
     @PreAuthorize("@ss.hasPermi('system:dict:query')")
     @GetMapping(value = "/{dictId}")
-    public AjaxResult getInfo(@PathVariable Long dictId)
+    public AjaxResult<SysDictType> getInfo(@PathVariable Long dictId) {
-    {
         return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
     }
 
     /**
      * 新增字典类型
      */
+    @ApiOperation("新增字典类型")
     @PreAuthorize("@ss.hasPermi('system:dict:add')")
     @Log(title = "字典类型", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysDictType dict)
+    public AjaxResult<Void> add(@Validated @RequestBody SysDictType dict) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
-        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
-        {
             return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
         dict.setCreateBy(getUsername());
@@ -74,13 +78,12 @@ public class SysDictTypeController extends BaseController
     /**
      * 修改字典类型
      */
+    @ApiOperation("修改字典类型")
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典类型", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysDictType dict)
+    public AjaxResult<Void> edit(@Validated @RequestBody SysDictType dict) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
-        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
-        {
             return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
         dict.setUpdateBy(getUsername());
@@ -90,11 +93,11 @@ public class SysDictTypeController extends BaseController
     /**
      * 删除字典类型
      */
+    @ApiOperation("删除字典类型")
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictIds}")
-    public AjaxResult remove(@PathVariable Long[] dictIds)
+    public AjaxResult<Void> remove(@PathVariable Long[] dictIds) {
-    {
         dictTypeService.deleteDictTypeByIds(dictIds);
         return success();
     }
@@ -102,11 +105,11 @@ public class SysDictTypeController extends BaseController
     /**
      * 刷新字典缓存
      */
+    @ApiOperation("刷新字典缓存")
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
-    public AjaxResult refreshCache()
+    public AjaxResult<Void> refreshCache() {
-    {
         dictTypeService.resetDictCache();
         return AjaxResult.success();
     }
@@ -114,9 +117,9 @@ public class SysDictTypeController extends BaseController
     /**
      * 获取字典选择框列表
      */
+    @ApiOperation("获取字典选择框列表")
     @GetMapping("/optionselect")
-    public AjaxResult optionselect()
+    public AjaxResult<List<SysDictType>> optionselect() {
-    {
         List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
         return AjaxResult.success(dictTypes);
     }

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

@@ -1,29 +1,35 @@
 package com.ruoyi.web.controller.system;
 
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.utils.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 首页
  *
- * @author ruoyi
+ * @author Lion Li
  */
+@Api(value = "首页控制器", tags = {"首页管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-public class SysIndexController
+public class SysIndexController {
-{
+
-    /** 系统基础配置 */
+    /**
-    @Autowired
+     * 系统基础配置
-    private RuoYiConfig ruoyiConfig;
+     */
+    private final RuoYiConfig ruoyiConfig;
 
     /**
      * 访问首页，提示语
      */
-    @RequestMapping("/")
+    @ApiOperation("访问首页，提示语")
-    public String index()
+    @GetMapping("/")
-    {
+    public String index() {
         return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion());
     }
 }

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

@@ -6,10 +6,15 @@ import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginBody;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.vo.RouterVo;
+import com.ruoyi.system.service.ISysMenuService;
 import com.ruoyi.system.service.SysLoginService;
 import com.ruoyi.system.service.SysPermissionService;
-import com.ruoyi.system.service.ISysMenuService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -23,19 +28,17 @@ import java.util.Set;
 /**
  * 登录验证
  *
- * @author ruoyi
+ * @author Lion Li
  */
+@Validated
+@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-public class SysLoginController
+public class SysLoginController {
-{
-    @Autowired
-    private SysLoginService loginService;
 
-    @Autowired
+    private final SysLoginService loginService;
-    private ISysMenuService menuService;
+    private final ISysMenuService menuService;
-
+    private final SysPermissionService permissionService;
-    @Autowired
-    private SysPermissionService permissionService;
 
     /**
      * 登录方法
@@ -43,10 +46,10 @@ public class SysLoginController
      * @param loginBody 登录信息
      * @return 结果
      */
+    @ApiOperation("登录方法")
     @PostMapping("/login")
-    public AjaxResult login(@RequestBody LoginBody loginBody)
+    public AjaxResult<Map<String, Object>> login(@RequestBody LoginBody loginBody) {
-    {
+        Map<String, Object> ajax = new HashMap<>();
-		Map<String,Object> ajax = new HashMap<>();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                 loginBody.getUuid());
@@ -59,15 +62,15 @@ public class SysLoginController
      *
      * @return 用户信息
      */
+    @ApiOperation("获取用户信息")
     @GetMapping("getInfo")
-    public AjaxResult getInfo()
+    public AjaxResult<Map<String, Object>> getInfo() {
-    {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
-		Map<String,Object> ajax = new HashMap<>();
+        Map<String, Object> ajax = new HashMap<>();
         ajax.put("user", user);
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);
@@ -79,9 +82,9 @@ public class SysLoginController
      *
      * @return 路由信息
      */
+    @ApiOperation("获取路由信息")
     @GetMapping("getRouters")
-    public AjaxResult getRouters()
+    public AjaxResult<List<RouterVo>> getRouters() {
-    {
         Long userId = SecurityUtils.getUserId();
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         return AjaxResult.success(menuService.buildMenus(menus));

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

@@ -4,10 +4,14 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysMenuService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -20,22 +24,24 @@ import java.util.Map;
 /**
  * 菜单信息
  *
- * @author ruoyi
+ * @author Lion Li
  */
+@Validated
+@Api(value = "菜单信息控制器", tags = {"菜单信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/menu")
-public class SysMenuController extends BaseController
+public class SysMenuController extends BaseController {
-{
+
-    @Autowired
+    private final ISysMenuService menuService;
-    private ISysMenuService menuService;
 
     /**
      * 获取菜单列表
      */
+    @ApiOperation("获取菜单列表")
     @PreAuthorize("@ss.hasPermi('system:menu:list')")
     @GetMapping("/list")
-    public AjaxResult list(SysMenu menu)
+    public AjaxResult<List<SysMenu>> list(SysMenu menu) {
-    {
         List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
         return AjaxResult.success(menus);
     }
@@ -43,19 +49,19 @@ public class SysMenuController extends BaseController
     /**
      * 根据菜单编号获取详细信息
      */
+    @ApiOperation("根据菜单编号获取详细信息")
     @PreAuthorize("@ss.hasPermi('system:menu:query')")
     @GetMapping(value = "/{menuId}")
-    public AjaxResult getInfo(@PathVariable Long menuId)
+    public AjaxResult<SysMenu> getInfo(@PathVariable Long menuId) {
-    {
         return AjaxResult.success(menuService.selectMenuById(menuId));
     }
 
     /**
      * 获取菜单下拉树列表
      */
+    @ApiOperation("获取菜单下拉树列表")
     @GetMapping("/treeselect")
-    public AjaxResult treeselect(SysMenu menu)
+    public AjaxResult<List<TreeSelect>> treeselect(SysMenu menu) {
-    {
         List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
         return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
     }
@@ -63,11 +69,11 @@ public class SysMenuController extends BaseController
     /**
      * 加载对应角色菜单列表树
      */
+    @ApiOperation("加载对应角色菜单列表树")
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
-    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
+    public AjaxResult<Map<String, Object>> roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
-    {
+        List<SysMenu> menus = menuService.selectMenuList(getUserId());
-		List<SysMenu> menus = menuService.selectMenuList(getUserId());
+        Map<String, Object> ajax = new HashMap<>();
-		Map<String,Object> ajax = new HashMap<>();
         ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
         ajax.put("menus", menuService.buildMenuTreeSelect(menus));
         return AjaxResult.success(ajax);
@@ -76,17 +82,14 @@ public class SysMenuController extends BaseController
     /**
      * 新增菜单
      */
+    @ApiOperation("新增菜单")
     @PreAuthorize("@ss.hasPermi('system:menu:add')")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysMenu menu)
+    public AjaxResult<Void> add(@Validated @RequestBody SysMenu menu) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
-        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
-        {
             return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
-        }
+        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
-        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
-        {
             return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
         }
         menu.setCreateBy(getUsername());
@@ -96,21 +99,16 @@ public class SysMenuController extends BaseController
     /**
      * 修改菜单
      */
+    @ApiOperation("修改菜单")
     @PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysMenu menu)
+    public AjaxResult<Void> edit(@Validated @RequestBody SysMenu menu) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
-        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
-        {
             return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
-        }
+        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
-        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
-        {
             return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
-        }
+        } else if (menu.getMenuId().equals(menu.getParentId())) {
-        else if (menu.getMenuId().equals(menu.getParentId()))
-        {
             return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
         }
         menu.setUpdateBy(getUsername());
@@ -120,17 +118,15 @@ public class SysMenuController extends BaseController
     /**
      * 删除菜单
      */
+    @ApiOperation("删除菜单")
     @PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
-    public AjaxResult remove(@PathVariable("menuId") Long menuId)
+    public AjaxResult<Void> remove(@PathVariable("menuId") Long menuId) {
-    {
+        if (menuService.hasChildByMenuId(menuId)) {
-        if (menuService.hasChildByMenuId(menuId))
-        {
             return AjaxResult.error("存在子菜单,不允许删除");
         }
-        if (menuService.checkMenuExistRole(menuId))
+        if (menuService.checkMenuExistRole(menuId)) {
-        {
             return AjaxResult.error("菜单已分配,不允许删除");
         }
         return toAjax(menuService.deleteMenuById(menuId));

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

@@ -1,17 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -19,47 +7,56 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 公告 信息操作处理
  *
- * @author ruoyi
+ * @author Lion Li
  */
+@Validated
+@Api(value = "公告信息控制器", tags = {"公告信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/notice")
-public class SysNoticeController extends BaseController
+public class SysNoticeController extends BaseController {
-{
+
-    @Autowired
+    private final ISysNoticeService noticeService;
-    private ISysNoticeService noticeService;
 
     /**
      * 获取通知公告列表
      */
+    @ApiOperation("获取通知公告列表")
     @PreAuthorize("@ss.hasPermi('system:notice:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysNotice notice)
+    public TableDataInfo<SysNotice> list(SysNotice notice) {
-    {
         return noticeService.selectPageNoticeList(notice);
     }
 
     /**
      * 根据通知公告编号获取详细信息
      */
+    @ApiOperation("根据通知公告编号获取详细信息")
     @PreAuthorize("@ss.hasPermi('system:notice:query')")
     @GetMapping(value = "/{noticeId}")
-    public AjaxResult getInfo(@PathVariable Long noticeId)
+    public AjaxResult<SysNotice> getInfo(@PathVariable Long noticeId) {
-    {
         return AjaxResult.success(noticeService.selectNoticeById(noticeId));
     }
 
     /**
      * 新增通知公告
      */
+    @ApiOperation("新增通知公告")
     @PreAuthorize("@ss.hasPermi('system:notice:add')")
     @Log(title = "通知公告", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysNotice notice)
+    public AjaxResult<Void> add(@Validated @RequestBody SysNotice notice) {
-    {
         notice.setCreateBy(getUsername());
         return toAjax(noticeService.insertNotice(notice));
     }
@@ -67,11 +64,11 @@ public class SysNoticeController extends BaseController
     /**
      * 修改通知公告
      */
+    @ApiOperation("修改通知公告")
     @PreAuthorize("@ss.hasPermi('system:notice:edit')")
     @Log(title = "通知公告", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysNotice notice)
+    public AjaxResult<Void> edit(@Validated @RequestBody SysNotice notice) {
-    {
         notice.setUpdateBy(getUsername());
         return toAjax(noticeService.updateNotice(notice));
     }
@@ -79,11 +76,11 @@ public class SysNoticeController extends BaseController
     /**
      * 删除通知公告
      */
+    @ApiOperation("删除通知公告")
     @PreAuthorize("@ss.hasPermi('system:notice:remove')")
     @Log(title = "通知公告", businessType = BusinessType.DELETE)
     @DeleteMapping("/{noticeIds}")
-    public AjaxResult remove(@PathVariable Long[] noticeIds)
+    public AjaxResult<Void> remove(@PathVariable Long[] noticeIds) {
-    {
         return toAjax(noticeService.deleteNoticeByIds(noticeIds));
     }
 }

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

@@ -38,72 +38,73 @@ import java.util.Arrays;
 @RequestMapping("/system/oss/config")
 public class SysOssConfigController extends BaseController {
 
-	private final ISysOssConfigService iSysOssConfigService;
+    private final ISysOssConfigService iSysOssConfigService;
 
-	/**
+    /**
-	 * 查询对象存储配置列表
+     * 查询对象存储配置列表
-	 */
+     */
-	@ApiOperation("查询对象存储配置列表")
+    @ApiOperation("查询对象存储配置列表")
-	@PreAuthorize("@ss.hasPermi('system:oss:list')")
+    @PreAuthorize("@ss.hasPermi('system:oss:list')")
-	@GetMapping("/list")
+    @GetMapping("/list")
-	public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo) {
+    public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo) {
-		return iSysOssConfigService.queryPageList(bo);
+        return iSysOssConfigService.queryPageList(bo);
-	}
+    }
 
-	/**
+    /**
-	 * 获取对象存储配置详细信息
+     * 获取对象存储配置详细信息
-	 */
+     */
-	@ApiOperation("获取对象存储配置详细信息")
+    @ApiOperation("获取对象存储配置详细信息")
-	@PreAuthorize("@ss.hasPermi('system:oss:query')")
+    @PreAuthorize("@ss.hasPermi('system:oss:query')")
-	@GetMapping("/{ossConfigId}")
+    @GetMapping("/{ossConfigId}")
-	public AjaxResult<SysOssConfigVo> getInfo(@NotNull(message = "主键不能为空")
+    public AjaxResult<SysOssConfigVo> getInfo(@NotNull(message = "主键不能为空")
-											  @PathVariable("ossConfigId") Integer ossConfigId) {
+                                              @PathVariable("ossConfigId") Integer ossConfigId) {
-		return AjaxResult.success(iSysOssConfigService.queryById(ossConfigId));
+        return AjaxResult.success(iSysOssConfigService.queryById(ossConfigId));
-	}
+    }
 
-	/**
+    /**
-	 * 新增对象存储配置
+     * 新增对象存储配置
-	 */
+     */
-	@ApiOperation("新增对象存储配置")
+    @ApiOperation("新增对象存储配置")
-	@PreAuthorize("@ss.hasPermi('system:oss:add')")
+    @PreAuthorize("@ss.hasPermi('system:oss:add')")
-	@Log(title = "对象存储配置", businessType = BusinessType.INSERT)
+    @Log(title = "对象存储配置", businessType = BusinessType.INSERT)
-	@RepeatSubmit()
+    @RepeatSubmit()
-	@PostMapping()
+    @PostMapping()
-	public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
-		return toAjax(iSysOssConfigService.insertByBo(bo) ? 1 : 0);
+        return toAjax(iSysOssConfigService.insertByBo(bo) ? 1 : 0);
-	}
+    }
 
-	/**
+    /**
-	 * 修改对象存储配置
+     * 修改对象存储配置
-	 */
+     */
-	@ApiOperation("修改对象存储配置")
+    @ApiOperation("修改对象存储配置")
-	@PreAuthorize("@ss.hasPermi('system:oss:edit')")
+    @PreAuthorize("@ss.hasPermi('system:oss:edit')")
-	@Log(title = "对象存储配置", businessType = BusinessType.UPDATE)
+    @Log(title = "对象存储配置", businessType = BusinessType.UPDATE)
-	@RepeatSubmit()
+    @RepeatSubmit()
-	@PutMapping()
+    @PutMapping()
-	public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
-		return toAjax(iSysOssConfigService.updateByBo(bo) ? 1 : 0);
+        return toAjax(iSysOssConfigService.updateByBo(bo) ? 1 : 0);
-	}
+    }
 
-	/**
+    /**
-	 * 删除对象存储配置
+     * 删除对象存储配置
-	 */
+     */
-	@ApiOperation("删除对象存储配置")
+    @ApiOperation("删除对象存储配置")
-	@PreAuthorize("@ss.hasPermi('system:oss:remove')")
+    @PreAuthorize("@ss.hasPermi('system:oss:remove')")
-	@Log(title = "对象存储配置", businessType = BusinessType.DELETE)
+    @Log(title = "对象存储配置", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ossConfigIds}")
+    @DeleteMapping("/{ossConfigIds}")
-	public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-								   @PathVariable Long[] ossConfigIds) {
+                                   @PathVariable Long[] ossConfigIds) {
-		return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true) ? 1 : 0);
+        return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true) ? 1 : 0);
-	}
+    }
 
-	/**
+    /**
-	 * 状态修改
+     * 状态修改
-	 */
+     */
-	@PreAuthorize("@ss.hasPermi('system:oss:edit')")
+    @ApiOperation("状态修改")
-	@Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
+    @PreAuthorize("@ss.hasPermi('system:oss:edit')")
-	@PutMapping("/changeStatus")
+    @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
-	public AjaxResult changeStatus(@RequestBody SysOssConfigBo bo) {
+    @PutMapping("/changeStatus")
-		return toAjax(iSysOssConfigService.updateOssConfigStatus(bo));
+    public AjaxResult<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
-	}
+        return toAjax(iSysOssConfigService.updateOssConfigStatus(bo));
+    }
 }

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

@@ -38,8 +38,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 import java.io.IOException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -56,92 +54,92 @@ import java.util.Map;
 @RequestMapping("/system/oss")
 public class SysOssController extends BaseController {
 
-	private final ISysOssService iSysOssService;
+    private final ISysOssService iSysOssService;
-	private final ISysConfigService iSysConfigService;
+    private final ISysConfigService iSysConfigService;
 
-	/**
+    /**
-	 * 查询OSS对象存储列表
+     * 查询OSS对象存储列表
-	 */
+     */
-	@ApiOperation("查询OSS对象存储列表")
+    @ApiOperation("查询OSS对象存储列表")
-	@PreAuthorize("@ss.hasPermi('system:oss:list')")
+    @PreAuthorize("@ss.hasPermi('system:oss:list')")
-	@GetMapping("/list")
+    @GetMapping("/list")
-	public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo) {
+    public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo) {
-		return iSysOssService.queryPageList(bo);
+        return iSysOssService.queryPageList(bo);
-	}
+    }
 
-	/**
+    /**
-	 * 上传OSS对象存储
+     * 上传OSS对象存储
-	 */
+     */
-	@ApiOperation("上传OSS对象存储")
+    @ApiOperation("上传OSS对象存储")
-	@ApiImplicitParams({
+    @ApiImplicitParams({
-		@ApiImplicitParam(name = "file", value = "文件", dataType = "java.io.File", required = true),
+            @ApiImplicitParam(name = "file", value = "文件", dataType = "java.io.File", required = true),
-	})
+    })
-	@PreAuthorize("@ss.hasPermi('system:oss:upload')")
+    @PreAuthorize("@ss.hasPermi('system:oss:upload')")
-	@Log(title = "OSS对象存储", businessType = BusinessType.INSERT)
+    @Log(title = "OSS对象存储", businessType = BusinessType.INSERT)
-	@RepeatSubmit
+    @RepeatSubmit
-	@PostMapping("/upload")
+    @PostMapping("/upload")
-	public AjaxResult<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
+    public AjaxResult<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
-		if (ObjectUtil.isNull(file)) {
+        if (ObjectUtil.isNull(file)) {
-			throw new ServiceException("上传文件不能为空");
+            throw new ServiceException("上传文件不能为空");
-		}
+        }
-		SysOss oss = iSysOssService.upload(file);
+        SysOss oss = iSysOssService.upload(file);
-		Map<String, String> map = new HashMap<>(2);
+        Map<String, String> map = new HashMap<>(2);
-		map.put("url", oss.getUrl());
+        map.put("url", oss.getUrl());
-		map.put("fileName", oss.getFileName());
+        map.put("fileName", oss.getFileName());
-		return AjaxResult.success(map);
+        return AjaxResult.success(map);
-	}
+    }
 
-	@ApiOperation("下载OSS对象存储")
+    @ApiOperation("下载OSS对象存储")
-	@PreAuthorize("@ss.hasPermi('system:oss:download')")
+    @PreAuthorize("@ss.hasPermi('system:oss:download')")
-	@GetMapping("/download/{ossId}")
+    @GetMapping("/download/{ossId}")
-	public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
+    public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
-		SysOss sysOss = iSysOssService.getById(ossId);
+        SysOss sysOss = iSysOssService.getById(ossId);
-		if (ObjectUtil.isNull(sysOss)) {
+        if (ObjectUtil.isNull(sysOss)) {
-			throw new ServiceException("文件数据不存在!");
+            throw new ServiceException("文件数据不存在!");
-		}
+        }
-		response.reset();
+        response.reset();
-		response.addHeader("Access-Control-Allow-Origin", "*");
+        response.addHeader("Access-Control-Allow-Origin", "*");
-		response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
+        response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
-		FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName());
+        FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName());
-		response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8");
+        response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8");
-		long data;
+        long data;
-		try {
+        try {
-			data = HttpUtil.download(sysOss.getUrl(), response.getOutputStream(), false);
+            data = HttpUtil.download(sysOss.getUrl(), response.getOutputStream(), false);
-		} catch (HttpException e) {
+        } catch (HttpException e) {
-			if (e.getMessage().contains("403")) {
+            if (e.getMessage().contains("403")) {
-				throw new ServiceException("无读取权限, 请在对应的OSS开启'公有读'权限!");
+                throw new ServiceException("无读取权限, 请在对应的OSS开启'公有读'权限!");
-			} else {
+            } else {
-				throw new ServiceException(e.getMessage());
+                throw new ServiceException(e.getMessage());
-			}
+            }
-		}
+        }
-		response.setContentLength(Convert.toInt(data));
+        response.setContentLength(Convert.toInt(data));
-	}
+    }
 
-	/**
+    /**
-	 * 删除OSS对象存储
+     * 删除OSS对象存储
-	 */
+     */
-	@ApiOperation("删除OSS对象存储")
+    @ApiOperation("删除OSS对象存储")
-	@PreAuthorize("@ss.hasPermi('system:oss:remove')")
+    @PreAuthorize("@ss.hasPermi('system:oss:remove')")
-	@Log(title = "OSS对象存储" , businessType = BusinessType.DELETE)
+    @Log(title = "OSS对象存储", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ossIds}")
+    @DeleteMapping("/{ossIds}")
-	public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-								   @PathVariable Long[] ossIds) {
+                                   @PathVariable Long[] ossIds) {
-		return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true) ? 1 : 0);
+        return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true) ? 1 : 0);
-	}
+    }
 
-	/**
+    /**
-	 * 变更图片列表预览状态
+     * 变更图片列表预览状态
-	 */
+     */
-	@ApiOperation("变更图片列表预览状态")
+    @ApiOperation("变更图片列表预览状态")
-	@PreAuthorize("@ss.hasPermi('system:oss:edit')")
+    @PreAuthorize("@ss.hasPermi('system:oss:edit')")
-	@Log(title = "OSS对象存储" , businessType = BusinessType.UPDATE)
+    @Log(title = "OSS对象存储", businessType = BusinessType.UPDATE)
-	@PutMapping("/changePreviewListResource")
+    @PutMapping("/changePreviewListResource")
-	public AjaxResult<Void> changePreviewListResource(@RequestBody String body) {
+    public AjaxResult<Void> changePreviewListResource(@RequestBody String body) {
-		Map<String, Boolean> map = JsonUtils.parseMap(body);
+        Map<String, Boolean> map = JsonUtils.parseMap(body);
-		SysConfig config = iSysConfigService.getOne(new LambdaQueryWrapper<SysConfig>()
+        SysConfig config = iSysConfigService.getOne(new LambdaQueryWrapper<SysConfig>()
-			.eq(SysConfig::getConfigKey, CloudConstant.PEREVIEW_LIST_RESOURCE_KEY));
+                .eq(SysConfig::getConfigKey, CloudConstant.PEREVIEW_LIST_RESOURCE_KEY));
-		config.setConfigValue(map.get("previewListResource").toString());
+        config.setConfigValue(map.get("previewListResource").toString());
-		return toAjax(iSysConfigService.updateConfig(config));
+        return toAjax(iSysConfigService.updateConfig(config));
-	}
+    }
 
 }

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

@@ -9,6 +9,9 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysPost;
 import com.ruoyi.system.service.ISysPostService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -20,58 +23,57 @@ import java.util.List;
 /**
  * 岗位信息操作处理
  *
- * @author ruoyi
+ * @author Lion Li
  */
+@Validated
+@Api(value = "岗位信息控制器", tags = {"岗位信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/post")
-public class SysPostController extends BaseController
+public class SysPostController extends BaseController {
-{
+
-    @Autowired
+    private final ISysPostService postService;
-    private ISysPostService postService;
 
     /**
      * 获取岗位列表
      */
+    @ApiOperation("获取岗位列表")
     @PreAuthorize("@ss.hasPermi('system:post:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysPost post)
+    public TableDataInfo<SysPost> list(SysPost post) {
-    {
         return postService.selectPagePostList(post);
     }
 
+    @ApiOperation("导出岗位列表")
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:post:export')")
     @GetMapping("/export")
-    public void export(SysPost post, HttpServletResponse response)
+    public void export(SysPost post, HttpServletResponse response) {
-    {
         List<SysPost> list = postService.selectPostList(post);
-		ExcelUtil.exportExcel(list, "岗位数据", SysPost.class, response);
+        ExcelUtil.exportExcel(list, "岗位数据", SysPost.class, response);
     }
 
     /**
      * 根据岗位编号获取详细信息
      */
+    @ApiOperation("根据岗位编号获取详细信息")
     @PreAuthorize("@ss.hasPermi('system:post:query')")
     @GetMapping(value = "/{postId}")
-    public AjaxResult getInfo(@PathVariable Long postId)
+    public AjaxResult<SysPost> getInfo(@PathVariable Long postId) {
-    {
         return AjaxResult.success(postService.selectPostById(postId));
     }
 
     /**
      * 新增岗位
      */
+    @ApiOperation("新增岗位")
     @PreAuthorize("@ss.hasPermi('system:post:add')")
     @Log(title = "岗位管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysPost post)
+    public AjaxResult<Void> add(@Validated @RequestBody SysPost post) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
-        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
-        {
             return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
-        }
+        } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
-        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
-        {
             return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
         }
         post.setCreateBy(getUsername());
@@ -81,17 +83,14 @@ public class SysPostController extends BaseController
     /**
      * 修改岗位
      */
+    @ApiOperation("修改岗位")
     @PreAuthorize("@ss.hasPermi('system:post:edit')")
     @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysPost post)
+    public AjaxResult<Void> edit(@Validated @RequestBody SysPost post) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
-        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
-        {
             return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
-        }
+        } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
-        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
-        {
             return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
         }
         post.setUpdateBy(getUsername());
@@ -101,20 +100,20 @@ public class SysPostController extends BaseController
     /**
      * 删除岗位
      */
+    @ApiOperation("删除岗位")
     @PreAuthorize("@ss.hasPermi('system:post:remove')")
     @Log(title = "岗位管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{postIds}")
-    public AjaxResult remove(@PathVariable Long[] postIds)
+    public AjaxResult<Void> remove(@PathVariable Long[] postIds) {
-    {
         return toAjax(postService.deletePostByIds(postIds));
     }
 
     /**
      * 获取岗位选择框列表
      */
+    @ApiOperation("获取岗位选择框列表")
     @GetMapping("/optionselect")
-    public AjaxResult optionselect()
+    public AjaxResult<List<SysPost>> optionselect() {
-    {
         List<SysPost> posts = postService.selectPostAll();
         return AjaxResult.success(posts);
     }

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

@@ -6,49 +6,49 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.core.service.TokenService;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.SysOss;
 import com.ruoyi.system.service.ISysOssService;
 import com.ruoyi.system.service.ISysUserService;
+import io.swagger.annotations.*;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
  * 个人信息 业务处理
  *
- * @author ruoyi
+ * @author Lion Li
  */
+@Validated
+@Api(value = "个人信息控制器", tags = {"个人信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/user/profile")
-public class SysProfileController extends BaseController
+public class SysProfileController extends BaseController {
-{
-    @Autowired
-    private ISysUserService userService;
 
-    @Autowired
+    private final ISysUserService userService;
-    private TokenService tokenService;
+    private final TokenService tokenService;
-
+    private final ISysOssService iSysOssService;
-    @Autowired
-	private ISysOssService iSysOssService;
 
     /**
      * 个人信息
      */
+    @ApiOperation("个人信息")
     @GetMapping
-    public AjaxResult profile()
+    public AjaxResult<Map<String, Object>> profile() {
-    {
         LoginUser loginUser = getLoginUser();
         SysUser user = loginUser.getUser();
-		Map<String,Object> ajax = new HashMap<>();
+        Map<String, Object> ajax = new HashMap<>();
-		ajax.put("user", user);
+        ajax.put("user", user);
         ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
         ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
         return AjaxResult.success(ajax);
@@ -57,26 +57,23 @@ public class SysProfileController extends BaseController
     /**
      * 修改用户
      */
+    @ApiOperation("修改用户")
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult updateProfile(@RequestBody SysUser user)
+    public AjaxResult<Void> updateProfile(@RequestBody SysUser user) {
-    {
         if (StringUtils.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
-        {
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
         }
         if (StringUtils.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
-        {
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         LoginUser loginUser = getLoginUser();
         SysUser sysUser = loginUser.getUser();
         user.setUserId(sysUser.getUserId());
         user.setPassword(null);
-        if (userService.updateUserProfile(user) > 0)
+        if (userService.updateUserProfile(user) > 0) {
-        {
             // 更新缓存用户信息
             sysUser.setNickName(user.getNickName());
             sysUser.setPhonenumber(user.getPhonenumber());
@@ -91,23 +88,20 @@ public class SysProfileController extends BaseController
     /**
      * 重置密码
      */
+    @ApiOperation("重置密码")
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
-    public AjaxResult updatePwd(String oldPassword, String newPassword)
+    public AjaxResult<Void> updatePwd(String oldPassword, String newPassword) {
-    {
         LoginUser loginUser = getLoginUser();
         String userName = loginUser.getUsername();
         String password = loginUser.getPassword();
-        if (!SecurityUtils.matchesPassword(oldPassword, password))
+        if (!SecurityUtils.matchesPassword(oldPassword, password)) {
-        {
             return AjaxResult.error("修改密码失败，旧密码错误");
         }
-        if (SecurityUtils.matchesPassword(newPassword, password))
+        if (SecurityUtils.matchesPassword(newPassword, password)) {
-        {
             return AjaxResult.error("新密码不能与旧密码相同");
         }
-        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
+        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) {
-        {
             // 更新缓存用户密码
             loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
             tokenService.setLoginUser(loginUser);
@@ -119,18 +113,19 @@ public class SysProfileController extends BaseController
     /**
      * 头像上传
      */
+    @ApiOperation("头像上传")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "用户头像", dataType = "java.io.File", required = true),
+    })
     @Log(title = "用户头像", businessType = BusinessType.UPDATE)
     @PostMapping("/avatar")
-    public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException
+    public AjaxResult<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile file) {
-    {
+        Map<String, Object> ajax = new HashMap<>();
-        if (!file.isEmpty())
+        if (!file.isEmpty()) {
-        {
             LoginUser loginUser = getLoginUser();
-			SysOss oss = iSysOssService.upload(file);
+            SysOss oss = iSysOssService.upload(file);
-			String avatar = oss.getUrl();
+            String avatar = oss.getUrl();
-            if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
+            if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) {
-            {
-				Map<String,Object> ajax = new HashMap<>();
                 ajax.put("imgUrl", avatar);
                 // 更新缓存用户头像
                 loginUser.getUser().setAvatar(avatar);
@@ -138,6 +133,6 @@ public class SysProfileController extends BaseController
                 return AjaxResult.success(ajax);
             }
         }
-        return AjaxResult.error("上传图片异常，请联系管理员");
+        return AjaxResult.error("上传图片异常，请联系管理员", ajax);
     }
 }

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

@@ -4,9 +4,13 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.RegisterBody;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.service.SysRegisterService;
 import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.system.service.SysRegisterService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -14,22 +18,21 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * 注册验证
  *
- * @author ruoyi
+ * @author Lion Li
  */
+@Validated
+@Api(value = "注册验证控制器", tags = {"注册验证管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-public class SysRegisterController extends BaseController
+public class SysRegisterController extends BaseController {
-{
-    @Autowired
-    private SysRegisterService registerService;
 
-    @Autowired
+    private final SysRegisterService registerService;
-    private ISysConfigService configService;
+    private final ISysConfigService configService;
 
+    @ApiOperation("用户注册")
     @PostMapping("/register")
-    public AjaxResult register(@RequestBody RegisterBody user)
+    public AjaxResult<Void> register(@RequestBody RegisterBody user) {
-    {
+        if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
-        if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
-        {
             return error("当前系统没有开启注册功能！");
         }
         String msg = registerService.register(user);

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

@@ -8,14 +8,17 @@ import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.core.service.TokenService;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.service.SysPermissionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -27,47 +30,43 @@ import java.util.List;
 /**
  * 角色信息
  *
- * @author ruoyi
+ * @author Lion Li
  */
+@Validated
+@Api(value = "角色信息控制器", tags = {"角色信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/role")
-public class SysRoleController extends BaseController
+public class SysRoleController extends BaseController {
-{
-    @Autowired
-    private ISysRoleService roleService;
 
-    @Autowired
+    private final ISysRoleService roleService;
-    private TokenService tokenService;
+    private final TokenService tokenService;
-
+    private final ISysUserService userService;
-    @Autowired
+    private final SysPermissionService permissionService;
-    private SysPermissionService permissionService;
-
-    @Autowired
-    private ISysUserService userService;
 
+    @ApiOperation("查询角色信息列表")
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysRole role)
+    public TableDataInfo<SysRole> list(SysRole role) {
-    {
         return roleService.selectPageRoleList(role);
     }
 
+    @ApiOperation("导出角色信息列表")
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:role:export')")
     @GetMapping("/export")
-    public void export(SysRole role, HttpServletResponse response)
+    public void export(SysRole role, HttpServletResponse response) {
-    {
         List<SysRole> list = roleService.selectRoleList(role);
-		ExcelUtil.exportExcel(list, "角色数据", SysRole.class, response);
+        ExcelUtil.exportExcel(list, "角色数据", SysRole.class, response);
     }
 
     /**
      * 根据角色编号获取详细信息
      */
+    @ApiOperation("根据角色编号获取详细信息")
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/{roleId}")
-    public AjaxResult getInfo(@PathVariable Long roleId)
+    public AjaxResult<SysRole> getInfo(@PathVariable Long roleId) {
-    {
         roleService.checkRoleDataScope(roleId);
         return AjaxResult.success(roleService.selectRoleById(roleId));
     }
@@ -75,17 +74,14 @@ public class SysRoleController extends BaseController
     /**
      * 新增角色
      */
+    @ApiOperation("新增角色")
     @PreAuthorize("@ss.hasPermi('system:role:add')")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysRole role)
+    public AjaxResult<Void> add(@Validated @RequestBody SysRole role) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
-        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
-        {
             return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
-        }
+        } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
-        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
-        {
             return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
         role.setCreateBy(getUsername());
@@ -96,28 +92,23 @@ public class SysRoleController extends BaseController
     /**
      * 修改保存角色
      */
+    @ApiOperation("修改保存角色")
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysRole role)
+    public AjaxResult<Void> edit(@Validated @RequestBody SysRole role) {
-    {
         roleService.checkRoleAllowed(role);
-        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
-        {
             return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
-        }
+        } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
-        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
-        {
             return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
         role.setUpdateBy(getUsername());
 
-        if (roleService.updateRole(role) > 0)
+        if (roleService.updateRole(role) > 0) {
-        {
             // 更新缓存用户权限
             LoginUser loginUser = getLoginUser();
-            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
+            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) {
-            {
                 loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
                 loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
                 tokenService.setLoginUser(loginUser);
@@ -130,11 +121,11 @@ public class SysRoleController extends BaseController
     /**
      * 修改保存数据权限
      */
+    @ApiOperation("修改保存数据权限")
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/dataScope")
-    public AjaxResult dataScope(@RequestBody SysRole role)
+    public AjaxResult<Void> dataScope(@RequestBody SysRole role) {
-    {
         roleService.checkRoleAllowed(role);
         return toAjax(roleService.authDataScope(role));
     }
@@ -142,11 +133,11 @@ public class SysRoleController extends BaseController
     /**
      * 状态修改
      */
+    @ApiOperation("状态修改")
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public AjaxResult changeStatus(@RequestBody SysRole role)
+    public AjaxResult<Void> changeStatus(@RequestBody SysRole role) {
-    {
         roleService.checkRoleAllowed(role);
         role.setUpdateBy(getUsername());
         return toAjax(roleService.updateRoleStatus(role));
@@ -155,74 +146,74 @@ public class SysRoleController extends BaseController
     /**
      * 删除角色
      */
+    @ApiOperation("删除角色")
     @PreAuthorize("@ss.hasPermi('system:role:remove')")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{roleIds}")
-    public AjaxResult remove(@PathVariable Long[] roleIds)
+    public AjaxResult<Void> remove(@PathVariable Long[] roleIds) {
-    {
         return toAjax(roleService.deleteRoleByIds(roleIds));
     }
 
     /**
      * 获取角色选择框列表
      */
+    @ApiOperation("获取角色选择框列表")
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping("/optionselect")
-    public AjaxResult optionselect()
+    public AjaxResult<List<SysRole>> optionselect() {
-    {
         return AjaxResult.success(roleService.selectRoleAll());
     }
 
     /**
      * 查询已分配用户角色列表
      */
+    @ApiOperation("查询已分配用户角色列表")
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/authUser/allocatedList")
-    public TableDataInfo allocatedList(SysUser user)
+    public TableDataInfo<SysUser> allocatedList(SysUser user) {
-    {
+        return userService.selectAllocatedList(user);
-		return userService.selectAllocatedList(user);
     }
 
     /**
      * 查询未分配用户角色列表
      */
+    @ApiOperation("查询未分配用户角色列表")
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/authUser/unallocatedList")
-    public TableDataInfo unallocatedList(SysUser user)
+    public TableDataInfo<SysUser> unallocatedList(SysUser user) {
-    {
         return userService.selectUnallocatedList(user);
     }
 
     /**
      * 取消授权用户
      */
+    @ApiOperation("取消授权用户")
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancel")
-    public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
+    public AjaxResult<Void> cancelAuthUser(@RequestBody SysUserRole userRole) {
-    {
         return toAjax(roleService.deleteAuthUser(userRole));
     }
 
     /**
      * 批量取消授权用户
      */
+    @ApiOperation("批量取消授权用户")
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancelAll")
-    public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
+    public AjaxResult<Void> cancelAuthUserAll(Long roleId, Long[] userIds) {
-    {
         return toAjax(roleService.deleteAuthUsers(roleId, userIds));
     }
 
     /**
      * 批量选择用户授权
      */
+    @ApiOperation("批量选择用户授权")
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/selectAll")
-    public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
+    public AjaxResult<Void> selectAuthUserAll(Long roleId, Long[] userIds) {
-    {
         return toAjax(roleService.insertAuthUsers(roleId, userIds));
     }
 }

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

@@ -20,6 +20,11 @@ import com.ruoyi.system.domain.vo.SysUserImportVo;
 import com.ruoyi.system.service.ISysPostService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -36,81 +41,81 @@ import java.util.stream.Collectors;
 /**
  * 用户信息
  *
- * @author ruoyi
+ * @author Lion Li
  */
+@Validated
+@Api(value = "用户信息控制器", tags = {"用户信息管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/user")
-public class SysUserController extends BaseController
+public class SysUserController extends BaseController {
-{
-    @Autowired
-    private ISysUserService userService;
 
-    @Autowired
+    private final ISysUserService userService;
-    private ISysRoleService roleService;
+    private final ISysRoleService roleService;
-
+    private final ISysPostService postService;
-    @Autowired
-    private ISysPostService postService;
 
     /**
      * 获取用户列表
      */
+    @ApiOperation("获取用户列表")
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysUser user)
+    public TableDataInfo<SysUser> list(SysUser user) {
-    {
         return userService.selectPageUserList(user);
     }
 
+    @ApiOperation("导出用户列表")
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @GetMapping("/export")
-    public void export(SysUser user, HttpServletResponse response)
+    public void export(SysUser user, HttpServletResponse response) {
-    {
         List<SysUser> list = userService.selectUserList(user);
-		List<SysUserExportVo> listVo = BeanUtil.copyToList(list, SysUserExportVo.class);
+        List<SysUserExportVo> listVo = BeanUtil.copyToList(list, SysUserExportVo.class);
-		for (int i = 0; i < list.size(); i++) {
+        for (int i = 0; i < list.size(); i++) {
-			SysDept dept = list.get(i).getDept();
+            SysDept dept = list.get(i).getDept();
-			SysUserExportVo vo = listVo.get(i);
+            SysUserExportVo vo = listVo.get(i);
-			if (ObjectUtil.isNotEmpty(dept)) {
+            if (ObjectUtil.isNotEmpty(dept)) {
-				vo.setDeptName(dept.getDeptName());
+                vo.setDeptName(dept.getDeptName());
-				vo.setLeader(dept.getLeader());
+                vo.setLeader(dept.getLeader());
-			}
+            }
-		}
+        }
-		ExcelUtil.exportExcel(listVo, "用户数据", SysUserExportVo.class, response);
+        ExcelUtil.exportExcel(listVo, "用户数据", SysUserExportVo.class, response);
     }
 
+    @ApiOperation("导入用户列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "导入文件", dataType = "java.io.File", required = true),
+    })
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
     @PreAuthorize("@ss.hasPermi('system:user:import')")
     @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    public AjaxResult<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
-    {
+        List<SysUserImportVo> userListVo = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class);
-		List<SysUserImportVo> userListVo = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class);
+        List<SysUser> userList = BeanUtil.copyToList(userListVo, SysUser.class);
-		List<SysUser> userList = BeanUtil.copyToList(userListVo, SysUser.class);
         String operName = getUsername();
         String message = userService.importUser(userList, updateSupport, operName);
         return AjaxResult.success(message);
     }
 
+    @ApiOperation("下载导入模板")
     @GetMapping("/importTemplate")
-    public void importTemplate(HttpServletResponse response)
+    public void importTemplate(HttpServletResponse response) {
-    {
+        ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", SysUserImportVo.class, response);
-		ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", SysUserImportVo.class, response);
     }
 
     /**
      * 根据用户编号获取详细信息
      */
+    @ApiOperation("根据用户编号获取详细信息")
     @PreAuthorize("@ss.hasPermi('system:user:query')")
-    @GetMapping(value = { "/", "/{userId}" })
+    @GetMapping(value = {"/", "/{userId}"})
-    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
+    public AjaxResult<Map<String, Object>> getInfo(@PathVariable(value = "userId", required = false) Long userId) {
-    {
+        userService.checkUserDataScope(userId);
-		userService.checkUserDataScope(userId);
         Map<String, Object> ajax = new HashMap<>();
         List<SysRole> roles = roleService.selectRoleAll();
         ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         ajax.put("posts", postService.selectPostAll());
-        if (StringUtils.isNotNull(userId))
+        if (StringUtils.isNotNull(userId)) {
-        {
             ajax.put("user", userService.selectUserById(userId));
             ajax.put("postIds", postService.selectPostListByUserId(userId));
             ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
@@ -121,23 +126,18 @@ public class SysUserController extends BaseController
     /**
      * 新增用户
      */
+    @ApiOperation("新增用户")
     @PreAuthorize("@ss.hasPermi('system:user:add')")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysUser user)
+    public AjaxResult<Void> add(@Validated @RequestBody SysUser user) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
-        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))
-        {
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
-        }
+        } else if (StringUtils.isNotEmpty(user.getPhonenumber())
-        else if (StringUtils.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
-        {
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
-        }
+        } else if (StringUtils.isNotEmpty(user.getEmail())
-        else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setCreateBy(getUsername());
@@ -148,20 +148,17 @@ public class SysUserController extends BaseController
     /**
      * 修改用户
      */
+    @ApiOperation("修改用户")
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysUser user)
+    public AjaxResult<Void> edit(@Validated @RequestBody SysUser user) {
-    {
         userService.checkUserAllowed(user);
         if (StringUtils.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
-        {
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
-        }
+        } else if (StringUtils.isNotEmpty(user.getEmail())
-        else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setUpdateBy(getUsername());
@@ -171,13 +168,12 @@ public class SysUserController extends BaseController
     /**
      * 删除用户
      */
+    @ApiOperation("删除用户")
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
-    public AjaxResult remove(@PathVariable Long[] userIds)
+    public AjaxResult<Void> remove(@PathVariable Long[] userIds) {
-    {
+        if (ArrayUtil.contains(userIds, getUserId())) {
-        if (ArrayUtil.contains(userIds, getUserId()))
-        {
             return error("当前用户不能删除");
         }
         return toAjax(userService.deleteUserByIds(userIds));
@@ -186,11 +182,11 @@ public class SysUserController extends BaseController
     /**
      * 重置密码
      */
+    @ApiOperation("重置密码")
     @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
-    public AjaxResult resetPwd(@RequestBody SysUser user)
+    public AjaxResult<Void> resetPwd(@RequestBody SysUser user) {
-    {
         userService.checkUserAllowed(user);
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         user.setUpdateBy(getUsername());
@@ -200,11 +196,11 @@ public class SysUserController extends BaseController
     /**
      * 状态修改
      */
+    @ApiOperation("状态修改")
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public AjaxResult changeStatus(@RequestBody SysUser user)
+    public AjaxResult<Void> changeStatus(@RequestBody SysUser user) {
-    {
         userService.checkUserAllowed(user);
         user.setUpdateBy(getUsername());
         return toAjax(userService.updateUserStatus(user));
@@ -213,13 +209,13 @@ public class SysUserController extends BaseController
     /**
      * 根据用户编号获取授权角色
      */
+    @ApiOperation("根据用户编号获取授权角色")
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/authRole/{userId}")
-    public AjaxResult authRole(@PathVariable("userId") Long userId)
+    public AjaxResult<Map<String, Object>> authRole(@PathVariable("userId") Long userId) {
-    {
         SysUser user = userService.selectUserById(userId);
         List<SysRole> roles = roleService.selectRolesByUserId(userId);
-		Map<String, Object> ajax = new HashMap<>();
+        Map<String, Object> ajax = new HashMap<>();
         ajax.put("user", user);
         ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         return AjaxResult.success(ajax);
@@ -228,11 +224,11 @@ public class SysUserController extends BaseController
     /**
      * 用户授权角色
      */
+    @ApiOperation("用户授权角色")
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
-    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
+    public AjaxResult<Void> insertAuthRole(Long userId, Long[] roleIds) {
-    {
         userService.insertUserAuth(userId, roleIds);
         return success();
     }

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

@@ -59,6 +59,10 @@ logging:
     org.springframework: warn
   config: classpath:logback.xml
 
+# tlog 全局访问性能拦截
+tlog:
+  enable-invoke-time-print: true
+
 # Spring配置
 spring:
   application:
@@ -244,10 +248,12 @@ swagger:
     email: crazylionli@163.com
     url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
   groups:
+    - name: 代码生成模块
+      basePackage: com.ruoyi.generator
     - name: 演示案例
       basePackage: com.ruoyi.demo
     - name: 系统模块
-      basePackage: com.ruoyi.admin
+      basePackage: com.ruoyi.web
 
 # 防止XSS攻击
 xss:

ruoyi-admin/src/main/resources/logback.xml

@@ -7,7 +7,7 @@
 
 	<!-- 控制台输出 -->
 	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
+        <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
 			<pattern>${console.log.pattern}</pattern>
             <charset>utf-8</charset>
 		</encoder>
@@ -22,7 +22,7 @@
             <!-- 日志最大 1天 -->
             <maxHistory>1</maxHistory>
         </rollingPolicy>
-        <encoder>
+        <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
             <pattern>${log.pattern}</pattern>
             <charset>utf-8</charset>
         </encoder>
@@ -42,7 +42,7 @@
 			<!-- 日志最大的历史 60天 -->
 			<maxHistory>60</maxHistory>
 		</rollingPolicy>
-		<encoder>
+        <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
 			<pattern>${log.pattern}</pattern>
 		</encoder>
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -64,7 +64,7 @@
 			<!-- 日志最大的历史 60天 -->
 			<maxHistory>60</maxHistory>
         </rollingPolicy>
-        <encoder>
+        <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
             <pattern>${log.pattern}</pattern>
         </encoder>
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -86,7 +86,7 @@
             <!-- 日志最大的历史 60天 -->
             <maxHistory>60</maxHistory>
         </rollingPolicy>
-        <encoder>
+        <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
             <pattern>${log.pattern}</pattern>
         </encoder>
     </appender>

ruoyi-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -111,11 +111,13 @@
             <artifactId>lombok</artifactId>
         </dependency>
 
+        <!-- @deprecated 由于使用人数较少 决定与 3.4.0 版本移除 -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
 
+        <!-- @deprecated 由于使用人数较少 决定与 3.4.0 版本移除 -->
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-okhttp</artifactId>
@@ -156,6 +158,21 @@
             <groupId>com.baomidou</groupId>
             <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>tlog-spring-boot-configuration</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>tlog-webroot</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>tlog-feign</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java

@@ -2,7 +2,6 @@ package com.ruoyi.common.config;
 
 import lombok.Data;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
@@ -10,34 +9,42 @@ import org.springframework.stereotype.Component;
 /**
  * 读取项目相关配置
  *
- * @author ruoyi
+ * @author Lion Li
  */
 
 @Data
-@NoArgsConstructor
 @Accessors(chain = true)
 @Component
 @ConfigurationProperties(prefix = "ruoyi")
-public class RuoYiConfig
+public class RuoYiConfig {
-{
+
-    /** 项目名称 */
+    /**
+     * 项目名称
+     */
     private String name;
 
-    /** 版本 */
+    /**
+     * 版本
+     */
     private String version;
 
-    /** 版权年份 */
+    /**
+     * 版权年份
+     */
     private String copyrightYear;
 
-    /** 实例演示开关 */
+    /**
+     * 实例演示开关
+     */
     private boolean demoEnabled;
 
-    /** 获取地址开关 */
+    /**
+     * 获取地址开关
+     */
     @Getter
     private static boolean addressEnabled;
 
-    public void setAddressEnabled(boolean addressEnabled)
+    public void setAddressEnabled(boolean addressEnabled) {
-    {
         RuoYiConfig.addressEnabled = addressEnabled;
     }
 

ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java

@@ -44,27 +44,27 @@ public class GenConstants
     public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
             "bit", "bigint", "float", "double", "decimal" };
 
-    /** 页面不需要添加字段 */
+    /** BO对象 不需要添加字段 */
     public static final String[] COLUMNNAME_NOT_ADD = { "create_by", "create_time", "del_flag", "update_by",
             "update_time", "version" };
 
-    /** 页面不需要编辑字段 */
+    /** BO对象 不需要编辑字段 */
     public static final String[] COLUMNNAME_NOT_EDIT = { "create_by", "create_time", "del_flag", "update_by",
             "update_time", "version" };
 
-    /** 页面不需要显示的列表字段 */
+    /** VO对象 不需要返回字段 */
-    public static final String[] COLUMNNAME_NOT_LIST = { "id", "create_by", "create_time", "del_flag", "update_by",
+    public static final String[] COLUMNNAME_NOT_LIST = { "create_by", "create_time", "del_flag", "update_by",
             "update_time", "version" };
 
-    /** 页面不需要查询字段 */
+    /** BO对象 不需要查询字段 */
     public static final String[] COLUMNNAME_NOT_QUERY = { "id", "create_by", "create_time", "del_flag", "update_by",
             "update_time", "remark", "version" };
 
     /** Entity基类字段 */
-    public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark" };
+    public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime" };
 
     /** Tree基类字段 */
-    public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors", "children" };
+    public static final String[] TREE_ENTITY = { "parentName", "parentId", "children" };
 
     /** 文本框 */
     public static final String HTML_INPUT = "input";

ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java

@@ -2,7 +2,8 @@ package com.ruoyi.common.constant;
 
 /**
  * 任务调度通用常量
- * 
+ *
+ * @deprecated 3.5.0删除 迁移至xxl-job
  * @author ruoyi
  */
 public class ScheduleConstants

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

@@ -1,9 +1,10 @@
 package com.ruoyi.common.core.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
@@ -14,11 +15,10 @@ import java.util.Map;
 /**
  * Entity基类
  *
- * @author ruoyi
+ * @author Lion Li
  */
 
 @Data
-@NoArgsConstructor
 @Accessors(chain = true)
 public class BaseEntity implements Serializable {
 
@@ -28,43 +28,43 @@ public class BaseEntity implements Serializable {
 	 * 搜索值
 	 */
 	@ApiModelProperty(value = "搜索值")
+	@TableField(exist = false)
 	private String searchValue;
 
 	/**
 	 * 创建者
 	 */
 	@ApiModelProperty(value = "创建者")
+	@TableField(fill = FieldFill.INSERT)
 	private String createBy;
 
 	/**
 	 * 创建时间
 	 */
 	@ApiModelProperty(value = "创建时间")
+	@TableField(fill = FieldFill.INSERT)
 	private Date createTime;
 
 	/**
 	 * 更新者
 	 */
 	@ApiModelProperty(value = "更新者")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String updateBy;
 
 	/**
 	 * 更新时间
 	 */
 	@ApiModelProperty(value = "更新时间")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private Date updateTime;
 
-	/**
-	 * 备注
-	 */
-	@ApiModelProperty(value = "备注")
-	private String remark;
-
 	/**
 	 * 请求参数
 	 */
 	@JsonIgnore
 	@ApiModelProperty(value = "请求参数")
+	@TableField(exist = false)
 	private Map<String, Object> params = new HashMap<>();
 
 }

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

@@ -1,9 +1,9 @@
 package com.ruoyi.common.core.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.util.ArrayList;
@@ -12,12 +12,11 @@ import java.util.List;
 /**
  * Tree基类
  *
- * @author ruoyi
+ * @author Lion Li
  */
 
-@EqualsAndHashCode(callSuper = true)
 @Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 public class TreeEntity extends BaseEntity {
 
@@ -26,6 +25,7 @@ public class TreeEntity extends BaseEntity {
 	/**
 	 * 父菜单名称
 	 */
+	@TableField(exist = false)
 	@ApiModelProperty(value = "父菜单名称")
 	private String parentName;
 
@@ -35,21 +35,10 @@ public class TreeEntity extends BaseEntity {
 	@ApiModelProperty(value = "父菜单ID")
 	private Long parentId;
 
-	/**
-	 * 显示顺序
-	 */
-	@ApiModelProperty(value = "显示顺序")
-	private Integer orderNum;
-
-	/**
-	 * 祖级列表
-	 */
-	@ApiModelProperty(value = "祖级列表")
-	private String ancestors;
-
 	/**
 	 * 子部门
 	 */
+	@TableField(exist = false)
 	@ApiModelProperty(value = "子部门")
 	private List<?> children = new ArrayList<>();
 

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

@@ -3,7 +3,10 @@ package com.ruoyi.common.core.domain;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysMenu;
-import lombok.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
@@ -12,39 +15,53 @@ import java.util.stream.Collectors;
 
 /**
  * Treeselect树结构实体类
- * 
+ *
- * @author ruoyi
+ * @author Lion Li
  */
 
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-public class TreeSelect implements Serializable
+@ApiModel("树结构实体类")
-{
+public class TreeSelect implements Serializable {
+
     private static final long serialVersionUID = 1L;
 
-    /** 节点ID */
+    /**
+     * 节点ID
+     */
+    @ApiModelProperty(value = "节点ID")
     private Long id;
 
-    /** 节点名称 */
+    /**
+     * 节点名称
+     */
+    @ApiModelProperty(value = "节点名称")
     private String label;
 
-    /** 子节点 */
+    /**
+     * 子节点
+     */
+    @ApiModelProperty(value = "子节点")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<TreeSelect> children;
 
-    public TreeSelect(SysDept dept)
+    public TreeSelect(SysDept dept) {
-    {
         this.id = dept.getDeptId();
         this.label = dept.getDeptName();
-        this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
+        this.children = dept.getChildren()
+                .stream()
+                .map(d -> new TreeSelect((SysDept) d))
+                .collect(Collectors.toList());
     }
 
-    public TreeSelect(SysMenu menu)
+    public TreeSelect(SysMenu menu) {
-    {
         this.id = menu.getMenuId();
         this.label = menu.getMenuName();
-        this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
+        this.children = menu.getChildren()
+                .stream()
+                .map(d -> new TreeSelect((SysMenu) d))
+                .collect(Collectors.toList());
     }
 
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/OperLogDTO.java

@@ -8,15 +8,16 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 操作日志记录表 oper_log
+ * 通用操作日志实体
  *
- * @author ruoyi
+ * @author Lion Li
  */
 
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
 public class OperLogDTO implements Serializable {
+
     private static final long serialVersionUID = 1L;
 
     /**

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -1,48 +1,44 @@
 package com.ruoyi.common.core.domain.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.TreeEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import java.io.Serializable;
-import java.util.*;
 
 /**
  * 部门表 sys_dept
  *
- * @author ruoyi
+ * @author Lion Li
  */
 
 @Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("sys_dept")
-public class SysDept implements Serializable {
+@ApiModel("部门业务对象")
+public class SysDept extends TreeEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**
 	 * 部门ID
 	 */
-	@TableId(value = "dept_id", type = IdType.AUTO)
+	@ApiModelProperty(value = "部门id")
+	@TableId(value = "dept_id")
 	private Long deptId;
 
-	/**
-	 * 父部门ID
-	 */
-	private Long parentId;
-
-	/**
-	 * 祖级列表
-	 */
-	private String ancestors;
-
 	/**
 	 * 部门名称
 	 */
+	@ApiModelProperty(value = "部门名称")
 	@NotBlank(message = "部门名称不能为空")
 	@Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
 	private String deptName;
@@ -50,23 +46,27 @@ public class SysDept implements Serializable {
 	/**
 	 * 显示顺序
 	 */
+	@ApiModelProperty(value = "显示顺序")
 	@NotBlank(message = "显示顺序不能为空")
 	private String orderNum;
 
 	/**
 	 * 负责人
 	 */
+	@ApiModelProperty(value = "负责人")
 	private String leader;
 
 	/**
 	 * 联系电话
 	 */
+	@ApiModelProperty(value = "联系电话")
 	@Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
 	private String phone;
 
 	/**
 	 * 邮箱
 	 */
+	@ApiModelProperty(value = "邮箱")
 	@Email(message = "邮箱格式不正确")
 	@Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
 	private String email;
@@ -74,54 +74,20 @@ public class SysDept implements Serializable {
 	/**
 	 * 部门状态:0正常,1停用
 	 */
+	@ApiModelProperty(value = "部门状态:0正常,1停用")
 	private String status;
 
 	/**
 	 * 删除标志（0代表存在 2代表删除）
 	 */
+	@ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
 	@TableLogic
 	private String delFlag;
 
 	/**
-	 * 父部门名称
+	 * 祖级列表
 	 */
-	@TableField(exist = false)
+	@ApiModelProperty(value = "祖级列表")
-	private String parentName;
+	private String ancestors;
-
-	/**
-	 * 创建者
-	 */
-	@TableField(fill = FieldFill.INSERT)
-	private String createBy;
-
-	/**
-	 * 创建时间
-	 */
-	@TableField(fill = FieldFill.INSERT)
-	private Date createTime;
-
-	/**
-	 * 更新者
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private String updateBy;
-
-	/**
-	 * 更新时间
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private Date updateTime;
-
-	/**
-	 * 子部门
-	 */
-	@TableField(exist = false)
-	private List<SysDept> children = new ArrayList<SysDept>();
-
-	/**
-	 * 请求参数
-	 */
-	@TableField(exist = false)
-	private Map<String, Object> params = new HashMap<>();
 
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java

@@ -2,51 +2,54 @@ package com.ruoyi.common.core.domain.entity;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * 字典数据表 sys_dict_data
  *
- * @author ruoyi
+ * @author Lion Li
  */
 
 @Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("sys_dict_data")
 @ExcelIgnoreUnannotated
-public class SysDictData implements Serializable {
+@ApiModel("字典数据业务对象")
-	private static final long serialVersionUID = 1L;
+public class SysDictData extends BaseEntity {
 
 	/**
 	 * 字典编码
 	 */
+	@ApiModelProperty(value = "字典编码")
 	@ExcelProperty(value = "字典编码")
-	@TableId(value = "dict_code", type = IdType.AUTO)
+	@TableId(value = "dict_code")
 	private Long dictCode;
 
 	/**
 	 * 字典排序
 	 */
+	@ApiModelProperty(value = "字典排序")
 	@ExcelProperty(value = "字典排序")
 	private Long dictSort;
 
 	/**
 	 * 字典标签
 	 */
+	@ApiModelProperty(value = "字典标签")
 	@ExcelProperty(value = "字典标签")
 	@NotBlank(message = "字典标签不能为空")
 	@Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
@@ -55,6 +58,7 @@ public class SysDictData implements Serializable {
 	/**
 	 * 字典键值
 	 */
+	@ApiModelProperty(value = "字典键值")
 	@ExcelProperty(value = "字典键值")
 	@NotBlank(message = "字典键值不能为空")
 	@Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
@@ -63,6 +67,7 @@ public class SysDictData implements Serializable {
 	/**
 	 * 字典类型
 	 */
+	@ApiModelProperty(value = "字典类型")
 	@ExcelProperty(value = "字典类型")
 	@NotBlank(message = "字典类型不能为空")
 	@Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
@@ -71,17 +76,20 @@ public class SysDictData implements Serializable {
 	/**
 	 * 样式属性（其他样式扩展）
 	 */
+	@ApiModelProperty(value = "样式属性（其他样式扩展）")
 	@Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
 	private String cssClass;
 
 	/**
 	 * 表格字典样式
 	 */
+	@ApiModelProperty(value = "表格字典样式")
 	private String listClass;
 
 	/**
 	 * 是否默认（Y是 N否）
 	 */
+	@ApiModelProperty(value = "是否默认（Y是 N否）")
 	@ExcelProperty(value = "是否默认", converter = ExcelDictConvert.class)
 	@ExcelDictFormat(dictType = "sys_yes_no")
 	private String isDefault;
@@ -89,47 +97,19 @@ public class SysDictData implements Serializable {
 	/**
 	 * 状态（0正常 1停用）
 	 */
+	@ApiModelProperty(value = "状态（0正常 1停用）")
 	@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
 	@ExcelDictFormat(dictType = "sys_normal_disable")
 	private String status;
 
-	/**
-	 * 创建者
-	 */
-	@TableField(fill = FieldFill.INSERT)
-	private String createBy;
-
-	/**
-	 * 创建时间
-	 */
-	@TableField(fill = FieldFill.INSERT)
-	private Date createTime;
-
-	/**
-	 * 更新者
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private String updateBy;
-
-	/**
-	 * 更新时间
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private Date updateTime;
-
 	/**
 	 * 备注
 	 */
+	@ApiModelProperty(value = "备注")
 	private String remark;
 
-	/**
-	 * 请求参数
-	 */
-	@TableField(exist = false)
-	private Map<String, Object> params = new HashMap<>();
-
 	public boolean getDefault() {
-		return UserConstants.YES.equals(this.isDefault) ? true : false;
+		return UserConstants.YES.equals(this.isDefault);
 	}
 
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java

@@ -2,44 +2,46 @@ package com.ruoyi.common.core.domain.entity;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * 字典类型表 sys_dict_type
  *
- * @author ruoyi
+ * @author Lion Li
  */
 
 @Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("sys_dict_type")
 @ExcelIgnoreUnannotated
-public class SysDictType implements Serializable {
+@ApiModel("字典类型业务对象")
-	private static final long serialVersionUID = 1L;
+public class SysDictType extends BaseEntity {
 
 	/**
 	 * 字典主键
 	 */
+	@ApiModelProperty(value = "字典主键")
 	@ExcelProperty(value = "字典主键")
-	@TableId(value = "dict_id", type = IdType.AUTO)
+	@TableId(value = "dict_id")
 	private Long dictId;
 
 	/**
 	 * 字典名称
 	 */
+	@ApiModelProperty(value = "字典名称")
 	@ExcelProperty(value = "字典名称")
 	@NotBlank(message = "字典名称不能为空")
 	@Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
@@ -48,6 +50,7 @@ public class SysDictType implements Serializable {
 	/**
 	 * 字典类型
 	 */
+	@ApiModelProperty(value = "字典类型")
 	@ExcelProperty(value = "字典类型")
 	@NotBlank(message = "字典类型不能为空")
 	@Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
@@ -56,43 +59,15 @@ public class SysDictType implements Serializable {
 	/**
 	 * 状态（0正常 1停用）
 	 */
+	@ApiModelProperty(value = "状态（0正常 1停用）")
 	@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
 	@ExcelDictFormat(dictType = "sys_normal_disable")
 	private String status;
 
-	/**
-	 * 创建者
-	 */
-	@TableField(fill = FieldFill.INSERT)
-	private String createBy;
-
-	/**
-	 * 创建时间
-	 */
-	@TableField(fill = FieldFill.INSERT)
-	private Date createTime;
-
-	/**
-	 * 更新者
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private String updateBy;
-
-	/**
-	 * 更新时间
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private Date updateTime;
-
 	/**
 	 * 备注
 	 */
+	@ApiModelProperty(value = "备注")
 	private String remark;
 
-	/**
-	 * 请求参数
-	 */
-	@TableField(exist = false)
-	private Map<String, Object> params = new HashMap<>();
-
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java

@@ -1,154 +1,120 @@
 package com.ruoyi.common.core.domain.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.TreeEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import java.io.Serializable;
-import java.util.*;
 
 /**
  * 菜单权限表 sys_menu
  *
- * @author ruoyi
+ * @author Lion Li
  */
 
 @Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("sys_menu")
-public class SysMenu implements Serializable {
+@ApiModel("菜单权限业务对象")
-	private static final long serialVersionUID = 1L;
+public class SysMenu extends TreeEntity {
 
 	/**
 	 * 菜单ID
 	 */
-	@TableId(value = "menu_id", type = IdType.AUTO)
+	@ApiModelProperty(value = "菜单ID")
+	@TableId(value = "menu_id")
 	private Long menuId;
 
 	/**
 	 * 菜单名称
 	 */
+	@ApiModelProperty(value = "菜单名称")
 	@NotBlank(message = "菜单名称不能为空")
 	@Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
 	private String menuName;
 
-	/**
-	 * 父菜单名称
-	 */
-	@TableField(exist = false)
-	private String parentName;
-
-	/**
-	 * 父菜单ID
-	 */
-	private Long parentId;
-
 	/**
 	 * 显示顺序
 	 */
+	@ApiModelProperty(value = "显示顺序")
 	@NotBlank(message = "显示顺序不能为空")
 	private String orderNum;
 
 	/**
 	 * 路由地址
 	 */
+	@ApiModelProperty(value = "路由地址")
 	@Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
 	private String path;
 
 	/**
 	 * 组件路径
 	 */
+	@ApiModelProperty(value = "组件路径")
 	@Size(min = 0, max = 200, message = "组件路径不能超过255个字符")
 	private String component;
 
     /**
      * 路由参数
      */
+	@ApiModelProperty(value = "路由参数")
     private String query;
 
 	/**
 	 * 是否为外链（0是 1否）
 	 */
+	@ApiModelProperty(value = "是否为外链（0是 1否）")
 	private String isFrame;
 
 	/**
 	 * 是否缓存（0缓存 1不缓存）
 	 */
+	@ApiModelProperty(value = "是否缓存（0缓存 1不缓存）")
 	private String isCache;
 
 	/**
 	 * 类型（M目录 C菜单 F按钮）
 	 */
+	@ApiModelProperty(value = "类型（M目录 C菜单 F按钮）")
 	@NotBlank(message = "菜单类型不能为空")
 	private String menuType;
 
 	/**
 	 * 显示状态（0显示 1隐藏）
 	 */
+	@ApiModelProperty(value = "显示状态（0显示 1隐藏）")
 	private String visible;
 
 	/**
 	 * 菜单状态（0显示 1隐藏）
 	 */
+	@ApiModelProperty(value = "菜单状态（0显示 1隐藏）")
 	private String status;
 
 	/**
 	 * 权限字符串
 	 */
+	@ApiModelProperty(value = "权限字符串")
 	@Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
 	private String perms;
 
 	/**
 	 * 菜单图标
 	 */
+	@ApiModelProperty(value = "菜单图标")
 	private String icon;
 
-	/**
-	 * 创建者
-	 */
-	@TableField(fill = FieldFill.INSERT)
-	private String createBy;
-
-	/**
-	 * 创建时间
-	 */
-	@TableField(fill = FieldFill.INSERT)
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date createTime;
-
-	/**
-	 * 更新者
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private String updateBy;
-
-	/**
-	 * 更新时间
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date updateTime;
-
 	/**
 	 * 备注
 	 */
+	@ApiModelProperty(value = "备注")
 	private String remark;
 
-	/**
-	 * 请求参数
-	 */
-	@TableField(exist = false)
-	private Map<String, Object> params = new HashMap<>();
-
-	/**
-	 * 子菜单
-	 */
-	@TableField(exist = false)
-	private List<SysMenu> children = new ArrayList<SysMenu>();
-
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java

@@ -2,44 +2,48 @@ package com.ruoyi.common.core.domain.entity;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * 角色表 sys_role
  *
- * @author ruoyi
+ * @author Lion Li
  */
 
 @Data
 @NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("sys_role")
 @ExcelIgnoreUnannotated
-public class SysRole implements Serializable {
+public class SysRole extends BaseEntity {
-	private static final long serialVersionUID = 1L;
 
 	/**
 	 * 角色ID
 	 */
+	@ApiModelProperty(value = "角色ID")
 	@ExcelProperty(value = "角色序号")
-	@TableId(value = "role_id", type = IdType.AUTO)
+	@TableId(value = "role_id")
 	private Long roleId;
 
 	/**
 	 * 角色名称
 	 */
+	@ApiModelProperty(value = "角色名称")
 	@ExcelProperty(value = "角色名称")
 	@NotBlank(message = "角色名称不能为空")
 	@Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
@@ -48,6 +52,7 @@ public class SysRole implements Serializable {
 	/**
 	 * 角色权限
 	 */
+	@ApiModelProperty(value = "角色权限")
 	@ExcelProperty(value = "角色权限")
 	@NotBlank(message = "权限字符不能为空")
 	@Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
@@ -56,6 +61,7 @@ public class SysRole implements Serializable {
 	/**
 	 * 角色排序
 	 */
+	@ApiModelProperty(value = "角色排序")
 	@ExcelProperty(value = "角色排序")
 	@NotBlank(message = "显示顺序不能为空")
 	private String roleSort;
@@ -63,6 +69,7 @@ public class SysRole implements Serializable {
 	/**
 	 * 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）
 	 */
+	@ApiModelProperty(value = "数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）")
 	@ExcelProperty(value = "数据范围", converter = ExcelDictConvert.class)
 	@ExcelDictFormat(readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
 	private String dataScope;
@@ -70,16 +77,19 @@ public class SysRole implements Serializable {
 	/**
 	 * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）
 	 */
+	@ApiModelProperty(value = "菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）")
 	private boolean menuCheckStrictly;
 
 	/**
 	 * 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）
 	 */
+	@ApiModelProperty(value = "部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）")
 	private boolean deptCheckStrictly;
 
 	/**
 	 * 角色状态（0正常 1停用）
 	 */
+	@ApiModelProperty(value = "角色状态（0正常 1停用）")
 	@ExcelProperty(value = "角色状态", converter = ExcelDictConvert.class)
 	@ExcelDictFormat(dictType = "sys_common_status")
 	private String status;
@@ -87,59 +97,34 @@ public class SysRole implements Serializable {
 	/**
 	 * 删除标志（0代表存在 2代表删除）
 	 */
+	@ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
 	@TableLogic
 	private String delFlag;
 
-	/**
-	 * 创建者
-	 */
-	@TableField(fill = FieldFill.INSERT)
-	private String createBy;
-
-	/**
-	 * 创建时间
-	 */
-	@TableField(fill = FieldFill.INSERT)
-	private Date createTime;
-
-	/**
-	 * 更新者
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private String updateBy;
-
-	/**
-	 * 更新时间
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private Date updateTime;
-
 	/**
 	 * 备注
 	 */
+	@ApiModelProperty(value = "备注")
 	private String remark;
 
-	/**
-	 * 请求参数
-	 */
-	@TableField(exist = false)
-	private Map<String, Object> params = new HashMap<>();
-
 	/**
 	 * 用户是否存在此角色标识 默认不存在
 	 */
+	@ApiModelProperty(value = "用户是否存在此角色标识 默认不存在")
 	@TableField(exist = false)
 	private boolean flag = false;
 
 	/**
 	 * 菜单组
 	 */
+	@ApiModelProperty(value = "菜单组")
 	@TableField(exist = false)
 	private Long[] menuIds;
 
 	/**
 	 * 部门组（数据权限）
 	 */
+	@ApiModelProperty(value = "部门组（数据权限）")
 	@TableField(exist = false)
 	private Long[] deptIds;
 
@@ -147,6 +132,7 @@ public class SysRole implements Serializable {
 		this.roleId = roleId;
 	}
 
+	@ApiModelProperty(value = "是否管理员")
 	public boolean isAdmin() {
 		return isAdmin(this.roleId);
 	}

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -3,46 +3,51 @@ package com.ruoyi.common.core.domain.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import java.io.Serializable;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 用户对象 sys_user
  *
- * @author ruoyi
+ * @author Lion Li
  */
 
 @Data
 @NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("sys_user")
-public class SysUser implements Serializable {
+@ApiModel("用户信息业务对象")
-	private static final long serialVersionUID = 1L;
+public class SysUser extends BaseEntity {
 
 	/**
 	 * 用户ID
 	 */
-	@TableId(value = "user_id", type = IdType.AUTO)
+	@ApiModelProperty(value = "用户ID")
+	@TableId(value = "user_id")
 	private Long userId;
 
 	/**
 	 * 部门ID
 	 */
+	@ApiModelProperty(value = "部门ID")
 	private Long deptId;
 
 	/**
 	 * 用户账号
 	 */
+	@ApiModelProperty(value = "用户账号")
 	@NotBlank(message = "用户账号不能为空")
 	@Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
 	private String userName;
@@ -50,12 +55,14 @@ public class SysUser implements Serializable {
 	/**
 	 * 用户昵称
 	 */
+	@ApiModelProperty(value = "用户昵称")
 	@Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
 	private String nickName;
 
 	/**
 	 * 用户邮箱
 	 */
+	@ApiModelProperty(value = "用户邮箱")
 	@Email(message = "邮箱格式不正确")
 	@Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
 	private String email;
@@ -63,21 +70,25 @@ public class SysUser implements Serializable {
 	/**
 	 * 手机号码
 	 */
+	@ApiModelProperty(value = "手机号码")
 	private String phonenumber;
 
 	/**
 	 * 用户性别
 	 */
+	@ApiModelProperty(value = "用户性别")
 	private String sex;
 
 	/**
 	 * 用户头像
 	 */
+	@ApiModelProperty(value = "用户头像")
 	private String avatar;
 
 	/**
 	 * 密码
 	 */
+	@ApiModelProperty(value = "密码")
 	@TableField(
 			insertStrategy = FieldStrategy.NOT_EMPTY,
 			updateStrategy = FieldStrategy.NOT_EMPTY,
@@ -94,86 +105,66 @@ public class SysUser implements Serializable {
 	/**
 	 * 帐号状态（0正常 1停用）
 	 */
+	@ApiModelProperty(value = "帐号状态（0正常 1停用）")
 	private String status;
 
 	/**
 	 * 删除标志（0代表存在 2代表删除）
 	 */
+	@ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
 	@TableLogic
 	private String delFlag;
 
 	/**
 	 * 最后登录IP
 	 */
+	@ApiModelProperty(value = "最后登录IP")
 	private String loginIp;
 
 	/**
 	 * 最后登录时间
 	 */
+	@ApiModelProperty(value = "最后登录时间")
 	private Date loginDate;
 
-	/**
-	 * 创建者
-	 */
-	@TableField(fill = FieldFill.INSERT)
-	private String createBy;
-
-	/**
-	 * 创建时间
-	 */
-	@TableField(fill = FieldFill.INSERT)
-	private Date createTime;
-
-	/**
-	 * 更新者
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private String updateBy;
-
-	/**
-	 * 更新时间
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private Date updateTime;
-
 	/**
 	 * 备注
 	 */
+	@ApiModelProperty(value = "备注")
 	private String remark;
 
-	/**
-	 * 请求参数
-	 */
-	@TableField(exist = false)
-	private Map<String, Object> params = new HashMap<>();
-
 	/**
 	 * 部门对象
 	 */
+	@ApiModelProperty(value = "部门对象")
 	@TableField(exist = false)
 	private SysDept dept;
 
 	/**
 	 * 角色对象
 	 */
+	@ApiModelProperty(value = "角色对象")
 	@TableField(exist = false)
 	private List<SysRole> roles;
 
 	/**
 	 * 角色组
 	 */
+	@ApiModelProperty(value = "角色组")
 	@TableField(exist = false)
 	private Long[] roleIds;
 
 	/**
 	 * 岗位组
 	 */
+	@ApiModelProperty(value = "岗位组")
 	@TableField(exist = false)
 	private Long[] postIds;
 
 	/**
 	 * 角色ID
 	 */
+	@ApiModelProperty(value = "角色ID")
 	@TableField(exist = false)
 	private Long roleId;
 
@@ -181,6 +172,7 @@ public class SysUser implements Serializable {
 		this.userId = userId;
 	}
 
+	@ApiModelProperty(value = "是否管理员")
 	public boolean isAdmin() {
 		return isAdmin(this.userId);
 	}

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java

@@ -1,37 +1,43 @@
 package com.ruoyi.common.core.domain.model;
 
-import lombok.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.experimental.Accessors;
 
 /**
  * 用户登录对象
- * 
+ *
- * @author ruoyi
+ * @author Lion Li
  */
 
 @Data
-@NoArgsConstructor
 @Accessors(chain = true)
-public class LoginBody
+@ApiModel("用户登录对象")
-{
+public class LoginBody {
+
     /**
      * 用户名
      */
+    @ApiModelProperty(value = "用户名")
     private String username;
 
     /**
      * 用户密码
      */
+    @ApiModelProperty(value = "用户密码")
     private String password;
 
     /**
      * 验证码
      */
+    @ApiModelProperty(value = "验证码")
     private String code;
 
     /**
      * 唯一标识
      */
+    @ApiModelProperty(value = "唯一标识")
     private String uuid = "";
 
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java

@@ -2,7 +2,8 @@ package com.ruoyi.common.core.domain.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.ruoyi.common.core.domain.entity.SysUser;
-import lombok.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -13,14 +14,14 @@ import java.util.Set;
 /**
  * 登录用户身份权限
  *
- * @author ruoyi
+ * @author Lion Li
  */
 
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
-public class LoginUser implements UserDetails
+public class LoginUser implements UserDetails {
-{
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -78,14 +79,12 @@ public class LoginUser implements UserDetails
      */
     private SysUser user;
 
-    public LoginUser(SysUser user, Set<String> permissions)
+    public LoginUser(SysUser user, Set<String> permissions) {
-    {
         this.user = user;
         this.permissions = permissions;
     }
 
-    public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions)
+    public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions) {
-    {
         this.userId = userId;
         this.deptId = deptId;
         this.user = user;
@@ -94,14 +93,12 @@ public class LoginUser implements UserDetails
 
     @JsonIgnore
     @Override
-    public String getPassword()
+    public String getPassword() {
-    {
         return user.getPassword();
     }
 
     @Override
-    public String getUsername()
+    public String getUsername() {
-    {
         return user.getUserName();
     }
 
@@ -110,50 +107,39 @@ public class LoginUser implements UserDetails
      */
     @JsonIgnore
     @Override
-    public boolean isAccountNonExpired()
+    public boolean isAccountNonExpired() {
-    {
         return true;
     }
 
     /**
      * 指定用户是否解锁,锁定的用户无法进行身份验证
-     *
-     * @return
      */
     @JsonIgnore
     @Override
-    public boolean isAccountNonLocked()
+    public boolean isAccountNonLocked() {
-    {
         return true;
     }
 
     /**
      * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
-     *
-     * @return
      */
     @JsonIgnore
     @Override
-    public boolean isCredentialsNonExpired()
+    public boolean isCredentialsNonExpired() {
-    {
         return true;
     }
 
     /**
      * 是否可用 ,禁用的用户不能身份验证
-     *
-     * @return
      */
     @JsonIgnore
     @Override
-    public boolean isEnabled()
+    public boolean isEnabled() {
-    {
         return true;
     }
 
     @Override
-    public Collection<? extends GrantedAuthority> getAuthorities()
+    public Collection<? extends GrantedAuthority> getAuthorities() {
-    {
         return null;
     }
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java

@@ -1,11 +1,13 @@
 package com.ruoyi.common.core.domain.model;
 
+import io.swagger.annotations.ApiModel;
+
 /**
  * 用户注册对象
- * 
+ *
- * @author ruoyi
+ * @author Lion Li
  */
-public class RegisterBody extends LoginBody
+@ApiModel("用户注册对象")
-{
+public class RegisterBody extends LoginBody {
 
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/cache/MybatisPlusRedisCache.java

@@ -18,6 +18,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
  * 使用方法 配置文件开启 mybatis-plus 二级缓存
  * 在 XxxMapper.java 类上添加注解 @CacheNamespace(implementation = MybatisPlusRedisCache.class, eviction = MybatisPlusRedisCache.class)
  *
+ * @deprecated 3.5.0删除 推荐使用spirng-cache
  * @author Lion Li
  */
 @Slf4j

ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java

@@ -2,7 +2,8 @@ package com.ruoyi.common.exception.job;
 
 /**
  * 计划策略异常
- * 
+ *
+ * @deprecated 3.5.0删除 迁移至xxl-job
  * @author ruoyi
  */
 public class TaskException extends Exception

ruoyi-demo/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/FeignTestController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  * feign测试controller
  *
  * @author Lion Li
+ * @deprecated 由于使用人数较少 决定与 3.4.0 版本移除
  */
 @Api(value = "feign测试", tags = {"feign测试"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)

ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java

@@ -1,13 +1,11 @@
 package com.ruoyi.demo.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.io.Serializable;
-import java.util.Date;
-
 /**
  * 测试单表对象 test_demo
  *
@@ -15,10 +13,10 @@ import java.util.Date;
  * @date 2021-07-26
  */
 @Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("test_demo")
-public class TestDemo implements Serializable {
+public class TestDemo extends BaseEntity {
 
     private static final long serialVersionUID=1L;
 
@@ -42,7 +40,7 @@ public class TestDemo implements Serializable {
     /**
      * 排序号
      */
-	@OrderBy(isDesc = false, sort = 1)
+	@OrderBy(asc = false, sort = 1)
     private Long orderNum;
 
     /**
@@ -61,30 +59,6 @@ public class TestDemo implements Serializable {
     @Version
     private Long version;
 
-    /**
-     * 创建时间
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-
-    /**
-     * 更新人
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateBy;
-
     /**
      * 删除标志
      */

ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java

@@ -1,13 +1,14 @@
 package com.ruoyi.demo.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.ruoyi.common.core.domain.TreeEntity;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.io.Serializable;
-import java.util.Date;
-
 /**
  * 测试树表对象 test_tree
  *
@@ -15,10 +16,10 @@ import java.util.Date;
  * @date 2021-07-26
  */
 @Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("test_tree")
-public class TestTree implements Serializable {
+public class TestTree extends TreeEntity {
 
     private static final long serialVersionUID=1L;
 
@@ -29,11 +30,6 @@ public class TestTree implements Serializable {
     @TableId(value = "id")
     private Long id;
 
-    /**
-     * 父id
-     */
-    private Long parentId;
-
     /**
      * 部门id
      */
@@ -55,30 +51,6 @@ public class TestTree implements Serializable {
     @Version
     private Long version;
 
-    /**
-     * 创建时间
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-
-    /**
-     * 更新人
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateBy;
-
     /**
      * 删除标志
      */

ruoyi-demo/src/main/java/com/ruoyi/demo/feign/FeignTestService.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
  * 增加 feign 的目的为使 http 请求接口化
  *
  * @author Lion Li
+ * @deprecated 由于使用人数较少 决定与 3.4.0 版本移除
  */
 @FeignClient(
 	name = FeignTestConstant.BAIDU_NAME,

ruoyi-demo/src/main/java/com/ruoyi/demo/feign/constant/FeignTestConstant.java

@@ -1,5 +1,9 @@
 package com.ruoyi.demo.feign.constant;
 
+/**
+ * @deprecated 由于使用人数较少 决定与 3.4.0 版本移除
+ */
+@Deprecated
 public class FeignTestConstant {
 
 	public static final String BAIDU_NAME = "baidu";

ruoyi-demo/src/main/java/com/ruoyi/demo/feign/fallback/FeignTestFallback.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
  *
  * @see {com.ruoyi.framework.config.FeignConfig#errorDecoder()}
  * @author Lion Li
+ * @deprecated 由于使用人数较少 决定与 3.4.0 版本移除
  */
 @Slf4j
 @Component

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java

@@ -1,11 +1,11 @@
 package com.ruoyi.demo.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.utils.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.demo.domain.TestTree;
 import com.ruoyi.demo.domain.bo.TestTreeBo;
 import com.ruoyi.demo.domain.vo.TestTreeVo;
@@ -23,6 +23,7 @@ import java.util.Map;
  * @author Lion Li
  * @date 2021-07-26
  */
+//@DataSource(DataSourceType.SLAVE) // 切换从库查询
 @Service
 public class TestTreeServiceImpl extends ServicePlusImpl<TestTreeMapper, TestTree, TestTreeVo> implements ITestTreeService {
 

ruoyi-extend/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ruoyi-extend</artifactId>

ruoyi-extend/ruoyi-monitor-admin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-extend</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/SecurityConfig.java

@@ -9,9 +9,9 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 
 /**
- * spring security配置
+ * admin 监控 安全配置
  *
- * @author ruoyi
+ * @author Lion Li
  */
 @Configuration
 @EnableWebSecurity
@@ -29,7 +29,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 		SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
 		successHandler.setTargetUrlParameter("redirectTo");
 		successHandler.setDefaultTargetUrl(adminContextPath + "/");
-
+		// admin监控 用户鉴权
 		httpSecurity.authorizeRequests()
 			//授予对所有静态资产和登录页面的公共访问权限。
 			.antMatchers(adminContextPath + "/assets/**").permitAll()

ruoyi-framework/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-framework/src/main/java/com/ruoyi/framework/Interceptor/PlusWebInvokeTimeInterceptor.java

@@ -0,0 +1,85 @@
+package com.ruoyi.framework.Interceptor;
+
+import cn.hutool.core.map.MapUtil;
+import com.alibaba.ttl.TransmittableThreadLocal;
+import com.ruoyi.common.utils.JsonUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.yomahub.tlog.context.TLogContext;
+import com.yomahub.tlog.web.interceptor.AbsTLogWebHandlerMethodInterceptor;
+import com.yomahub.tlog.web.wrapper.RequestWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.StopWatch;
+import org.springframework.http.MediaType;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+/**
+ * 重写Tlog web的调用时间统计拦截器
+ *
+ * @author Lion Li
+ * @since 3.3.0
+ */
+@Slf4j
+public class PlusWebInvokeTimeInterceptor extends AbsTLogWebHandlerMethodInterceptor {
+
+    private final TransmittableThreadLocal<StopWatch> invokeTimeTL = new TransmittableThreadLocal<>();
+
+    @Override
+    public boolean preHandleByHandlerMethod(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        if (TLogContext.enableInvokeTimePrint()) {
+            String url = request.getMethod() + " " + request.getRequestURI();
+
+            // 打印请求参数
+            if (isJsonRequest(request)) {
+                    String jsonParam = new RequestWrapper(request).getBodyString();
+                    log.info("[PLUS]开始请求 => URL[{}],参数类型[json],参数:[{}]", url, jsonParam);
+            } else {
+                Map<String, String[]> parameterMap = request.getParameterMap();
+                if (MapUtil.isNotEmpty(parameterMap)) {
+                    String parameters = JsonUtils.toJsonString(parameterMap);
+                    log.info("[PLUS]开始请求 => URL[{}],参数类型[param],参数:[{}]", url, parameters);
+                } else {
+                    log.info("[PLUS]开始请求 => URL[{}],无参数", url);
+                }
+            }
+
+            StopWatch stopWatch = new StopWatch();
+            invokeTimeTL.set(stopWatch);
+            stopWatch.start();
+        }
+        return true;
+    }
+
+    @Override
+    public void postHandleByHandlerMethod(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
+
+    }
+
+    @Override
+    public void afterCompletionByHandlerMethod(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+        if (TLogContext.enableInvokeTimePrint()) {
+            StopWatch stopWatch = invokeTimeTL.get();
+            stopWatch.stop();
+            log.info("[PLUS]结束请求 => URL[{}],耗时:[{}]毫秒", request.getMethod() + " " + request.getRequestURI(), stopWatch.getTime());
+            invokeTimeTL.remove();
+        }
+    }
+
+    /**
+     * 判断本次请求的数据类型是否为json
+     *
+     * @param request request
+     * @return boolean
+     */
+    private boolean isJsonRequest(HttpServletRequest request) {
+        String contentType = request.getContentType();
+        if (contentType != null) {
+            return StringUtils.startsWithIgnoreCase(contentType, MediaType.APPLICATION_JSON_VALUE);
+        }
+        return false;
+    }
+
+}

ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java

@@ -6,9 +6,14 @@ import com.ruoyi.common.utils.StringUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
+import java.util.Objects;
+
 /**
  * 多数据源处理
  *
@@ -19,8 +24,15 @@ import org.springframework.stereotype.Component;
 @Component
 public class DataSourceAspect {
 
-	@Around("@annotation(dataSource) || @within(dataSource)")
+	@Pointcut("@annotation(com.ruoyi.common.annotation.DataSource)"
-	public Object around(ProceedingJoinPoint point, DataSource dataSource) throws Throwable {
+			+ "|| @within(com.ruoyi.common.annotation.DataSource)")
+	public void dsPointCut() {
+	}
+
+	@Around("dsPointCut()")
+	public Object around(ProceedingJoinPoint point) throws Throwable {
+		DataSource dataSource = getDataSource(point);
+
 		if (StringUtils.isNotNull(dataSource)) {
 			DynamicDataSourceContextHolder.poll();
 			String source = dataSource.value().getSource();
@@ -35,4 +47,17 @@ public class DataSourceAspect {
 		}
 	}
 
+	/**
+	 * 获取需要切换的数据源
+	 */
+	public DataSource getDataSource(ProceedingJoinPoint point) {
+		MethodSignature signature = (MethodSignature) point.getSignature();
+		DataSource dataSource = AnnotationUtils.findAnnotation(signature.getMethod(), DataSource.class);
+		if (Objects.nonNull(dataSource)) {
+			return dataSource;
+		}
+
+		return AnnotationUtils.findAnnotation(signature.getDeclaringType(), DataSource.class);
+	}
+
 }

ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java

@@ -17,7 +17,9 @@ import java.util.concurrent.TimeUnit;
  * openfeign配置类
  *
  * @author Lion Li
+ * @deprecated 由于使用人数较少 决定与 3.4.0 版本移除
  */
+@Deprecated
 @EnableFeignClients("${feign.package}")
 @Configuration
 @ConditionalOnClass(Feign.class)

ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.ruoyi.common.core.mybatisplus.methods.InsertAll;
-import com.ruoyi.framework.mybatisplus.CreateAndUpdateMetaObjectHandler;
+import com.ruoyi.framework.handler.CreateAndUpdateMetaObjectHandler;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java

@@ -1,10 +1,13 @@
 package com.ruoyi.framework.config;
 
+import com.ruoyi.framework.Interceptor.PlusWebInvokeTimeInterceptor;
+import com.yomahub.tlog.web.interceptor.TLogWebInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -20,12 +23,19 @@ public class ResourcesConfig implements WebMvcConfigurer {
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
     }
 
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        // 全局链路跟踪拦截器
+        registry.addInterceptor(new TLogWebInterceptor());
+        // 全局访问性能拦截
+        registry.addInterceptor(new PlusWebInvokeTimeInterceptor());
+    }
+
     /**
      * 跨域配置
      */
     @Bean
     public CorsFilter corsFilter() {
-        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         CorsConfiguration config = new CorsConfiguration();
         config.setAllowCredentials(true);
         // 设置访问源地址
@@ -34,8 +44,12 @@ public class ResourcesConfig implements WebMvcConfigurer {
         config.addAllowedHeader("*");
         // 设置访问源请求方法
         config.addAllowedMethod("*");
-        // 对接口配置跨域设置
+        // 有效期 1800秒
+        config.setMaxAge(1800L);
+        // 添加映射路径，拦截一切请求
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         source.registerCorsConfiguration("/**", config);
+        // 返回新的CorsFilter
         return new CorsFilter(source);
     }
-}
+}

ruoyi-framework/src/main/java/com/ruoyi/framework/config/TLogConfig.java

@@ -0,0 +1,49 @@
+package com.ruoyi.framework.config;
+
+import com.yomahub.tlog.core.aop.AspectLogAop;
+import com.yomahub.tlog.feign.filter.TLogFeignFilter;
+import com.yomahub.tlog.spring.TLogPropertyInit;
+import com.yomahub.tlog.spring.TLogSpringAware;
+import com.yomahub.tlog.springboot.property.TLogProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.core.annotation.Order;
+
+/**
+ * 整合 TLog 框架配置
+ *
+ * @author Lion Li
+ * @since 3.3.0
+ */
+@Order(-999)
+@Configuration
+@Import(TLogProperty.class)
+public class TLogConfig {
+
+    @Bean
+    public TLogPropertyInit tLogPropertyInit(TLogProperty tLogProperty) {
+        TLogPropertyInit tLogPropertyInit = new TLogPropertyInit();
+        tLogPropertyInit.setPattern(tLogProperty.getPattern());
+        tLogPropertyInit.setEnableInvokeTimePrint(tLogProperty.enableInvokeTimePrint());
+        tLogPropertyInit.setIdGenerator(tLogProperty.getIdGenerator());
+        tLogPropertyInit.setMdcEnable(tLogProperty.getMdcEnable());
+        return tLogPropertyInit;
+    }
+
+    @Bean
+    public TLogSpringAware tLogSpringAware(){
+        return new TLogSpringAware();
+    }
+
+    @Bean
+    public AspectLogAop aspectLogAop() {
+        return new AspectLogAop();
+    }
+
+    @Bean
+    public TLogFeignFilter tLogFeignFilter() {
+        return new TLogFeignFilter();
+    }
+
+}

ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java

@@ -0,0 +1,92 @@
+package com.ruoyi.framework.handler;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.http.HttpStatus;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.reflection.MetaObject;
+
+import java.util.Date;
+
+/**
+ * MP注入处理器
+ *
+ * @author Lion Li
+ * @date 2021/4/25
+ */
+@Slf4j
+public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
+
+	@Override
+	public void insertFill(MetaObject metaObject) {
+		try {
+			if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity) {
+				BaseEntity baseEntity = (BaseEntity) metaObject.getOriginalObject();
+				Date current = new Date();
+				// 创建时间为空 则填充
+				if (ObjectUtil.isNull(baseEntity.getCreateTime())) {
+					baseEntity.setCreateTime(current);
+				}
+				// 更新时间为空 则填充
+				if (ObjectUtil.isNull(baseEntity.getUpdateTime())) {
+					baseEntity.setUpdateTime(current);
+				}
+				String username = getLoginUsername();
+				// 当前已登录 且 创建人为空 则填充
+				if (StringUtils.isNotBlank(username)
+						&& StringUtils.isBlank(baseEntity.getCreateBy())) {
+					baseEntity.setCreateBy(username);
+				}
+				// 当前已登录 且 更信任为空 则填充
+				if (StringUtils.isNotBlank(username)
+						&& StringUtils.isBlank(baseEntity.getUpdateBy())) {
+					baseEntity.setUpdateBy(username);
+				}
+			}
+		} catch (Exception e) {
+			throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+		}
+	}
+
+	@Override
+	public void updateFill(MetaObject metaObject) {
+		try {
+			if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity) {
+				BaseEntity baseEntity = (BaseEntity) metaObject.getOriginalObject();
+				Date current = new Date();
+				// 更新时间为空 则填充
+				if (ObjectUtil.isNull(baseEntity.getUpdateTime())) {
+					baseEntity.setUpdateTime(current);
+				}
+				String username = getLoginUsername();
+				// 当前已登录 且 更信任为空 则填充
+				if (StringUtils.isNotBlank(username)
+						&& StringUtils.isBlank(baseEntity.getUpdateBy())) {
+					baseEntity.setUpdateBy(username);
+				}
+			}
+		} catch (Exception e) {
+			throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+		}
+	}
+
+	/**
+	 * 获取登录用户名
+	 */
+	private String getLoginUsername() {
+		LoginUser loginUser;
+		try {
+			loginUser = SecurityUtils.getLoginUser();
+		} catch (Exception e) {
+			log.warn("自动注入警告 => 用户未登录");
+			return null;
+		}
+		return loginUser.getUsername();
+	}
+
+}

ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java

@@ -1,66 +0,0 @@
-package com.ruoyi.framework.mybatisplus;
-
-import cn.hutool.http.HttpStatus;
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.SecurityUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.reflection.MetaObject;
-
-import java.util.Date;
-
-/**
- * MP注入处理器
- *
- * @author Lion Li
- * @date 2021/4/25
- */
-@Slf4j
-public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
-
-	@Override
-	public void insertFill(MetaObject metaObject) {
-		try {
-			//根据属性名字设置要填充的值
-			if (metaObject.hasGetter("createTime")) {
-				this.setFieldValByName("createTime", new Date(), metaObject);
-			}
-			if (metaObject.hasGetter("createBy")) {
-				this.setFieldValByName("createBy", getLoginUsername(), metaObject);
-			}
-		} catch (Exception e) {
-			throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
-		}
-		updateFill(metaObject);
-	}
-
-	@Override
-	public void updateFill(MetaObject metaObject) {
-		try {
-			if (metaObject.hasGetter("updateBy")) {
-				this.setFieldValByName("updateBy", getLoginUsername(), metaObject);
-			}
-			if (metaObject.hasGetter("updateTime")) {
-				this.setFieldValByName("updateTime", new Date(), metaObject);
-			}
-		} catch (Exception e) {
-			throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
-		}
-	}
-
-	/**
-	 * 获取登录用户名
-	 */
-	private String getLoginUsername() {
-		LoginUser loginUser;
-		try {
-			loginUser = SecurityUtils.getLoginUser();
-		} catch (Exception e) {
-			log.warn("自动注入警告 => 用户未登录");
-			return null;
-		}
-		return loginUser.getUsername();
-	}
-
-}

ruoyi-generator/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java

@@ -7,67 +7,67 @@ import org.springframework.stereotype.Component;
 
 /**
  * 读取代码生成相关配置
- * 
+ *
  * @author ruoyi
  */
 @Component
 @ConfigurationProperties(prefix = "gen")
-@PropertySource(value = { "classpath:generator.yml" })
+@PropertySource(value = {"classpath:generator.yml"})
-public class GenConfig
+public class GenConfig {
-{
+
-    /** 作者 */
+    /**
+     * 作者
+     */
     public static String author;
 
-    /** 生成包路径 */
+    /**
+     * 生成包路径
+     */
     public static String packageName;
 
-    /** 自动去除表前缀，默认是false */
+    /**
+     * 自动去除表前缀，默认是false
+     */
     public static boolean autoRemovePre;
 
-    /** 表前缀(类名不会包含表前缀) */
+    /**
+     * 表前缀(类名不会包含表前缀)
+     */
     public static String tablePrefix;
 
-    public static String getAuthor()
+    public static String getAuthor() {
-    {
         return author;
     }
 
     @Value("${author}")
-    public void setAuthor(String author)
+    public void setAuthor(String author) {
-    {
         GenConfig.author = author;
     }
 
-    public static String getPackageName()
+    public static String getPackageName() {
-    {
         return packageName;
     }
 
     @Value("${packageName}")
-    public void setPackageName(String packageName)
+    public void setPackageName(String packageName) {
-    {
         GenConfig.packageName = packageName;
     }
 
-    public static boolean getAutoRemovePre()
+    public static boolean getAutoRemovePre() {
-    {
         return autoRemovePre;
     }
 
     @Value("${autoRemovePre}")
-    public void setAutoRemovePre(boolean autoRemovePre)
+    public void setAutoRemovePre(boolean autoRemovePre) {
-    {
         GenConfig.autoRemovePre = autoRemovePre;
     }
 
-    public static String getTablePrefix()
+    public static String getTablePrefix() {
-    {
         return tablePrefix;
     }
 
     @Value("${tablePrefix}")
-    public void setTablePrefix(String tablePrefix)
+    public void setTablePrefix(String tablePrefix) {
-    {
         GenConfig.tablePrefix = tablePrefix;
     }
 }

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

@@ -10,6 +10,9 @@ import com.ruoyi.generator.domain.GenTable;
 import com.ruoyi.generator.domain.GenTableColumn;
 import com.ruoyi.generator.service.IGenTableColumnService;
 import com.ruoyi.generator.service.IGenTableService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -24,36 +27,36 @@ import java.util.Map;
 
 /**
  * 代码生成 操作处理
- * 
+ *
- * @author ruoyi
+ * @author Lion Li
  */
+@Validated
+@Api(value = "代码生成", tags = {"代码生成管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/tool/gen")
-public class GenController extends BaseController
+public class GenController extends BaseController {
-{
-    @Autowired
-    private IGenTableService genTableService;
 
-    @Autowired
+    private final IGenTableService genTableService;
-    private IGenTableColumnService genTableColumnService;
+    private final IGenTableColumnService genTableColumnService;
 
     /**
      * 查询代码生成列表
      */
+    @ApiOperation("查询代码生成列表")
     @PreAuthorize("@ss.hasPermi('tool:gen:list')")
     @GetMapping("/list")
-    public TableDataInfo genList(GenTable genTable)
+    public TableDataInfo<GenTable> genList(GenTable genTable) {
-    {
         return genTableService.selectPageGenTableList(genTable);
     }
 
     /**
      * 修改代码生成业务
      */
+    @ApiOperation("修改代码生成业务")
     @PreAuthorize("@ss.hasPermi('tool:gen:query')")
     @GetMapping(value = "/{talbleId}")
-    public AjaxResult getInfo(@PathVariable Long talbleId)
+    public AjaxResult<Map<String, Object>> getInfo(@PathVariable Long talbleId) {
-    {
         GenTable table = genTableService.selectGenTableById(talbleId);
         List<GenTable> tables = genTableService.selectGenTableAll();
         List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(talbleId);
@@ -67,21 +70,21 @@ public class GenController extends BaseController
     /**
      * 查询数据库列表
      */
+    @ApiOperation("查询数据库列表")
     @PreAuthorize("@ss.hasPermi('tool:gen:list')")
     @GetMapping("/db/list")
-    public TableDataInfo dataList(GenTable genTable)
+    public TableDataInfo<GenTable> dataList(GenTable genTable) {
-    {
         return genTableService.selectPageDbTableList(genTable);
     }
 
     /**
      * 查询数据表字段列表
      */
+    @ApiOperation("查询数据表字段列表")
     @PreAuthorize("@ss.hasPermi('tool:gen:list')")
     @GetMapping(value = "/column/{talbleId}")
-    public TableDataInfo columnList(Long tableId)
+    public TableDataInfo<GenTableColumn> columnList(Long tableId) {
-    {
+        TableDataInfo<GenTableColumn> dataInfo = new TableDataInfo<>();
-        TableDataInfo dataInfo = new TableDataInfo();
         List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
         dataInfo.setRows(list);
         dataInfo.setTotal(list.size());
@@ -91,11 +94,11 @@ public class GenController extends BaseController
     /**
      * 导入表结构（保存）
      */
+    @ApiOperation("导入表结构（保存）")
     @PreAuthorize("@ss.hasPermi('tool:gen:import')")
     @Log(title = "代码生成", businessType = BusinessType.IMPORT)
     @PostMapping("/importTable")
-    public AjaxResult importTableSave(String tables)
+    public AjaxResult<Void> importTableSave(String tables) {
-    {
         String[] tableNames = Convert.toStrArray(tables);
         // 查询表信息
         List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);
@@ -106,11 +109,11 @@ public class GenController extends BaseController
     /**
      * 修改保存代码生成业务
      */
+    @ApiOperation("修改保存代码生成业务")
     @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
     @Log(title = "代码生成", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult editSave(@Validated @RequestBody GenTable genTable)
+    public AjaxResult<Void> editSave(@Validated @RequestBody GenTable genTable) {
-    {
         genTableService.validateEdit(genTable);
         genTableService.updateGenTable(genTable);
         return AjaxResult.success();
@@ -119,11 +122,11 @@ public class GenController extends BaseController
     /**
      * 删除代码生成
      */
+    @ApiOperation("删除代码生成")
     @PreAuthorize("@ss.hasPermi('tool:gen:remove')")
     @Log(title = "代码生成", businessType = BusinessType.DELETE)
     @DeleteMapping("/{tableIds}")
-    public AjaxResult remove(@PathVariable Long[] tableIds)
+    public AjaxResult<Void> remove(@PathVariable Long[] tableIds) {
-    {
         genTableService.deleteGenTableByIds(tableIds);
         return AjaxResult.success();
     }
@@ -131,10 +134,10 @@ public class GenController extends BaseController
     /**
      * 预览代码
      */
+    @ApiOperation("预览代码")
     @PreAuthorize("@ss.hasPermi('tool:gen:preview')")
     @GetMapping("/preview/{tableId}")
-    public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException
+    public AjaxResult<Map<String, String>> preview(@PathVariable("tableId") Long tableId) throws IOException {
-    {
         Map<String, String> dataMap = genTableService.previewCode(tableId);
         return AjaxResult.success(dataMap);
     }
@@ -142,11 +145,11 @@ public class GenController extends BaseController
     /**
      * 生成代码（下载方式）
      */
+    @ApiOperation("生成代码（下载方式）")
     @PreAuthorize("@ss.hasPermi('tool:gen:code')")
     @Log(title = "代码生成", businessType = BusinessType.GENCODE)
     @GetMapping("/download/{tableName}")
-    public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException
+    public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException {
-    {
         byte[] data = genTableService.downloadCode(tableName);
         genCode(response, data);
     }
@@ -154,11 +157,11 @@ public class GenController extends BaseController
     /**
      * 生成代码（自定义路径）
      */
+    @ApiOperation("生成代码（自定义路径）")
     @PreAuthorize("@ss.hasPermi('tool:gen:code')")
     @Log(title = "代码生成", businessType = BusinessType.GENCODE)
     @GetMapping("/genCode/{tableName}")
-    public AjaxResult genCode(@PathVariable("tableName") String tableName)
+    public AjaxResult<Void> genCode(@PathVariable("tableName") String tableName) {
-    {
         genTableService.generatorCode(tableName);
         return AjaxResult.success();
     }
@@ -166,11 +169,11 @@ public class GenController extends BaseController
     /**
      * 同步数据库
      */
+    @ApiOperation("同步数据库")
     @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
     @Log(title = "代码生成", businessType = BusinessType.UPDATE)
     @GetMapping("/synchDb/{tableName}")
-    public AjaxResult synchDb(@PathVariable("tableName") String tableName)
+    public AjaxResult<Void> synchDb(@PathVariable("tableName") String tableName) {
-    {
         genTableService.synchDb(tableName);
         return AjaxResult.success();
     }
@@ -178,11 +181,11 @@ public class GenController extends BaseController
     /**
      * 批量生成代码
      */
+    @ApiOperation("批量生成代码")
     @PreAuthorize("@ss.hasPermi('tool:gen:code')")
     @Log(title = "代码生成", businessType = BusinessType.GENCODE)
     @GetMapping("/batchGenCode")
-    public void batchGenCode(HttpServletResponse response, String tables) throws IOException
+    public void batchGenCode(HttpServletResponse response, String tables) throws IOException {
-    {
         String[] tableNames = Convert.toStrArray(tables);
         byte[] data = genTableService.downloadCode(tableNames);
         genCode(response, data);
@@ -191,8 +194,7 @@ public class GenController extends BaseController
     /**
      * 生成zip文件
      */
-    private void genCode(HttpServletResponse response, byte[] data) throws IOException
+    private void genCode(HttpServletResponse response, byte[] data) throws IOException {
-    {
         response.reset();
         response.addHeader("Access-Control-Allow-Origin", "*");
         response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java

@@ -1,38 +1,36 @@
 package com.ruoyi.generator.domain;
 
-import com.ruoyi.common.utils.StringUtils;
+import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.constant.GenConstants;
-import lombok.*;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.utils.StringUtils;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.apache.commons.lang3.ArrayUtils;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 业务表 gen_table
  *
- * @author ruoyi
+ * @author Lion Li
  */
 
 @Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("gen_table")
-public class GenTable implements Serializable {
+public class GenTable extends BaseEntity {
-    private static final long serialVersionUID = 1L;
 
     /**
      * 编号
      */
-    @TableId(value = "table_id", type = IdType.AUTO)
+    @TableId(value = "table_id")
     private Long tableId;
 
     /**
@@ -132,43 +130,11 @@ public class GenTable implements Serializable {
      */
     private String options;
 
-    /**
-     * 创建者
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /**
-     * 更新者
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
     /**
      * 备注
      */
     private String remark;
 
-    /**
-     * 请求参数
-     */
-    @TableField(exist = false)
-    private Map<String, Object> params = new HashMap<>();
-
     /**
      * 树编码字段
      */

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java

@@ -1,34 +1,33 @@
 package com.ruoyi.generator.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.utils.StringUtils;
-import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.EqualsAndHashCode;
-import lombok.*;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * 代码生成业务字段表 gen_table_column
  *
- * @author ruoyi
+ * @author Lion Li
  */
 
 @Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("gen_table_column")
-public class GenTableColumn implements Serializable {
+public class GenTableColumn extends BaseEntity {
-    private static final long serialVersionUID = 1L;
 
     /**
      * 编号
      */
-    @TableId(value = "column_id", type = IdType.AUTO)
+    @TableId(value = "column_id")
     private Long columnId;
 
     /**
@@ -125,38 +124,6 @@ public class GenTableColumn implements Serializable {
      */
     private Integer sort;
 
-    /**
-     * 创建者
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /**
-     * 更新者
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    /**
-     * 请求参数
-     */
-    @TableField(exist = false)
-    private Map<String, Object> params = new HashMap<>();
-
     public String getCapJavaField() {
         return StringUtils.uncapitalize(javaField);
     }
@@ -224,9 +191,9 @@ public class GenTableColumn implements Serializable {
     public static boolean isSuperColumn(String javaField) {
         return StringUtils.equalsAnyIgnoreCase(javaField,
                 // BaseEntity
-                "createBy", "createTime", "updateBy", "updateTime", "remark",
+                "createBy", "createTime", "updateBy", "updateTime",
                 // TreeEntity
-                "parentName", "parentId", "orderNum", "ancestors");
+                "parentName", "parentId");
     }
 
     public boolean isUsableColumn() {

ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * 业务字段 数据层
  *
- * @author ruoyi
+ * @author Lion Li
  */
 public interface GenTableColumnMapper extends BaseMapperPlus<GenTableColumn> {
     /**
@@ -17,6 +17,6 @@ public interface GenTableColumnMapper extends BaseMapperPlus<GenTableColumn> {
      * @param tableName 表名称
      * @return 列信息
      */
-    public List<GenTableColumn> selectDbTableColumnsByName(String tableName);
+    List<GenTableColumn> selectDbTableColumnsByName(String tableName);
 
 }

ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * 业务 数据层
  *
- * @author ruoyi
+ * @author Lion Li
  */
 public interface GenTableMapper extends BaseMapperPlus<GenTable> {
 
@@ -25,7 +25,7 @@ public interface GenTableMapper extends BaseMapperPlus<GenTable> {
      * @param genTable 业务信息
      * @return 业务集合
      */
-    public List<GenTable> selectGenTableList(GenTable genTable);
+    List<GenTable> selectGenTableList(GenTable genTable);
 
     /**
      * 查询据库列表
@@ -33,7 +33,7 @@ public interface GenTableMapper extends BaseMapperPlus<GenTable> {
      * @param genTable 业务信息
      * @return 数据库表集合
      */
-    public List<GenTable> selectDbTableList(GenTable genTable);
+    List<GenTable> selectDbTableList(GenTable genTable);
 
     /**
      * 查询据库列表
@@ -41,14 +41,14 @@ public interface GenTableMapper extends BaseMapperPlus<GenTable> {
      * @param tableNames 表名称组
      * @return 数据库表集合
      */
-    public List<GenTable> selectDbTableListByNames(String[] tableNames);
+    List<GenTable> selectDbTableListByNames(String[] tableNames);
 
     /**
      * 查询所有表信息
      *
      * @return 表信息集合
      */
-    public List<GenTable> selectGenTableAll();
+    List<GenTable> selectGenTableAll();
 
     /**
      * 查询表ID业务信息
@@ -56,7 +56,7 @@ public interface GenTableMapper extends BaseMapperPlus<GenTable> {
      * @param id 业务ID
      * @return 业务信息
      */
-    public GenTable selectGenTableById(Long id);
+    GenTable selectGenTableById(Long id);
 
     /**
      * 查询表名称业务信息
@@ -64,6 +64,6 @@ public interface GenTableMapper extends BaseMapperPlus<GenTable> {
      * @param tableName 表名称
      * @return 业务信息
      */
-    public GenTable selectGenTableByName(String tableName);
+    GenTable selectGenTableByName(String tableName);
 
 }

ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java

@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * 业务字段 服务层实现
  *
- * @author ruoyi
+ * @author Lion Li
  */
 @Service
 public class GenTableColumnServiceImpl extends ServicePlusImpl<GenTableColumnMapper, GenTableColumn, GenTableColumn> implements IGenTableColumnService {
@@ -26,7 +26,7 @@ public class GenTableColumnServiceImpl extends ServicePlusImpl<GenTableColumnMap
     @Override
     public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId) {
         return list(new LambdaQueryWrapper<GenTableColumn>()
-                .eq(GenTableColumn::getTableId,tableId)
+                .eq(GenTableColumn::getTableId, tableId)
                 .orderByAsc(GenTableColumn::getSort));
     }
 

ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

@@ -41,7 +41,7 @@ import java.util.zip.ZipOutputStream;
 /**
  * 业务 服务层实现
  *
- * @author ruoyi
+ * @author Lion Li
  */
 @Slf4j
 @Service
@@ -163,18 +163,18 @@ public class GenTableServiceImpl extends ServicePlusImpl<GenTableMapper, GenTabl
                 String tableName = table.getTableName();
                 GenUtils.initTable(table, operName);
                 int row = baseMapper.insert(table);
-				if (row > 0) {
+                if (row > 0) {
-					// 保存列信息
+                    // 保存列信息
-					List<GenTableColumn> genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
+                    List<GenTableColumn> genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
-					List<GenTableColumn> saveColumns = new ArrayList<>();
+                    List<GenTableColumn> saveColumns = new ArrayList<>();
-					for (GenTableColumn column : genTableColumns) {
+                    for (GenTableColumn column : genTableColumns) {
-						GenUtils.initColumnField(column, table);
+                        GenUtils.initColumnField(column, table);
-						saveColumns.add(column);
+                        saveColumns.add(column);
-					}
+                    }
-					if (CollUtil.isNotEmpty(saveColumns)) {
+                    if (CollUtil.isNotEmpty(saveColumns)) {
-						genTableColumnMapper.insertAll(saveColumns);
+                        genTableColumnMapper.insertAll(saveColumns);
-					}
+                    }
-				}
+                }
             }
         } catch (Exception e) {
             throw new ServiceException("导入失败：" + e.getMessage());
@@ -253,12 +253,12 @@ public class GenTableServiceImpl extends ServicePlusImpl<GenTableMapper, GenTabl
                 StringWriter sw = new StringWriter();
                 Template tpl = Velocity.getTemplate(template, Constants.UTF8);
                 tpl.merge(context, sw);
-				try {
+                try {
-                	String path = getGenPath(table, template);
+                    String path = getGenPath(table, template);
-                	FileUtils.writeUtf8String(sw.toString(), path);
+                    FileUtils.writeUtf8String(sw.toString(), path);
-				} catch (Exception e) {
+                } catch (Exception e) {
-					throw new ServiceException("渲染模板失败，表名：" + table.getTableName());
+                    throw new ServiceException("渲染模板失败，表名：" + table.getTableName());
-				}
+                }
             }
         }
     }
@@ -281,16 +281,16 @@ public class GenTableServiceImpl extends ServicePlusImpl<GenTableMapper, GenTabl
         }
         List<String> dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());
 
-		List<GenTableColumn> saveColumns = new ArrayList<>();
+        List<GenTableColumn> saveColumns = new ArrayList<>();
-		dbTableColumns.forEach(column -> {
+        dbTableColumns.forEach(column -> {
-			if (!tableColumnNames.contains(column.getColumnName())) {
+            if (!tableColumnNames.contains(column.getColumnName())) {
-				GenUtils.initColumnField(column, table);
+                GenUtils.initColumnField(column, table);
-				saveColumns.add(column);
+                saveColumns.add(column);
-			}
+            }
-		});
+        });
-		if (CollUtil.isNotEmpty(saveColumns)) {
+        if (CollUtil.isNotEmpty(saveColumns)) {
-			genTableColumnMapper.insertAll(saveColumns);
+            genTableColumnMapper.insertAll(saveColumns);
-		}
+        }
 
         List<GenTableColumn> delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList());
         if (CollUtil.isNotEmpty(delColumns)) {
@@ -359,7 +359,7 @@ public class GenTableServiceImpl extends ServicePlusImpl<GenTableMapper, GenTabl
     @Override
     public void validateEdit(GenTable genTable) {
         if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) {
-			Map<String, Object> paramsObj = genTable.getParams();
+            Map<String, Object> paramsObj = genTable.getParams();
             if (StringUtils.isEmpty(paramsObj.get(GenConstants.TREE_CODE))) {
                 throw new ServiceException("树编码字段不能为空");
             } else if (StringUtils.isEmpty(paramsObj.get(GenConstants.TREE_PARENT_CODE))) {
@@ -422,7 +422,7 @@ public class GenTableServiceImpl extends ServicePlusImpl<GenTableMapper, GenTabl
      * @param genTable 设置后的生成对象
      */
     public void setTableFromOptions(GenTable genTable) {
-		Map<String, Object> paramsObj = JsonUtils.parseMap(genTable.getOptions());
+        Map<String, Object> paramsObj = JsonUtils.parseMap(genTable.getOptions());
         if (StringUtils.isNotNull(paramsObj)) {
             String treeCode = Convert.toStr(paramsObj.get(GenConstants.TREE_CODE));
             String treeParentCode = Convert.toStr(paramsObj.get(GenConstants.TREE_PARENT_CODE));
@@ -441,7 +441,7 @@ public class GenTableServiceImpl extends ServicePlusImpl<GenTableMapper, GenTabl
     /**
      * 获取代码生成地址
      *
-     * @param table 业务表信息
+     * @param table    业务表信息
      * @param template 模板文件路径
      * @return 生成地址
      */

ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java

@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * 业务字段 服务层
  *
- * @author ruoyi
+ * @author Lion Li
  */
 public interface IGenTableColumnService extends IService<GenTableColumn> {
     /**
@@ -17,7 +17,7 @@ public interface IGenTableColumnService extends IService<GenTableColumn> {
      * @param tableId 业务字段编号
      * @return 业务字段集合
      */
-    public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);
+    List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);
 
     /**
      * 新增业务字段
@@ -25,7 +25,7 @@ public interface IGenTableColumnService extends IService<GenTableColumn> {
      * @param genTableColumn 业务字段信息
      * @return 结果
      */
-    public int insertGenTableColumn(GenTableColumn genTableColumn);
+    int insertGenTableColumn(GenTableColumn genTableColumn);
 
     /**
      * 修改业务字段
@@ -33,7 +33,7 @@ public interface IGenTableColumnService extends IService<GenTableColumn> {
      * @param genTableColumn 业务字段信息
      * @return 结果
      */
-    public int updateGenTableColumn(GenTableColumn genTableColumn);
+    int updateGenTableColumn(GenTableColumn genTableColumn);
 
     /**
      * 删除业务字段信息
@@ -41,5 +41,5 @@ public interface IGenTableColumnService extends IService<GenTableColumn> {
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    public int deleteGenTableColumnByIds(String ids);
+    int deleteGenTableColumnByIds(String ids);
 }

ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java

@@ -10,7 +10,7 @@ import java.util.Map;
 /**
  * 业务 服务层
  *
- * @author ruoyi
+ * @author Lion Li
  */
 public interface IGenTableService extends IService<GenTable> {
 
@@ -26,7 +26,7 @@ public interface IGenTableService extends IService<GenTable> {
      * @param genTable 业务信息
      * @return 业务集合
      */
-    public List<GenTable> selectGenTableList(GenTable genTable);
+    List<GenTable> selectGenTableList(GenTable genTable);
 
     /**
      * 查询据库列表
@@ -34,7 +34,7 @@ public interface IGenTableService extends IService<GenTable> {
      * @param genTable 业务信息
      * @return 数据库表集合
      */
-    public List<GenTable> selectDbTableList(GenTable genTable);
+    List<GenTable> selectDbTableList(GenTable genTable);
 
     /**
      * 查询据库列表
@@ -42,14 +42,14 @@ public interface IGenTableService extends IService<GenTable> {
      * @param tableNames 表名称组
      * @return 数据库表集合
      */
-    public List<GenTable> selectDbTableListByNames(String[] tableNames);
+    List<GenTable> selectDbTableListByNames(String[] tableNames);
 
     /**
      * 查询所有表信息
      *
      * @return 表信息集合
      */
-    public List<GenTable> selectGenTableAll();
+    List<GenTable> selectGenTableAll();
 
     /**
      * 查询业务信息
@@ -57,7 +57,7 @@ public interface IGenTableService extends IService<GenTable> {
      * @param id 业务ID
      * @return 业务信息
      */
-    public GenTable selectGenTableById(Long id);
+    GenTable selectGenTableById(Long id);
 
     /**
      * 修改业务
@@ -65,7 +65,7 @@ public interface IGenTableService extends IService<GenTable> {
      * @param genTable 业务信息
      * @return 结果
      */
-    public void updateGenTable(GenTable genTable);
+    void updateGenTable(GenTable genTable);
 
     /**
      * 删除业务信息
@@ -73,14 +73,14 @@ public interface IGenTableService extends IService<GenTable> {
      * @param tableIds 需要删除的表数据ID
      * @return 结果
      */
-    public void deleteGenTableByIds(Long[] tableIds);
+    void deleteGenTableByIds(Long[] tableIds);
 
     /**
      * 导入表结构
      *
      * @param tableList 导入表列表
      */
-    public void importGenTable(List<GenTable> tableList);
+    void importGenTable(List<GenTable> tableList);
 
     /**
      * 预览代码
@@ -88,7 +88,7 @@ public interface IGenTableService extends IService<GenTable> {
      * @param tableId 表编号
      * @return 预览数据列表
      */
-    public Map<String, String> previewCode(Long tableId);
+    Map<String, String> previewCode(Long tableId);
 
     /**
      * 生成代码（下载方式）
@@ -96,7 +96,7 @@ public interface IGenTableService extends IService<GenTable> {
      * @param tableName 表名称
      * @return 数据
      */
-    public byte[] downloadCode(String tableName);
+    byte[] downloadCode(String tableName);
 
     /**
      * 生成代码（自定义路径）
@@ -104,14 +104,14 @@ public interface IGenTableService extends IService<GenTable> {
      * @param tableName 表名称
      * @return 数据
      */
-    public void generatorCode(String tableName);
+    void generatorCode(String tableName);
 
     /**
      * 同步数据库
      *
      * @param tableName 表名称
      */
-    public void synchDb(String tableName);
+    void synchDb(String tableName);
 
     /**
      * 批量生成代码（下载方式）
@@ -119,12 +119,12 @@ public interface IGenTableService extends IService<GenTable> {
      * @param tableNames 表数组
      * @return 数据
      */
-    public byte[] downloadCode(String[] tableNames);
+    byte[] downloadCode(String[] tableNames);
 
     /**
      * 修改保存参数校验
      *
      * @param genTable 业务信息
      */
-    public void validateEdit(GenTable genTable);
+    void validateEdit(GenTable genTable);
 }

ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java

@@ -1,7 +1,7 @@
 package com.ruoyi.generator.util;
 
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.constant.GenConstants;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.generator.config.GenConfig;
 import com.ruoyi.generator.domain.GenTable;
 import com.ruoyi.generator.domain.GenTableColumn;
@@ -14,13 +14,12 @@ import java.util.Arrays;
  *
  * @author ruoyi
  */
-public class GenUtils
+public class GenUtils {
-{
+
     /**
      * 初始化表信息
      */
-    public static void initTable(GenTable genTable, String operName)
+    public static void initTable(GenTable genTable, String operName) {
-    {
         genTable.setClassName(convertClassName(genTable.getTableName()));
         genTable.setPackageName(GenConfig.getPackageName());
         genTable.setModuleName(getModuleName(GenConfig.getPackageName()));
@@ -69,62 +68,50 @@ public class GenUtils
             }
         }
 
-        // 插入字段（默认所有字段都需要插入）
+        // BO对象 默认插入勾选
-        // 主键不需要添加
         if (!arraysContains(GenConstants.COLUMNNAME_NOT_ADD, columnName) && !column.isPk()) {
             column.setIsInsert(GenConstants.REQUIRE);
         }
-        // 编辑字段
+        // BO对象 默认编辑勾选
-        // 编辑需要主键
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName)) {
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName))
-        {
             column.setIsEdit(GenConstants.REQUIRE);
         }
-        // 编辑需要的设置必选
+        // BO对象 默认是否必填勾选
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName))
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName)) {
-        {
             column.setIsRequired(GenConstants.REQUIRE);
         }
-        // 列表字段
+        // VO对象 默认返回勾选
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk())
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName)) {
-        {
             column.setIsList(GenConstants.REQUIRE);
         }
-        // 查询字段
+        // BO对象 默认查询勾选
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk())
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk()) {
-        {
             column.setIsQuery(GenConstants.REQUIRE);
         }
 
         // 查询字段类型
-        if (StringUtils.endsWithIgnoreCase(columnName, "name"))
+        if (StringUtils.endsWithIgnoreCase(columnName, "name")) {
-        {
             column.setQueryType(GenConstants.QUERY_LIKE);
         }
         // 状态字段设置单选框
-        if (StringUtils.endsWithIgnoreCase(columnName, "status"))
+        if (StringUtils.endsWithIgnoreCase(columnName, "status")) {
-        {
             column.setHtmlType(GenConstants.HTML_RADIO);
         }
         // 类型&性别字段设置下拉框
         else if (StringUtils.endsWithIgnoreCase(columnName, "type")
-                || StringUtils.endsWithIgnoreCase(columnName, "sex"))
+                || StringUtils.endsWithIgnoreCase(columnName, "sex")) {
-        {
             column.setHtmlType(GenConstants.HTML_SELECT);
         }
         // 图片字段设置图片上传控件
-        else if (StringUtils.endsWithIgnoreCase(columnName, "image"))
+        else if (StringUtils.endsWithIgnoreCase(columnName, "image")) {
-        {
             column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
         }
         // 文件字段设置文件上传控件
-        else if (StringUtils.endsWithIgnoreCase(columnName, "file"))
+        else if (StringUtils.endsWithIgnoreCase(columnName, "file")) {
-        {
             column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
         }
         // 内容字段设置富文本控件
-        else if (StringUtils.endsWithIgnoreCase(columnName, "content"))
+        else if (StringUtils.endsWithIgnoreCase(columnName, "content")) {
-        {
             column.setHtmlType(GenConstants.HTML_EDITOR);
         }
     }
@@ -132,12 +119,11 @@ public class GenUtils
     /**
      * 校验数组是否包含指定值
      *
-     * @param arr 数组
+     * @param arr         数组
      * @param targetValue 值
      * @return 是否包含
      */
-    public static boolean arraysContains(String[] arr, String targetValue)
+    public static boolean arraysContains(String[] arr, String targetValue) {
-    {
         return Arrays.asList(arr).contains(targetValue);
     }
 
@@ -147,8 +133,7 @@ public class GenUtils
      * @param packageName 包名
      * @return 模块名
      */
-    public static String getModuleName(String packageName)
+    public static String getModuleName(String packageName) {
-    {
         int lastIndex = packageName.lastIndexOf(".");
         int nameLength = packageName.length();
         String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength);
@@ -161,12 +146,11 @@ public class GenUtils
      * @param tableName 表名
      * @return 业务名
      */
-    public static String getBusinessName(String tableName)
+    public static String getBusinessName(String tableName) {
-    {
         int firstIndex = tableName.indexOf("_");
         int nameLength = tableName.length();
         String businessName = StringUtils.substring(tableName, firstIndex + 1, nameLength);
-		businessName = StringUtils.toCamelCase(businessName);
+        businessName = StringUtils.toCamelCase(businessName);
         return businessName;
     }
 
@@ -176,12 +160,10 @@ public class GenUtils
      * @param tableName 表名称
      * @return 类名
      */
-    public static String convertClassName(String tableName)
+    public static String convertClassName(String tableName) {
-    {
         boolean autoRemovePre = GenConfig.getAutoRemovePre();
         String tablePrefix = GenConfig.getTablePrefix();
-        if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix))
+        if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) {
-        {
             String[] searchList = StringUtils.split(tablePrefix, ",");
             tableName = replaceFirst(tableName, searchList);
         }
@@ -192,16 +174,13 @@ public class GenUtils
      * 批量替换前缀
      *
      * @param replacementm 替换值
-     * @param searchList 替换列表
+     * @param searchList   替换列表
      * @return
      */
-    public static String replaceFirst(String replacementm, String[] searchList)
+    public static String replaceFirst(String replacementm, String[] searchList) {
-    {
         String text = replacementm;
-        for (String searchString : searchList)
+        for (String searchString : searchList) {
-        {
+            if (replacementm.startsWith(searchString)) {
-            if (replacementm.startsWith(searchString))
-            {
                 text = replacementm.replaceFirst(searchString, "");
                 break;
             }
@@ -215,8 +194,7 @@ public class GenUtils
      * @param text 需要被替换的名字
      * @return 替换后的名字
      */
-    public static String replaceText(String text)
+    public static String replaceText(String text) {
-    {
         return RegExUtils.replaceAll(text, "(?:表|若依)", "");
     }
 
@@ -226,14 +204,10 @@ public class GenUtils
      * @param columnType 列类型
      * @return 截取后的列类型
      */
-    public static String getDbType(String columnType)
+    public static String getDbType(String columnType) {
-    {
+        if (StringUtils.indexOf(columnType, '(') > 0) {
-        if (StringUtils.indexOf(columnType, '(') > 0)
-        {
             return StringUtils.substringBefore(columnType, "(");
-        }
+        } else {
-        else
-        {
             return columnType;
         }
     }
@@ -244,15 +218,11 @@ public class GenUtils
      * @param columnType 列类型
      * @return 截取后的列类型
      */
-    public static Integer getColumnLength(String columnType)
+    public static Integer getColumnLength(String columnType) {
-    {
+        if (StringUtils.indexOf(columnType, '(') > 0) {
-        if (StringUtils.indexOf(columnType, '(') > 0)
-        {
             String length = StringUtils.substringBetween(columnType, "(", ")");
             return Integer.valueOf(length);
-        }
+        } else {
-        else
-        {
             return 0;
         }
     }

ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java

@@ -1,24 +1,23 @@
 package com.ruoyi.generator.util;
 
-import java.util.Properties;
-import org.apache.velocity.app.Velocity;
 import com.ruoyi.common.constant.Constants;
+import org.apache.velocity.app.Velocity;
+
+import java.util.Properties;
 
 /**
  * VelocityEngine工厂
- * 
+ *
  * @author ruoyi
  */
-public class VelocityInitializer
+public class VelocityInitializer {
-{
+
     /**
      * 初始化vm方法
      */
-    public static void initVelocity()
+    public static void initVelocity() {
-    {
         Properties p = new Properties();
-        try
+        try {
-        {
             // 加载classpath目录下的vm文件
             p.setProperty("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
             // 定义字符集
@@ -26,10 +25,9 @@ public class VelocityInitializer
             p.setProperty(Velocity.OUTPUT_ENCODING, Constants.UTF8);
             // 初始化Velocity引擎，指定配置Properties
             Velocity.init(p);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             throw new RuntimeException(e);
         }
     }
+
 }

ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

@@ -16,18 +16,24 @@ import java.util.Map;
 
 /**
  * 模板处理工具类
- * 
+ *
  * @author ruoyi
  */
-public class VelocityUtils
+public class VelocityUtils {
-{
+
-    /** 项目空间路径 */
+    /**
+     * 项目空间路径
+     */
     private static final String PROJECT_PATH = "main/java";
 
-    /** mybatis空间路径 */
+    /**
+     * mybatis空间路径
+     */
     private static final String MYBATIS_PATH = "main/resources/mapper";
 
-    /** 默认上级菜单，系统工具 */
+    /**
+     * 默认上级菜单，系统工具
+     */
     private static final String DEFAULT_PARENT_MENU_ID = "3";
 
     /**
@@ -35,8 +41,7 @@ public class VelocityUtils
      *
      * @return 模板列表
      */
-    public static VelocityContext prepareContext(GenTable genTable)
+    public static VelocityContext prepareContext(GenTable genTable) {
-    {
         String moduleName = genTable.getModuleName();
         String businessName = genTable.getBusinessName();
         String packageName = genTable.getPackageName();
@@ -63,29 +68,25 @@ public class VelocityUtils
         velocityContext.put("table", genTable);
         velocityContext.put("dicts", getDicts(genTable));
         setMenuVelocityContext(velocityContext, genTable);
-        if (GenConstants.TPL_TREE.equals(tplCategory))
+        if (GenConstants.TPL_TREE.equals(tplCategory)) {
-        {
             setTreeVelocityContext(velocityContext, genTable);
         }
-        if (GenConstants.TPL_SUB.equals(tplCategory))
+        if (GenConstants.TPL_SUB.equals(tplCategory)) {
-        {
             setSubVelocityContext(velocityContext, genTable);
         }
         return velocityContext;
     }
 
-    public static void setMenuVelocityContext(VelocityContext context, GenTable genTable)
+    public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) {
-    {
         String options = genTable.getOptions();
-		Map<String, Object> paramsObj = JsonUtils.parseMap(options);
+        Map<String, Object> paramsObj = JsonUtils.parseMap(options);
         String parentMenuId = getParentMenuId(paramsObj);
         context.put("parentMenuId", parentMenuId);
     }
 
-    public static void setTreeVelocityContext(VelocityContext context, GenTable genTable)
+    public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) {
-    {
         String options = genTable.getOptions();
-		Map<String, Object> paramsObj = JsonUtils.parseMap(options);
+        Map<String, Object> paramsObj = JsonUtils.parseMap(options);
         String treeCode = getTreecode(paramsObj);
         String treeParentCode = getTreeParentCode(paramsObj);
         String treeName = getTreeName(paramsObj);
@@ -94,18 +95,15 @@ public class VelocityUtils
         context.put("treeParentCode", treeParentCode);
         context.put("treeName", treeName);
         context.put("expandColumn", getExpandColumn(genTable));
-        if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE))
+        if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) {
-        {
             context.put("tree_parent_code", paramsObj.get(GenConstants.TREE_PARENT_CODE));
         }
-        if (paramsObj.containsKey(GenConstants.TREE_NAME))
+        if (paramsObj.containsKey(GenConstants.TREE_NAME)) {
-        {
             context.put("tree_name", paramsObj.get(GenConstants.TREE_NAME));
         }
     }
 
-    public static void setSubVelocityContext(VelocityContext context, GenTable genTable)
+    public static void setSubVelocityContext(VelocityContext context, GenTable genTable) {
-    {
         GenTable subTable = genTable.getSubTable();
         String subTableName = genTable.getSubTableName();
         String subTableFkName = genTable.getSubTableFkName();
@@ -127,12 +125,11 @@ public class VelocityUtils
      *
      * @return 模板列表
      */
-    public static List<String> getTemplateList(String tplCategory)
+    public static List<String> getTemplateList(String tplCategory) {
-    {
         List<String> templates = new ArrayList<String>();
         templates.add("vm/java/domain.java.vm");
         templates.add("vm/java/vo.java.vm");
-		templates.add("vm/java/bo.java.vm");
+        templates.add("vm/java/bo.java.vm");
         templates.add("vm/java/mapper.java.vm");
         templates.add("vm/java/service.java.vm");
         templates.add("vm/java/serviceImpl.java.vm");
@@ -140,16 +137,11 @@ public class VelocityUtils
         templates.add("vm/xml/mapper.xml.vm");
         templates.add("vm/sql/sql.vm");
         templates.add("vm/js/api.js.vm");
-        if (GenConstants.TPL_CRUD.equals(tplCategory))
+        if (GenConstants.TPL_CRUD.equals(tplCategory)) {
-        {
             templates.add("vm/vue/index.vue.vm");
-        }
+        } else if (GenConstants.TPL_TREE.equals(tplCategory)) {
-        else if (GenConstants.TPL_TREE.equals(tplCategory))
-        {
             templates.add("vm/vue/index-tree.vue.vm");
-        }
+        } else if (GenConstants.TPL_SUB.equals(tplCategory)) {
-        else if (GenConstants.TPL_SUB.equals(tplCategory))
-        {
             templates.add("vm/vue/index.vue.vm");
             templates.add("vm/java/sub-domain.java.vm");
         }
@@ -159,8 +151,7 @@ public class VelocityUtils
     /**
      * 获取文件名
      */
-    public static String getFileName(String template, GenTable genTable)
+    public static String getFileName(String template, GenTable genTable) {
-    {
         // 文件名称
         String fileName = "";
         // 包路径
@@ -176,56 +167,34 @@ public class VelocityUtils
         String mybatisPath = MYBATIS_PATH + "/" + moduleName;
         String vuePath = "vue";
 
-        if (template.contains("domain.java.vm"))
+        if (template.contains("domain.java.vm")) {
-        {
             fileName = StringUtils.format("{}/domain/{}.java", javaPath, className);
         }
-        if (template.contains("vo.java.vm"))
+        if (template.contains("vo.java.vm")) {
-        {
             fileName = StringUtils.format("{}/domain/vo/{}Vo.java", javaPath, className);
         }
-		if (template.contains("bo.java.vm"))
+        if (template.contains("bo.java.vm")) {
-		{
+            fileName = StringUtils.format("{}/domain/bo/{}Bo.java", javaPath, className);
-			fileName = StringUtils.format("{}/domain/bo/{}Bo.java", javaPath, className);
+        }
-		}
+        if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) {
-        if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory()))
-        {
             fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName());
-        }
+        } else if (template.contains("mapper.java.vm")) {
-        else if (template.contains("mapper.java.vm"))
-        {
             fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className);
-        }
+        } else if (template.contains("service.java.vm")) {
-        else if (template.contains("service.java.vm"))
-        {
             fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className);
-        }
+        } else if (template.contains("serviceImpl.java.vm")) {
-        else if (template.contains("serviceImpl.java.vm"))
-        {
             fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className);
-        }
+        } else if (template.contains("controller.java.vm")) {
-        else if (template.contains("controller.java.vm"))
-        {
             fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className);
-        }
+        } else if (template.contains("mapper.xml.vm")) {
-        else if (template.contains("mapper.xml.vm"))
-        {
             fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, className);
-        }
+        } else if (template.contains("sql.vm")) {
-        else if (template.contains("sql.vm"))
-        {
             fileName = businessName + "Menu.sql";
-        }
+        } else if (template.contains("api.js.vm")) {
-        else if (template.contains("api.js.vm"))
-        {
             fileName = StringUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName);
-        }
+        } else if (template.contains("index.vue.vm")) {
-        else if (template.contains("index.vue.vm"))
-        {
             fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
-        }
+        } else if (template.contains("index-tree.vue.vm")) {
-        else if (template.contains("index-tree.vue.vm"))
-        {
             fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
         }
         return fileName;
@@ -237,8 +206,7 @@ public class VelocityUtils
      * @param packageName 包名称
      * @return 包前缀名称
      */
-    public static String getPackagePrefix(String packageName)
+    public static String getPackagePrefix(String packageName) {
-    {
         int lastIndex = packageName.lastIndexOf(".");
         String basePackage = StringUtils.substring(packageName, 0, lastIndex);
         return basePackage;
@@ -246,28 +214,22 @@ public class VelocityUtils
 
     /**
      * 根据列类型获取导入包
-     * 
+     *
      * @param genTable 业务表对象
      * @return 返回需要导入的包列表
      */
-    public static HashSet<String> getImportList(GenTable genTable)
+    public static HashSet<String> getImportList(GenTable genTable) {
-    {
         List<GenTableColumn> columns = genTable.getColumns();
         GenTable subGenTable = genTable.getSubTable();
         HashSet<String> importList = new HashSet<String>();
-        if (StringUtils.isNotNull(subGenTable))
+        if (StringUtils.isNotNull(subGenTable)) {
-        {
             importList.add("java.util.List");
         }
-        for (GenTableColumn column : columns)
+        for (GenTableColumn column : columns) {
-        {
+            if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType())) {
-            if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType()))
-            {
                 importList.add("java.util.Date");
                 importList.add("com.fasterxml.jackson.annotation.JsonFormat");
-            }
+            } else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType())) {
-            else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType()))
-            {
                 importList.add("java.math.BigDecimal");
             }
         }
@@ -280,15 +242,12 @@ public class VelocityUtils
      * @param genTable 业务表对象
      * @return 返回字典组
      */
-    public static String getDicts(GenTable genTable)
+    public static String getDicts(GenTable genTable) {
-    {
         List<GenTableColumn> columns = genTable.getColumns();
         List<String> dicts = new ArrayList<String>();
-        for (GenTableColumn column : columns)
+        for (GenTableColumn column : columns) {
-        {
             if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny(
-                    column.getHtmlType(), new String[] { GenConstants.HTML_SELECT, GenConstants.HTML_RADIO }))
+                    column.getHtmlType(), new String[]{GenConstants.HTML_SELECT, GenConstants.HTML_RADIO})) {
-            {
                 dicts.add("'" + column.getDictType() + "'");
             }
         }
@@ -298,12 +257,11 @@ public class VelocityUtils
     /**
      * 获取权限前缀
      *
-     * @param moduleName 模块名称
+     * @param moduleName   模块名称
      * @param businessName 业务名称
      * @return 返回权限前缀
      */
-    public static String getPermissionPrefix(String moduleName, String businessName)
+    public static String getPermissionPrefix(String moduleName, String businessName) {
-    {
         return StringUtils.format("{}:{}", moduleName, businessName);
     }
 
@@ -313,11 +271,9 @@ public class VelocityUtils
      * @param paramsObj 生成其他选项
      * @return 上级菜单ID字段
      */
-    public static String getParentMenuId(Map<String, Object> paramsObj)
+    public static String getParentMenuId(Map<String, Object> paramsObj) {
-    {
         if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)
-				&& StringUtils.isNotEmpty(Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID))))
+                && StringUtils.isNotEmpty(Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID)))) {
-        {
             return Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID));
         }
         return DEFAULT_PARENT_MENU_ID;
@@ -329,10 +285,8 @@ public class VelocityUtils
      * @param paramsObj 生成其他选项
      * @return 树编码
      */
-    public static String getTreecode(Map<String, Object> paramsObj)
+    public static String getTreecode(Map<String, Object> paramsObj) {
-    {
+        if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_CODE)) {
-        if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_CODE))
-        {
             return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_CODE)));
         }
         return StringUtils.EMPTY;
@@ -344,10 +298,8 @@ public class VelocityUtils
      * @param paramsObj 生成其他选项
      * @return 树父编码
      */
-    public static String getTreeParentCode(Map<String, Object> paramsObj)
+    public static String getTreeParentCode(Map<String, Object> paramsObj) {
-    {
+        if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) {
-        if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_PARENT_CODE))
-        {
             return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_PARENT_CODE)));
         }
         return StringUtils.EMPTY;
@@ -359,10 +311,8 @@ public class VelocityUtils
      * @param paramsObj 生成其他选项
      * @return 树名称
      */
-    public static String getTreeName(Map<String, Object> paramsObj)
+    public static String getTreeName(Map<String, Object> paramsObj) {
-    {
+        if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_NAME)) {
-        if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_NAME))
-        {
             return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_NAME)));
         }
         return StringUtils.EMPTY;
@@ -374,20 +324,16 @@ public class VelocityUtils
      * @param genTable 业务表对象
      * @return 展开按钮列序号
      */
-    public static int getExpandColumn(GenTable genTable)
+    public static int getExpandColumn(GenTable genTable) {
-    {
         String options = genTable.getOptions();
         Map<String, Object> paramsObj = JsonUtils.parseMap(options);
         String treeName = Convert.toStr(paramsObj.get(GenConstants.TREE_NAME));
         int num = 0;
-        for (GenTableColumn column : genTable.getColumns())
+        for (GenTableColumn column : genTable.getColumns()) {
-        {
+            if (column.isList()) {
-            if (column.isList())
-            {
                 num++;
                 String columnName = column.getColumnName();
-                if (columnName.equals(treeName))
+                if (columnName.equals(treeName)) {
-                {
                     break;
                 }
             }

ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -8,31 +8,38 @@ import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
 
+#foreach ($import in $importList)
+import ${import};
+#end
+#if($table.crud || $table.sub)
+import com.ruoyi.common.core.domain.BaseEntity;
+#elseif($table.tree)
+import com.ruoyi.common.core.domain.TreeEntity;
+#end
+
 /**
  * ${functionName}对象 ${tableName}
  *
  * @author ${author}
  * @date ${datetime}
  */
+#if($table.crud || $table.sub)
+    #set($Entity="BaseEntity")
+#elseif($table.tree)
+    #set($Entity="TreeEntity")
+#end
 @Data
-@NoArgsConstructor
 @Accessors(chain = true)
 @TableName("${tableName}")
-public class ${ClassName} implements Serializable {
+public class ${ClassName} extends ${Entity} {
 
     private static final long serialVersionUID=1L;
 
 #foreach ($column in $columns)
-
+#if(!$table.isSuperColumn($column.javaField))
     /**
      * $column.columnComment
      */
-#if($column.javaField=="createBy"||$column.javaField=="createTime")
-    @TableField(fill = FieldFill.INSERT)
-#end
-#if($column.javaField=="updateBy"||$column.javaField=="updateTime")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-#end
 #if($column.javaField=='delFlag')
     @TableLogic
 #end
@@ -44,5 +51,6 @@ public class ${ClassName} implements Serializable {
 #end
     private $column.javaType $column.javaField;
 #end
+#end
 
 }

ruoyi-oss/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-quartz/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java

@@ -5,8 +5,10 @@ import org.springframework.context.annotation.Configuration;
 /**
  * 定时任务配置
  *
+ * @deprecated 3.5.0删除 迁移至xxl-job
  * @author Lion Li
  */
+@Deprecated
 @Configuration
 public class ScheduleConfig {
 

ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java

@@ -23,6 +23,7 @@ import java.util.List;
 /**
  * 调度任务信息操作处理
  *
+ * @deprecated 3.5.0删除 迁移至xxl-job
  * @author ruoyi
  */
 @RestController

ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java

@@ -18,6 +18,7 @@ import java.util.List;
 /**
  * 调度日志操作处理
  *
+ * @deprecated 3.5.0删除 迁移至xxl-job
  * @author ruoyi
  */
 @RestController

ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java

@@ -23,6 +23,7 @@ import java.util.Map;
 /**
  * 定时任务调度表 sys_job
  *
+ * @deprecated 3.5.0删除 迁移至xxl-job
  * @author ruoyi
  */
 

ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java

@@ -16,6 +16,7 @@ import java.util.Map;
 /**
  * 定时任务调度日志表 sys_job_log
  *
+ * @deprecated 3.5.0删除 迁移至xxl-job
  * @author ruoyi
  */
 

ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java

@@ -6,6 +6,7 @@ import com.ruoyi.quartz.domain.SysJobLog;
 /**
  * 调度任务日志信息 数据层
  *
+ * @deprecated 3.5.0删除 迁移至xxl-job
  * @author ruoyi
  */
 public interface SysJobLogMapper extends BaseMapperPlus<SysJobLog> {

ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java

@@ -6,6 +6,7 @@ import com.ruoyi.quartz.domain.SysJob;
 /**
  * 调度任务信息 数据层
  *
+ * @deprecated 3.5.0删除 迁移至xxl-job
  * @author ruoyi
  */
 public interface SysJobMapper extends BaseMapperPlus<SysJob> {

ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java

@@ -9,6 +9,7 @@ import java.util.List;
 /**
  * 定时任务调度日志信息信息 服务层
  *
+ * @deprecated 3.5.0删除 迁移至xxl-job
  * @author ruoyi
  */
 public interface ISysJobLogService extends IService<SysJobLog> {

ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java

@@ -11,6 +11,7 @@ import java.util.List;
 /**
  * 定时任务调度信息信息 服务层
  *
+ * @deprecated 3.5.0删除 迁移至xxl-job
  * @author ruoyi
  */
 public interface ISysJobService extends IService<SysJob> {

ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java

@@ -17,6 +17,7 @@ import java.util.Map;
 /**
  * 定时任务调度日志信息 服务层
  *
+ * @deprecated 3.5.0删除 迁移至xxl-job
  * @author ruoyi
  */
 @Service

ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java

@@ -26,6 +26,7 @@ import java.util.List;
 /**
  * 定时任务调度信息 服务层
  *
+ * @deprecated 3.5.0删除 迁移至xxl-job
  * @author ruoyi
  */
 @Service

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -7,6 +7,7 @@ import org.springframework.stereotype.Component;
 /**
  * 定时任务调度测试
  *
+ * @deprecated 3.5.0删除 迁移至xxl-job
  * @author ruoyi
  */
 @Component("ryTask")

ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java

@@ -20,6 +20,7 @@ import java.util.Date;
 /**
  * 抽象quartz调用
  *
+ * @deprecated 3.5.0删除 迁移至xxl-job
  * @author ruoyi
  */
 public abstract class AbstractQuartzJob implements Job

ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java

@@ -1,12 +1,14 @@
 package com.ruoyi.quartz.util;
 
+import org.quartz.CronExpression;
+
 import java.text.ParseException;
 import java.util.Date;
-import org.quartz.CronExpression;
 
 /**
  * cron表达式工具类
- * 
+ *
+ * @deprecated 3.5.0删除 迁移至xxl-job
  * @author ruoyi
  *
  */

ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java

@@ -11,6 +11,7 @@ import com.ruoyi.quartz.domain.SysJob;
 /**
  * 任务执行工具
  *
+ * @deprecated 3.5.0删除 迁移至xxl-job
  * @author ruoyi
  */
 public class JobInvokeUtil

ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java

@@ -6,7 +6,8 @@ import com.ruoyi.quartz.domain.SysJob;
 
 /**
  * 定时任务处理（禁止并发执行）
- * 
+ *
+ * @deprecated 3.5.0删除 迁移至xxl-job
  * @author ruoyi
  *
  */