xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-18 17:26:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
#	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
#	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
This commit is contained in:
疯狂的狮子li 2021-10-27 13:16:19 +08:00
commit 695cb6d76b
418 changed files with 43660 additions and 4512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -29,7 +29,6 @@ target/
nbproject/private/ nbproject/private/
build/* build/*
nbbuild/ nbbuild/
dist/
nbdist/ nbdist/
.nb-gradle/ .nb-gradle/

2
README.md
View File

@ -33,6 +33,8 @@ RuoYi-Vue-Plus 是基于 RuoYi-Vue 针对 `分布式集群` 场景升级(不兼
| 分布式限流 | Redisson | [Redisson文档](https://github.com/redisson/redisson/wiki/%E7%9B%AE%E5%BD%95) | 全局、请求IP、集群ID 多种限流 | | 分布式限流 | 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) | 注解锁、工具锁 多种多样 |
| 分布式幂等 | Lock4j | [Lock4j文档](https://gitee.com/baomidou/lock4j) | 基于分布式锁实现 | | 分布式幂等 | Lock4j | [Lock4j文档](https://gitee.com/baomidou/lock4j) | 基于分布式锁实现 |
| 分布式日志 | TLog | [TLog文档](https://yomahub.com/tlog/docs) | 支持跟踪链路日志记录、性能分析、链路排查 |
| 分布式任务调度 | Xxl-Job | [Xxl-Job官网](https://www.xuxueli.com/xxl-job/) | 高性能 高可靠 易扩展 |
| 文件存储 | Minio | [Minio文档](https://docs.min.io/) | 本地存储 | | 文件存储 | Minio | [Minio文档](https://docs.min.io/) | 本地存储 |
| 文件存储 | 七牛、阿里、腾讯 | [OSS使用文档](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=4359146&doc_id=1469725) | 云存储 | | 文件存储 | 七牛、阿里、腾讯 | [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/) | 全方位服务监控 | | 监控框架 | SpringBoot-Admin | [SpringBoot-Admin文档](https://codecentric.github.io/spring-boot-admin/current/) | 全方位服务监控 |

72
pom.xml
View File

@ -14,12 +14,12 @@
<properties> <properties>
<ruoyi-vue-plus.version>3.2.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> <spring-boot.version>2.5.6</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.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> <knife4j.version>3.0.3</knife4j.version>
<swagger-annotations.version>1.5.22</swagger-annotations.version> <swagger-annotations.version>1.5.22</swagger-annotations.version>
<poi.version>4.1.2</poi.version> <poi.version>4.1.2</poi.version>
@ -28,14 +28,16 @@
<satoken.version>1.27.0</satoken.version> <satoken.version>1.27.0</satoken.version>
<mybatis-plus.version>3.4.3.4</mybatis-plus.version> <mybatis-plus.version>3.4.3.4</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version> <p6spy.version>3.9.1</p6spy.version>
<hutool.version>5.7.13</hutool.version> <hutool.version>5.7.15</hutool.version>
<feign.version>3.0.3</feign.version> <feign.version>3.0.3</feign.version>
<feign-okhttp.version>11.6</feign-okhttp.version> <feign-okhttp.version>11.6</feign-okhttp.version>
<okhttp.version>4.9.1</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> <redisson.version>3.16.3</redisson.version>
<lock4j.version>2.2.1</lock4j.version> <lock4j.version>2.2.1</lock4j.version>
<dynamic-ds.version>3.4.1</dynamic-ds.version> <dynamic-ds.version>3.4.1</dynamic-ds.version>
<tlog.version>1.3.3</tlog.version>
<xxl-job.version>2.3.0</xxl-job.version>
<!-- jdk11 缺失依赖 jaxb--> <!-- jdk11 缺失依赖 jaxb-->
<jaxb.version>3.0.1</jaxb.version> <jaxb.version>3.0.1</jaxb.version>
@ -43,14 +45,15 @@
<!-- OSS 配置 --> <!-- OSS 配置 -->
<qiniu.version>7.8.0</qiniu.version> <qiniu.version>7.8.0</qiniu.version>
<aliyun.oss.version>3.13.1</aliyun.oss.version> <aliyun.oss.version>3.13.1</aliyun.oss.version>
<qcloud.cos.version>5.6.55</qcloud.cos.version> <qcloud.cos.version>5.6.58</qcloud.cos.version>
<minio.version>8.3.0</minio.version> <minio.version>8.3.1</minio.version>
<!-- docker 配置 --> <!-- docker 配置 -->
<docker.registry.url>localhost</docker.registry.url> <docker.registry.url>localhost</docker.registry.url>
<docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host> <docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
<docker.namespace>ruoyi</docker.namespace> <docker.namespace>ruoyi</docker.namespace>
<docker.plugin.version>1.2.2</docker.plugin.version> <docker.plugin.version>1.2.2</docker.plugin.version>
</properties> </properties>
<!-- 依赖声明 --> <!-- 依赖声明 -->
@ -170,6 +173,7 @@
<version>${hutool.version}</version> <version>${hutool.version}</version>
</dependency> </dependency>
<!-- @deprecated 由于使用人数较少 决定与 3.4.0 版本移除 -->
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId> <artifactId>spring-cloud-starter-openfeign</artifactId>
@ -181,7 +185,7 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- @deprecated 由于使用人数较少 决定与 3.4.0 版本移除 -->
<dependency> <dependency>
<groupId>io.github.openfeign</groupId> <groupId>io.github.openfeign</groupId>
<artifactId>feign-okhttp</artifactId> <artifactId>feign-okhttp</artifactId>
@ -216,13 +220,62 @@
<artifactId>lock4j-redisson-spring-boot-starter</artifactId> <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
<version>${lock4j.version}</version> <version>${lock4j.version}</version>
</dependency> </dependency>
<!-- 定时任务-->
<!-- xxl-job-core -->
<dependency>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
<version>${xxl-job.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>
<dependency>
<groupId>com.yomahub</groupId>
<artifactId>tlog-xxl-job</artifactId>
<version>${tlog.version}</version>
</dependency>
<!-- 定时任务 @deprecated 3.4.0删除 迁移至xxl-job -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.ruoyi</groupId>
<artifactId>ruoyi-quartz</artifactId> <artifactId>ruoyi-quartz</artifactId>
<version>${ruoyi-vue-plus.version}</version> <version>${ruoyi-vue-plus.version}</version>
</dependency> </dependency>
<!-- 定时任务 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-job</artifactId>
<version>${ruoyi-vue-plus.version}</version>
</dependency>
<!-- 代码生成--> <!-- 代码生成-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.ruoyi</groupId>
@ -251,7 +304,7 @@
<version>${ruoyi-vue-plus.version}</version> <version>${ruoyi-vue-plus.version}</version>
</dependency> </dependency>
<!-- demo模块 --> <!-- OSS对象存储模块 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.ruoyi</groupId>
<artifactId>ruoyi-oss</artifactId> <artifactId>ruoyi-oss</artifactId>
@ -273,6 +326,7 @@
<module>ruoyi-framework</module> <module>ruoyi-framework</module>
<module>ruoyi-system</module> <module>ruoyi-system</module>
<module>ruoyi-quartz</module> <module>ruoyi-quartz</module>
<module>ruoyi-job</module>
<module>ruoyi-generator</module> <module>ruoyi-generator</module>
<module>ruoyi-common</module> <module>ruoyi-common</module>
<module>ruoyi-demo</module> <module>ruoyi-demo</module>

9
ruoyi-admin/pom.xml
View File

@ -41,10 +41,15 @@
<artifactId>ruoyi-system</artifactId> <artifactId>ruoyi-system</artifactId>
</dependency> </dependency>
<!-- 定时任务--> <!-- 定时任务 @deprecated 3.4.0删除 迁移至xxl-job -->
<!-- <dependency>-->
<!-- <groupId>com.ruoyi</groupId>-->
<!-- <artifactId>ruoyi-quartz</artifactId>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.ruoyi</groupId>
<artifactId>ruoyi-quartz</artifactId> <artifactId>ruoyi-job</artifactId>
</dependency> </dependency>
<dependency> <dependency>

8
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
View File

@ -10,12 +10,12 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
*/ */
@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"); System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(RuoYiApplication.class, args); SpringApplication.run(RuoYiApplication.class, args);
System.out.println("(♥◠‿◠)ﾉﾞ RuoYi-Vue-Plus启动成功 ლ(´ڡ`ლ)ﾞ"); System.out.println("(♥◠‿◠)ﾉﾞ RuoYi-Vue-Plus启动成功 ლ(´ڡ`ლ)ﾞ");
} }
} }

8
ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java
View File

@ -8,11 +8,11 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
* *
* @author ruoyi * @author ruoyi
*/ */
public class RuoYiServletInitializer extends SpringBootServletInitializer public class RuoYiServletInitializer extends SpringBootServletInitializer {
{
@Override @Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
{
return application.sources(RuoYiApplication.class); return application.sources(RuoYiApplication.class);
} }
} }

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

@ -13,6 +13,9 @@ import com.ruoyi.common.utils.reflect.ReflectUtils;
import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.config.properties.CaptchaProperties; import com.ruoyi.framework.config.properties.CaptchaProperties;
import com.ruoyi.system.service.ISysConfigService; 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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -24,22 +27,22 @@ import java.util.concurrent.TimeUnit;
/** /**
* 验证码操作处理 * 验证码操作处理
* *
* @author ruoyi * @author Lion Li
*/ */
@Api(value = "验证码操作处理", tags = {"验证码管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController @RestController
public class CaptchaController { public class CaptchaController {
@Autowired private final CaptchaProperties captchaProperties;
private CaptchaProperties captchaProperties; private final ISysConfigService configService;
@Autowired
private ISysConfigService configService;
/** /**
* 生成验证码 * 生成验证码
*/ */
@ApiOperation("生成验证码")
@GetMapping("/captchaImage") @GetMapping("/captchaImage")
public AjaxResult getCode() { public AjaxResult<Map<String, Object>> getCode() {
Map<String, Object> ajax = new HashMap<>(); Map<String, Object> ajax = new HashMap<>();
boolean captchaOnOff = configService.selectCaptchaOnOff(); boolean captchaOnOff = configService.selectCaptchaOnOff();
ajax.put("captchaOnOff", captchaOnOff); ajax.put("captchaOnOff", captchaOnOff);

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

@ -3,7 +3,11 @@ package com.ruoyi.web.controller.monitor;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils; 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.beans.factory.annotation.Autowired;
import org.springframework.data.redis.connection.RedisServerCommands;
import org.springframework.data.redis.core.RedisCallback; import org.springframework.data.redis.core.RedisCallback;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -15,28 +19,30 @@ import java.util.*;
/** /**
* 缓存监控 * 缓存监控
* *
* @author ruoyi * @author Lion Li
*/ */
@Api(value = "缓存监控", tags = {"缓存监控管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController @RestController
@RequestMapping("/monitor/cache") @RequestMapping("/monitor/cache")
public class CacheController public class CacheController {
{
@Autowired
private RedisTemplate<String, String> redisTemplate;
private final RedisTemplate<String, String> redisTemplate;
@ApiOperation("获取缓存监控详细信息")
@SaCheckPermission("monitor:cache:list") @SaCheckPermission("monitor:cache:list")
@GetMapping() @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")); 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); Map<String, Object> result = new HashMap<>(3);
result.put("info", info); result.put("info", info);
result.put("dbSize", dbSize); result.put("dbSize", dbSize);
List<Map<String, String>> pieList = new ArrayList<>(); List<Map<String, String>> pieList = new ArrayList<>();
if (commandStats != null) {
commandStats.stringPropertyNames().forEach(key -> { commandStats.stringPropertyNames().forEach(key -> {
Map<String, String> data = new HashMap<>(2); Map<String, String> data = new HashMap<>(2);
String property = commandStats.getProperty(key); String property = commandStats.getProperty(key);
@ -44,6 +50,7 @@ public class CacheController
data.put("value", StringUtils.substringBetween(property, "calls=", ",usec")); data.put("value", StringUtils.substringBetween(property, "calls=", ",usec"));
pieList.add(data); pieList.add(data);
}); });
}
result.put("commandStats", pieList); result.put("commandStats", pieList);
return AjaxResult.success(result); return AjaxResult.success(result);
} }

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

@ -9,7 +9,11 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysLogininfor; import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.system.service.ISysLogininforService; 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.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; 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 @RestController
@RequestMapping("/monitor/logininfor") @RequestMapping("/monitor/logininfor")
public class SysLogininforController extends BaseController public class SysLogininforController extends BaseController {
{
@Autowired
private ISysLogininforService logininforService;
private final ISysLogininforService logininforService;
@ApiOperation("查询系统访问记录列表")
@SaCheckPermission("monitor:logininfor:list") @SaCheckPermission("monitor:logininfor:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysLogininfor logininfor) public TableDataInfo<SysLogininfor> list(SysLogininfor logininfor) {
{
return logininforService.selectPageLogininforList(logininfor); return logininforService.selectPageLogininforList(logininfor);
} }
@ApiOperation("导出系统访问记录列表")
@Log(title = "登录日志", businessType = BusinessType.EXPORT) @Log(title = "登录日志", businessType = BusinessType.EXPORT)
@SaCheckPermission("monitor:logininfor:export") @SaCheckPermission("monitor:logininfor:export")
@GetMapping("/export") @GetMapping("/export")
public void export(SysLogininfor logininfor, HttpServletResponse response) public void export(SysLogininfor logininfor, HttpServletResponse response) {
{
List<SysLogininfor> list = logininforService.selectLogininforList(logininfor); List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
ExcelUtil.exportExcel(list, "登录日志", SysLogininfor.class, response); ExcelUtil.exportExcel(list, "登录日志", SysLogininfor.class, response);
} }
@ApiOperation("删除系统访问记录")
@SaCheckPermission("monitor:logininfor:remove") @SaCheckPermission("monitor:logininfor:remove")
@Log(title = "登录日志", businessType = BusinessType.DELETE) @Log(title = "登录日志", businessType = BusinessType.DELETE)
@DeleteMapping("/{infoIds}") @DeleteMapping("/{infoIds}")
public AjaxResult remove(@PathVariable Long[] infoIds) public AjaxResult<Void> remove(@PathVariable Long[] infoIds) {
{
return toAjax(logininforService.deleteLogininforByIds(infoIds)); return toAjax(logininforService.deleteLogininforByIds(infoIds));
} }
@ApiOperation("清空系统访问记录")
@SaCheckPermission("monitor:logininfor:remove") @SaCheckPermission("monitor:logininfor:remove")
@Log(title = "登录日志", businessType = BusinessType.CLEAN) @Log(title = "登录日志", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean") @DeleteMapping("/clean")
public AjaxResult clean() public AjaxResult<Void> clean() {
{
logininforService.cleanLogininfor(); logininforService.cleanLogininfor();
return AjaxResult.success(); return AjaxResult.success();
} }

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

@ -9,7 +9,11 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysOperLog; import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.service.ISysOperLogService; 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.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; 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 @RestController
@RequestMapping("/monitor/operlog") @RequestMapping("/monitor/operlog")
public class SysOperlogController extends BaseController public class SysOperlogController extends BaseController {
{
@Autowired
private ISysOperLogService operLogService;
private final ISysOperLogService operLogService;
@ApiOperation("查询操作日志记录列表")
@SaCheckPermission("monitor:operlog:list") @SaCheckPermission("monitor:operlog:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysOperLog operLog) public TableDataInfo<SysOperLog> list(SysOperLog operLog) {
{
return operLogService.selectPageOperLogList(operLog); return operLogService.selectPageOperLogList(operLog);
} }
@ApiOperation("导出操作日志记录列表")
@Log(title = "操作日志", businessType = BusinessType.EXPORT) @Log(title = "操作日志", businessType = BusinessType.EXPORT)
@SaCheckPermission("monitor:operlog:export") @SaCheckPermission("monitor:operlog:export")
@GetMapping("/export") @GetMapping("/export")
public void export(SysOperLog operLog, HttpServletResponse response) public void export(SysOperLog operLog, HttpServletResponse response) {
{
List<SysOperLog> list = operLogService.selectOperLogList(operLog); List<SysOperLog> list = operLogService.selectOperLogList(operLog);
ExcelUtil.exportExcel(list, "操作日志", SysOperLog.class, response); ExcelUtil.exportExcel(list, "操作日志", SysOperLog.class, response);
} }
@ApiOperation("删除操作日志记录")
@Log(title = "操作日志", businessType = BusinessType.DELETE) @Log(title = "操作日志", businessType = BusinessType.DELETE)
@SaCheckPermission("monitor:operlog:remove") @SaCheckPermission("monitor:operlog:remove")
@DeleteMapping("/{operIds}") @DeleteMapping("/{operIds}")
public AjaxResult remove(@PathVariable Long[] operIds) public AjaxResult<Void> remove(@PathVariable Long[] operIds) {
{
return toAjax(operLogService.deleteOperLogByIds(operIds)); return toAjax(operLogService.deleteOperLogByIds(operIds));
} }
@ApiOperation("清空操作日志记录")
@Log(title = "操作日志", businessType = BusinessType.CLEAN) @Log(title = "操作日志", businessType = BusinessType.CLEAN)
@SaCheckPermission("monitor:operlog:remove") @SaCheckPermission("monitor:operlog:remove")
@DeleteMapping("/clean") @DeleteMapping("/clean")
public AjaxResult clean() public AjaxResult<Void> clean() {
{
operLogService.cleanOperLog(); operLogService.cleanOperLog();
return AjaxResult.success(); return AjaxResult.success();
} }

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

@ -15,6 +15,9 @@ import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.RedisUtils; import com.ruoyi.common.utils.RedisUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysUserOnline; import com.ruoyi.system.domain.SysUserOnline;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.ArrayList; import java.util.ArrayList;
@ -26,15 +29,18 @@ import java.util.stream.Collectors;
/** /**
* 在线用户监控 * 在线用户监控
* *
* @author ruoyi * @author Lion Li
*/ */
@Api(value = "在线用户监控", tags = {"在线用户监控管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController @RestController
@RequestMapping("/monitor/online") @RequestMapping("/monitor/online")
public class SysUserOnlineController extends BaseController { public class SysUserOnlineController extends BaseController {
@ApiOperation("在线用户列表")
@SaCheckPermission("monitor:online:list") @SaCheckPermission("monitor:online:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(String ipaddr, String userName) { public TableDataInfo<SysUserOnline> list(String ipaddr, String userName) {
Collection<String> keys = RedisUtils.keys(Constants.ONLINE_TOKEN_KEY + "*"); Collection<String> keys = RedisUtils.keys(Constants.ONLINE_TOKEN_KEY + "*");
List<UserOnlineDTO> userOnlineDTOList = new ArrayList<>(); List<UserOnlineDTO> userOnlineDTOList = new ArrayList<>();
for (String key : keys) { for (String key : keys) {
@ -63,10 +69,11 @@ public class SysUserOnlineController extends BaseController {
/** /**
* 强退用户 * 强退用户
*/ */
@ApiOperation("强退用户")
@SaCheckPermission("monitor:online:forceLogout") @SaCheckPermission("monitor:online:forceLogout")
@Log(title = "在线用户", businessType = BusinessType.FORCE) @Log(title = "在线用户", businessType = BusinessType.FORCE)
@DeleteMapping("/{tokenId}") @DeleteMapping("/{tokenId}")
public AjaxResult forceLogout(@PathVariable String tokenId) { public AjaxResult<Void> forceLogout(@PathVariable String tokenId) {
try { try {
StpUtil.logoutByTokenValue(tokenId); StpUtil.logoutByTokenValue(tokenId);
} catch (NotLoginException e) { } catch (NotLoginException e) {

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

@ -11,6 +11,9 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService; 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.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -21,30 +24,32 @@ import java.util.List;
/** /**
* 参数配置 信息操作处理 * 参数配置 信息操作处理
* *
* @author ruoyi * @author Lion Li
*/ */
@Validated
@Api(value = "参数配置控制器", tags = {"参数配置管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController @RestController
@RequestMapping("/system/config") @RequestMapping("/system/config")
public class SysConfigController extends BaseController public class SysConfigController extends BaseController {
{
@Autowired private final ISysConfigService configService;
private ISysConfigService configService;
/** /**
* 获取参数配置列表 * 获取参数配置列表
*/ */
@ApiOperation("获取参数配置列表")
@SaCheckPermission("system:config:list") @SaCheckPermission("system:config:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysConfig config) public TableDataInfo<SysConfig> list(SysConfig config) {
{
return configService.selectPageConfigList(config); return configService.selectPageConfigList(config);
} }
@ApiOperation("导出参数配置列表")
@Log(title = "参数管理", businessType = BusinessType.EXPORT) @Log(title = "参数管理", businessType = BusinessType.EXPORT)
@SaCheckPermission("system:config:export") @SaCheckPermission("system:config:export")
@GetMapping("/export") @GetMapping("/export")
public void export(SysConfig config, HttpServletResponse response) public void export(SysConfig config, HttpServletResponse response) {
{
List<SysConfig> list = configService.selectConfigList(config); List<SysConfig> list = configService.selectConfigList(config);
ExcelUtil.exportExcel(list, "参数数据", SysConfig.class, response); ExcelUtil.exportExcel(list, "参数数据", SysConfig.class, response);
} }
@ -52,33 +57,32 @@ public class SysConfigController extends BaseController
/** /**
* 根据参数编号获取详细信息 * 根据参数编号获取详细信息
*/ */
@ApiOperation("根据参数编号获取详细信息")
@SaCheckPermission("system:config:query") @SaCheckPermission("system:config:query")
@GetMapping(value = "/{configId}") @GetMapping(value = "/{configId}")
public AjaxResult getInfo(@PathVariable Long configId) public AjaxResult<SysConfig> getInfo(@PathVariable Long configId) {
{
return AjaxResult.success(configService.selectConfigById(configId)); return AjaxResult.success(configService.selectConfigById(configId));
} }
/** /**
* 根据参数键名查询参数值 * 根据参数键名查询参数值
*/ */
@ApiOperation("根据参数键名查询参数值")
@GetMapping(value = "/configKey/{configKey}") @GetMapping(value = "/configKey/{configKey}")
public AjaxResult getConfigKey(@PathVariable String configKey) public AjaxResult<Void> getConfigKey(@PathVariable String configKey) {
{
return AjaxResult.success(configService.selectConfigByKey(configKey)); return AjaxResult.success(configService.selectConfigByKey(configKey));
} }
/** /**
* 新增参数配置 * 新增参数配置
*/ */
@ApiOperation("新增参数配置")
@SaCheckPermission("system:config:add") @SaCheckPermission("system:config:add")
@Log(title = "参数管理", businessType = BusinessType.INSERT) @Log(title = "参数管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
@RepeatSubmit @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() + "'失败，参数键名已存在"); return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
} }
return toAjax(configService.insertConfig(config)); return toAjax(configService.insertConfig(config));
@ -87,13 +91,12 @@ public class SysConfigController extends BaseController
/** /**
* 修改参数配置 * 修改参数配置
*/ */
@ApiOperation("修改参数配置")
@SaCheckPermission("system:config:edit") @SaCheckPermission("system:config:edit")
@Log(title = "参数管理", businessType = BusinessType.UPDATE) @Log(title = "参数管理", businessType = BusinessType.UPDATE)
@PutMapping @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() + "'失败，参数键名已存在"); return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
} }
return toAjax(configService.updateConfig(config)); return toAjax(configService.updateConfig(config));
@ -102,11 +105,11 @@ public class SysConfigController extends BaseController
/** /**
* 删除参数配置 * 删除参数配置
*/ */
@ApiOperation("删除参数配置")
@SaCheckPermission("system:config:remove") @SaCheckPermission("system:config:remove")
@Log(title = "参数管理", businessType = BusinessType.DELETE) @Log(title = "参数管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{configIds}") @DeleteMapping("/{configIds}")
public AjaxResult remove(@PathVariable Long[] configIds) public AjaxResult<Void> remove(@PathVariable Long[] configIds) {
{
configService.deleteConfigByIds(configIds); configService.deleteConfigByIds(configIds);
return success(); return success();
} }
@ -114,11 +117,11 @@ public class SysConfigController extends BaseController
/** /**
* 刷新参数缓存 * 刷新参数缓存
*/ */
@ApiOperation("刷新参数缓存")
@SaCheckPermission("system:config:remove") @SaCheckPermission("system:config:remove")
@Log(title = "参数管理", businessType = BusinessType.CLEAN) @Log(title = "参数管理", businessType = BusinessType.CLEAN)
@DeleteMapping("/refreshCache") @DeleteMapping("/refreshCache")
public AjaxResult refreshCache() public AjaxResult<Void> refreshCache() {
{
configService.resetConfigCache(); configService.resetConfigCache();
return AjaxResult.success(); return AjaxResult.success();
} }

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

@ -6,38 +6,43 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; 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.core.domain.entity.SysDept;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysDeptService; 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.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* 部门信息 * 部门信息
* *
* @author ruoyi * @author Lion Li
*/ */
@Validated
@Api(value = "部门控制器", tags = {"部门管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController @RestController
@RequestMapping("/system/dept") @RequestMapping("/system/dept")
public class SysDeptController extends BaseController public class SysDeptController extends BaseController {
{
@Autowired private final ISysDeptService deptService;
private ISysDeptService deptService;
/** /**
* 获取部门列表 * 获取部门列表
*/ */
@ApiOperation("获取部门列表")
@SaCheckPermission("system:dept:list") @SaCheckPermission("system:dept:list")
@GetMapping("/list") @GetMapping("/list")
public AjaxResult list(SysDept dept) public AjaxResult<List<SysDept>> list(SysDept dept) {
{
List<SysDept> depts = deptService.selectDeptList(dept); List<SysDept> depts = deptService.selectDeptList(dept);
return AjaxResult.success(depts); return AjaxResult.success(depts);
} }
@ -45,31 +50,23 @@ public class SysDeptController extends BaseController
/** /**
* 查询部门列表（排除节点） * 查询部门列表（排除节点）
*/ */
@ApiOperation("查询部门列表（排除节点）")
@SaCheckPermission("system:dept:list") @SaCheckPermission("system:dept:list")
@GetMapping("/list/exclude/{deptId}") @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()); 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); return AjaxResult.success(depts);
} }
/** /**
* 根据部门编号获取详细信息 * 根据部门编号获取详细信息
*/ */
@ApiOperation("根据部门编号获取详细信息")
@SaCheckPermission("system:dept:query") @SaCheckPermission("system:dept:query")
@GetMapping(value = "/{deptId}") @GetMapping(value = "/{deptId}")
public AjaxResult getInfo(@PathVariable Long deptId) public AjaxResult<SysDept> getInfo(@PathVariable Long deptId) {
{
deptService.checkDeptDataScope(deptId); deptService.checkDeptDataScope(deptId);
return AjaxResult.success(deptService.selectDeptById(deptId)); return AjaxResult.success(deptService.selectDeptById(deptId));
} }
@ -77,9 +74,9 @@ public class SysDeptController extends BaseController
/** /**
* 获取部门下拉树列表 * 获取部门下拉树列表
*/ */
@ApiOperation("获取部门下拉树列表")
@GetMapping("/treeselect") @GetMapping("/treeselect")
public AjaxResult treeselect(SysDept dept) public AjaxResult<List<TreeSelect>> treeselect(SysDept dept) {
{
List<SysDept> depts = deptService.selectDeptList(dept); List<SysDept> depts = deptService.selectDeptList(dept);
return AjaxResult.success(deptService.buildDeptTreeSelect(depts)); return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
} }
@ -87,11 +84,11 @@ public class SysDeptController extends BaseController
/** /**
* 加载对应角色部门列表树 * 加载对应角色部门列表树
*/ */
@ApiOperation("加载对应角色部门列表树")
@GetMapping(value = "/roleDeptTreeselect/{roleId}") @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()); 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("checkedKeys", deptService.selectDeptListByRoleId(roleId));
ajax.put("depts", deptService.buildDeptTreeSelect(depts)); ajax.put("depts", deptService.buildDeptTreeSelect(depts));
return AjaxResult.success(ajax); return AjaxResult.success(ajax);
@ -100,13 +97,12 @@ public class SysDeptController extends BaseController
/** /**
* 新增部门 * 新增部门
*/ */
@ApiOperation("新增部门")
@SaCheckPermission("system:dept:add") @SaCheckPermission("system:dept:add")
@Log(title = "部门管理", businessType = BusinessType.INSERT) @Log(title = "部门管理", businessType = BusinessType.INSERT)
@PostMapping @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() + "'失败，部门名称已存在"); return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
} }
return toAjax(deptService.insertDept(dept)); return toAjax(deptService.insertDept(dept));
@ -115,22 +111,17 @@ public class SysDeptController extends BaseController
/** /**
* 修改部门 * 修改部门
*/ */
@ApiOperation("修改部门")
@SaCheckPermission("system:dept:edit") @SaCheckPermission("system:dept:edit")
@Log(title = "部门管理", businessType = BusinessType.UPDATE) @Log(title = "部门管理", businessType = BusinessType.UPDATE)
@PutMapping @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() + "'失败，部门名称已存在"); return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
} } else if (dept.getParentId().equals(dept.getDeptId())) {
else if (dept.getParentId().equals(dept.getDeptId()))
{
return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己"); 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("该部门包含未停用的子部门！"); return AjaxResult.error("该部门包含未停用的子部门！");
} }
return toAjax(deptService.updateDept(dept)); return toAjax(deptService.updateDept(dept));
@ -139,17 +130,15 @@ public class SysDeptController extends BaseController
/** /**
* 删除部门 * 删除部门
*/ */
@ApiOperation("删除部门")
@SaCheckPermission("system:dept:remove") @SaCheckPermission("system:dept:remove")
@Log(title = "部门管理", businessType = BusinessType.DELETE) @Log(title = "部门管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{deptId}") @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("存在下级部门,不允许删除"); return AjaxResult.error("存在下级部门,不允许删除");
} }
if (deptService.checkDeptExistUser(deptId)) if (deptService.checkDeptExistUser(deptId)) {
{
return AjaxResult.error("部门存在用户,不允许删除"); return AjaxResult.error("部门存在用户,不允许删除");
} }
return toAjax(deptService.deleteDeptById(deptId)); return toAjax(deptService.deleteDeptById(deptId));

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

@ -11,6 +11,9 @@ import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysDictTypeService; 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.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -22,30 +25,30 @@ import java.util.List;
/** /**
* 数据字典信息 * 数据字典信息
* *
* @author ruoyi * @author Lion Li
*/ */
@Validated
@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController @RestController
@RequestMapping("/system/dict/data") @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("查询字典数据列表")
@SaCheckPermission("system:dict:list") @SaCheckPermission("system:dict:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysDictData dictData) public TableDataInfo<SysDictData> list(SysDictData dictData) {
{
return dictDataService.selectPageDictDataList(dictData); return dictDataService.selectPageDictDataList(dictData);
} }
@ApiOperation("导出字典数据列表")
@Log(title = "字典数据", businessType = BusinessType.EXPORT) @Log(title = "字典数据", businessType = BusinessType.EXPORT)
@SaCheckPermission("system:dict:export") @SaCheckPermission("system:dict:export")
@GetMapping("/export") @GetMapping("/export")
public void export(SysDictData dictData, HttpServletResponse response) public void export(SysDictData dictData, HttpServletResponse response) {
{
List<SysDictData> list = dictDataService.selectDictDataList(dictData); List<SysDictData> list = dictDataService.selectDictDataList(dictData);
ExcelUtil.exportExcel(list, "字典数据", SysDictData.class, response); ExcelUtil.exportExcel(list, "字典数据", SysDictData.class, response);
} }
@ -53,23 +56,22 @@ public class SysDictDataController extends BaseController
/** /**
* 查询字典数据详细 * 查询字典数据详细
*/ */
@ApiOperation("查询字典数据详细")
@SaCheckPermission("system:dict:query") @SaCheckPermission("system:dict:query")
@GetMapping(value = "/{dictCode}") @GetMapping(value = "/{dictCode}")
public AjaxResult getInfo(@PathVariable Long dictCode) public AjaxResult<SysDictData> getInfo(@PathVariable Long dictCode) {
{
return AjaxResult.success(dictDataService.selectDictDataById(dictCode)); return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
} }
/** /**
* 根据字典类型查询字典数据信息 * 根据字典类型查询字典数据信息
*/ */
@ApiOperation("根据字典类型查询字典数据信息")
@GetMapping(value = "/type/{dictType}") @GetMapping(value = "/type/{dictType}")
public AjaxResult dictType(@PathVariable String dictType) public AjaxResult<List<SysDictData>> dictType(@PathVariable String dictType) {
{
List<SysDictData> data = dictTypeService.selectDictDataByType(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); return AjaxResult.success(data);
} }
@ -77,33 +79,33 @@ public class SysDictDataController extends BaseController
/** /**
* 新增字典类型 * 新增字典类型
*/ */
@ApiOperation("新增字典类型")
@SaCheckPermission("system:dict:add") @SaCheckPermission("system:dict:add")
@Log(title = "字典数据", businessType = BusinessType.INSERT) @Log(title = "字典数据", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@Validated @RequestBody SysDictData dict) public AjaxResult<Void> add(@Validated @RequestBody SysDictData dict) {
{
return toAjax(dictDataService.insertDictData(dict)); return toAjax(dictDataService.insertDictData(dict));
} }
/** /**
* 修改保存字典类型 * 修改保存字典类型
*/ */
@ApiOperation("修改保存字典类型")
@SaCheckPermission("system:dict:edit") @SaCheckPermission("system:dict:edit")
@Log(title = "字典数据", businessType = BusinessType.UPDATE) @Log(title = "字典数据", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody SysDictData dict) public AjaxResult<Void> edit(@Validated @RequestBody SysDictData dict) {
{
return toAjax(dictDataService.updateDictData(dict)); return toAjax(dictDataService.updateDictData(dict));
} }
/** /**
* 删除字典类型 * 删除字典类型
*/ */
@ApiOperation("删除字典类型")
@SaCheckPermission("system:dict:remove") @SaCheckPermission("system:dict:remove")
@Log(title = "字典类型", businessType = BusinessType.DELETE) @Log(title = "字典类型", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictCodes}") @DeleteMapping("/{dictCodes}")
public AjaxResult remove(@PathVariable Long[] dictCodes) public AjaxResult<Void> remove(@PathVariable Long[] dictCodes) {
{
dictDataService.deleteDictDataByIds(dictCodes); dictDataService.deleteDictDataByIds(dictCodes);
return success(); return success();
} }

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

@ -10,6 +10,9 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictTypeService; 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.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -20,27 +23,29 @@ import java.util.List;
/** /**
* 数据字典信息 * 数据字典信息
* *
* @author ruoyi * @author Lion Li
*/ */
@Validated
@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController @RestController
@RequestMapping("/system/dict/type") @RequestMapping("/system/dict/type")
public class SysDictTypeController extends BaseController public class SysDictTypeController extends BaseController {
{
@Autowired
private ISysDictTypeService dictTypeService;
private final ISysDictTypeService dictTypeService;
@ApiOperation("查询字典类型列表")
@SaCheckPermission("system:dict:list") @SaCheckPermission("system:dict:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysDictType dictType) public TableDataInfo<SysDictType> list(SysDictType dictType) {
{
return dictTypeService.selectPageDictTypeList(dictType); return dictTypeService.selectPageDictTypeList(dictType);
} }
@ApiOperation("导出字典类型列表")
@Log(title = "字典类型", businessType = BusinessType.EXPORT) @Log(title = "字典类型", businessType = BusinessType.EXPORT)
@SaCheckPermission("system:dict:export") @SaCheckPermission("system:dict:export")
@GetMapping("/export") @GetMapping("/export")
public void export(SysDictType dictType, HttpServletResponse response) public void export(SysDictType dictType, HttpServletResponse response) {
{
List<SysDictType> list = dictTypeService.selectDictTypeList(dictType); List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
ExcelUtil.exportExcel(list, "字典类型", SysDictType.class, response); ExcelUtil.exportExcel(list, "字典类型", SysDictType.class, response);
} }
@ -48,23 +53,22 @@ public class SysDictTypeController extends BaseController
/** /**
* 查询字典类型详细 * 查询字典类型详细
*/ */
@ApiOperation("查询字典类型详细")
@SaCheckPermission("system:dict:query") @SaCheckPermission("system:dict:query")
@GetMapping(value = "/{dictId}") @GetMapping(value = "/{dictId}")
public AjaxResult getInfo(@PathVariable Long dictId) public AjaxResult<SysDictType> getInfo(@PathVariable Long dictId) {
{
return AjaxResult.success(dictTypeService.selectDictTypeById(dictId)); return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
} }
/** /**
* 新增字典类型 * 新增字典类型
*/ */
@ApiOperation("新增字典类型")
@SaCheckPermission("system:dict:add") @SaCheckPermission("system:dict:add")
@Log(title = "字典类型", businessType = BusinessType.INSERT) @Log(title = "字典类型", businessType = BusinessType.INSERT)
@PostMapping @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() + "'失败，字典类型已存在"); return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
} }
return toAjax(dictTypeService.insertDictType(dict)); return toAjax(dictTypeService.insertDictType(dict));
@ -73,13 +77,12 @@ public class SysDictTypeController extends BaseController
/** /**
* 修改字典类型 * 修改字典类型
*/ */
@ApiOperation("修改字典类型")
@SaCheckPermission("system:dict:edit") @SaCheckPermission("system:dict:edit")
@Log(title = "字典类型", businessType = BusinessType.UPDATE) @Log(title = "字典类型", businessType = BusinessType.UPDATE)
@PutMapping @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() + "'失败，字典类型已存在"); return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
} }
return toAjax(dictTypeService.updateDictType(dict)); return toAjax(dictTypeService.updateDictType(dict));
@ -88,11 +91,11 @@ public class SysDictTypeController extends BaseController
/** /**
* 删除字典类型 * 删除字典类型
*/ */
@ApiOperation("删除字典类型")
@SaCheckPermission("system:dict:remove") @SaCheckPermission("system:dict:remove")
@Log(title = "字典类型", businessType = BusinessType.DELETE) @Log(title = "字典类型", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictIds}") @DeleteMapping("/{dictIds}")
public AjaxResult remove(@PathVariable Long[] dictIds) public AjaxResult<Void> remove(@PathVariable Long[] dictIds) {
{
dictTypeService.deleteDictTypeByIds(dictIds); dictTypeService.deleteDictTypeByIds(dictIds);
return success(); return success();
} }
@ -100,11 +103,11 @@ public class SysDictTypeController extends BaseController
/** /**
* 刷新字典缓存 * 刷新字典缓存
*/ */
@ApiOperation("刷新字典缓存")
@SaCheckPermission("system:dict:remove") @SaCheckPermission("system:dict:remove")
@Log(title = "字典类型", businessType = BusinessType.CLEAN) @Log(title = "字典类型", businessType = BusinessType.CLEAN)
@DeleteMapping("/refreshCache") @DeleteMapping("/refreshCache")
public AjaxResult refreshCache() public AjaxResult<Void> refreshCache() {
{
dictTypeService.resetDictCache(); dictTypeService.resetDictCache();
return AjaxResult.success(); return AjaxResult.success();
} }
@ -112,9 +115,9 @@ public class SysDictTypeController extends BaseController
/** /**
* 获取字典选择框列表 * 获取字典选择框列表
*/ */
@ApiOperation("获取字典选择框列表")
@GetMapping("/optionselect") @GetMapping("/optionselect")
public AjaxResult optionselect() public AjaxResult<List<SysDictType>> optionselect() {
{
List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll(); List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
return AjaxResult.success(dictTypes); return AjaxResult.success(dictTypes);
} }

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

@ -1,29 +1,35 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.config.RuoYiConfig; 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.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; import org.springframework.web.bind.annotation.RestController;
/** /**
* 首页 * 首页
* *
* @author ruoyi * @author Lion Li
*/ */
@Api(value = "首页控制器", tags = {"首页管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController @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()); return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion());
} }
} }

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

@ -8,11 +8,16 @@ import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginBody; import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.domain.vo.RouterVo;
import com.ruoyi.system.service.ISysMenuService; import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.SysLoginService; import com.ruoyi.system.service.SysLoginService;
import com.ruoyi.system.service.SysPermissionService; 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.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@ -26,22 +31,18 @@ import java.util.Set;
/** /**
* 登录验证 * 登录验证
* *
* @author ruoyi * @author Lion Li
*/ */
@Validated
@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController @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 final ISysUserService iSysUserService;
private SysPermissionService permissionService;
@Autowired
private ISysUserService iSysUserService;
/** /**
* 登录方法 * 登录方法
@ -49,10 +50,10 @@ public class SysLoginController
* @param loginBody 登录信息 * @param loginBody 登录信息
* @return 结果 * @return 结果
*/ */
@ApiOperation("登录方法")
@PostMapping("/login") @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(), String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
loginBody.getUuid()); loginBody.getUuid());
@ -60,6 +61,7 @@ public class SysLoginController
return AjaxResult.success(ajax); return AjaxResult.success(ajax);
} }
@ApiOperation("登出方法")
@PostMapping("/logout") @PostMapping("/logout")
public AjaxResult logout(){ public AjaxResult logout(){
try { try {
@ -74,15 +76,15 @@ public class SysLoginController
* *
* @return 用户信息 * @return 用户信息
*/ */
@ApiOperation("获取用户信息")
@GetMapping("getInfo") @GetMapping("getInfo")
public AjaxResult getInfo() public AjaxResult<Map<String, Object>> getInfo() {
{
SysUser user = SecurityUtils.getUser(); SysUser user = SecurityUtils.getUser();
// 角色集合 // 角色集合
Set<String> roles = permissionService.getRolePermission(user); Set<String> roles = permissionService.getRolePermission(user);
// 权限集合 // 权限集合
Set<String> permissions = permissionService.getMenuPermission(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("user", user);
ajax.put("roles", roles); ajax.put("roles", roles);
ajax.put("permissions", permissions); ajax.put("permissions", permissions);
@ -94,10 +96,11 @@ public class SysLoginController
* *
* @return 路由信息 * @return 路由信息
*/ */
@ApiOperation("获取路由信息")
@GetMapping("getRouters") @GetMapping("getRouters")
public AjaxResult getRouters() public AjaxResult<List<RouterVo>> getRouters() {
{ Long userId = SecurityUtils.getUserId();
List<SysMenu> menus = menuService.selectMenuTreeByUserId(SecurityUtils.getUserId()); List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
return AjaxResult.success(menuService.buildMenus(menus)); return AjaxResult.success(menuService.buildMenus(menus));
} }
} }

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

@ -5,10 +5,14 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; 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.core.domain.entity.SysMenu;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysMenuService; 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.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -20,22 +24,24 @@ import java.util.Map;
/** /**
* 菜单信息 * 菜单信息
* *
* @author ruoyi * @author Lion Li
*/ */
@Validated
@Api(value = "菜单信息控制器", tags = {"菜单信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController @RestController
@RequestMapping("/system/menu") @RequestMapping("/system/menu")
public class SysMenuController extends BaseController public class SysMenuController extends BaseController {
{
@Autowired private final ISysMenuService menuService;
private ISysMenuService menuService;
/** /**
* 获取菜单列表 * 获取菜单列表
*/ */
@ApiOperation("获取菜单列表")
@SaCheckPermission("system:menu:list") @SaCheckPermission("system:menu:list")
@GetMapping("/list") @GetMapping("/list")
public AjaxResult list(SysMenu menu) public AjaxResult<List<SysMenu>> list(SysMenu menu) {
{
List<SysMenu> menus = menuService.selectMenuList(menu, getUserId()); List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
return AjaxResult.success(menus); return AjaxResult.success(menus);
} }
@ -43,19 +49,19 @@ public class SysMenuController extends BaseController
/** /**
* 根据菜单编号获取详细信息 * 根据菜单编号获取详细信息
*/ */
@ApiOperation("根据菜单编号获取详细信息")
@SaCheckPermission("system:menu:query") @SaCheckPermission("system:menu:query")
@GetMapping(value = "/{menuId}") @GetMapping(value = "/{menuId}")
public AjaxResult getInfo(@PathVariable Long menuId) public AjaxResult<SysMenu> getInfo(@PathVariable Long menuId) {
{
return AjaxResult.success(menuService.selectMenuById(menuId)); return AjaxResult.success(menuService.selectMenuById(menuId));
} }
/** /**
* 获取菜单下拉树列表 * 获取菜单下拉树列表
*/ */
@ApiOperation("获取菜单下拉树列表")
@GetMapping("/treeselect") @GetMapping("/treeselect")
public AjaxResult treeselect(SysMenu menu) public AjaxResult<List<TreeSelect>> treeselect(SysMenu menu) {
{
List<SysMenu> menus = menuService.selectMenuList(menu, getUserId()); List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
return AjaxResult.success(menuService.buildMenuTreeSelect(menus)); return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
} }
@ -63,11 +69,11 @@ public class SysMenuController extends BaseController
/** /**
* 加载对应角色菜单列表树 * 加载对应角色菜单列表树
*/ */
@ApiOperation("加载对应角色菜单列表树")
@GetMapping(value = "/roleMenuTreeselect/{roleId}") @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("checkedKeys", menuService.selectMenuListByRoleId(roleId));
ajax.put("menus", menuService.buildMenuTreeSelect(menus)); ajax.put("menus", menuService.buildMenuTreeSelect(menus));
return AjaxResult.success(ajax); return AjaxResult.success(ajax);
@ -76,17 +82,14 @@ public class SysMenuController extends BaseController
/** /**
* 新增菜单 * 新增菜单
*/ */
@ApiOperation("新增菜单")
@SaCheckPermission("system:menu:add") @SaCheckPermission("system:menu:add")
@Log(title = "菜单管理", businessType = BusinessType.INSERT) @Log(title = "菜单管理", businessType = BusinessType.INSERT)
@PostMapping @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() + "'失败，菜单名称已存在"); 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)://开头"); return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
} }
return toAjax(menuService.insertMenu(menu)); return toAjax(menuService.insertMenu(menu));
@ -95,21 +98,16 @@ public class SysMenuController extends BaseController
/** /**
* 修改菜单 * 修改菜单
*/ */
@ApiOperation("修改菜单")
@SaCheckPermission("system:menu:edit") @SaCheckPermission("system:menu:edit")
@Log(title = "菜单管理", businessType = BusinessType.UPDATE) @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
@PutMapping @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() + "'失败，菜单名称已存在"); 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)://开头"); 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() + "'失败，上级菜单不能选择自己"); return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
} }
return toAjax(menuService.updateMenu(menu)); return toAjax(menuService.updateMenu(menu));
@ -118,17 +116,15 @@ public class SysMenuController extends BaseController
/** /**
* 删除菜单 * 删除菜单
*/ */
@ApiOperation("删除菜单")
@SaCheckPermission("system:menu:remove") @SaCheckPermission("system:menu:remove")
@Log(title = "菜单管理", businessType = BusinessType.DELETE) @Log(title = "菜单管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{menuId}") @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("存在子菜单,不允许删除"); return AjaxResult.error("存在子菜单,不允许删除");
} }
if (menuService.checkMenuExistRole(menuId)) if (menuService.checkMenuExistRole(menuId)) {
{
return AjaxResult.error("菜单已分配,不允许删除"); return AjaxResult.error("菜单已分配,不允许删除");
} }
return toAjax(menuService.deleteMenuById(menuId)); return toAjax(menuService.deleteMenuById(menuId));

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

@ -11,69 +11,74 @@ import com.ruoyi.system.service.ISysNoticeService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
/** /**
* 公告 信息操作处理 * 公告 信息操作处理
* *
* @author ruoyi * @author Lion Li
*/ */
@Validated
@Api(value = "公告信息控制器", tags = {"公告信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController @RestController
@RequestMapping("/system/notice") @RequestMapping("/system/notice")
public class SysNoticeController extends BaseController public class SysNoticeController extends BaseController {
{
@Autowired private final ISysNoticeService noticeService;
private ISysNoticeService noticeService;
/** /**
* 获取通知公告列表 * 获取通知公告列表
*/ */
@ApiOperation("获取通知公告列表")
@SaCheckPermission("system:notice:list") @SaCheckPermission("system:notice:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysNotice notice) public TableDataInfo<SysNotice> list(SysNotice notice) {
{
return noticeService.selectPageNoticeList(notice); return noticeService.selectPageNoticeList(notice);
} }
/** /**
* 根据通知公告编号获取详细信息 * 根据通知公告编号获取详细信息
*/ */
@ApiOperation("根据通知公告编号获取详细信息")
@SaCheckPermission("system:notice:query") @SaCheckPermission("system:notice:query")
@GetMapping(value = "/{noticeId}") @GetMapping(value = "/{noticeId}")
public AjaxResult getInfo(@PathVariable Long noticeId) public AjaxResult<SysNotice> getInfo(@PathVariable Long noticeId) {
{
return AjaxResult.success(noticeService.selectNoticeById(noticeId)); return AjaxResult.success(noticeService.selectNoticeById(noticeId));
} }
/** /**
* 新增通知公告 * 新增通知公告
*/ */
@ApiOperation("新增通知公告")
@SaCheckPermission("system:notice:add") @SaCheckPermission("system:notice:add")
@Log(title = "通知公告", businessType = BusinessType.INSERT) @Log(title = "通知公告", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@Validated @RequestBody SysNotice notice) public AjaxResult<Void> add(@Validated @RequestBody SysNotice notice) {
{
return toAjax(noticeService.insertNotice(notice)); return toAjax(noticeService.insertNotice(notice));
} }
/** /**
* 修改通知公告 * 修改通知公告
*/ */
@ApiOperation("修改通知公告")
@SaCheckPermission("system:notice:edit") @SaCheckPermission("system:notice:edit")
@Log(title = "通知公告", businessType = BusinessType.UPDATE) @Log(title = "通知公告", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody SysNotice notice) public AjaxResult<Void> edit(@Validated @RequestBody SysNotice notice) {
{
return toAjax(noticeService.updateNotice(notice)); return toAjax(noticeService.updateNotice(notice));
} }
/** /**
* 删除通知公告 * 删除通知公告
*/ */
@ApiOperation("删除通知公告")
@SaCheckPermission("system:notice:remove") @SaCheckPermission("system:notice:remove")
@Log(title = "通知公告", businessType = BusinessType.DELETE) @Log(title = "通知公告", businessType = BusinessType.DELETE)
@DeleteMapping("/{noticeIds}") @DeleteMapping("/{noticeIds}")
public AjaxResult remove(@PathVariable Long[] noticeIds) public AjaxResult<Void> remove(@PathVariable Long[] noticeIds) {
{
return toAjax(noticeService.deleteNoticeByIds(noticeIds)); return toAjax(noticeService.deleteNoticeByIds(noticeIds));
} }
} }

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

@ -100,10 +100,11 @@ public class SysOssConfigController extends BaseController {
/** /**
* 状态修改 * 状态修改
*/ */
@ApiOperation("状态修改")
@SaCheckPermission("system:oss:edit") @SaCheckPermission("system:oss:edit")
@Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE) @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus") @PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysOssConfigBo bo) { public AjaxResult<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
return toAjax(iSysOssConfigService.updateOssConfigStatus(bo)); return toAjax(iSysOssConfigService.updateOssConfigStatus(bo));
} }
} }

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

@ -38,8 +38,6 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import java.io.IOException; import java.io.IOException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -100,8 +98,6 @@ public class SysOssController extends BaseController {
throw new ServiceException("文件数据不存在!"); throw new ServiceException("文件数据不存在!");
} }
response.reset(); response.reset();
response.addHeader("Access-Control-Allow-Origin", "*");
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;
@ -122,7 +118,7 @@ public class SysOssController extends BaseController {
*/ */
@ApiOperation("删除OSS对象存储") @ApiOperation("删除OSS对象存储")
@SaCheckPermission("system:oss:remove") @SaCheckPermission("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) {
@ -134,7 +130,7 @@ public class SysOssController extends BaseController {
*/ */
@ApiOperation("变更图片列表预览状态") @ApiOperation("变更图片列表预览状态")
@SaCheckPermission("system:oss:edit") @SaCheckPermission("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);

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

@ -10,6 +10,9 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.service.ISysPostService; 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.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -20,30 +23,32 @@ import java.util.List;
/** /**
* 岗位信息操作处理 * 岗位信息操作处理
* *
* @author ruoyi * @author Lion Li
*/ */
@Validated
@Api(value = "岗位信息控制器", tags = {"岗位信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController @RestController
@RequestMapping("/system/post") @RequestMapping("/system/post")
public class SysPostController extends BaseController public class SysPostController extends BaseController {
{
@Autowired private final ISysPostService postService;
private ISysPostService postService;
/** /**
* 获取岗位列表 * 获取岗位列表
*/ */
@ApiOperation("获取岗位列表")
@SaCheckPermission("system:post:list") @SaCheckPermission("system:post:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysPost post) public TableDataInfo<SysPost> list(SysPost post) {
{
return postService.selectPagePostList(post); return postService.selectPagePostList(post);
} }
@ApiOperation("导出岗位列表")
@Log(title = "岗位管理", businessType = BusinessType.EXPORT) @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
@SaCheckPermission("system:post:export") @SaCheckPermission("system:post:export")
@GetMapping("/export") @GetMapping("/export")
public void export(SysPost post, HttpServletResponse response) public void export(SysPost post, HttpServletResponse response) {
{
List<SysPost> list = postService.selectPostList(post); List<SysPost> list = postService.selectPostList(post);
ExcelUtil.exportExcel(list, "岗位数据", SysPost.class, response); ExcelUtil.exportExcel(list, "岗位数据", SysPost.class, response);
} }
@ -51,27 +56,24 @@ public class SysPostController extends BaseController
/** /**
* 根据岗位编号获取详细信息 * 根据岗位编号获取详细信息
*/ */
@ApiOperation("根据岗位编号获取详细信息")
@SaCheckPermission("system:post:query") @SaCheckPermission("system:post:query")
@GetMapping(value = "/{postId}") @GetMapping(value = "/{postId}")
public AjaxResult getInfo(@PathVariable Long postId) public AjaxResult<SysPost> getInfo(@PathVariable Long postId) {
{
return AjaxResult.success(postService.selectPostById(postId)); return AjaxResult.success(postService.selectPostById(postId));
} }
/** /**
* 新增岗位 * 新增岗位
*/ */
@ApiOperation("新增岗位")
@SaCheckPermission("system:post:add") @SaCheckPermission("system:post:add")
@Log(title = "岗位管理", businessType = BusinessType.INSERT) @Log(title = "岗位管理", businessType = BusinessType.INSERT)
@PostMapping @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() + "'失败，岗位名称已存在"); 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() + "'失败，岗位编码已存在"); return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
} }
return toAjax(postService.insertPost(post)); return toAjax(postService.insertPost(post));
@ -80,17 +82,14 @@ public class SysPostController extends BaseController
/** /**
* 修改岗位 * 修改岗位
*/ */
@ApiOperation("修改岗位")
@SaCheckPermission("system:post:edit") @SaCheckPermission("system:post:edit")
@Log(title = "岗位管理", businessType = BusinessType.UPDATE) @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
@PutMapping @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() + "'失败，岗位名称已存在"); 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() + "'失败，岗位编码已存在"); return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
} }
return toAjax(postService.updatePost(post)); return toAjax(postService.updatePost(post));
@ -99,20 +98,20 @@ public class SysPostController extends BaseController
/** /**
* 删除岗位 * 删除岗位
*/ */
@ApiOperation("删除岗位")
@SaCheckPermission("system:post:remove") @SaCheckPermission("system:post:remove")
@Log(title = "岗位管理", businessType = BusinessType.DELETE) @Log(title = "岗位管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{postIds}") @DeleteMapping("/{postIds}")
public AjaxResult remove(@PathVariable Long[] postIds) public AjaxResult<Void> remove(@PathVariable Long[] postIds) {
{
return toAjax(postService.deletePostByIds(postIds)); return toAjax(postService.deletePostByIds(postIds));
} }
/** /**
* 获取岗位选择框列表 * 获取岗位选择框列表
*/ */
@ApiOperation("获取岗位选择框列表")
@GetMapping("/optionselect") @GetMapping("/optionselect")
public AjaxResult optionselect() public AjaxResult<List<SysPost>> optionselect() {
{
List<SysPost> posts = postService.selectPostAll(); List<SysPost> posts = postService.selectPostAll();
return AjaxResult.success(posts); return AjaxResult.success(posts);
} }

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

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

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

@ -4,9 +4,13 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.RegisterBody; import com.ruoyi.common.core.domain.model.RegisterBody;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.SysRegisterService;
import com.ruoyi.system.service.ISysConfigService; 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.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; 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 @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") @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("当前系统没有开启注册功能！"); return error("当前系统没有开启注册功能！");
} }
String msg = registerService.register(user); String msg = registerService.register(user);

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

@ -13,6 +13,9 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -23,30 +26,30 @@ import java.util.List;
/** /**
* 角色信息 * 角色信息
* *
* @author ruoyi * @author Lion Li
*/ */
@Validated
@Api(value = "角色信息控制器", tags = {"角色信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController @RestController
@RequestMapping("/system/role") @RequestMapping("/system/role")
public class SysRoleController extends BaseController public class SysRoleController extends BaseController {
{
@Autowired
private ISysRoleService roleService;
@Autowired private final ISysRoleService roleService;
private ISysUserService userService; private final ISysUserService userService;
@ApiOperation("查询角色信息列表")
@SaCheckPermission("system:role:list") @SaCheckPermission("system:role:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysRole role) public TableDataInfo<SysRole> list(SysRole role) {
{
return roleService.selectPageRoleList(role); return roleService.selectPageRoleList(role);
} }
@ApiOperation("导出角色信息列表")
@Log(title = "角色管理", businessType = BusinessType.EXPORT) @Log(title = "角色管理", businessType = BusinessType.EXPORT)
@SaCheckPermission("system:role:export") @SaCheckPermission("system:role:export")
@GetMapping("/export") @GetMapping("/export")
public void export(SysRole role, HttpServletResponse response) public void export(SysRole role, HttpServletResponse response) {
{
List<SysRole> list = roleService.selectRoleList(role); List<SysRole> list = roleService.selectRoleList(role);
ExcelUtil.exportExcel(list, "角色数据", SysRole.class, response); ExcelUtil.exportExcel(list, "角色数据", SysRole.class, response);
} }
@ -54,10 +57,10 @@ public class SysRoleController extends BaseController
/** /**
* 根据角色编号获取详细信息 * 根据角色编号获取详细信息
*/ */
@ApiOperation("根据角色编号获取详细信息")
@SaCheckPermission("system:role:query") @SaCheckPermission("system:role:query")
@GetMapping(value = "/{roleId}") @GetMapping(value = "/{roleId}")
public AjaxResult getInfo(@PathVariable Long roleId) public AjaxResult<SysRole> getInfo(@PathVariable Long roleId) {
{
roleService.checkRoleDataScope(roleId); roleService.checkRoleDataScope(roleId);
return AjaxResult.success(roleService.selectRoleById(roleId)); return AjaxResult.success(roleService.selectRoleById(roleId));
} }
@ -65,17 +68,14 @@ public class SysRoleController extends BaseController
/** /**
* 新增角色 * 新增角色
*/ */
@ApiOperation("新增角色")
@SaCheckPermission("system:role:add") @SaCheckPermission("system:role:add")
@Log(title = "角色管理", businessType = BusinessType.INSERT) @Log(title = "角色管理", businessType = BusinessType.INSERT)
@PostMapping @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() + "'失败，角色名称已存在"); 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() + "'失败，角色权限已存在"); return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
} }
return toAjax(roleService.insertRole(role)); return toAjax(roleService.insertRole(role));
@ -85,23 +85,19 @@ public class SysRoleController extends BaseController
/** /**
* 修改保存角色 * 修改保存角色
*/ */
@ApiOperation("修改保存角色")
@SaCheckPermission("system:role:edit") @SaCheckPermission("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.UPDATE) @Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody SysRole role) public AjaxResult<Void> edit(@Validated @RequestBody SysRole role) {
{
roleService.checkRoleAllowed(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() + "'失败，角色名称已存在"); 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() + "'失败，角色权限已存在"); return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
} }
if (roleService.updateRole(role) > 0) if (roleService.updateRole(role) > 0) {
{
return AjaxResult.success(); return AjaxResult.success();
} }
return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员"); return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
@ -110,11 +106,11 @@ public class SysRoleController extends BaseController
/** /**
* 修改保存数据权限 * 修改保存数据权限
*/ */
@ApiOperation("修改保存数据权限")
@SaCheckPermission("system:role:edit") @SaCheckPermission("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.UPDATE) @Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping("/dataScope") @PutMapping("/dataScope")
public AjaxResult dataScope(@RequestBody SysRole role) public AjaxResult<Void> dataScope(@RequestBody SysRole role) {
{
roleService.checkRoleAllowed(role); roleService.checkRoleAllowed(role);
return toAjax(roleService.authDataScope(role)); return toAjax(roleService.authDataScope(role));
} }
@ -122,11 +118,11 @@ public class SysRoleController extends BaseController
/** /**
* 状态修改 * 状态修改
*/ */
@ApiOperation("状态修改")
@SaCheckPermission("system:role:edit") @SaCheckPermission("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.UPDATE) @Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus") @PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysRole role) public AjaxResult<Void> changeStatus(@RequestBody SysRole role) {
{
roleService.checkRoleAllowed(role); roleService.checkRoleAllowed(role);
return toAjax(roleService.updateRoleStatus(role)); return toAjax(roleService.updateRoleStatus(role));
} }
@ -134,74 +130,74 @@ public class SysRoleController extends BaseController
/** /**
* 删除角色 * 删除角色
*/ */
@ApiOperation("删除角色")
@SaCheckPermission("system:role:remove") @SaCheckPermission("system:role:remove")
@Log(title = "角色管理", businessType = BusinessType.DELETE) @Log(title = "角色管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{roleIds}") @DeleteMapping("/{roleIds}")
public AjaxResult remove(@PathVariable Long[] roleIds) public AjaxResult<Void> remove(@PathVariable Long[] roleIds) {
{
return toAjax(roleService.deleteRoleByIds(roleIds)); return toAjax(roleService.deleteRoleByIds(roleIds));
} }
/** /**
* 获取角色选择框列表 * 获取角色选择框列表
*/ */
@ApiOperation("获取角色选择框列表")
@SaCheckPermission("system:role:query") @SaCheckPermission("system:role:query")
@GetMapping("/optionselect") @GetMapping("/optionselect")
public AjaxResult optionselect() public AjaxResult<List<SysRole>> optionselect() {
{
return AjaxResult.success(roleService.selectRoleAll()); return AjaxResult.success(roleService.selectRoleAll());
} }
/** /**
* 查询已分配用户角色列表 * 查询已分配用户角色列表
*/ */
@ApiOperation("查询已分配用户角色列表")
@SaCheckPermission("system:role:list") @SaCheckPermission("system:role:list")
@GetMapping("/authUser/allocatedList") @GetMapping("/authUser/allocatedList")
public TableDataInfo allocatedList(SysUser user) public TableDataInfo<SysUser> allocatedList(SysUser user) {
{
return userService.selectAllocatedList(user); return userService.selectAllocatedList(user);
} }
/** /**
* 查询未分配用户角色列表 * 查询未分配用户角色列表
*/ */
@ApiOperation("查询未分配用户角色列表")
@SaCheckPermission("system:role:list") @SaCheckPermission("system:role:list")
@GetMapping("/authUser/unallocatedList") @GetMapping("/authUser/unallocatedList")
public TableDataInfo unallocatedList(SysUser user) public TableDataInfo<SysUser> unallocatedList(SysUser user) {
{
return userService.selectUnallocatedList(user); return userService.selectUnallocatedList(user);
} }
/** /**
* 取消授权用户 * 取消授权用户
*/ */
@ApiOperation("取消授权用户")
@SaCheckPermission("system:role:edit") @SaCheckPermission("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.GRANT) @Log(title = "角色管理", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancel") @PutMapping("/authUser/cancel")
public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole) public AjaxResult<Void> cancelAuthUser(@RequestBody SysUserRole userRole) {
{
return toAjax(roleService.deleteAuthUser(userRole)); return toAjax(roleService.deleteAuthUser(userRole));
} }
/** /**
* 批量取消授权用户 * 批量取消授权用户
*/ */
@ApiOperation("批量取消授权用户")
@SaCheckPermission("system:role:edit") @SaCheckPermission("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.GRANT) @Log(title = "角色管理", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancelAll") @PutMapping("/authUser/cancelAll")
public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds) public AjaxResult<Void> cancelAuthUserAll(Long roleId, Long[] userIds) {
{
return toAjax(roleService.deleteAuthUsers(roleId, userIds)); return toAjax(roleService.deleteAuthUsers(roleId, userIds));
} }
/** /**
* 批量选择用户授权 * 批量选择用户授权
*/ */
@ApiOperation("批量选择用户授权")
@SaCheckPermission("system:role:edit") @SaCheckPermission("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.GRANT) @Log(title = "角色管理", businessType = BusinessType.GRANT)
@PutMapping("/authUser/selectAll") @PutMapping("/authUser/selectAll")
public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds) public AjaxResult<Void> selectAuthUserAll(Long roleId, Long[] userIds) {
{
return toAjax(roleService.insertAuthUsers(roleId, userIds)); return toAjax(roleService.insertAuthUsers(roleId, userIds));
} }
} }

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

@ -21,6 +21,11 @@ import com.ruoyi.system.domain.vo.SysUserImportVo;
import com.ruoyi.system.service.ISysPostService; import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService; 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.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -36,36 +41,34 @@ import java.util.stream.Collectors;
/** /**
* 用户信息 * 用户信息
* *
* @author ruoyi * @author Lion Li
*/ */
@Validated
@Api(value = "用户信息控制器", tags = {"用户信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController @RestController
@RequestMapping("/system/user") @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("获取用户列表")
@SaCheckPermission("system:user:list") @SaCheckPermission("system:user:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysUser user) public TableDataInfo<SysUser> list(SysUser user) {
{
return userService.selectPageUserList(user); return userService.selectPageUserList(user);
} }
@ApiOperation("导出用户列表")
@Log(title = "用户管理", businessType = BusinessType.EXPORT) @Log(title = "用户管理", businessType = BusinessType.EXPORT)
@SaCheckPermission("system:user:export") @SaCheckPermission("system:user:export")
@GetMapping("/export") @GetMapping("/export")
public void export(SysUser user, HttpServletResponse response) public void export(SysUser user, HttpServletResponse response) {
{
List<SysUser> list = userService.selectUserList(user); 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++) {
@ -79,11 +82,14 @@ public class SysUserController extends BaseController
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) @Log(title = "用户管理", businessType = BusinessType.IMPORT)
@SaCheckPermission("system:user:import") @SaCheckPermission("system:user:import")
@PostMapping("/importData") @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 = userService.getById(getUserId()).getUserName(); String operName = userService.getById(getUserId()).getUserName();
@ -91,26 +97,25 @@ public class SysUserController extends BaseController
return AjaxResult.success(message); return AjaxResult.success(message);
} }
@ApiOperation("下载导入模板")
@GetMapping("/importTemplate") @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("根据用户编号获取详细信息")
@SaCheckPermission("system:user:query") @SaCheckPermission("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<>(); Map<String, Object> ajax = new HashMap<>();
List<SysRole> roles = roleService.selectRoleAll(); List<SysRole> roles = roleService.selectRoleAll();
ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
ajax.put("posts", postService.selectPostAll()); ajax.put("posts", postService.selectPostAll());
if (StringUtils.isNotNull(userId)) if (StringUtils.isNotNull(userId)) {
{
ajax.put("user", userService.selectUserById(userId)); ajax.put("user", userService.selectUserById(userId));
ajax.put("postIds", postService.selectPostListByUserId(userId)); ajax.put("postIds", postService.selectPostListByUserId(userId));
ajax.put("roleIds", roleService.selectRoleListByUserId(userId)); ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
@ -121,23 +126,18 @@ public class SysUserController extends BaseController
/** /**
* 新增用户 * 新增用户
*/ */
@ApiOperation("新增用户")
@SaCheckPermission("system:user:add") @SaCheckPermission("system:user:add")
@Log(title = "用户管理", businessType = BusinessType.INSERT) @Log(title = "用户管理", businessType = BusinessType.INSERT)
@PostMapping @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() + "'失败，登录账号已存在"); 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() + "'失败，手机号码已存在"); 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() + "'失败，邮箱账号已存在"); return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
} }
user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@ -147,20 +147,17 @@ public class SysUserController extends BaseController
/** /**
* 修改用户 * 修改用户
*/ */
@ApiOperation("修改用户")
@SaCheckPermission("system:user:edit") @SaCheckPermission("system:user:edit")
@Log(title = "用户管理", businessType = BusinessType.UPDATE) @Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody SysUser user) public AjaxResult<Void> edit(@Validated @RequestBody SysUser user) {
{
userService.checkUserAllowed(user); userService.checkUserAllowed(user);
if (StringUtils.isNotEmpty(user.getPhonenumber()) if (StringUtils.isNotEmpty(user.getPhonenumber())
&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
{
return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); 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() + "'失败，邮箱账号已存在"); return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
} }
return toAjax(userService.updateUser(user)); return toAjax(userService.updateUser(user));
@ -169,13 +166,12 @@ public class SysUserController extends BaseController
/** /**
* 删除用户 * 删除用户
*/ */
@ApiOperation("删除用户")
@SaCheckPermission("system:user:remove") @SaCheckPermission("system:user:remove")
@Log(title = "用户管理", businessType = BusinessType.DELETE) @Log(title = "用户管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{userIds}") @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 error("当前用户不能删除");
} }
return toAjax(userService.deleteUserByIds(userIds)); return toAjax(userService.deleteUserByIds(userIds));
@ -184,11 +180,11 @@ public class SysUserController extends BaseController
/** /**
* 重置密码 * 重置密码
*/ */
@ApiOperation("重置密码")
@SaCheckPermission("system:user:resetPwd") @SaCheckPermission("system:user:resetPwd")
@Log(title = "用户管理", businessType = BusinessType.UPDATE) @Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping("/resetPwd") @PutMapping("/resetPwd")
public AjaxResult resetPwd(@RequestBody SysUser user) public AjaxResult<Void> resetPwd(@RequestBody SysUser user) {
{
userService.checkUserAllowed(user); userService.checkUserAllowed(user);
user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
return toAjax(userService.resetPwd(user)); return toAjax(userService.resetPwd(user));
@ -197,11 +193,11 @@ public class SysUserController extends BaseController
/** /**
* 状态修改 * 状态修改
*/ */
@ApiOperation("状态修改")
@SaCheckPermission("system:user:edit") @SaCheckPermission("system:user:edit")
@Log(title = "用户管理", businessType = BusinessType.UPDATE) @Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus") @PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysUser user) public AjaxResult<Void> changeStatus(@RequestBody SysUser user) {
{
userService.checkUserAllowed(user); userService.checkUserAllowed(user);
return toAjax(userService.updateUserStatus(user)); return toAjax(userService.updateUserStatus(user));
} }
@ -209,10 +205,10 @@ public class SysUserController extends BaseController
/** /**
* 根据用户编号获取授权角色 * 根据用户编号获取授权角色
*/ */
@ApiOperation("根据用户编号获取授权角色")
@SaCheckPermission("system:user:query") @SaCheckPermission("system:user:query")
@GetMapping("/authRole/{userId}") @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); SysUser user = userService.selectUserById(userId);
List<SysRole> roles = roleService.selectRolesByUserId(userId); List<SysRole> roles = roleService.selectRolesByUserId(userId);
Map<String, Object> ajax = new HashMap<>(); Map<String, Object> ajax = new HashMap<>();
@ -224,11 +220,11 @@ public class SysUserController extends BaseController
/** /**
* 用户授权角色 * 用户授权角色
*/ */
@ApiOperation("用户授权角色")
@SaCheckPermission("system:user:edit") @SaCheckPermission("system:user:edit")
@Log(title = "用户管理", businessType = BusinessType.GRANT) @Log(title = "用户管理", businessType = BusinessType.GRANT)
@PutMapping("/authRole") @PutMapping("/authRole")
public AjaxResult insertAuthRole(Long userId, Long[] roleIds) public AjaxResult<Void> insertAuthRole(Long userId, Long[] roleIds) {
{
userService.insertUserAuth(userId, roleIds); userService.insertUserAuth(userId, roleIds);
return success(); return success();
} }

117
ruoyi-admin/src/main/resources/application-dev.yml
View File

@ -1,4 +1,43 @@
# 数据源配置 --- # 监控配置
spring:
boot:
admin:
# Spring Boot Admin Client 客户端的相关配置
client:
# 增加客户端开关
enabled: true
# 设置 Spring Boot Admin Server 地址
url: http://localhost:9090/admin
instance:
prefer-ip: true # 注册实例时，优先使用 IP
username: ruoyi
password: 123456
--- # xxl-job 配置
xxl:
job:
# 执行器开关
enabled: true
# 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
admin-addresses: http://localhost:9100/xxl-job-admin
# 执行器通讯TOKEN：非空时启用
access-token: xxl-job
# 执行器配置
executor:
# 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册
appname: xxl-job-executor
# 执行器端口号 执行器从9101开始往后写
port: 9101
# 执行器注册：默认IP:PORT
address:
# 执行器IP：默认自动获取IP
ip:
# 执行器运行日志文件存储磁盘路径
logpath: ./logs/xxl-job
# 执行器日志文件保存天数：大于3生效
logretentiondays: 30
--- # 数据源配置
spring: spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
@ -117,79 +156,3 @@ redisson:
subscriptionsPerConnection: 5 subscriptionsPerConnection: 5
# DNS监测时间间隔，单位：毫秒 # DNS监测时间间隔，单位：毫秒
dnsMonitoringInterval: 5000 dnsMonitoringInterval: 5000
#--- # redis 集群配置(单机与集群只能开启一个另一个需要注释掉)
#spring:
# redis:
# cluster:
# nodes:
# - 192.168.0.100:6379
# - 192.168.0.101:6379
# - 192.168.0.102:6379
# # 密码
# password:
# # 连接超时时间
# timeout: 10s
# # 是否开启ssl
# ssl: false
#
#redisson:
# # 线程池数量
# threads: 16
# # Netty线程池数量
# nettyThreads: 32
# # 传输模式
# transportMode: "NIO"
# # 集群配置
# clusterServersConfig:
# # 客户端名称
# clientName: ${ruoyi.name}
# # master最小空闲连接数
# masterConnectionMinimumIdleSize: 32
# # master连接池大小
# masterConnectionPoolSize: 64
# # slave最小空闲连接数
# slaveConnectionMinimumIdleSize: 32
# # slave连接池大小
# slaveConnectionPoolSize: 64
# # 连接空闲超时，单位：毫秒
# idleConnectionTimeout: 10000
# # ping连接间隔
# pingConnectionInterval: 1000
# # 命令等待超时，单位：毫秒
# timeout: 3000
# # 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
# retryAttempts: 3
# # 命令重试发送时间间隔，单位：毫秒
# retryInterval: 1500
# # 从可用服务器的内部列表中排除 Redis Slave 重新连接尝试的间隔。
# failedSlaveReconnectionInterval: 3000
# # 发布和订阅连接池最小空闲连接数
# subscriptionConnectionMinimumIdleSize: 1
# # 发布和订阅连接池大小
# subscriptionConnectionPoolSize: 50
# # 单个连接最大订阅数量
# subscriptionsPerConnection: 5
# # 扫描间隔
# scanInterval: 1000
# # DNS监测时间间隔，单位：毫秒
# dnsMonitoringInterval: 5000
# # 读取模式
# readMode: "SLAVE"
# # 订阅模式
# subscriptionMode: "MASTER"
--- # 监控配置
spring:
boot:
admin:
# Spring Boot Admin Client 客户端的相关配置
client:
# 增加客户端开关
enabled: true
# 设置 Spring Boot Admin Server 地址
url: http://localhost:9090/admin
instance:
prefer-ip: true # 注册实例时，优先使用 IP
username: ruoyi
password: 123456

117
ruoyi-admin/src/main/resources/application-prod.yml
View File

@ -1,4 +1,43 @@
# 数据源配置 --- # 监控配置
spring:
boot:
admin:
# Spring Boot Admin Client 客户端的相关配置
client:
# 增加客户端开关
enabled: true
# 设置 Spring Boot Admin Server 地址
url: http://172.30.0.90:9090/admin
instance:
prefer-ip: true # 注册实例时，优先使用 IP
username: ruoyi
password: 123456
--- # xxl-job 配置
xxl:
job:
# 执行器开关
enabled: true
# 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
admin-addresses: http://172.30.0.92:9100/xxl-job-admin
# 执行器通讯TOKEN：非空时启用
access-token: xxl-job
# 执行器配置
executor:
# 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册
appname: xxl-job-executor
# 执行器端口号 执行器从9101开始往后写
port: 9101
# 执行器注册：默认IP:PORT
address:
# 执行器IP：默认自动获取IP
ip:
# 执行器运行日志文件存储磁盘路径
logpath: ./logs/xxl-job
# 执行器日志文件保存天数：大于3生效
logretentiondays: 30
--- # 数据源配置
spring: spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
@ -117,79 +156,3 @@ redisson:
subscriptionsPerConnection: 5 subscriptionsPerConnection: 5
# DNS监测时间间隔，单位：毫秒 # DNS监测时间间隔，单位：毫秒
dnsMonitoringInterval: 5000 dnsMonitoringInterval: 5000
#--- # redis 集群配置(单机与集群只能开启一个另一个需要注释掉)
#spring:
# redis:
# cluster:
# nodes:
# - 192.168.0.100:6379
# - 192.168.0.101:6379
# - 192.168.0.102:6379
# # 密码
# password:
# # 连接超时时间
# timeout: 10s
# # 是否开启ssl
# ssl: false
#
#redisson:
# # 线程池数量
# threads: 16
# # Netty线程池数量
# nettyThreads: 32
# # 传输模式
# transportMode: "NIO"
# # 集群配置
# clusterServersConfig:
# # 客户端名称
# clientName: ${ruoyi.name}
# # master最小空闲连接数
# masterConnectionMinimumIdleSize: 32
# # master连接池大小
# masterConnectionPoolSize: 64
# # slave最小空闲连接数
# slaveConnectionMinimumIdleSize: 32
# # slave连接池大小
# slaveConnectionPoolSize: 64
# # 连接空闲超时，单位：毫秒
# idleConnectionTimeout: 10000
# # ping连接间隔
# pingConnectionInterval: 1000
# # 命令等待超时，单位：毫秒
# timeout: 3000
# # 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
# retryAttempts: 3
# # 命令重试发送时间间隔，单位：毫秒
# retryInterval: 1500
# # 从可用服务器的内部列表中排除 Redis Slave 重新连接尝试的间隔。
# failedSlaveReconnectionInterval: 3000
# # 发布和订阅连接池最小空闲连接数
# subscriptionConnectionMinimumIdleSize: 1
# # 发布和订阅连接池大小
# subscriptionConnectionPoolSize: 50
# # 单个连接最大订阅数量
# subscriptionsPerConnection: 5
# # 扫描间隔
# scanInterval: 1000
# # DNS监测时间间隔，单位：毫秒
# dnsMonitoringInterval: 5000
# # 读取模式
# readMode: "SLAVE"
# # 订阅模式
# subscriptionMode: "MASTER"
--- # 监控配置
spring:
boot:
admin:
# Spring Boot Admin Client 客户端的相关配置
client:
# 增加客户端开关
enabled: true
# 设置 Spring Boot Admin Server 地址
url: http://172.30.0.90:9090/admin
instance:
prefer-ip: true # 注册实例时，优先使用 IP
username: ruoyi
password: 123456

65
ruoyi-admin/src/main/resources/application.yml
View File

@ -43,14 +43,6 @@ server:
io: 8 io: 8
# 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载 # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载
worker: 256 worker: 256
# # tomcat 配置
# tomcat:
# # tomcat的URI编码
# uri-encoding: UTF-8
# # tomcat最大线程数，默认为200
# max-threads: 500
# # Tomcat启动初始化的线程数，默认值25
# min-spare-threads: 30
# 日志配置 # 日志配置
logging: logging:
@ -59,6 +51,10 @@ logging:
org.springframework: warn org.springframework: warn
config: classpath:logback.xml config: classpath:logback.xml
# tlog 全局访问性能拦截
tlog:
enable-invoke-time-print: true
# Spring配置 # Spring配置
spring: spring:
application: application:
@ -161,43 +157,24 @@ mybatis-plus:
mapperLocations: classpath*:mapper/**/*Mapper.xml mapperLocations: classpath*:mapper/**/*Mapper.xml
# 实体扫描，多个package用逗号或者分号分隔 # 实体扫描，多个package用逗号或者分号分隔
typeAliasesPackage: com.ruoyi.**.domain typeAliasesPackage: com.ruoyi.**.domain
# 针对 typeAliasesPackage，如果配置了该属性，则仅仅会扫描路径下以该类作为父类的域对象
#typeAliasesSuperType: Class<?>
# 如果配置了该属性，SqlSessionFactoryBean 会把该包下面的类注册为对应的 TypeHandler
#typeHandlersPackage: null
# 如果配置了该属性，会将路径下的枚举类进行注入，让实体类字段能够简单快捷的使用枚举属性
#typeEnumsPackage: null
# 启动时是否检查 MyBatis XML 文件的存在，默认不检查 # 启动时是否检查 MyBatis XML 文件的存在，默认不检查
checkConfigLocation: false checkConfigLocation: false
# 通过该属性可指定 MyBatis 的执行器，MyBatis 的执行器总共有三种： # 通过该属性可指定 MyBatis 的执行器，MyBatis 的执行器总共有三种：
# SIMPLE：该执行器类型不做特殊的事情，为每个语句的执行创建一个新的预处理语句（PreparedStatement） # SIMPLE：每个语句创建新的预处理器 REUSE：会复用预处理器 BATCH：批量执行所有的更新
# REUSE：该执行器类型会复用预处理语句（PreparedStatement）
# BATCH：该执行器类型会批量执行所有的更新语句
executorType: SIMPLE executorType: SIMPLE
configuration: configuration:
# 自动驼峰命名规则（camel case）映射 # 自动驼峰命名规则（camel case）映射
# 如果您的数据库命名符合规则无需使用 @TableField 注解指定数据库字段名
mapUnderscoreToCamelCase: true mapUnderscoreToCamelCase: true
# 默认枚举处理类,如果配置了该属性,枚举将统一使用指定处理器进行处理
# org.apache.ibatis.type.EnumTypeHandler : 存储枚举的名称
# org.apache.ibatis.type.EnumOrdinalTypeHandler : 存储枚举的索引
# com.baomidou.mybatisplus.extension.handlers.MybatisEnumTypeHandler : 枚举类需要实现IEnum接口或字段标记@EnumValue注解.
defaultEnumTypeHandler: org.apache.ibatis.type.EnumTypeHandler
# 当设置为 true 的时候，懒加载的对象可能被任何懒属性全部加载，否则，每个属性都按需加载。需要和 lazyLoadingEnabled 一起使用。 # 当设置为 true 的时候，懒加载的对象可能被任何懒属性全部加载，否则，每个属性都按需加载。需要和 lazyLoadingEnabled 一起使用。
aggressiveLazyLoading: true aggressiveLazyLoading: true
# MyBatis 自动映射策略 # MyBatis 自动映射策略
# NONE：不启用自动映射 # NONE：不启用 PARTIAL：只对非嵌套 resultMap 自动映射 FULL：对所有 resultMap 自动映射
# PARTIAL：只对非嵌套的 resultMap 进行自动映射
# FULL：对所有的 resultMap 都进行自动映射
autoMappingBehavior: PARTIAL autoMappingBehavior: PARTIAL
# MyBatis 自动映射时未知列或未知属性处理策 # MyBatis 自动映射时未知列或未知属性处理策
# NONE：不做任何处理 (默认值) # NONE：不做处理 WARNING：打印相关警告 FAILING：抛出异常和详细信息
# WARNING：以日志的形式打印相关警告信息
# FAILING：当作映射失败处理，并抛出异常和详细信息
autoMappingUnknownColumnBehavior: NONE autoMappingUnknownColumnBehavior: NONE
# Mybatis一级缓存，默认为 SESSION # Mybatis一级缓存，默认为 SESSION
# SESSION session级别缓存，同一个session相同查询语句不会再次查询数据库 # SESSION session级别缓存 STATEMENT 关闭一级缓存
# STATEMENT 关闭一级缓存
localCacheScope: SESSION localCacheScope: SESSION
# 开启Mybatis二级缓存，默认为 true # 开启Mybatis二级缓存，默认为 true
cacheEnabled: false cacheEnabled: false
@ -212,32 +189,18 @@ mybatis-plus:
enableSqlRunner: false enableSqlRunner: false
dbConfig: dbConfig:
# 主键类型 # 主键类型
# AUTO 数据库ID自增 # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID
# NONE 空
# INPUT 用户输入ID
# ASSIGN_ID 全局唯一ID
# ASSIGN_UUID 全局唯一ID UUID
idType: AUTO idType: AUTO
# 表名前缀
tablePrefix: null
# 字段 format,例: %s,(对主键无效)
columnFormat: null
# 表名是否使用驼峰转下划线命名,只对表名生效 # 表名是否使用驼峰转下划线命名,只对表名生效
tableUnderline: true tableUnderline: true
# 大写命名,对表名和字段名均生效 # 大写命名,对表名和字段名均生效
capitalMode: false capitalMode: false
# 全局的entity的逻辑删除字段属性名
logicDeleteField: null
# 逻辑已删除值 # 逻辑已删除值
logicDeleteValue: 2 logicDeleteValue: 2
# 逻辑未删除值 # 逻辑未删除值
logicNotDeleteValue: 0 logicNotDeleteValue: 0
# 字段验证策略之 insert,在 insert 的时候的字段验证策略 # 字段验证策略之 insert,在 insert 的时候的字段验证策略
# IGNORED 忽略判断 # IGNORED 忽略 NOT_NULL 非NULL NOT_EMPTY 非空 DEFAULT 默认 NEVER 不加入 SQL
# NOT_NULL 非NULL判断
# NOT_EMPTY 非空判断(只对字符串类型字段,其他类型字段依然为非NULL判断)
# DEFAULT 默认的,一般只用于注解里
# NEVER 不加入 SQL
insertStrategy: NOT_NULL insertStrategy: NOT_NULL
# 字段验证策略之 update,在 update 的时候的字段验证策略 # 字段验证策略之 update,在 update 的时候的字段验证策略
updateStrategy: NOT_NULL updateStrategy: NOT_NULL
@ -262,10 +225,12 @@ swagger:
email: crazylionli@163.com email: crazylionli@163.com
url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
groups: groups:
- name: 演示案例 - name: 1.演示案例
basePackage: com.ruoyi.demo basePackage: com.ruoyi.demo
- name: 系统模块 - name: 2.系统模块
basePackage: com.ruoyi.admin basePackage: com.ruoyi.web
- name: 3.代码生成模块
basePackage: com.ruoyi.generator
# 防止XSS攻击 # 防止XSS攻击
xss: xss:

5
ruoyi-admin/src/main/resources/i18n/messages.properties
View File

@ -10,12 +10,9 @@ user.password.delete=对不起，您的账号已被删除
user.blocked=用户已封禁，请联系管理员 user.blocked=用户已封禁，请联系管理员
role.blocked=角色已封禁，请联系管理员 role.blocked=角色已封禁，请联系管理员
user.logout.success=退出成功 user.logout.success=退出成功
length.not.valid=长度必须在{min}到{max}个字符之间 length.not.valid=长度必须在{min}到{max}个字符之间
user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头 user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
user.password.not.valid=* 5-50个字符 user.password.not.valid=* 5-50个字符
user.email.not.valid=邮箱格式错误 user.email.not.valid=邮箱格式错误
user.mobile.phone.number.not.valid=手机号格式错误 user.mobile.phone.number.not.valid=手机号格式错误
user.login.success=登录成功 user.login.success=登录成功
@ -23,11 +20,9 @@ user.register.success=注册成功
user.notfound=请重新登录 user.notfound=请重新登录
user.forcelogout=管理员强制退出，请重新登录 user.forcelogout=管理员强制退出，请重新登录
user.unknown.error=未知错误，请重新登录 user.unknown.error=未知错误，请重新登录
##文件上传消息 ##文件上传消息
upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！ upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
upload.filename.exceed.length=上传的文件名最长{0}个字符 upload.filename.exceed.length=上传的文件名最长{0}个字符
##权限 ##权限
no.permission=您没有数据的权限，请联系管理员添加权限 [{0}] no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}] no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]

59
ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
View File

@ -1,33 +1,32 @@
#错误消息 #错误消息
not.null= not.null=* Required fill in
user.jcaptcha.error= user.jcaptcha.error=Captcha error
user.jcaptcha.expire= user.jcaptcha.expire=Captcha invalid
user.not.exists= user.not.exists=User does not exist/Password error
user.password.not.match= user.password.not.match=User does not exist/Password error
user.password.retry.limit.count= user.password.retry.limit.count=Password input error {0} times
user.password.retry.limit.exceed= user.password.retry.limit.exceed=Password input error {0} times, account locked for 10 minutes
user.password.delete= user.password.delete=Sorry, your account has been deleted
user.blocked= user.blocked=User disabled，please contact administrators
role.blocked= role.blocked=Role disabled，please contact administrators
user.logout.success= user.logout.success=Exit successful
length.not.valid= length.not.valid=The length must be between {min} and {max} characters
user.username.not.valid= user.username.not.valid=* 2 to 20 chinese characters, letters, numbers or underscores, and must start with a non number
user.password.not.valid= user.password.not.valid=* 5-50 characters
user.email.not.valid= user.email.not.valid=Mailbox format error
user.mobile.phone.number.not.valid= user.mobile.phone.number.not.valid=Phone number format error
user.login.success= user.login.success=Login successful
user.register.success=register success user.register.success=Register successful
user.notfound= user.notfound=Please login again
user.unknown.error= user.forcelogout=The administrator is forced to exit，please login again
user.unknown.error=Unknown error, please login again
##文件上传消息 ##文件上传消息
upload.exceed.maxSize= upload.exceed.maxSize=The uploaded file size exceeds the limit file size！<br/>the maximum allowed file size is：{0}MB！
upload.filename.exceed.length= upload.filename.exceed.length=The maximum length of uploaded file name is {0} characters
##权限 ##权限
no.permission= no.permission=You do not have permission to the data，please contact your administrator to add permissions [{0}]
no.create.permission= no.create.permission=You do not have permission to create data，please contact your administrator to add permissions [{0}]
no.update.permission= no.update.permission=You do not have permission to modify data，please contact your administrator to add permissions [{0}]
no.delete.permission= no.delete.permission=You do not have permission to delete data，please contact your administrator to add permissions [{0}]
no.export.permission= no.export.permission=You do not have permission to export data，please contact your administrator to add permissions [{0}]
no.view.permission= no.view.permission=You do not have permission to view data，please contact your administrator to add permissions [{0}]

5
ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -10,12 +10,9 @@ user.password.delete=对不起，您的账号已被删除
user.blocked=用户已封禁，请联系管理员 user.blocked=用户已封禁，请联系管理员
role.blocked=角色已封禁，请联系管理员 role.blocked=角色已封禁，请联系管理员
user.logout.success=退出成功 user.logout.success=退出成功
length.not.valid=长度必须在{min}到{max}个字符之间 length.not.valid=长度必须在{min}到{max}个字符之间
user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头 user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
user.password.not.valid=* 5-50个字符 user.password.not.valid=* 5-50个字符
user.email.not.valid=邮箱格式错误 user.email.not.valid=邮箱格式错误
user.mobile.phone.number.not.valid=手机号格式错误 user.mobile.phone.number.not.valid=手机号格式错误
user.login.success=登录成功 user.login.success=登录成功
@ -23,11 +20,9 @@ user.register.success=注册成功
user.notfound=请重新登录 user.notfound=请重新登录
user.forcelogout=管理员强制退出，请重新登录 user.forcelogout=管理员强制退出，请重新登录
user.unknown.error=未知错误，请重新登录 user.unknown.error=未知错误，请重新登录
##文件上传消息 ##文件上传消息
upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！ upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
upload.filename.exceed.length=上传的文件名最长{0}个字符 upload.filename.exceed.length=上传的文件名最长{0}个字符
##权限 ##权限
no.permission=您没有数据的权限，请联系管理员添加权限 [{0}] no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}] no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]

10
ruoyi-admin/src/main/resources/logback.xml
View File

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

21
ruoyi-common/pom.xml
View File

@ -47,8 +47,8 @@
<!-- 自定义验证注解 --> <!-- 自定义验证注解 -->
<dependency> <dependency>
<groupId>javax.validation</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>validation-api</artifactId> <artifactId>spring-boot-starter-validation</artifactId>
</dependency> </dependency>
<!--常用工具类 --> <!--常用工具类 -->
@ -121,11 +121,13 @@
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<!-- @deprecated 由于使用人数较少 决定与 3.4.0 版本移除 -->
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId> <artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency> </dependency>
<!-- @deprecated 由于使用人数较少 决定与 3.4.0 版本移除 -->
<dependency> <dependency>
<groupId>io.github.openfeign</groupId> <groupId>io.github.openfeign</groupId>
<artifactId>feign-okhttp</artifactId> <artifactId>feign-okhttp</artifactId>
@ -166,6 +168,21 @@
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>lock4j-redisson-spring-boot-starter</artifactId> <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
</dependency> </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> </dependencies>
</project> </project>

15
ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java
View File

@ -1,10 +1,6 @@
package com.ruoyi.common.annotation; package com.ruoyi.common.annotation;
import java.lang.annotation.Documented; import java.lang.annotation.*;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/** /**
* 数据权限过滤注解 * 数据权限过滤注解
@ -14,20 +10,19 @@ import java.lang.annotation.Target;
@Target(ElementType.METHOD) @Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Documented @Documented
public @interface DataScope public @interface DataScope {
{
/** /**
* 部门表的别名 * 部门表的别名
*/ */
public String deptAlias() default ""; String deptAlias() default "";
/** /**
* 用户表的别名 * 用户表的别名
*/ */
public String userAlias() default ""; String userAlias() default "";
/** /**
* 是否过滤用户权限 * 是否过滤用户权限
*/ */
public boolean isUser() default false; boolean isUser() default false;
} }

17
ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java
View File

@ -1,28 +1,23 @@
package com.ruoyi.common.annotation; package com.ruoyi.common.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.common.enums.DataSourceType;
import java.lang.annotation.*;
/** /**
* 自定义多数据源切换注解 * 自定义多数据源切换注解
* * <p>
* 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准 * 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准
* *
* @author ruoyi * @author ruoyi
*/ */
@Target({ ElementType.METHOD, ElementType.TYPE }) @Target({ElementType.METHOD, ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Documented @Documented
@Inherited @Inherited
public @interface DataSource public @interface DataSource {
{
/** /**
* 切换数据源名称 * 切换数据源名称
*/ */
public DataSourceType value() default DataSourceType.MASTER; DataSourceType value() default DataSourceType.MASTER;
} }

23
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java
View File

@ -1,46 +1,41 @@
package com.ruoyi.common.annotation; package com.ruoyi.common.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.OperatorType; import com.ruoyi.common.enums.OperatorType;
import java.lang.annotation.*;
/** /**
* 自定义操作日志记录注解 * 自定义操作日志记录注解
* *
* @author ruoyi * @author ruoyi
*
*/ */
@Target({ ElementType.PARAMETER, ElementType.METHOD }) @Target({ElementType.PARAMETER, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Documented @Documented
public @interface Log public @interface Log {
{
/** /**
* 模块 * 模块
*/ */
public String title() default ""; String title() default "";
/** /**
* 功能 * 功能
*/ */
public BusinessType businessType() default BusinessType.OTHER; BusinessType businessType() default BusinessType.OTHER;
/** /**
* 操作人类别 * 操作人类别
*/ */
public OperatorType operatorType() default OperatorType.MANAGE; OperatorType operatorType() default OperatorType.MANAGE;
/** /**
* 是否保存请求的参数 * 是否保存请求的参数
*/ */
public boolean isSaveRequestData() default true; boolean isSaveRequestData() default true;
/** /**
* 是否保存响应的参数 * 是否保存响应的参数
*/ */
public boolean isSaveResponseData() default true; boolean isSaveResponseData() default true;
} }

20
ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java
View File

@ -1,40 +1,36 @@
package com.ruoyi.common.annotation; package com.ruoyi.common.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.enums.LimitType; import com.ruoyi.common.enums.LimitType;
import java.lang.annotation.*;
/** /**
* 限流注解 * 限流注解
* *
* @author ruoyi * @author Lion Li
*/ */
@Target(ElementType.METHOD) @Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Documented @Documented
public @interface RateLimiter public @interface RateLimiter {
{
/** /**
* 限流key * 限流key
*/ */
public String key() default Constants.RATE_LIMIT_KEY; String key() default Constants.RATE_LIMIT_KEY;
/** /**
* 限流时间,单位秒 * 限流时间,单位秒
*/ */
public int time() default 60; int time() default 60;
/** /**
* 限流次数 * 限流次数
*/ */
public int count() default 100; int count() default 100;
/** /**
* 限流类型 * 限流类型
*/ */
public LimitType limitType() default LimitType.DEFAULT; LimitType limitType() default LimitType.DEFAULT;
} }

9
ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
View File

@ -1,11 +1,6 @@
package com.ruoyi.common.annotation; package com.ruoyi.common.annotation;
import java.lang.annotation.Documented; import java.lang.annotation.*;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/** /**
@ -29,6 +24,6 @@ public @interface RepeatSubmit {
/** /**
* 提示消息 * 提示消息
*/ */
String message() default "不允许重复提交，请稍后再试"; String message() default "不允许重复提交，请稍候再试";
} }

31
ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
View File

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

3
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
View File

@ -5,8 +5,7 @@ package com.ruoyi.common.constant;
* *
* @author ruoyi * @author ruoyi
*/ */
public class Constants public class Constants {
{
/** /**
* UTF-8 字符集 * UTF-8 字符集
*/ */

173
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
View File

@ -5,115 +5,184 @@ package com.ruoyi.common.constant;
* *
* @author ruoyi * @author ruoyi
*/ */
public class GenConstants public class GenConstants {
{ /**
/** 单表（增删改查） */ * 单表（增删改查）
*/
public static final String TPL_CRUD = "crud"; public static final String TPL_CRUD = "crud";
/** 树表（增删改查） */ /**
* 树表（增删改查）
*/
public static final String TPL_TREE = "tree"; public static final String TPL_TREE = "tree";
/** 主子表（增删改查） */ /**
* 主子表（增删改查）
*/
public static final String TPL_SUB = "sub"; public static final String TPL_SUB = "sub";
/** 树编码字段 */ /**
* 树编码字段
*/
public static final String TREE_CODE = "treeCode"; public static final String TREE_CODE = "treeCode";
/** 树父编码字段 */ /**
* 树父编码字段
*/
public static final String TREE_PARENT_CODE = "treeParentCode"; public static final String TREE_PARENT_CODE = "treeParentCode";
/** 树名称字段 */ /**
* 树名称字段
*/
public static final String TREE_NAME = "treeName"; public static final String TREE_NAME = "treeName";
/** 上级菜单ID字段 */ /**
* 上级菜单ID字段
*/
public static final String PARENT_MENU_ID = "parentMenuId"; public static final String PARENT_MENU_ID = "parentMenuId";
/** 上级菜单名称字段 */ /**
* 上级菜单名称字段
*/
public static final String PARENT_MENU_NAME = "parentMenuName"; public static final String PARENT_MENU_NAME = "parentMenuName";
/** 数据库字符串类型 */ /**
public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" }; * 数据库字符串类型
*/
public static final String[] COLUMNTYPE_STR = {"char", "varchar", "nvarchar", "varchar2"};
/** 数据库文本类型 */ /**
public static final String[] COLUMNTYPE_TEXT = { "tinytext", "text", "mediumtext", "longtext" }; * 数据库文本类型
*/
public static final String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"};
/** 数据库时间类型 */ /**
public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" }; * 数据库时间类型
*/
public static final String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"};
/** 数据库数字类型 */ /**
public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer", * 数据库数字类型
"bit", "bigint", "float", "double", "decimal" }; */
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", * BO对象 不需要添加字段
"update_time", "version" }; */
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", * BO对象 不需要编辑字段
"update_time", "version" }; */
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 = { "create_by", "create_time", "del_flag", "update_by", * VO对象 不需要返回字段
"update_time", "version" }; */
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", * BO对象 不需要查询字段
"update_time", "remark", "version" }; */
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" }; * Entity基类字段
*/
public static final String[] BASE_ENTITY = {"createBy", "createTime", "updateBy", "updateTime"};
/** Tree基类字段 */ /**
public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors", "children" }; * Tree基类字段
*/
public static final String[] TREE_ENTITY = {"parentName", "parentId", "children"};
/** 文本框 */ /**
* 文本框
*/
public static final String HTML_INPUT = "input"; public static final String HTML_INPUT = "input";
/** 文本域 */ /**
* 文本域
*/
public static final String HTML_TEXTAREA = "textarea"; public static final String HTML_TEXTAREA = "textarea";
/** 下拉框 */ /**
* 下拉框
*/
public static final String HTML_SELECT = "select"; public static final String HTML_SELECT = "select";
/** 单选框 */ /**
* 单选框
*/
public static final String HTML_RADIO = "radio"; public static final String HTML_RADIO = "radio";
/** 复选框 */ /**
* 复选框
*/
public static final String HTML_CHECKBOX = "checkbox"; public static final String HTML_CHECKBOX = "checkbox";
/** 日期控件 */ /**
* 日期控件
*/
public static final String HTML_DATETIME = "datetime"; public static final String HTML_DATETIME = "datetime";
/** 图片上传控件 */ /**
* 图片上传控件
*/
public static final String HTML_IMAGE_UPLOAD = "imageUpload"; public static final String HTML_IMAGE_UPLOAD = "imageUpload";
/** 文件上传控件 */ /**
* 文件上传控件
*/
public static final String HTML_FILE_UPLOAD = "fileUpload"; public static final String HTML_FILE_UPLOAD = "fileUpload";
/** 富文本控件 */ /**
* 富文本控件
*/
public static final String HTML_EDITOR = "editor"; public static final String HTML_EDITOR = "editor";
/** 字符串类型 */ /**
* 字符串类型
*/
public static final String TYPE_STRING = "String"; public static final String TYPE_STRING = "String";
/** 整型 */ /**
* 整型
*/
public static final String TYPE_INTEGER = "Integer"; public static final String TYPE_INTEGER = "Integer";
/** 长整型 */ /**
* 长整型
*/
public static final String TYPE_LONG = "Long"; public static final String TYPE_LONG = "Long";
/** 浮点型 */ /**
* 浮点型
*/
public static final String TYPE_DOUBLE = "Double"; public static final String TYPE_DOUBLE = "Double";
/** 高精度计算类型 */ /**
* 高精度计算类型
*/
public static final String TYPE_BIGDECIMAL = "BigDecimal"; public static final String TYPE_BIGDECIMAL = "BigDecimal";
/** 时间类型 */ /**
* 时间类型
*/
public static final String TYPE_DATE = "Date"; public static final String TYPE_DATE = "Date";
/** 模糊查询 */ /**
* 模糊查询
*/
public static final String QUERY_LIKE = "LIKE"; public static final String QUERY_LIKE = "LIKE";
/** 需要 */ /**
* 需要
*/
public static final String REQUIRE = "1"; public static final String REQUIRE = "1";
} }

1
ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
View File

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

72
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
View File

@ -5,62 +5,96 @@ package com.ruoyi.common.constant;
* *
* @author ruoyi * @author ruoyi
*/ */
public class UserConstants public class UserConstants {
{
/** /**
* 平台内系统用户的唯一标志 * 平台内系统用户的唯一标志
*/ */
public static final String SYS_USER = "SYS_USER"; public static final String SYS_USER = "SYS_USER";
/** 正常状态 */ /**
* 正常状态
*/
public static final String NORMAL = "0"; public static final String NORMAL = "0";
/** 异常状态 */ /**
* 异常状态
*/
public static final String EXCEPTION = "1"; public static final String EXCEPTION = "1";
/** 用户封禁状态 */ /**
* 用户封禁状态
*/
public static final String USER_DISABLE = "1"; public static final String USER_DISABLE = "1";
/** 角色封禁状态 */ /**
* 角色封禁状态
*/
public static final String ROLE_DISABLE = "1"; public static final String ROLE_DISABLE = "1";
/** 部门正常状态 */ /**
* 部门正常状态
*/
public static final String DEPT_NORMAL = "0"; public static final String DEPT_NORMAL = "0";
/** 部门停用状态 */ /**
* 部门停用状态
*/
public static final String DEPT_DISABLE = "1"; public static final String DEPT_DISABLE = "1";
/** 字典正常状态 */ /**
* 字典正常状态
*/
public static final String DICT_NORMAL = "0"; public static final String DICT_NORMAL = "0";
/** 是否为系统默认（是） */ /**
* 是否为系统默认（是）
*/
public static final String YES = "Y"; public static final String YES = "Y";
/** 是否菜单外链（是） */ /**
* 是否菜单外链（是）
*/
public static final String YES_FRAME = "0"; public static final String YES_FRAME = "0";
/** 是否菜单外链（否） */ /**
* 是否菜单外链（否）
*/
public static final String NO_FRAME = "1"; public static final String NO_FRAME = "1";
/** 菜单类型（目录） */ /**
* 菜单类型（目录）
*/
public static final String TYPE_DIR = "M"; public static final String TYPE_DIR = "M";
/** 菜单类型（菜单） */ /**
* 菜单类型（菜单）
*/
public static final String TYPE_MENU = "C"; public static final String TYPE_MENU = "C";
/** 菜单类型（按钮） */ /**
* 菜单类型（按钮）
*/
public static final String TYPE_BUTTON = "F"; public static final String TYPE_BUTTON = "F";
/** Layout组件标识 */ /**
* Layout组件标识
*/
public final static String LAYOUT = "Layout"; public final static String LAYOUT = "Layout";
/** ParentView组件标识 */ /**
* ParentView组件标识
*/
public final static String PARENT_VIEW = "ParentView"; public final static String PARENT_VIEW = "ParentView";
/** InnerLink组件标识 */ /**
* InnerLink组件标识
*/
public final static String INNER_LINK = "InnerLink"; public final static String INNER_LINK = "InnerLink";
/** 校验返回结果码 */ /**
* 校验返回结果码
*/
public final static String UNIQUE = "0"; public final static String UNIQUE = "0";
public final static String NOT_UNIQUE = "1"; public final static String NOT_UNIQUE = "1";

36
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
View File

@ -4,47 +4,39 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* web层通用数据处理 * web层通用数据处理
* *
* @author ruoyi * @author ruoyi
*/ */
public class BaseController public class BaseController {
{
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
/** /**
* 返回成功 * 返回成功
*/ */
public AjaxResult<Void> success() public AjaxResult<Void> success() {
{
return AjaxResult.success(); return AjaxResult.success();
} }
/** /**
* 返回失败消息 * 返回失败消息
*/ */
public AjaxResult<Void> error() public AjaxResult<Void> error() {
{
return AjaxResult.error(); return AjaxResult.error();
} }
/** /**
* 返回成功消息 * 返回成功消息
*/ */
public AjaxResult<Void> success(String message) public AjaxResult<Void> success(String message) {
{
return AjaxResult.success(message); return AjaxResult.success(message);
} }
/** /**
* 返回失败消息 * 返回失败消息
*/ */
public AjaxResult<Void> error(String message) public AjaxResult<Void> error(String message) {
{
return AjaxResult.error(message); return AjaxResult.error(message);
} }
@ -54,8 +46,7 @@ public class BaseController
* @param rows 影响行数 * @param rows 影响行数
* @return 操作结果 * @return 操作结果
*/ */
protected AjaxResult<Void> toAjax(int rows) protected AjaxResult<Void> toAjax(int rows) {
{
return rows > 0 ? AjaxResult.success() : AjaxResult.error(); return rows > 0 ? AjaxResult.success() : AjaxResult.error();
} }
@ -65,24 +56,21 @@ public class BaseController
* @param result 结果 * @param result 结果
* @return 操作结果 * @return 操作结果
*/ */
protected AjaxResult<Void> toAjax(boolean result) protected AjaxResult<Void> toAjax(boolean result) {
{
return result ? success() : error(); return result ? success() : error();
} }
/** /**
* 页面跳转 * 页面跳转
*/ */
public String redirect(String url) public String redirect(String url) {
{
return StringUtils.format("redirect:{}", url); return StringUtils.format("redirect:{}", url);
} }
/** /**
* 获取用户缓存信息 * 获取用户缓存信息
*/ */
public SysUser getUser() public SysUser getUser() {
{
return SecurityUtils.getUser(); return SecurityUtils.getUser();
} }
@ -96,16 +84,14 @@ public class BaseController
/** /**
* 获取登录部门id * 获取登录部门id
*/ */
public Long getDeptId() public Long getDeptId() {
{
return SecurityUtils.getDeptId(); return SecurityUtils.getDeptId();
} }
/** /**
* 获取登录用户名 * 获取登录用户名
*/ */
public String getUsername() public String getUsername() {
{
return SecurityUtils.getUsername(); return SecurityUtils.getUsername();
} }
} }

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

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

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

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

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

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

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

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

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

@ -1,48 +1,44 @@
package com.ruoyi.common.core.domain.entity; 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.Data;
import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.Email; import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import java.io.Serializable;
import java.util.*;
/** /**
* 部门表 sys_dept * 部门表 sys_dept
* *
* @author ruoyi * @author Lion Li
*/ */
@Data @Data
@NoArgsConstructor @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("sys_dept") @TableName("sys_dept")
public class SysDept implements Serializable { @ApiModel("部门业务对象")
public class SysDept extends TreeEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 部门ID * 部门ID
*/ */
@TableId(value = "dept_id", type = IdType.AUTO) @ApiModelProperty(value = "部门id")
@TableId(value = "dept_id")
private Long deptId; private Long deptId;
/**
* 父部门ID
*/
private Long parentId;
/**
* 祖级列表
*/
private String ancestors;
/** /**
* 部门名称 * 部门名称
*/ */
@ApiModelProperty(value = "部门名称")
@NotBlank(message = "部门名称不能为空") @NotBlank(message = "部门名称不能为空")
@Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符") @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
private String deptName; private String deptName;
@ -50,23 +46,27 @@ public class SysDept implements Serializable {
/** /**
* 显示顺序 * 显示顺序
*/ */
@ApiModelProperty(value = "显示顺序")
@NotBlank(message = "显示顺序不能为空") @NotBlank(message = "显示顺序不能为空")
private String orderNum; private String orderNum;
/** /**
* 负责人 * 负责人
*/ */
@ApiModelProperty(value = "负责人")
private String leader; private String leader;
/** /**
* 联系电话 * 联系电话
*/ */
@ApiModelProperty(value = "联系电话")
@Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符") @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
private String phone; private String phone;
/** /**
* 邮箱 * 邮箱
*/ */
@ApiModelProperty(value = "邮箱")
@Email(message = "邮箱格式不正确") @Email(message = "邮箱格式不正确")
@Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
private String email; private String email;
@ -74,54 +74,20 @@ public class SysDept implements Serializable {
/** /**
* 部门状态:0正常,1停用 * 部门状态:0正常,1停用
*/ */
@ApiModelProperty(value = "部门状态:0正常,1停用")
private String status; private String status;
/** /**
* 删除标志（0代表存在 2代表删除） * 删除标志（0代表存在 2代表删除）
*/ */
@ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
@TableLogic @TableLogic
private String delFlag; 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<>();
} }

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -1,11 +1,13 @@
package com.ruoyi.common.core.domain.model; 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 {
} }

1
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/cache/MybatisPlusRedisCache.java vendored
View File

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

4
ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java
View File

@ -4,10 +4,8 @@ package com.ruoyi.common.enums;
* 操作状态 * 操作状态
* *
* @author ruoyi * @author ruoyi
*
*/ */
public enum BusinessStatus public enum BusinessStatus {
{
/** /**
* 成功 * 成功
*/ */

3
ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java
View File

@ -5,8 +5,7 @@ package com.ruoyi.common.enums;
* *
* @author ruoyi * @author ruoyi
*/ */
public enum BusinessType public enum BusinessType {
{
/** /**
* 其它 * 其它
*/ */

18
ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java
View File

@ -1,36 +1,32 @@
package com.ruoyi.common.enums; package com.ruoyi.common.enums;
import org.springframework.lang.Nullable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.springframework.lang.Nullable;
/** /**
* 请求方式 * 请求方式
* *
* @author ruoyi * @author ruoyi
*/ */
public enum HttpMethod public enum HttpMethod {
{
GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE; GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE;
private static final Map<String, HttpMethod> mappings = new HashMap<>(16); private static final Map<String, HttpMethod> mappings = new HashMap<>(16);
static static {
{ for (HttpMethod httpMethod : values()) {
for (HttpMethod httpMethod : values())
{
mappings.put(httpMethod.name(), httpMethod); mappings.put(httpMethod.name(), httpMethod);
} }
} }
@Nullable @Nullable
public static HttpMethod resolve(@Nullable String method) public static HttpMethod resolve(@Nullable String method) {
{
return (method != null ? mappings.get(method) : null); return (method != null ? mappings.get(method) : null);
} }
public boolean matches(String method) public boolean matches(String method) {
{
return (this == resolve(method)); return (this == resolve(method));
} }
} }

3
ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java
View File

@ -6,8 +6,7 @@ package com.ruoyi.common.enums;
* @author ruoyi * @author ruoyi
*/ */
public enum LimitType public enum LimitType {
{
/** /**
* 默认策略全局限流 * 默认策略全局限流
*/ */

3
ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java
View File

@ -5,8 +5,7 @@ package com.ruoyi.common.enums;
* *
* @author ruoyi * @author ruoyi
*/ */
public enum OperatorType public enum OperatorType {
{
/** /**
* 其它 * 其它
*/ */

12
ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java
View File

@ -5,26 +5,22 @@ package com.ruoyi.common.enums;
* *
* @author ruoyi * @author ruoyi
*/ */
public enum UserStatus public enum UserStatus {
{
OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除"); OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除");
private final String code; private final String code;
private final String info; private final String info;
UserStatus(String code, String info) UserStatus(String code, String info) {
{
this.code = code; this.code = code;
this.info = info; this.info = info;
} }
public String getCode() public String getCode() {
{
return code; return code;
} }
public String getInfo() public String getInfo() {
{
return info; return info;
} }
} }

6
ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java
View File

@ -5,11 +5,9 @@ package com.ruoyi.common.exception;
* *
* @author ruoyi * @author ruoyi
*/ */
public class DemoModeException extends RuntimeException public class DemoModeException extends RuntimeException {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public DemoModeException() public DemoModeException() {
{
} }
} }

24
ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java
View File

@ -5,8 +5,7 @@ package com.ruoyi.common.exception;
* *
* @author ruoyi * @author ruoyi
*/ */
public class GlobalException extends RuntimeException public class GlobalException extends RuntimeException {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -17,7 +16,7 @@ public class GlobalException extends RuntimeException
/** /**
* 错误明细，内部调试错误 * 错误明细，内部调试错误
* * <p>
* 和 {@link CommonResult#getDetailMessage()} 一致的设计 * 和 {@link CommonResult#getDetailMessage()} 一致的设计
*/ */
private String detailMessage; private String detailMessage;
@ -25,33 +24,28 @@ public class GlobalException extends RuntimeException
/** /**
* 空构造方法，避免反序列化问题 * 空构造方法，避免反序列化问题
*/ */
public GlobalException() public GlobalException() {
{
} }
public GlobalException(String message) public GlobalException(String message) {
{
this.message = message; this.message = message;
} }
public String getDetailMessage() public String getDetailMessage() {
{
return detailMessage; return detailMessage;
} }
public GlobalException setDetailMessage(String detailMessage) public GlobalException setDetailMessage(String detailMessage) {
{
this.detailMessage = detailMessage; this.detailMessage = detailMessage;
return this; return this;
} }
public String getMessage() @Override
{ public String getMessage() {
return message; return message;
} }
public GlobalException setMessage(String message) public GlobalException setMessage(String message) {
{
this.message = message; this.message = message;
return this; return this;
} }

30
ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java
View File

@ -5,8 +5,7 @@ package com.ruoyi.common.exception;
* *
* @author ruoyi * @author ruoyi
*/ */
public final class ServiceException extends RuntimeException public final class ServiceException extends RuntimeException {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
@ -21,7 +20,7 @@ public final class ServiceException extends RuntimeException
/** /**
* 错误明细，内部调试错误 * 错误明细，内部调试错误
* * <p>
* 和 {@link CommonResult#getDetailMessage()} 一致的设计 * 和 {@link CommonResult#getDetailMessage()} 一致的设计
*/ */
private String detailMessage; private String detailMessage;
@ -29,44 +28,37 @@ public final class ServiceException extends RuntimeException
/** /**
* 空构造方法，避免反序列化问题 * 空构造方法，避免反序列化问题
*/ */
public ServiceException() public ServiceException() {
{
} }
public ServiceException(String message) public ServiceException(String message) {
{
this.message = message; this.message = message;
} }
public ServiceException(String message, Integer code) public ServiceException(String message, Integer code) {
{
this.message = message; this.message = message;
this.code = code; this.code = code;
} }
public String getDetailMessage() public String getDetailMessage() {
{
return detailMessage; return detailMessage;
} }
public String getMessage() @Override
{ public String getMessage() {
return message; return message;
} }
public Integer getCode() public Integer getCode() {
{
return code; return code;
} }
public ServiceException setMessage(String message) public ServiceException setMessage(String message) {
{
this.message = message; this.message = message;
return this; return this;
} }
public ServiceException setDetailMessage(String detailMessage) public ServiceException setDetailMessage(String detailMessage) {
{
this.detailMessage = detailMessage; this.detailMessage = detailMessage;
return this; return this;
} }

12
ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java
View File

@ -5,22 +5,18 @@ package com.ruoyi.common.exception;
* *
* @author ruoyi * @author ruoyi
*/ */
public class UtilException extends RuntimeException public class UtilException extends RuntimeException {
{
private static final long serialVersionUID = 8247610319171014183L; private static final long serialVersionUID = 8247610319171014183L;
public UtilException(Throwable e) public UtilException(Throwable e) {
{
super(e.getMessage(), e); super(e.getMessage(), e);
} }
public UtilException(String message) public UtilException(String message) {
{
super(message); super(message);
} }
public UtilException(String message, Throwable throwable) public UtilException(String message, Throwable throwable) {
{
super(message, throwable); super(message, throwable);
} }
} }

50
ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
View File

@ -2,14 +2,17 @@ package com.ruoyi.common.exception.base;
import com.ruoyi.common.utils.MessageUtils; import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import lombok.*;
/** /**
* 基础异常 * 基础异常
* *
* @author ruoyi * @author ruoyi
*/ */
public class BaseException extends RuntimeException @Data
{ @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
public class BaseException extends RuntimeException {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
@ -32,66 +35,39 @@ public class BaseException extends RuntimeException
*/ */
private String defaultMessage; private String defaultMessage;
public BaseException(String module, String code, Object[] args, String defaultMessage) public BaseException(String module, String code, Object[] args, String defaultMessage) {
{
this.module = module; this.module = module;
this.code = code; this.code = code;
this.args = args; this.args = args;
this.defaultMessage = defaultMessage; this.defaultMessage = defaultMessage;
} }
public BaseException(String module, String code, Object[] args) public BaseException(String module, String code, Object[] args) {
{
this(module, code, args, null); this(module, code, args, null);
} }
public BaseException(String module, String defaultMessage) public BaseException(String module, String defaultMessage) {
{
this(module, null, null, defaultMessage); this(module, null, null, defaultMessage);
} }
public BaseException(String code, Object[] args) public BaseException(String code, Object[] args) {
{
this(null, code, args, null); this(null, code, args, null);
} }
public BaseException(String defaultMessage) public BaseException(String defaultMessage) {
{
this(null, null, null, defaultMessage); this(null, null, null, defaultMessage);
} }
@Override @Override
public String getMessage() public String getMessage() {
{
String message = null; String message = null;
if (!StringUtils.isEmpty(code)) if (!StringUtils.isEmpty(code)) {
{
message = MessageUtils.message(code, args); message = MessageUtils.message(code, args);
} }
if (message == null) if (message == null) {
{
message = defaultMessage; message = defaultMessage;
} }
return message; return message;
} }
public String getModule()
{
return module;
}
public String getCode()
{
return code;
}
public Object[] getArgs()
{
return args;
}
public String getDefaultMessage()
{
return defaultMessage;
}
} }

6
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java
View File

@ -7,12 +7,10 @@ import com.ruoyi.common.exception.base.BaseException;
* *
* @author ruoyi * @author ruoyi
*/ */
public class FileException extends BaseException public class FileException extends BaseException {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public FileException(String code, Object[] args) public FileException(String code, Object[] args) {
{
super("file", code, args, null); super("file", code, args, null);
} }

8
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java
View File

@ -5,12 +5,10 @@ package com.ruoyi.common.exception.file;
* *
* @author ruoyi * @author ruoyi
*/ */
public class FileNameLengthLimitExceededException extends FileException public class FileNameLengthLimitExceededException extends FileException {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public FileNameLengthLimitExceededException(int defaultFileNameLength) public FileNameLengthLimitExceededException(int defaultFileNameLength) {
{ super("upload.filename.exceed.length", new Object[]{defaultFileNameLength});
super("upload.filename.exceed.length", new Object[] { defaultFileNameLength });
} }
} }

8
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java
View File

@ -5,12 +5,10 @@ package com.ruoyi.common.exception.file;
* *
* @author ruoyi * @author ruoyi
*/ */
public class FileSizeLimitExceededException extends FileException public class FileSizeLimitExceededException extends FileException {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public FileSizeLimitExceededException(long defaultMaxSize) public FileSizeLimitExceededException(long defaultMaxSize) {
{ super("upload.exceed.maxSize", new Object[]{defaultMaxSize});
super("upload.exceed.maxSize", new Object[] { defaultMaxSize });
} }
} }

52
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
View File

@ -1,80 +1,60 @@
package com.ruoyi.common.exception.file; package com.ruoyi.common.exception.file;
import java.util.Arrays; import lombok.*;
import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.fileupload.FileUploadException;
import java.util.Arrays;
/** /**
* 文件上传 误异常类 * 文件上传 误异常类
* *
* @author ruoyi * @author ruoyi
*/ */
public class InvalidExtensionException extends FileUploadException @Data
{ @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
public class InvalidExtensionException extends FileUploadException {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private String[] allowedExtension; private String[] allowedExtension;
private String extension; private String extension;
private String filename; private String filename;
public InvalidExtensionException(String[] allowedExtension, String extension, String filename) public InvalidExtensionException(String[] allowedExtension, String extension, String filename) {
{
super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]"); super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");
this.allowedExtension = allowedExtension; this.allowedExtension = allowedExtension;
this.extension = extension; this.extension = extension;
this.filename = filename; this.filename = filename;
} }
public String[] getAllowedExtension() public static class InvalidImageExtensionException extends InvalidExtensionException {
{
return allowedExtension;
}
public String getExtension()
{
return extension;
}
public String getFilename()
{
return filename;
}
public static class InvalidImageExtensionException extends InvalidExtensionException
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename) public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename) {
{
super(allowedExtension, extension, filename); super(allowedExtension, extension, filename);
} }
} }
public static class InvalidFlashExtensionException extends InvalidExtensionException public static class InvalidFlashExtensionException extends InvalidExtensionException {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename) public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename) {
{
super(allowedExtension, extension, filename); super(allowedExtension, extension, filename);
} }
} }
public static class InvalidMediaExtensionException extends InvalidExtensionException public static class InvalidMediaExtensionException extends InvalidExtensionException {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename) public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename) {
{
super(allowedExtension, extension, filename); super(allowedExtension, extension, filename);
} }
} }
public static class InvalidVideoExtensionException extends InvalidExtensionException public static class InvalidVideoExtensionException extends InvalidExtensionException {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename) public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename) {
{
super(allowedExtension, extension, filename); super(allowedExtension, extension, filename);
} }
} }

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

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

6
ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java
View File

@ -5,12 +5,10 @@ package com.ruoyi.common.exception.user;
* *
* @author ruoyi * @author ruoyi
*/ */
public class CaptchaException extends UserException public class CaptchaException extends UserException {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public CaptchaException() public CaptchaException() {
{
super("user.jcaptcha.error", null); super("user.jcaptcha.error", null);
} }
} }

6
ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java
View File

@ -5,12 +5,10 @@ package com.ruoyi.common.exception.user;
* *
* @author ruoyi * @author ruoyi
*/ */
public class CaptchaExpireException extends UserException public class CaptchaExpireException extends UserException {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public CaptchaExpireException() public CaptchaExpireException() {
{
super("user.jcaptcha.expire", null); super("user.jcaptcha.expire", null);
} }
} }

6
ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java
View File

@ -7,12 +7,10 @@ import com.ruoyi.common.exception.base.BaseException;
* *
* @author ruoyi * @author ruoyi
*/ */
public class UserException extends BaseException public class UserException extends BaseException {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public UserException(String code, Object[] args) public UserException(String code, Object[] args) {
{
super("user", code, args, null); super("user", code, args, null);
} }
} }

6
ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java
View File

@ -5,12 +5,10 @@ package com.ruoyi.common.exception.user;
* *
* @author ruoyi * @author ruoyi
*/ */
public class UserPasswordNotMatchException extends UserException public class UserPasswordNotMatchException extends UserException {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public UserPasswordNotMatchException() public UserPasswordNotMatchException() {
{
super("user.password.not.match", null); super("user.password.not.match", null);
} }
} }

22
ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java
View File

@ -12,37 +12,29 @@ import java.io.IOException;
* *
* @author ruoyi * @author ruoyi
*/ */
public class RepeatableFilter implements Filter public class RepeatableFilter implements Filter {
{
@Override @Override
public void init(FilterConfig filterConfig) throws ServletException public void init(FilterConfig filterConfig) throws ServletException {
{
} }
@Override @Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException throws IOException, ServletException {
{
ServletRequest requestWrapper = null; ServletRequest requestWrapper = null;
if (request instanceof HttpServletRequest if (request instanceof HttpServletRequest
&& StringUtils.startsWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE)) && StringUtils.startsWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE)) {
{
requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response); requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response);
} }
if (null == requestWrapper) if (null == requestWrapper) {
{
chain.doFilter(request, response); chain.doFilter(request, response);
} } else {
else
{
chain.doFilter(requestWrapper, response); chain.doFilter(requestWrapper, response);
} }
} }
@Override @Override
public void destroy() public void destroy() {
{
} }
} }

30
ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java
View File

@ -18,12 +18,10 @@ import java.nio.charset.StandardCharsets;
* *
* @author ruoyi * @author ruoyi
*/ */
public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper {
{
private final byte[] body; private final byte[] body;
public RepeatedlyRequestWrapper(HttpServletRequest request, ServletResponse response) throws IOException public RepeatedlyRequestWrapper(HttpServletRequest request, ServletResponse response) throws IOException {
{
super(request); super(request);
request.setCharacterEncoding("UTF-8"); request.setCharacterEncoding("UTF-8");
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
@ -32,44 +30,36 @@ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper
} }
@Override @Override
public BufferedReader getReader() throws IOException public BufferedReader getReader() throws IOException {
{
return new BufferedReader(new InputStreamReader(getInputStream())); return new BufferedReader(new InputStreamReader(getInputStream()));
} }
@Override @Override
public ServletInputStream getInputStream() throws IOException public ServletInputStream getInputStream() throws IOException {
{
final ByteArrayInputStream bais = new ByteArrayInputStream(body); final ByteArrayInputStream bais = new ByteArrayInputStream(body);
return new ServletInputStream() return new ServletInputStream() {
{
@Override @Override
public int read() throws IOException public int read() throws IOException {
{
return bais.read(); return bais.read();
} }
@Override @Override
public int available() throws IOException public int available() throws IOException {
{
return body.length; return body.length;
} }
@Override @Override
public boolean isFinished() public boolean isFinished() {
{
return false; return false;
} }
@Override @Override
public boolean isReady() public boolean isReady() {
{
return false; return false;
} }
@Override @Override
public void setReadListener(ReadListener readListener) public void setReadListener(ReadListener readListener) {
{
} }
}; };

27
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
View File

@ -14,22 +14,18 @@ import java.util.List;
* *
* @author ruoyi * @author ruoyi
*/ */
public class XssFilter implements Filter public class XssFilter implements Filter {
{
/** /**
* 排除链接 * 排除链接
*/ */
public List<String> excludes = new ArrayList<>(); public List<String> excludes = new ArrayList<>();
@Override @Override
public void init(FilterConfig filterConfig) throws ServletException public void init(FilterConfig filterConfig) throws ServletException {
{
String tempExcludes = filterConfig.getInitParameter("excludes"); String tempExcludes = filterConfig.getInitParameter("excludes");
if (StringUtils.isNotEmpty(tempExcludes)) if (StringUtils.isNotEmpty(tempExcludes)) {
{
String[] url = tempExcludes.split(","); String[] url = tempExcludes.split(",");
for (int i = 0; url != null && i < url.length; i++) for (int i = 0; url != null && i < url.length; i++) {
{
excludes.add(url[i]); excludes.add(url[i]);
} }
} }
@ -37,12 +33,10 @@ public class XssFilter implements Filter
@Override @Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException throws IOException, ServletException {
{
HttpServletRequest req = (HttpServletRequest) request; HttpServletRequest req = (HttpServletRequest) request;
HttpServletResponse resp = (HttpServletResponse) response; HttpServletResponse resp = (HttpServletResponse) response;
if (handleExcludeURL(req, resp)) if (handleExcludeURL(req, resp)) {
{
chain.doFilter(request, response); chain.doFilter(request, response);
return; return;
} }
@ -50,21 +44,18 @@ public class XssFilter implements Filter
chain.doFilter(xssRequest, response); chain.doFilter(xssRequest, response);
} }
private boolean handleExcludeURL(HttpServletRequest request, HttpServletResponse response) private boolean handleExcludeURL(HttpServletRequest request, HttpServletResponse response) {
{
String url = request.getServletPath(); String url = request.getServletPath();
String method = request.getMethod(); String method = request.getMethod();
// GET DELETE 不过滤 // GET DELETE 不过滤
if (method == null || method.matches("GET") || method.matches("DELETE")) if (method == null || method.matches("GET") || method.matches("DELETE")) {
{
return true; return true;
} }
return StringUtils.matches(url, excludes); return StringUtils.matches(url, excludes);
} }
@Override @Override
public void destroy() public void destroy() {
{
} }
} }

45
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
View File

@ -19,26 +19,21 @@ import java.nio.charset.StandardCharsets;
* *
* @author ruoyi * @author ruoyi
*/ */
public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
{
/** /**
* @param request * @param request
*/ */
public XssHttpServletRequestWrapper(HttpServletRequest request) public XssHttpServletRequestWrapper(HttpServletRequest request) {
{
super(request); super(request);
} }
@Override @Override
public String[] getParameterValues(String name) public String[] getParameterValues(String name) {
{
String[] values = super.getParameterValues(name); String[] values = super.getParameterValues(name);
if (values != null) if (values != null) {
{
int length = values.length; int length = values.length;
String[] escapseValues = new String[length]; String[] escapseValues = new String[length];
for (int i = 0; i < length; i++) for (int i = 0; i < length; i++) {
{
// 防xss攻击和过滤前后空格 // 防xss攻击和过滤前后空格
escapseValues[i] = HtmlUtil.cleanHtmlTag(values[i]).trim(); escapseValues[i] = HtmlUtil.cleanHtmlTag(values[i]).trim();
} }
@ -48,18 +43,15 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
} }
@Override @Override
public ServletInputStream getInputStream() throws IOException public ServletInputStream getInputStream() throws IOException {
{
// 非json类型，直接返回 // 非json类型，直接返回
if (!isJsonRequest()) if (!isJsonRequest()) {
{
return super.getInputStream(); return super.getInputStream();
} }
// 为空，直接返回 // 为空，直接返回
String json = IoUtil.read(super.getInputStream(), StandardCharsets.UTF_8); String json = IoUtil.read(super.getInputStream(), StandardCharsets.UTF_8);
if (StringUtils.isEmpty(json)) if (StringUtils.isEmpty(json)) {
{
return super.getInputStream(); return super.getInputStream();
} }
@ -67,34 +59,28 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
json = HtmlUtil.cleanHtmlTag(json).trim(); json = HtmlUtil.cleanHtmlTag(json).trim();
byte[] jsonBytes = json.getBytes(StandardCharsets.UTF_8); byte[] jsonBytes = json.getBytes(StandardCharsets.UTF_8);
final ByteArrayInputStream bis = IoUtil.toStream(jsonBytes); final ByteArrayInputStream bis = IoUtil.toStream(jsonBytes);
return new ServletInputStream() return new ServletInputStream() {
{
@Override @Override
public boolean isFinished() public boolean isFinished() {
{
return true; return true;
} }
@Override @Override
public boolean isReady() public boolean isReady() {
{
return true; return true;
} }
@Override @Override
public int available() throws IOException public int available() throws IOException {
{
return jsonBytes.length; return jsonBytes.length;
} }
@Override @Override
public void setReadListener(ReadListener readListener) public void setReadListener(ReadListener readListener) {
{
} }
@Override @Override
public int read() throws IOException public int read() throws IOException {
{
return bis.read(); return bis.read();
} }
}; };
@ -105,8 +91,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
* *
* @param request * @param request
*/ */
public boolean isJsonRequest() public boolean isJsonRequest() {
{
String header = super.getHeader(HttpHeaders.CONTENT_TYPE); String header = super.getHeader(HttpHeaders.CONTENT_TYPE);
return StringUtils.startsWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE); return StringUtils.startsWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE);
} }

63
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
View File

@ -1,18 +1,19 @@
package com.ruoyi.common.utils; package com.ruoyi.common.utils;
import org.apache.commons.lang3.time.DateFormatUtils;
import java.lang.management.ManagementFactory; import java.lang.management.ManagementFactory;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import org.apache.commons.lang3.time.DateFormatUtils;
/** /**
* 时间工具类 * 时间工具类
* *
* @author ruoyi * @author ruoyi
*/ */
public class DateUtils extends org.apache.commons.lang3.time.DateUtils public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
{
public static String YYYY = "yyyy"; public static String YYYY = "yyyy";
public static String YYYY_MM = "yyyy-MM"; public static String YYYY_MM = "yyyy-MM";
@ -33,8 +34,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
* *
* @return Date() 当前日期 * @return Date() 当前日期
*/ */
public static Date getNowDate() public static Date getNowDate() {
{
return new Date(); return new Date();
} }
@ -43,44 +43,34 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
* *
* @return String * @return String
*/ */
public static String getDate() public static String getDate() {
{
return dateTimeNow(YYYY_MM_DD); return dateTimeNow(YYYY_MM_DD);
} }
public static final String getTime() public static final String getTime() {
{
return dateTimeNow(YYYY_MM_DD_HH_MM_SS); return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
} }
public static final String dateTimeNow() public static final String dateTimeNow() {
{
return dateTimeNow(YYYYMMDDHHMMSS); return dateTimeNow(YYYYMMDDHHMMSS);
} }
public static final String dateTimeNow(final String format) public static final String dateTimeNow(final String format) {
{
return parseDateToStr(format, new Date()); return parseDateToStr(format, new Date());
} }
public static final String dateTime(final Date date) public static final String dateTime(final Date date) {
{
return parseDateToStr(YYYY_MM_DD, date); return parseDateToStr(YYYY_MM_DD, date);
} }
public static final String parseDateToStr(final String format, final Date date) public static final String parseDateToStr(final String format, final Date date) {
{
return new SimpleDateFormat(format).format(date); return new SimpleDateFormat(format).format(date);
} }
public static final Date dateTime(final String format, final String ts) public static final Date dateTime(final String format, final String ts) {
{ try {
try
{
return new SimpleDateFormat(format).parse(ts); return new SimpleDateFormat(format).parse(ts);
} } catch (ParseException e) {
catch (ParseException e)
{
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
@ -88,8 +78,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
/** /**
* 日期路径 即年/月/日 如2018/08/08 * 日期路径 即年/月/日 如2018/08/08
*/ */
public static final String datePath() public static final String datePath() {
{
Date now = new Date(); Date now = new Date();
return DateFormatUtils.format(now, "yyyy/MM/dd"); return DateFormatUtils.format(now, "yyyy/MM/dd");
} }
@ -97,8 +86,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
/** /**
* 日期路径 即年/月/日 如20180808 * 日期路径 即年/月/日 如20180808
*/ */
public static final String dateTime() public static final String dateTime() {
{
Date now = new Date(); Date now = new Date();
return DateFormatUtils.format(now, "yyyyMMdd"); return DateFormatUtils.format(now, "yyyyMMdd");
} }
@ -106,18 +94,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
/** /**
* 日期型字符串转化为日期 格式 * 日期型字符串转化为日期 格式
*/ */
public static Date parseDate(Object str) public static Date parseDate(Object str) {
{ if (str == null) {
if (str == null)
{
return null; return null;
} }
try try {
{
return parseDate(str.toString(), parsePatterns); return parseDate(str.toString(), parsePatterns);
} } catch (ParseException e) {
catch (ParseException e)
{
return null; return null;
} }
} }
@ -125,8 +108,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
/** /**
* 获取服务器启动时间 * 获取服务器启动时间
*/ */
public static Date getServerStartDate() public static Date getServerStartDate() {
{
long time = ManagementFactory.getRuntimeMXBean().getStartTime(); long time = ManagementFactory.getRuntimeMXBean().getStartTime();
return new Date(time); return new Date(time);
} }
@ -134,8 +116,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
/** /**
* 计算两个时间差 * 计算两个时间差
*/ */
public static String getDatePoor(Date endDate, Date nowDate) public static String getDatePoor(Date endDate, Date nowDate) {
{
long nd = 1000 * 24 * 60 * 60; long nd = 1000 * 24 * 60 * 60;
long nh = 1000 * 60 * 60; long nh = 1000 * 60 * 60;
long nm = 1000 * 60; long nm = 1000 * 60;

80
ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
View File

@ -12,8 +12,8 @@ import java.util.List;
* *
* @author ruoyi * @author ruoyi
*/ */
public class DictUtils public class DictUtils {
{
/** /**
* 分隔符 * 分隔符
*/ */
@ -25,8 +25,7 @@ public class DictUtils
* @param key 参数键 * @param key 参数键
* @param dictDatas 字典数据列表 * @param dictDatas 字典数据列表
*/ */
public static void setDictCache(String key, List<SysDictData> dictDatas) public static void setDictCache(String key, List<SysDictData> dictDatas) {
{
RedisUtils.setCacheObject(getCacheKey(key), dictDatas); RedisUtils.setCacheObject(getCacheKey(key), dictDatas);
} }
@ -36,12 +35,10 @@ public class DictUtils
* @param key 参数键 * @param key 参数键
* @return dictDatas 字典数据列表 * @return dictDatas 字典数据列表
*/ */
public static List<SysDictData> getDictCache(String key) public static List<SysDictData> getDictCache(String key) {
{
Object cacheObj = RedisUtils.getCacheObject(getCacheKey(key)); Object cacheObj = RedisUtils.getCacheObject(getCacheKey(key));
if (StringUtils.isNotNull(cacheObj)) if (StringUtils.isNotNull(cacheObj)) {
{ List<SysDictData> dictDatas = (List<SysDictData>) cacheObj;
List<SysDictData> dictDatas = (List<SysDictData>)cacheObj;
return dictDatas; return dictDatas;
} }
return null; return null;
@ -54,8 +51,7 @@ public class DictUtils
* @param dictValue 字典值 * @param dictValue 字典值
* @return 字典标签 * @return 字典标签
*/ */
public static String getDictLabel(String dictType, String dictValue) public static String getDictLabel(String dictType, String dictValue) {
{
return getDictLabel(dictType, dictValue, SEPARATOR); return getDictLabel(dictType, dictValue, SEPARATOR);
} }
@ -66,8 +62,7 @@ public class DictUtils
* @param dictLabel 字典标签 * @param dictLabel 字典标签
* @return 字典值 * @return 字典值
*/ */
public static String getDictValue(String dictType, String dictLabel) public static String getDictValue(String dictType, String dictLabel) {
{
return getDictValue(dictType, dictLabel, SEPARATOR); return getDictValue(dictType, dictLabel, SEPARATOR);
} }
@ -79,31 +74,22 @@ public class DictUtils
* @param separator 分隔符 * @param separator 分隔符
* @return 字典标签 * @return 字典标签
*/ */
public static String getDictLabel(String dictType, String dictValue, String separator) public static String getDictLabel(String dictType, String dictValue, String separator) {
{
StringBuilder propertyString = new StringBuilder(); StringBuilder propertyString = new StringBuilder();
List<SysDictData> datas = getDictCache(dictType); List<SysDictData> datas = getDictCache(dictType);
if (StringUtils.containsAny(dictValue, separator) && CollUtil.isNotEmpty(datas)) if (StringUtils.containsAny(dictValue, separator) && CollUtil.isNotEmpty(datas)) {
{ for (SysDictData dict : datas) {
for (SysDictData dict : datas) for (String value : dictValue.split(separator)) {
{ if (value.equals(dict.getDictValue())) {
for (String value : dictValue.split(separator))
{
if (value.equals(dict.getDictValue()))
{
propertyString.append(dict.getDictLabel() + separator); propertyString.append(dict.getDictLabel() + separator);
break; break;
} }
} }
} }
} } else {
else for (SysDictData dict : datas) {
{ if (dictValue.equals(dict.getDictValue())) {
for (SysDictData dict : datas)
{
if (dictValue.equals(dict.getDictValue()))
{
return dict.getDictLabel(); return dict.getDictLabel();
} }
} }
@ -119,31 +105,22 @@ public class DictUtils
* @param separator 分隔符 * @param separator 分隔符
* @return 字典值 * @return 字典值
*/ */
public static String getDictValue(String dictType, String dictLabel, String separator) public static String getDictValue(String dictType, String dictLabel, String separator) {
{
StringBuilder propertyString = new StringBuilder(); StringBuilder propertyString = new StringBuilder();
List<SysDictData> datas = getDictCache(dictType); List<SysDictData> datas = getDictCache(dictType);
if (StringUtils.containsAny(dictLabel, separator) && CollUtil.isNotEmpty(datas)) if (StringUtils.containsAny(dictLabel, separator) && CollUtil.isNotEmpty(datas)) {
{ for (SysDictData dict : datas) {
for (SysDictData dict : datas) for (String label : dictLabel.split(separator)) {
{ if (label.equals(dict.getDictLabel())) {
for (String label : dictLabel.split(separator))
{
if (label.equals(dict.getDictLabel()))
{
propertyString.append(dict.getDictValue() + separator); propertyString.append(dict.getDictValue() + separator);
break; break;
} }
} }
} }
} } else {
else for (SysDictData dict : datas) {
{ if (dictLabel.equals(dict.getDictLabel())) {
for (SysDictData dict : datas)
{
if (dictLabel.equals(dict.getDictLabel()))
{
return dict.getDictValue(); return dict.getDictValue();
} }
} }
@ -156,16 +133,14 @@ public class DictUtils
* *
* @param key 字典键 * @param key 字典键
*/ */
public static void removeDictCache(String key) public static void removeDictCache(String key) {
{
RedisUtils.deleteObject(getCacheKey(key)); RedisUtils.deleteObject(getCacheKey(key));
} }
/** /**
* 清空字典缓存 * 清空字典缓存
*/ */
public static void clearDictCache() public static void clearDictCache() {
{
Collection<String> keys = RedisUtils.keys(Constants.SYS_DICT_KEY + "*"); Collection<String> keys = RedisUtils.keys(Constants.SYS_DICT_KEY + "*");
RedisUtils.deleteObject(keys); RedisUtils.deleteObject(keys);
} }
@ -176,8 +151,7 @@ public class DictUtils
* @param configKey 参数键 * @param configKey 参数键
* @return 缓存键key * @return 缓存键key
*/ */
public static String getCacheKey(String configKey) public static String getCacheKey(String configKey) {
{
return Constants.SYS_DICT_KEY + configKey; return Constants.SYS_DICT_KEY + configKey;
} }
} }

3
ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java
View File

@ -72,7 +72,8 @@ public class JsonUtils {
return null; return null;
} }
try { try {
return objectMapper.readValue(text, new TypeReference<Map<String, T>>() {}); return objectMapper.readValue(text, new TypeReference<Map<String, T>>() {
});
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }

8
ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java
View File

@ -1,16 +1,15 @@
package com.ruoyi.common.utils; package com.ruoyi.common.utils;
import com.ruoyi.common.utils.spring.SpringUtils;
import org.springframework.context.MessageSource; import org.springframework.context.MessageSource;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;
import com.ruoyi.common.utils.spring.SpringUtils;
/** /**
* 获取i18n资源文件 * 获取i18n资源文件
* *
* @author ruoyi * @author ruoyi
*/ */
public class MessageUtils public class MessageUtils {
{
/** /**
* 根据消息键和参数 获取消息 委托给spring messageSource * 根据消息键和参数 获取消息 委托给spring messageSource
* *
@ -18,8 +17,7 @@ public class MessageUtils
* @param args 参数 * @param args 参数
* @return 获取国际化翻译值 * @return 获取国际化翻译值
*/ */
public static String message(String code, Object... args) public static String message(String code, Object... args) {
{
MessageSource messageSource = SpringUtils.getBean(MessageSource.class); MessageSource messageSource = SpringUtils.getBean(MessageSource.class);
return messageSource.getMessage(code, args, LocaleContextHolder.getLocale()); return messageSource.getMessage(code, args, LocaleContextHolder.getLocale());
} }

2
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
View File

@ -48,6 +48,7 @@ public class PageUtils {
/** /**
* 构建 plus 分页对象 * 构建 plus 分页对象
*
* @param <T> domain 实体 * @param <T> domain 实体
* @param <K> vo 实体 * @param <K> vo 实体
* @return 分页对象 * @return 分页对象
@ -72,6 +73,7 @@ public class PageUtils {
/** /**
* 构建 MP 普通分页对象 * 构建 MP 普通分页对象
*
* @param <T> domain 实体 * @param <T> domain 实体
* @return 分页对象 * @return 分页对象
*/ */

1
ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
View File

@ -20,6 +20,7 @@ import java.nio.charset.StandardCharsets;
* @author ruoyi * @author ruoyi
*/ */
public class ServletUtils extends ServletUtil { public class ServletUtils extends ServletUtil {
/** /**
* 获取String参数 * 获取String参数
*/ */

2
ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
View File

@ -13,7 +13,7 @@ import java.util.*;
/** /**
* 字符串工具类 * 字符串工具类
* *
* @author ruoyi * @author Lion Li
*/ */
public class StringUtils extends org.apache.commons.lang3.StringUtils { public class StringUtils extends org.apache.commons.lang3.StringUtils {

68
ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java
View File

@ -1,33 +1,25 @@
package com.ruoyi.common.utils; package com.ruoyi.common.utils;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.concurrent.*;
/** /**
* 线程相关工具类. * 线程相关工具类.
* *
* @author ruoyi * @author ruoyi
*/ */
public class Threads public class Threads {
{
private static final Logger logger = LoggerFactory.getLogger(Threads.class); private static final Logger logger = LoggerFactory.getLogger(Threads.class);
/** /**
* sleep等待,单位为毫秒 * sleep等待,单位为毫秒
*/ */
public static void sleep(long milliseconds) public static void sleep(long milliseconds) {
{ try {
try
{
Thread.sleep(milliseconds); Thread.sleep(milliseconds);
} } catch (InterruptedException e) {
catch (InterruptedException e)
{
return; return;
} }
} }
@ -36,27 +28,20 @@ public class Threads
* 停止线程池 * 停止线程池
* 先使用shutdown, 停止接收新任务并尝试完成所有已存在任务. * 先使用shutdown, 停止接收新任务并尝试完成所有已存在任务.
* 如果超时, 则调用shutdownNow, 取消在workQueue中Pending的任务,并中断所有阻塞函数. * 如果超时, 则调用shutdownNow, 取消在workQueue中Pending的任务,并中断所有阻塞函数.
* 如果仍人超時，則強制退出. * 如果仍然超時，則強制退出.
* 另对在shutdown时线程本身被调用中断做了处理. * 另对在shutdown时线程本身被调用中断做了处理.
*/ */
public static void shutdownAndAwaitTermination(ExecutorService pool) public static void shutdownAndAwaitTermination(ExecutorService pool) {
{ if (pool != null && !pool.isShutdown()) {
if (pool != null && !pool.isShutdown())
{
pool.shutdown(); pool.shutdown();
try try {
{ if (!pool.awaitTermination(120, TimeUnit.SECONDS)) {
if (!pool.awaitTermination(120, TimeUnit.SECONDS))
{
pool.shutdownNow(); pool.shutdownNow();
if (!pool.awaitTermination(120, TimeUnit.SECONDS)) if (!pool.awaitTermination(120, TimeUnit.SECONDS)) {
{
logger.info("Pool did not terminate"); logger.info("Pool did not terminate");
} }
} }
} } catch (InterruptedException ie) {
catch (InterruptedException ie)
{
pool.shutdownNow(); pool.shutdownNow();
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} }
@ -66,33 +51,22 @@ public class Threads
/** /**
* 打印线程异常信息 * 打印线程异常信息
*/ */
public static void printException(Runnable r, Throwable t) public static void printException(Runnable r, Throwable t) {
{ if (t == null && r instanceof Future<?>) {
if (t == null && r instanceof Future<?>) try {
{
try
{
Future<?> future = (Future<?>) r; Future<?> future = (Future<?>) r;
if (future.isDone()) if (future.isDone()) {
{
future.get(); future.get();
} }
} } catch (CancellationException ce) {
catch (CancellationException ce)
{
t = ce; t = ce;
} } catch (ExecutionException ee) {
catch (ExecutionException ee)
{
t = ee.getCause(); t = ee.getCause();
} } catch (InterruptedException ie) {
catch (InterruptedException ie)
{
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} }
} }
if (t != null) if (t != null) {
{
logger.error(t.getMessage(), t); logger.error(t.getMessage(), t);
} }
} }

13
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
View File

@ -10,10 +10,9 @@ import java.nio.charset.StandardCharsets;
/** /**
* 文件处理工具类 * 文件处理工具类
* *
* @author ruoyi * @author Lion Li
*/ */
public class FileUtils extends FileUtil public class FileUtils extends FileUtil {
{
/** /**
* 下载文件名重新编码 * 下载文件名重新编码
@ -22,8 +21,7 @@ public class FileUtils extends FileUtil
* @param realFileName 真实文件名 * @param realFileName 真实文件名
* @return * @return
*/ */
public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException {
{
String percentEncodedFileName = percentEncode(realFileName); String percentEncodedFileName = percentEncode(realFileName);
StringBuilder contentDispositionValue = new StringBuilder(); StringBuilder contentDispositionValue = new StringBuilder();
@ -34,6 +32,8 @@ public class FileUtils extends FileUtil
.append("utf-8''") .append("utf-8''")
.append(percentEncodedFileName); .append(percentEncodedFileName);
response.addHeader("Access-Control-Allow-Origin", "*");
response.addHeader("Access-Control-Expose-Headers", "Content-Disposition,download-filename");
response.setHeader("Content-disposition", contentDispositionValue.toString()); response.setHeader("Content-disposition", contentDispositionValue.toString());
response.setHeader("download-filename", percentEncodedFileName); response.setHeader("download-filename", percentEncodedFileName);
} }
@ -44,8 +44,7 @@ public class FileUtils extends FileUtil
* @param s 需要百分号编码的字符串 * @param s 需要百分号编码的字符串
* @return 百分号编码后的字符串 * @return 百分号编码后的字符串
*/ */
public static String percentEncode(String s) throws UnsupportedEncodingException public static String percentEncode(String s) throws UnsupportedEncodingException {
{
String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString()); String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString());
return encode.replaceAll("\\+", "%20"); return encode.replaceAll("\\+", "%20");
} }

4
ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
View File

@ -14,7 +14,7 @@ import java.util.Map;
/** /**
* 获取地址类 * 获取地址类
* *
* @author ruoyi * @author Lion Li
*/ */
@Slf4j @Slf4j
public class AddressUtils { public class AddressUtils {
@ -27,7 +27,7 @@ public class AddressUtils {
public static String getRealAddressByIP(String ip) { public static String getRealAddressByIP(String ip) {
String address = UNKNOWN; String address = UNKNOWN;
if (StringUtils.isBlank(ip)){ if (StringUtils.isBlank(ip)) {
return address; return address;
} }
// 内网不查询 // 内网不查询

6
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
View File

@ -12,14 +12,12 @@ import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.List; import java.util.List;
/** /**
* Excel相关处理 * Excel相关处理
* *
* @author ruoyi * @author Lion Li
*/ */
public class ExcelUtil { public class ExcelUtil {
@ -44,8 +42,6 @@ public class ExcelUtil {
try { try {
String filename = encodingFilename(sheetName); String filename = encodingFilename(sheetName);
response.reset(); response.reset();
response.addHeader("Access-Control-Allow-Origin", "*");
response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
FileUtils.setAttachmentResponseHeader(response, filename); FileUtils.setAttachmentResponseHeader(response, filename);
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8"); response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8");
ServletOutputStream os = response.getOutputStream(); ServletOutputStream os = response.getOutputStream();

12
ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
View File

@ -8,8 +8,7 @@ import com.ruoyi.common.utils.StringUtils;
* *
* @author ruoyi * @author ruoyi
*/ */
public class SqlUtil public class SqlUtil {
{
/** /**
* 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序） * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序）
*/ */
@ -18,10 +17,8 @@ public class SqlUtil
/** /**
* 检查字符，防止注入绕过 * 检查字符，防止注入绕过
*/ */
public static String escapeOrderBySql(String value) public static String escapeOrderBySql(String value) {
{ if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value)) {
if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value))
{
throw new UtilException("参数不符合规范，不能进行查询"); throw new UtilException("参数不符合规范，不能进行查询");
} }
return value; return value;
@ -30,8 +27,7 @@ public class SqlUtil
/** /**
* 验证 order by 语法是否符合规范 * 验证 order by 语法是否符合规范
*/ */
public static boolean isValidOrderBySql(String value) public static boolean isValidOrderBySql(String value) {
{
return value.matches(SQL_PATTERN); return value.matches(SQL_PATTERN);
} }
} }

1
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/FeignTestController.java
View File

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

23
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java
View File

@ -1,6 +1,7 @@
package com.ruoyi.demo.controller; package com.ruoyi.demo.controller;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.RedisUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -12,6 +13,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.concurrent.TimeUnit;
/** /**
* spring-cache 演示案例 * spring-cache 演示案例
* *
@ -76,4 +79,24 @@ public class RedisCacheController {
return AjaxResult.success("操作成功", value); return AjaxResult.success("操作成功", value);
} }
/**
* 测试设置过期时间
* 手动设置过期时间10秒
* 11秒后获取 判断是否相等
*/
@ApiOperation("测试设置过期时间")
@GetMapping("/test6")
public AjaxResult<Boolean> test6(String key, String value){
RedisUtils.setCacheObject(key, value);
boolean flag = RedisUtils.expire(key, 10, TimeUnit.SECONDS);
System.out.println("***********" + flag);
try {
Thread.sleep(11 * 1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
Object obj = RedisUtils.getCacheObject(key);
return AjaxResult.success("操作成功", value.equals(obj));
}
} }

2
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
View File

@ -59,7 +59,7 @@ public class TestDemoController extends BaseController {
@ApiOperation("自定义分页查询") @ApiOperation("自定义分页查询")
@SaCheckPermission("demo:demo:list") @SaCheckPermission("demo:demo:list")
@GetMapping("/page") @GetMapping("/page")
public TableDataInfo<TestDemoVo> page(@Validated TestDemoBo bo) { public TableDataInfo<TestDemoVo> page(@Validated(QueryGroup.class) TestDemoBo bo) {
return iTestDemoService.customPageList(bo); return iTestDemoService.customPageList(bo);
} }

36
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java
View File

@ -1,13 +1,11 @@
package com.ruoyi.demo.domain; package com.ruoyi.demo.domain;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
/** /**
* 测试单表对象 test_demo * 测试单表对象 test_demo
* *
@ -15,10 +13,10 @@ import java.util.Date;
* @date 2021-07-26 * @date 2021-07-26
*/ */
@Data @Data
@NoArgsConstructor @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("test_demo") @TableName("test_demo")
public class TestDemo implements Serializable { public class TestDemo extends BaseEntity {
private static final long serialVersionUID=1L; 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; private Long orderNum;
/** /**
@ -61,30 +59,6 @@ public class TestDemo implements Serializable {
@Version @Version
private Long 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;
/** /**
* 删除标志 * 删除标志
*/ */

44
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java
View File

@ -1,13 +1,14 @@
package com.ruoyi.demo.domain; 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.Data;
import lombok.NoArgsConstructor; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
/** /**
* 测试树表对象 test_tree * 测试树表对象 test_tree
* *
@ -15,10 +16,10 @@ import java.util.Date;
* @date 2021-07-26 * @date 2021-07-26
*/ */
@Data @Data
@NoArgsConstructor @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("test_tree") @TableName("test_tree")
public class TestTree implements Serializable { public class TestTree extends TreeEntity {
private static final long serialVersionUID=1L; private static final long serialVersionUID=1L;
@ -29,11 +30,6 @@ public class TestTree implements Serializable {
@TableId(value = "id") @TableId(value = "id")
private Long id; private Long id;
/**
* 父id
*/
private Long parentId;
/** /**
* 部门id * 部门id
*/ */
@ -55,30 +51,6 @@ public class TestTree implements Serializable {
@Version @Version
private Long 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;
/** /**
* 删除标志 * 删除标志
*/ */

1
ruoyi-demo/src/main/java/com/ruoyi/demo/feign/FeignTestService.java
View File

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

Some files were not shown because too many files have changed in this diff Show More