opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-19 09:55:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !8 from yinguofeng/dev

Browse Source
This commit is contained in:
yinguofeng 2021-03-13 10:47:51 +08:00 committed by Gitee
commit 37e254edf5
281 changed files with 7259 additions and 7259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

226
ruoyi-admin/pom.xml → jiajiakang-admin/pom.xml
View File

@ -1,114 +1,114 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>ruoyi</artifactId> <artifactId>jiajiakang</artifactId>
<groupId>com.ruoyi</groupId> <groupId>com.jiajiakang</groupId>
<version>3.4.0</version> <version>3.4.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging> <packaging>jar</packaging>
<artifactId>ruoyi-admin</artifactId> <artifactId>jiajiakang-admin</artifactId>
<description> <description>
web服务入口 web服务入口
</description> </description>
<dependencies> <dependencies>
<!-- spring-boot-devtools --> <!-- spring-boot-devtools -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId> <artifactId>spring-boot-devtools</artifactId>
<optional>true</optional> <!-- 表示依赖不会传递 --> <optional>true</optional> <!-- 表示依赖不会传递 -->
</dependency> </dependency>
<!-- swagger2--> <!-- swagger2-->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-swagger2</artifactId>
</dependency> </dependency>
<!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本--> <!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>1.5.21</version> <version>1.5.21</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId> <artifactId>swagger-models</artifactId>
<version>1.5.21</version> <version>1.5.21</version>
</dependency> </dependency>
<!-- swagger2-UI--> <!-- swagger2-UI-->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId> <artifactId>springfox-swagger-ui</artifactId>
</dependency> </dependency>
<!-- Mysql驱动包 --> <!-- Mysql驱动包 -->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
</dependency> </dependency>
<!-- 核心模块--> <!-- 核心模块-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.jiajiakang</groupId>
<artifactId>ruoyi-framework</artifactId> <artifactId>jiajiakang-framework</artifactId>
</dependency> </dependency>
<!-- 定时任务--> <!-- 定时任务-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.jiajiakang</groupId>
<artifactId>ruoyi-quartz</artifactId> <artifactId>jiajiakang-quartz</artifactId>
</dependency> </dependency>
<!-- 代码生成--> <!-- 代码生成-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.jiajiakang</groupId>
<artifactId>ruoyi-generator</artifactId> <artifactId>jiajiakang-generator</artifactId>
</dependency> </dependency>
<!-- demo模块 --> <!-- demo模块 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.jiajiakang</groupId>
<artifactId>ruoyi-demo</artifactId> <artifactId>jiajiakang-demo</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>2.1.1.RELEASE</version> <version>2.1.1.RELEASE</version>
<configuration> <configuration>
<fork>true</fork> <!-- 如果没有该配置，devtools不会生效 --> <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<goals> <goals>
<goal>repackage</goal> <goal>repackage</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>3.1.0</version> <version>3.1.0</version>
<configuration> <configuration>
<failOnMissingWebXml>false</failOnMissingWebXml> <failOnMissingWebXml>false</failOnMissingWebXml>
<warName>${project.artifactId}</warName> <warName>${project.artifactId}</warName>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
<finalName>${project.artifactId}</finalName> <finalName>${project.artifactId}</finalName>
</build> </build>
</project> </project>

2
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java → jiajiakang-admin/src/main/java/com/jiajiakang/RuoYiApplication.java
View File

@ -1,4 +1,4 @@
package com.ruoyi; package com.jiajiakang;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;

2
ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java → jiajiakang-admin/src/main/java/com/jiajiakang/RuoYiServletInitializer.java
View File

@ -1,4 +1,4 @@
package com.ruoyi; package com.jiajiakang;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;

10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/common/CaptchaController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.common; package com.jiajiakang.web.controller.common;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -11,14 +11,14 @@ import cn.hutool.captcha.generator.MathGenerator;
import cn.hutool.captcha.generator.RandomGenerator; import cn.hutool.captcha.generator.RandomGenerator;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.ruoyi.common.core.text.Convert; import com.jiajiakang.common.core.text.Convert;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
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;
import com.ruoyi.common.constant.Constants; import com.jiajiakang.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult; import com.jiajiakang.common.core.domain.AjaxResult;
import com.ruoyi.common.core.redis.RedisCache; import com.jiajiakang.common.core.redis.RedisCache;
import javax.annotation.Resource; import javax.annotation.Resource;

16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/common/CommonController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.common; package com.jiajiakang.web.controller.common;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -10,13 +10,13 @@ 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.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.config.RuoYiConfig; import com.jiajiakang.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants; import com.jiajiakang.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult; import com.jiajiakang.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils; import com.jiajiakang.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUploadUtils; import com.jiajiakang.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils; import com.jiajiakang.common.utils.file.FileUtils;
import com.ruoyi.framework.config.ServerConfig; import com.jiajiakang.framework.config.ServerConfig;
/** /**
* 通用请求处理 * 通用请求处理

106
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/monitor/CacheController.java
View File

@ -1,53 +1,53 @@
package com.ruoyi.web.controller.monitor; package com.jiajiakang.web.controller.monitor;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
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.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping; 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 com.ruoyi.common.core.domain.AjaxResult; import com.jiajiakang.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils; import com.jiajiakang.common.utils.StringUtils;
/** /**
* 缓存监控 * 缓存监控
* *
* @author ruoyi * @author ruoyi
*/ */
@RestController @RestController
@RequestMapping("/monitor/cache") @RequestMapping("/monitor/cache")
public class CacheController public class CacheController
{ {
@Autowired @Autowired
private RedisTemplate<String, String> redisTemplate; private RedisTemplate<String, String> redisTemplate;
@PreAuthorize("@ss.hasPermi('monitor:cache:list')") @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@GetMapping() @GetMapping()
public AjaxResult getInfo() throws Exception public AjaxResult getInfo() throws Exception
{ {
Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.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>) connection -> connection.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<>();
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);
data.put("name", StringUtils.removeStart(key, "cmdstat_")); data.put("name", StringUtils.removeStart(key, "cmdstat_"));
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);
} }
} }

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/monitor/ServerController.java
View File

@ -1,11 +1,11 @@
package com.ruoyi.web.controller.monitor; package com.jiajiakang.web.controller.monitor;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping; 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 com.ruoyi.common.core.domain.AjaxResult; import com.jiajiakang.common.core.domain.AjaxResult;
import com.ruoyi.framework.web.domain.Server; import com.jiajiakang.framework.web.domain.Server;
/** /**
* 服务器监控 * 服务器监控

18
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/monitor/SysLogininforController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.monitor; package com.jiajiakang.web.controller.monitor;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -8,14 +8,14 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
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 com.ruoyi.common.annotation.Log; import com.jiajiakang.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.jiajiakang.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.jiajiakang.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.jiajiakang.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.jiajiakang.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.jiajiakang.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysLogininfor; import com.jiajiakang.system.domain.SysLogininfor;
import com.ruoyi.system.service.ISysLogininforService; import com.jiajiakang.system.service.ISysLogininforService;
/** /**
* 系统访问记录 * 系统访问记录

18
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/monitor/SysOperlogController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.monitor; package com.jiajiakang.web.controller.monitor;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -8,14 +8,14 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
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 com.ruoyi.common.annotation.Log; import com.jiajiakang.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.jiajiakang.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.jiajiakang.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.jiajiakang.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.jiajiakang.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.jiajiakang.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysOperLog; import com.jiajiakang.system.domain.SysOperLog;
import com.ruoyi.system.service.ISysOperLogService; import com.jiajiakang.system.service.ISysOperLogService;
/** /**
* 操作日志记录 * 操作日志记录

24
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/monitor/SysUserOnlineController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.monitor; package com.jiajiakang.web.controller.monitor;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -11,17 +11,17 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
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 com.ruoyi.common.annotation.Log; import com.jiajiakang.common.annotation.Log;
import com.ruoyi.common.constant.Constants; import com.jiajiakang.common.constant.Constants;
import com.ruoyi.common.core.controller.BaseController; import com.jiajiakang.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.jiajiakang.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.LoginUser; import com.jiajiakang.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.jiajiakang.common.core.page.TableDataInfo;
import com.ruoyi.common.core.redis.RedisCache; import com.jiajiakang.common.core.redis.RedisCache;
import com.ruoyi.common.enums.BusinessType; import com.jiajiakang.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils; import com.jiajiakang.common.utils.StringUtils;
import com.ruoyi.system.domain.SysUserOnline; import com.jiajiakang.system.domain.SysUserOnline;
import com.ruoyi.system.service.ISysUserOnlineService; import com.jiajiakang.system.service.ISysUserOnlineService;
/** /**
* 在线用户监控 * 在线用户监控

24
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysConfigController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.jiajiakang.web.controller.system;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -12,17 +12,17 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
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 com.ruoyi.common.annotation.Log; import com.jiajiakang.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit; import com.jiajiakang.common.annotation.RepeatSubmit;
import com.ruoyi.common.constant.UserConstants; import com.jiajiakang.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.jiajiakang.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.jiajiakang.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.jiajiakang.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.jiajiakang.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.jiajiakang.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.jiajiakang.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysConfig; import com.jiajiakang.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService; import com.jiajiakang.system.service.ISysConfigService;
/** /**
* 参数配置 信息操作处理 * 参数配置 信息操作处理

20
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysDeptController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.jiajiakang.web.controller.system;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -14,15 +14,15 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
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 com.ruoyi.common.annotation.Log; import com.jiajiakang.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.jiajiakang.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.jiajiakang.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.jiajiakang.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept; import com.jiajiakang.common.core.domain.entity.SysDept;
import com.ruoyi.common.enums.BusinessType; import com.jiajiakang.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.jiajiakang.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.jiajiakang.common.utils.StringUtils;
import com.ruoyi.system.service.ISysDeptService; import com.jiajiakang.system.service.ISysDeptService;
/** /**
* 部门信息 * 部门信息

24
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysDictDataController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.jiajiakang.web.controller.system;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -13,17 +13,17 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
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 com.ruoyi.common.annotation.Log; import com.jiajiakang.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.jiajiakang.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.jiajiakang.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictData; import com.jiajiakang.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo; import com.jiajiakang.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.jiajiakang.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.jiajiakang.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.jiajiakang.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.jiajiakang.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictDataService; import com.jiajiakang.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysDictTypeService; import com.jiajiakang.system.service.ISysDictTypeService;
/** /**
* 数据字典信息 * 数据字典信息

22
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysDictTypeController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.jiajiakang.web.controller.system;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
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 com.ruoyi.common.annotation.Log; import com.jiajiakang.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.jiajiakang.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.jiajiakang.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.jiajiakang.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictType; import com.jiajiakang.common.core.domain.entity.SysDictType;
import com.ruoyi.common.core.page.TableDataInfo; import com.jiajiakang.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.jiajiakang.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.jiajiakang.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.jiajiakang.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictTypeService; import com.jiajiakang.system.service.ISysDictTypeService;
/** /**
* 数据字典信息 * 数据字典信息

24
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysLoginController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.jiajiakang.web.controller.system;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ -7,17 +7,17 @@ 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;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.constant.Constants; import com.jiajiakang.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult; import com.jiajiakang.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu; import com.jiajiakang.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser; import com.jiajiakang.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginBody; import com.jiajiakang.common.core.domain.model.LoginBody;
import com.ruoyi.common.core.domain.model.LoginUser; import com.jiajiakang.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.ServletUtils; import com.jiajiakang.common.utils.ServletUtils;
import com.ruoyi.framework.web.service.SysLoginService; import com.jiajiakang.framework.web.service.SysLoginService;
import com.ruoyi.framework.web.service.SysPermissionService; import com.jiajiakang.framework.web.service.SysPermissionService;
import com.ruoyi.framework.web.service.TokenService; import com.jiajiakang.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysMenuService; import com.jiajiakang.system.service.ISysMenuService;
/** /**
* 登录验证 * 登录验证

28
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysMenuController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.jiajiakang.web.controller.system;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
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 com.ruoyi.common.annotation.Log; import com.jiajiakang.common.annotation.Log;
import com.ruoyi.common.constant.Constants; import com.jiajiakang.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants; import com.jiajiakang.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.jiajiakang.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.jiajiakang.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu; import com.jiajiakang.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.model.LoginUser; import com.jiajiakang.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType; import com.jiajiakang.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.jiajiakang.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils; import com.jiajiakang.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils; import com.jiajiakang.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService; import com.jiajiakang.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysMenuService; import com.jiajiakang.system.service.ISysMenuService;
/** /**
* 菜单信息 * 菜单信息

18
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysNoticeController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.jiajiakang.web.controller.system;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -12,14 +12,14 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
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 com.ruoyi.common.annotation.Log; import com.jiajiakang.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.jiajiakang.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.jiajiakang.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.jiajiakang.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.jiajiakang.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.jiajiakang.common.utils.SecurityUtils;
import com.ruoyi.system.domain.SysNotice; import com.jiajiakang.system.domain.SysNotice;
import com.ruoyi.system.service.ISysNoticeService; import com.jiajiakang.system.service.ISysNoticeService;
/** /**
* 公告 信息操作处理 * 公告 信息操作处理

22
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysPostController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.jiajiakang.web.controller.system;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
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 com.ruoyi.common.annotation.Log; import com.jiajiakang.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.jiajiakang.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.jiajiakang.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.jiajiakang.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.jiajiakang.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.jiajiakang.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.jiajiakang.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.jiajiakang.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysPost; import com.jiajiakang.system.domain.SysPost;
import com.ruoyi.system.service.ISysPostService; import com.jiajiakang.system.service.ISysPostService;
/** /**
* 岗位信息操作处理 * 岗位信息操作处理

26
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysProfileController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.jiajiakang.web.controller.system;
import java.io.IOException; import java.io.IOException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -10,18 +10,18 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.annotation.Log; import com.jiajiakang.common.annotation.Log;
import com.ruoyi.common.config.RuoYiConfig; import com.jiajiakang.common.config.RuoYiConfig;
import com.ruoyi.common.core.controller.BaseController; import com.jiajiakang.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.jiajiakang.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser; import com.jiajiakang.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser; import com.jiajiakang.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType; import com.jiajiakang.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.jiajiakang.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils; import com.jiajiakang.common.utils.ServletUtils;
import com.ruoyi.common.utils.file.FileUploadUtils; import com.jiajiakang.common.utils.file.FileUploadUtils;
import com.ruoyi.framework.web.service.TokenService; import com.jiajiakang.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysUserService; import com.jiajiakang.system.service.ISysUserService;
/** /**
* 个人信息 业务处理 * 个人信息 业务处理

34
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysRoleController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.jiajiakang.web.controller.system;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -12,22 +12,22 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
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 com.ruoyi.common.annotation.Log; import com.jiajiakang.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.jiajiakang.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.jiajiakang.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.jiajiakang.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole; import com.jiajiakang.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.model.LoginUser; import com.jiajiakang.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.jiajiakang.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.jiajiakang.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.jiajiakang.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils; import com.jiajiakang.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils; import com.jiajiakang.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.jiajiakang.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.service.SysPermissionService; import com.jiajiakang.framework.web.service.SysPermissionService;
import com.ruoyi.framework.web.service.TokenService; import com.jiajiakang.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysRoleService; import com.jiajiakang.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService; import com.jiajiakang.system.service.ISysUserService;
/** /**
* 角色信息 * 角色信息

36
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/system/SysUserController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.jiajiakang.web.controller.system;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -14,23 +14,23 @@ import org.springframework.web.bind.annotation.RequestBody;
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 org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.annotation.Log; import com.jiajiakang.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.jiajiakang.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.jiajiakang.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.jiajiakang.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole; import com.jiajiakang.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser; import com.jiajiakang.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser; import com.jiajiakang.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.jiajiakang.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.jiajiakang.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.jiajiakang.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils; import com.jiajiakang.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils; import com.jiajiakang.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.jiajiakang.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.service.TokenService; import com.jiajiakang.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysPostService; import com.jiajiakang.system.service.ISysPostService;
import com.ruoyi.system.service.ISysRoleService; import com.jiajiakang.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService; import com.jiajiakang.system.service.ISysUserService;
/** /**
* 用户信息 * 用户信息

48
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/tool/SwaggerController.java
View File

@ -1,24 +1,24 @@
package com.ruoyi.web.controller.tool; package com.jiajiakang.web.controller.tool;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import com.ruoyi.common.core.controller.BaseController; import com.jiajiakang.common.core.controller.BaseController;
/** /**
* swagger 接口 * swagger 接口
* *
* @author ruoyi * @author ruoyi
*/ */
@Controller @Controller
@RequestMapping("/tool/swagger") @RequestMapping("/tool/swagger")
public class SwaggerController extends BaseController public class SwaggerController extends BaseController
{ {
@PreAuthorize("@ss.hasPermi('tool:swagger:view')") @PreAuthorize("@ss.hasPermi('tool:swagger:view')")
@GetMapping() @GetMapping()
public String index() public String index()
{ {
return redirect("/swagger-ui.html"); return redirect("/swagger-ui.html");
} }
} }

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/controller/tool/TestController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.tool; package com.jiajiakang.web.controller.tool;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.PutMapping;
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 com.ruoyi.common.core.controller.BaseController; import com.jiajiakang.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.jiajiakang.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils; import com.jiajiakang.common.utils.StringUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;

6
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java → jiajiakang-admin/src/main/java/com/jiajiakang/web/core/config/SwaggerConfig.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.core.config; package com.jiajiakang.web.core.config;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import com.ruoyi.common.config.RuoYiConfig; import com.jiajiakang.common.config.RuoYiConfig;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.PathSelectors;
@ -58,7 +58,7 @@ public class SwaggerConfig
// 扫描所有有注解的api，用这种方式更灵活 // 扫描所有有注解的api，用这种方式更灵活
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
// 扫描指定包中的swagger注解 // 扫描指定包中的swagger注解
// .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger")) // .apis(RequestHandlerSelectors.basePackage("com.jiajiakang.project.tool.swagger"))
// 扫描所有 .apis(RequestHandlerSelectors.any()) // 扫描所有 .apis(RequestHandlerSelectors.any())
.paths(PathSelectors.any()) .paths(PathSelectors.any())
.build() .build()

0
ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties → jiajiakang-admin/src/main/resources/META-INF/spring-devtools.properties
View File

0
ruoyi-admin/src/main/resources/application-dev.yml → jiajiakang-admin/src/main/resources/application-dev.yml
View File

0
ruoyi-admin/src/main/resources/application-prod.yml → jiajiakang-admin/src/main/resources/application-prod.yml
View File

4
ruoyi-admin/src/main/resources/application.yml → jiajiakang-admin/src/main/resources/application.yml
View File

@ -55,7 +55,7 @@ server:
# 日志配置 # 日志配置
logging: logging:
level: level:
com.ruoyi: @logging.level@ com.jiajiakang: @logging.level@
org.springframework: warn org.springframework: warn
# Spring配置 # Spring配置
@ -94,7 +94,7 @@ mybatis-plus:
# 对应的 XML 文件位置 # 对应的 XML 文件位置
mapperLocations: classpath*:mapper/**/*Mapper.xml mapperLocations: classpath*:mapper/**/*Mapper.xml
# 实体扫描，多个package用逗号或者分号分隔 # 实体扫描，多个package用逗号或者分号分隔
typeAliasesPackage: com.ruoyi.**.domain typeAliasesPackage: com.jiajiakang.**.domain
# 针对 typeAliasesPackage，如果配置了该属性，则仅仅会扫描路径下以该类作为父类的域对象 # 针对 typeAliasesPackage，如果配置了该属性，则仅仅会扫描路径下以该类作为父类的域对象
#typeAliasesSuperType: Class<?> #typeAliasesSuperType: Class<?>
# 如果配置了该属性，SqlSessionFactoryBean 会把该包下面的类注册为对应的 TypeHandler # 如果配置了该属性，SqlSessionFactoryBean 会把该包下面的类注册为对应的 TypeHandler

0
ruoyi-admin/src/main/resources/banner.txt → jiajiakang-admin/src/main/resources/banner.txt
View File

0
ruoyi-admin/src/main/resources/i18n/messages.properties → jiajiakang-admin/src/main/resources/i18n/messages.properties
View File

2
ruoyi-admin/src/main/resources/logback.xml → jiajiakang-admin/src/main/resources/logback.xml
View File

@ -73,7 +73,7 @@
</appender> </appender>
<!-- 系统模块日志级别控制 --> <!-- 系统模块日志级别控制 -->
<logger name="com.ruoyi" level="info" /> <logger name="com.jiajiakang" level="info" />
<!-- Spring日志级别控制 --> <!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" /> <logger name="org.springframework" level="warn" />

0
ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml → jiajiakang-admin/src/main/resources/mybatis/mybatis-config.xml
View File

300
ruoyi-common/pom.xml → jiajiakang-common/pom.xml
View File

@ -1,151 +1,151 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>ruoyi</artifactId> <artifactId>jiajiakang</artifactId>
<groupId>com.ruoyi</groupId> <groupId>com.jiajiakang</groupId>
<version>3.4.0</version> <version>3.4.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-common</artifactId> <artifactId>jiajiakang-common</artifactId>
<description> <description>
common通用工具 common通用工具
</description> </description>
<dependencies> <dependencies>
<!-- Spring框架基本的核心工具 --> <!-- Spring框架基本的核心工具 -->
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId> <artifactId>spring-context-support</artifactId>
</dependency> </dependency>
<!-- SpringWeb模块 --> <!-- SpringWeb模块 -->
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId> <artifactId>spring-web</artifactId>
</dependency> </dependency>
<!-- spring security 安全认证 --> <!-- spring security 安全认证 -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId> <artifactId>spring-boot-starter-security</artifactId>
</dependency> </dependency>
<!-- pagehelper 分页插件 --> <!-- pagehelper 分页插件 -->
<dependency> <dependency>
<groupId>com.github.pagehelper</groupId> <groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId> <artifactId>pagehelper-spring-boot-starter</artifactId>
</dependency> </dependency>
<!-- 自定义验证注解 --> <!-- 自定义验证注解 -->
<dependency> <dependency>
<groupId>javax.validation</groupId> <groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId> <artifactId>validation-api</artifactId>
</dependency> </dependency>
<!--常用工具类 --> <!--常用工具类 -->
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
</dependency> </dependency>
<!-- JSON工具类 --> <!-- JSON工具类 -->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
</dependency> </dependency>
<!-- 阿里JSON解析器 --> <!-- 阿里JSON解析器 -->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
</dependency> </dependency>
<!-- io常用工具类 --> <!-- io常用工具类 -->
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
</dependency> </dependency>
<!-- 文件上传工具类 --> <!-- 文件上传工具类 -->
<dependency> <dependency>
<groupId>commons-fileupload</groupId> <groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId> <artifactId>commons-fileupload</artifactId>
</dependency> </dependency>
<!-- excel工具 --> <!-- excel工具 -->
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId> <artifactId>poi-ooxml</artifactId>
</dependency> </dependency>
<!-- yml解析器 --> <!-- yml解析器 -->
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId> <artifactId>snakeyaml</artifactId>
</dependency> </dependency>
<!--Token生成与解析--> <!--Token生成与解析-->
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId> <artifactId>jjwt</artifactId>
</dependency> </dependency>
<!-- redis 缓存操作 --> <!-- redis 缓存操作 -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId> <artifactId>spring-boot-starter-data-redis</artifactId>
</dependency> </dependency>
<!-- pool 对象池 --> <!-- pool 对象池 -->
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId> <artifactId>commons-pool2</artifactId>
</dependency> </dependency>
<!-- 解析客户端操作系统、浏览器等 --> <!-- 解析客户端操作系统、浏览器等 -->
<dependency> <dependency>
<groupId>eu.bitwalker</groupId> <groupId>eu.bitwalker</groupId>
<artifactId>UserAgentUtils</artifactId> <artifactId>UserAgentUtils</artifactId>
</dependency> </dependency>
<!-- servlet包 --> <!-- servlet包 -->
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId> <artifactId>mybatis-plus-boot-starter</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-extension</artifactId> <artifactId>mybatis-plus-extension</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.hutool</groupId> <groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId> <artifactId>hutool-all</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<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>
<dependency> <dependency>
<groupId>io.github.openfeign</groupId> <groupId>io.github.openfeign</groupId>
<artifactId>feign-okhttp</artifactId> <artifactId>feign-okhttp</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java → jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/DataScope.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.annotation; package com.jiajiakang.common.annotation;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;

4
ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java → jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/DataSource.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.annotation; package com.jiajiakang.common.annotation;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
@ -6,7 +6,7 @@ import java.lang.annotation.Inherited;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import com.ruoyi.common.enums.DataSourceType; import com.jiajiakang.common.enums.DataSourceType;
/** /**
* 自定义多数据源切换注解 * 自定义多数据源切换注解

328
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java → jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/Excel.java
View File

@ -1,165 +1,165 @@
package com.ruoyi.common.annotation; package com.jiajiakang.common.annotation;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
* 自定义导出Excel数据注解 * 自定义导出Excel数据注解
* *
* @author ruoyi * @author ruoyi
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD) @Target(ElementType.FIELD)
public @interface Excel public @interface Excel
{ {
/** /**
* 导出时在excel中排序 * 导出时在excel中排序
*/ */
public int sort() default Integer.MAX_VALUE; public int sort() default Integer.MAX_VALUE;
/** /**
* 导出到Excel中的名字. * 导出到Excel中的名字.
*/ */
public String name() default ""; public String name() default "";
/** /**
* 日期格式, 如: yyyy-MM-dd * 日期格式, 如: yyyy-MM-dd
*/ */
public String dateFormat() default ""; public String dateFormat() default "";
/** /**
* 如果是字典类型，请设置字典的type值 (如: sys_user_sex) * 如果是字典类型，请设置字典的type值 (如: sys_user_sex)
*/ */
public String dictType() default ""; public String dictType() default "";
/** /**
* 读取内容转表达式 (如: 0=男,1=女,2=未知) * 读取内容转表达式 (如: 0=男,1=女,2=未知)
*/ */
public String readConverterExp() default ""; public String readConverterExp() default "";
/** /**
* 分隔符，读取字符串组内容 * 分隔符，读取字符串组内容
*/ */
public String separator() default ","; public String separator() default ",";
/** /**
* BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化) * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化)
*/ */
public int scale() default -1; public int scale() default -1;
/** /**
* BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
*/ */
public int roundingMode() default BigDecimal.ROUND_HALF_EVEN; public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
/** /**
* 导出类型（0数字 1字符串） * 导出类型（0数字 1字符串）
*/ */
public ColumnType cellType() default ColumnType.STRING; public ColumnType cellType() default ColumnType.STRING;
/** /**
* 导出时在excel中每个列的高度 单位为字符 * 导出时在excel中每个列的高度 单位为字符
*/ */
public double height() default 14; public double height() default 14;
/** /**
* 导出时在excel中每个列的宽 单位为字符 * 导出时在excel中每个列的宽 单位为字符
*/ */
public double width() default 16; public double width() default 16;
/** /**
* 文字后缀,如% 90 变成90% * 文字后缀,如% 90 变成90%
*/ */
public String suffix() default ""; public String suffix() default "";
/** /**
* 当值为空时,字段的默认值 * 当值为空时,字段的默认值
*/ */
public String defaultValue() default ""; public String defaultValue() default "";
/** /**
* 提示信息 * 提示信息
*/ */
public String prompt() default ""; public String prompt() default "";
/** /**
* 设置只能选择不能输入的列内容. * 设置只能选择不能输入的列内容.
*/ */
public String[] combo() default {}; public String[] combo() default {};
/** /**
* 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写. * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
*/ */
public boolean isExport() default true; public boolean isExport() default true;
/** /**
* 另一个类中的属性名称,支持多级获取,以小数点隔开 * 另一个类中的属性名称,支持多级获取,以小数点隔开
*/ */
public String targetAttr() default ""; public String targetAttr() default "";
/** /**
* 是否自动统计数据,在最后追加一行统计数据总和 * 是否自动统计数据,在最后追加一行统计数据总和
*/ */
public boolean isStatistics() default false; public boolean isStatistics() default false;
/** /**
* 导出字段对齐方式（0：默认；1：靠左；2：居中；3：靠右） * 导出字段对齐方式（0：默认；1：靠左；2：居中；3：靠右）
*/ */
Align align() default Align.AUTO; Align align() default Align.AUTO;
public enum Align public enum Align
{ {
AUTO(0), LEFT(1), CENTER(2), RIGHT(3); AUTO(0), LEFT(1), CENTER(2), RIGHT(3);
private final int value; private final int value;
Align(int value) Align(int value)
{ {
this.value = value; this.value = value;
} }
public int value() public int value()
{ {
return this.value; return this.value;
} }
} }
/** /**
* 字段类型（0：导出导入；1：仅导出；2：仅导入） * 字段类型（0：导出导入；1：仅导出；2：仅导入）
*/ */
Type type() default Type.ALL; Type type() default Type.ALL;
public enum Type public enum Type
{ {
ALL(0), EXPORT(1), IMPORT(2); ALL(0), EXPORT(1), IMPORT(2);
private final int value; private final int value;
Type(int value) Type(int value)
{ {
this.value = value; this.value = value;
} }
public int value() public int value()
{ {
return this.value; return this.value;
} }
} }
public enum ColumnType public enum ColumnType
{ {
NUMERIC(0), STRING(1), IMAGE(2); NUMERIC(0), STRING(1), IMAGE(2);
private final int value; private final int value;
ColumnType(int value) ColumnType(int value)
{ {
this.value = value; this.value = value;
} }
public int value() public int value()
{ {
return this.value; return this.value;
} }
} }
} }

36
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java → jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/Excels.java
View File

@ -1,18 +1,18 @@
package com.ruoyi.common.annotation; package com.jiajiakang.common.annotation;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
/** /**
* Excel注解集 * Excel注解集
* *
* @author ruoyi * @author ruoyi
*/ */
@Target(ElementType.FIELD) @Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
public @interface Excels public @interface Excels
{ {
Excel[] value(); Excel[] value();
} }

6
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java → jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/Log.java
View File

@ -1,12 +1,12 @@
package com.ruoyi.common.annotation; package com.jiajiakang.common.annotation;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import com.ruoyi.common.enums.BusinessType; import com.jiajiakang.common.enums.BusinessType;
import com.ruoyi.common.enums.OperatorType; import com.jiajiakang.common.enums.OperatorType;
/** /**
* 自定义操作日志记录注解 * 自定义操作日志记录注解

46
ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java → jiajiakang-common/src/main/java/com/jiajiakang/common/annotation/RepeatSubmit.java
View File

@ -1,23 +1,23 @@
package com.ruoyi.common.annotation; package com.jiajiakang.common.annotation;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited; import java.lang.annotation.Inherited;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
/** /**
* 自定义注解防止表单重复提交 * 自定义注解防止表单重复提交
* *
* @author ruoyi * @author ruoyi
* *
*/ */
@Inherited @Inherited
@Target(ElementType.METHOD) @Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Documented @Documented
public @interface RepeatSubmit public @interface RepeatSubmit
{ {
} }

2
ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java → jiajiakang-common/src/main/java/com/jiajiakang/common/config/RuoYiConfig.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.config; package com.jiajiakang.common.config;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

2
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java → jiajiakang-common/src/main/java/com/jiajiakang/common/constant/Constants.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.constant; package com.jiajiakang.common.constant;
/** /**
* 通用常量信息 * 通用常量信息

2
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java → jiajiakang-common/src/main/java/com/jiajiakang/common/constant/GenConstants.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.constant; package com.jiajiakang.common.constant;
/** /**
* 代码生成通用常量 * 代码生成通用常量

2
ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java → jiajiakang-common/src/main/java/com/jiajiakang/common/constant/HttpStatus.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.constant; package com.jiajiakang.common.constant;
/** /**
* 返回状态码 * 返回状态码

100
ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java → jiajiakang-common/src/main/java/com/jiajiakang/common/constant/ScheduleConstants.java
View File

@ -1,50 +1,50 @@
package com.ruoyi.common.constant; package com.jiajiakang.common.constant;
/** /**
* 任务调度通用常量 * 任务调度通用常量
* *
* @author ruoyi * @author ruoyi
*/ */
public class ScheduleConstants public class ScheduleConstants
{ {
public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME"; public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME";
/** 执行目标key */ /** 执行目标key */
public static final String TASK_PROPERTIES = "TASK_PROPERTIES"; public static final String TASK_PROPERTIES = "TASK_PROPERTIES";
/** 默认 */ /** 默认 */
public static final String MISFIRE_DEFAULT = "0"; public static final String MISFIRE_DEFAULT = "0";
/** 立即触发执行 */ /** 立即触发执行 */
public static final String MISFIRE_IGNORE_MISFIRES = "1"; public static final String MISFIRE_IGNORE_MISFIRES = "1";
/** 触发一次执行 */ /** 触发一次执行 */
public static final String MISFIRE_FIRE_AND_PROCEED = "2"; public static final String MISFIRE_FIRE_AND_PROCEED = "2";
/** 不触发立即执行 */ /** 不触发立即执行 */
public static final String MISFIRE_DO_NOTHING = "3"; public static final String MISFIRE_DO_NOTHING = "3";
public enum Status public enum Status
{ {
/** /**
* 正常 * 正常
*/ */
NORMAL("0"), NORMAL("0"),
/** /**
* 暂停 * 暂停
*/ */
PAUSE("1"); PAUSE("1");
private String value; private String value;
private Status(String value) private Status(String value)
{ {
this.value = value; this.value = value;
} }
public String getValue() public String getValue()
{ {
return value; return value;
} }
} }
} }

2
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java → jiajiakang-common/src/main/java/com/jiajiakang/common/constant/UserConstants.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.constant; package com.jiajiakang.common.constant;
/** /**
* 用户常量信息 * 用户常量信息

18
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java → jiajiakang-common/src/main/java/com/jiajiakang/common/core/controller/BaseController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.controller; package com.jiajiakang.common.core.controller;
import java.beans.PropertyEditorSupport; import java.beans.PropertyEditorSupport;
import java.util.Date; import java.util.Date;
@ -9,14 +9,14 @@ import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.InitBinder;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.ruoyi.common.constant.HttpStatus; import com.jiajiakang.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.AjaxResult; import com.jiajiakang.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.PageDomain; import com.jiajiakang.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableDataInfo; import com.jiajiakang.common.core.page.TableDataInfo;
import com.ruoyi.common.core.page.TableSupport; import com.jiajiakang.common.core.page.TableSupport;
import com.ruoyi.common.utils.DateUtils; import com.jiajiakang.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.jiajiakang.common.utils.StringUtils;
import com.ruoyi.common.utils.sql.SqlUtil; import com.jiajiakang.common.utils.sql.SqlUtil;
/** /**
* web层通用数据处理 * web层通用数据处理

6
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java → jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/AjaxResult.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.common.core.domain; package com.jiajiakang.common.core.domain;
import java.util.HashMap; import java.util.HashMap;
import com.ruoyi.common.constant.HttpStatus; import com.jiajiakang.common.constant.HttpStatus;
import com.ruoyi.common.utils.StringUtils; import com.jiajiakang.common.utils.StringUtils;
/** /**
* 操作消息提醒 * 操作消息提醒

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java → jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/BaseEntity.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain; package com.jiajiakang.common.core.domain;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;

158
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java → jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/TreeEntity.java
View File

@ -1,79 +1,79 @@
package com.ruoyi.common.core.domain; package com.jiajiakang.common.core.domain;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
* Tree基类 * Tree基类
* *
* @author ruoyi * @author ruoyi
*/ */
public class TreeEntity extends BaseEntity public class TreeEntity extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 父菜单名称 */ /** 父菜单名称 */
private String parentName; private String parentName;
/** 父菜单ID */ /** 父菜单ID */
private Long parentId; private Long parentId;
/** 显示顺序 */ /** 显示顺序 */
private Integer orderNum; private Integer orderNum;
/** 祖级列表 */ /** 祖级列表 */
private String ancestors; private String ancestors;
/** 子部门 */ /** 子部门 */
private List<?> children = new ArrayList<>(); private List<?> children = new ArrayList<>();
public String getParentName() public String getParentName()
{ {
return parentName; return parentName;
} }
public void setParentName(String parentName) public void setParentName(String parentName)
{ {
this.parentName = parentName; this.parentName = parentName;
} }
public Long getParentId() public Long getParentId()
{ {
return parentId; return parentId;
} }
public void setParentId(Long parentId) public void setParentId(Long parentId)
{ {
this.parentId = parentId; this.parentId = parentId;
} }
public Integer getOrderNum() public Integer getOrderNum()
{ {
return orderNum; return orderNum;
} }
public void setOrderNum(Integer orderNum) public void setOrderNum(Integer orderNum)
{ {
this.orderNum = orderNum; this.orderNum = orderNum;
} }
public String getAncestors() public String getAncestors()
{ {
return ancestors; return ancestors;
} }
public void setAncestors(String ancestors) public void setAncestors(String ancestors)
{ {
this.ancestors = ancestors; this.ancestors = ancestors;
} }
public List<?> getChildren() public List<?> getChildren()
{ {
return children; return children;
} }
public void setChildren(List<?> children) public void setChildren(List<?> children)
{ {
this.children = children; this.children = children;
} }
} }

6
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java → jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/TreeSelect.java
View File

@ -1,11 +1,11 @@
package com.ruoyi.common.core.domain; package com.jiajiakang.common.core.domain;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.domain.entity.SysDept; import com.jiajiakang.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysMenu; import com.jiajiakang.common.core.domain.entity.SysMenu;
/** /**
* Treeselect树结构实体类 * Treeselect树结构实体类

4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java → jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysDept.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain.entity; package com.jiajiakang.common.core.domain.entity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -7,7 +7,7 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.domain.BaseEntity; import com.jiajiakang.common.core.domain.BaseEntity;
/** /**
* 部门表 sys_dept * 部门表 sys_dept

10
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java → jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysDictData.java
View File

@ -1,13 +1,13 @@
package com.ruoyi.common.core.domain.entity; package com.jiajiakang.common.core.domain.entity;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel; import com.jiajiakang.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType; import com.jiajiakang.common.annotation.Excel.ColumnType;
import com.ruoyi.common.constant.UserConstants; import com.jiajiakang.common.constant.UserConstants;
import com.ruoyi.common.core.domain.BaseEntity; import com.jiajiakang.common.core.domain.BaseEntity;
/** /**
* 字典数据表 sys_dict_data * 字典数据表 sys_dict_data

8
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java → jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysDictType.java
View File

@ -1,12 +1,12 @@
package com.ruoyi.common.core.domain.entity; package com.jiajiakang.common.core.domain.entity;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel; import com.jiajiakang.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType; import com.jiajiakang.common.annotation.Excel.ColumnType;
import com.ruoyi.common.core.domain.BaseEntity; import com.jiajiakang.common.core.domain.BaseEntity;
/** /**
* 字典类型表 sys_dict_type * 字典类型表 sys_dict_type

4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java → jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysMenu.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain.entity; package com.jiajiakang.common.core.domain.entity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -6,7 +6,7 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.domain.BaseEntity; import com.jiajiakang.common.core.domain.BaseEntity;
/** /**
* 菜单权限表 sys_menu * 菜单权限表 sys_menu

8
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java → jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysRole.java
View File

@ -1,12 +1,12 @@
package com.ruoyi.common.core.domain.entity; package com.jiajiakang.common.core.domain.entity;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel; import com.jiajiakang.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType; import com.jiajiakang.common.annotation.Excel.ColumnType;
import com.ruoyi.common.core.domain.BaseEntity; import com.jiajiakang.common.core.domain.BaseEntity;
/** /**
* 角色表 sys_role * 角色表 sys_role

12
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java → jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/entity/SysUser.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain.entity; package com.jiajiakang.common.core.domain.entity;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -9,11 +9,11 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
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.annotation.Excel; import com.jiajiakang.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType; import com.jiajiakang.common.annotation.Excel.ColumnType;
import com.ruoyi.common.annotation.Excel.Type; import com.jiajiakang.common.annotation.Excel.Type;
import com.ruoyi.common.annotation.Excels; import com.jiajiakang.common.annotation.Excels;
import com.ruoyi.common.core.domain.BaseEntity; import com.jiajiakang.common.core.domain.BaseEntity;
/** /**
* 用户对象 sys_user * 用户对象 sys_user

138
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java → jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/model/LoginBody.java
View File

@ -1,69 +1,69 @@
package com.ruoyi.common.core.domain.model; package com.jiajiakang.common.core.domain.model;
/** /**
* 用户登录对象 * 用户登录对象
* *
* @author ruoyi * @author ruoyi
*/ */
public class LoginBody public class LoginBody
{ {
/** /**
* 用户名 * 用户名
*/ */
private String username; private String username;
/** /**
* 用户密码 * 用户密码
*/ */
private String password; private String password;
/** /**
* 验证码 * 验证码
*/ */
private String code; private String code;
/** /**
* 唯一标识 * 唯一标识
*/ */
private String uuid = ""; private String uuid = "";
public String getUsername() public String getUsername()
{ {
return username; return username;
} }
public void setUsername(String username) public void setUsername(String username)
{ {
this.username = username; this.username = username;
} }
public String getPassword() public String getPassword()
{ {
return password; return password;
} }
public void setPassword(String password) public void setPassword(String password)
{ {
this.password = password; this.password = password;
} }
public String getCode() public String getCode()
{ {
return code; return code;
} }
public void setCode(String code) public void setCode(String code)
{ {
this.code = code; this.code = code;
} }
public String getUuid() public String getUuid()
{ {
return uuid; return uuid;
} }
public void setUuid(String uuid) public void setUuid(String uuid)
{ {
this.uuid = uuid; this.uuid = uuid;
} }
} }

4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java → jiajiakang-common/src/main/java/com/jiajiakang/common/core/domain/model/LoginUser.java
View File

@ -1,11 +1,11 @@
package com.ruoyi.common.core.domain.model; package com.jiajiakang.common.core.domain.model;
import java.util.Collection; import java.util.Collection;
import java.util.Set; import java.util.Set;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.ruoyi.common.core.domain.entity.SysUser; import com.jiajiakang.common.core.domain.entity.SysUser;
/** /**
* 登录用户身份权限 * 登录用户身份权限

4
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java → jiajiakang-common/src/main/java/com/jiajiakang/common/core/page/PageDomain.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.common.core.page; package com.jiajiakang.common.core.page;
import com.ruoyi.common.utils.StringUtils; import com.jiajiakang.common.utils.StringUtils;
/** /**
* 分页数据 * 分页数据

2
ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java → jiajiakang-common/src/main/java/com/jiajiakang/common/core/page/TableDataInfo.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.page; package com.jiajiakang.common.core.page;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;

4
ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java → jiajiakang-common/src/main/java/com/jiajiakang/common/core/page/TableSupport.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.common.core.page; package com.jiajiakang.common.core.page;
import com.ruoyi.common.utils.ServletUtils; import com.jiajiakang.common.utils.ServletUtils;
/** /**
* 表格数据处理 * 表格数据处理

2
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java → jiajiakang-common/src/main/java/com/jiajiakang/common/core/redis/RedisCache.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.redis; package com.jiajiakang.common.core.redis;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;

4
ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java → jiajiakang-common/src/main/java/com/jiajiakang/common/core/text/CharsetKit.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.common.core.text; package com.jiajiakang.common.core.text;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import com.ruoyi.common.utils.StringUtils; import com.jiajiakang.common.utils.StringUtils;
/** /**
* 字符集工具类 * 字符集工具类

4
ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java → jiajiakang-common/src/main/java/com/jiajiakang/common/core/text/Convert.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.text; package com.jiajiakang.common.core.text;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.BigInteger; import java.math.BigInteger;
@ -6,7 +6,7 @@ import java.nio.ByteBuffer;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.text.NumberFormat; import java.text.NumberFormat;
import java.util.Set; import java.util.Set;
import com.ruoyi.common.utils.StringUtils; import com.jiajiakang.common.utils.StringUtils;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
/** /**

4
ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java → jiajiakang-common/src/main/java/com/jiajiakang/common/core/text/StrFormatter.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.common.core.text; package com.jiajiakang.common.core.text;
import com.ruoyi.common.utils.StringUtils; import com.jiajiakang.common.utils.StringUtils;
/** /**
* 字符串格式化 * 字符串格式化

2
ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java → jiajiakang-common/src/main/java/com/jiajiakang/common/enums/BusinessStatus.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.enums; package com.jiajiakang.common.enums;
/** /**
* 操作状态 * 操作状态

2
ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java → jiajiakang-common/src/main/java/com/jiajiakang/common/enums/BusinessType.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.enums; package com.jiajiakang.common.enums;
/** /**
* 业务操作类型 * 业务操作类型

2
ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java → jiajiakang-common/src/main/java/com/jiajiakang/common/enums/DataSourceType.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.enums; package com.jiajiakang.common.enums;
/** /**
* 数据源 * 数据源

2
ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java → jiajiakang-common/src/main/java/com/jiajiakang/common/enums/HttpMethod.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.enums; package com.jiajiakang.common.enums;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

2
ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java → jiajiakang-common/src/main/java/com/jiajiakang/common/enums/OperatorType.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.enums; package com.jiajiakang.common.enums;
/** /**
* 操作人类别 * 操作人类别

2
ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java → jiajiakang-common/src/main/java/com/jiajiakang/common/enums/UserStatus.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.enums; package com.jiajiakang.common.enums;
/** /**
* 用户状态 * 用户状态

6
ruoyi-common/src/main/java/com/ruoyi/common/exception/BaseException.java → jiajiakang-common/src/main/java/com/jiajiakang/common/exception/BaseException.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.common.exception; package com.jiajiakang.common.exception;
import com.ruoyi.common.utils.MessageUtils; import com.jiajiakang.common.utils.MessageUtils;
import com.ruoyi.common.utils.StringUtils; import com.jiajiakang.common.utils.StringUtils;
/** /**
* 基础异常 * 基础异常

2
ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java → jiajiakang-common/src/main/java/com/jiajiakang/common/exception/CustomException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.exception; package com.jiajiakang.common.exception;
/** /**
* 自定义异常 * 自定义异常

2
ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java → jiajiakang-common/src/main/java/com/jiajiakang/common/exception/DemoModeException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.exception; package com.jiajiakang.common.exception;
/** /**
* 演示模式异常 * 演示模式异常

2
ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java → jiajiakang-common/src/main/java/com/jiajiakang/common/exception/UtilException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.exception; package com.jiajiakang.common.exception;
/** /**
* 工具类异常 * 工具类异常

4
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java → jiajiakang-common/src/main/java/com/jiajiakang/common/exception/file/FileException.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.common.exception.file; package com.jiajiakang.common.exception.file;
import com.ruoyi.common.exception.BaseException; import com.jiajiakang.common.exception.BaseException;
/** /**
* 文件信息异常类 * 文件信息异常类

2
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java → jiajiakang-common/src/main/java/com/jiajiakang/common/exception/file/FileNameLengthLimitExceededException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.exception.file; package com.jiajiakang.common.exception.file;
/** /**
* 文件名称超长限制异常类 * 文件名称超长限制异常类

2
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java → jiajiakang-common/src/main/java/com/jiajiakang/common/exception/file/FileSizeLimitExceededException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.exception.file; package com.jiajiakang.common.exception.file;
/** /**
* 文件名大小限制异常类 * 文件名大小限制异常类

2
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java → jiajiakang-common/src/main/java/com/jiajiakang/common/exception/file/InvalidExtensionException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.exception.file; package com.jiajiakang.common.exception.file;
import java.util.Arrays; import java.util.Arrays;
import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.fileupload.FileUploadException;

66
ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java → jiajiakang-common/src/main/java/com/jiajiakang/common/exception/job/TaskException.java
View File

@ -1,34 +1,34 @@
package com.ruoyi.common.exception.job; package com.jiajiakang.common.exception.job;
/** /**
* 计划策略异常 * 计划策略异常
* *
* @author ruoyi * @author ruoyi
*/ */
public class TaskException extends Exception public class TaskException extends Exception
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private Code code; private Code code;
public TaskException(String msg, Code code) public TaskException(String msg, Code code)
{ {
this(msg, code, null); this(msg, code, null);
} }
public TaskException(String msg, Code code, Exception nestedEx) public TaskException(String msg, Code code, Exception nestedEx)
{ {
super(msg, nestedEx); super(msg, nestedEx);
this.code = code; this.code = code;
} }
public Code getCode() public Code getCode()
{ {
return code; return code;
} }
public enum Code public enum Code
{ {
TASK_EXISTS, NO_TASK_EXISTS, TASK_ALREADY_STARTED, UNKNOWN, CONFIG_ERROR, TASK_NODE_NOT_AVAILABLE TASK_EXISTS, NO_TASK_EXISTS, TASK_ALREADY_STARTED, UNKNOWN, CONFIG_ERROR, TASK_NODE_NOT_AVAILABLE
} }
} }

2
ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java → jiajiakang-common/src/main/java/com/jiajiakang/common/exception/user/CaptchaException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.exception.user; package com.jiajiakang.common.exception.user;
/** /**
* 验证码错误异常类 * 验证码错误异常类

2
ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java → jiajiakang-common/src/main/java/com/jiajiakang/common/exception/user/CaptchaExpireException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.exception.user; package com.jiajiakang.common.exception.user;
/** /**
* 验证码失效异常类 * 验证码失效异常类

4
ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java → jiajiakang-common/src/main/java/com/jiajiakang/common/exception/user/UserException.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.common.exception.user; package com.jiajiakang.common.exception.user;
import com.ruoyi.common.exception.BaseException; import com.jiajiakang.common.exception.BaseException;
/** /**
* 用户信息异常类 * 用户信息异常类

2
ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java → jiajiakang-common/src/main/java/com/jiajiakang/common/exception/user/UserPasswordNotMatchException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.exception.user; package com.jiajiakang.common.exception.user;
/** /**
* 用户密码不正确或不符合规范异常类 * 用户密码不正确或不符合规范异常类

104
ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java → jiajiakang-common/src/main/java/com/jiajiakang/common/filter/RepeatableFilter.java
View File

@ -1,52 +1,52 @@
package com.ruoyi.common.filter; package com.jiajiakang.common.filter;
import java.io.IOException; import java.io.IOException;
import javax.servlet.Filter; import javax.servlet.Filter;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
import javax.servlet.FilterConfig; import javax.servlet.FilterConfig;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse; import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import com.ruoyi.common.utils.StringUtils; import com.jiajiakang.common.utils.StringUtils;
/** /**
* Repeatable 过滤器 * Repeatable 过滤器
* *
* @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.equalsAnyIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE)) && StringUtils.equalsAnyIgnoreCase(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()
{ {
} }
} }

144
ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java → jiajiakang-common/src/main/java/com/jiajiakang/common/filter/RepeatedlyRequestWrapper.java
View File

@ -1,72 +1,72 @@
package com.ruoyi.common.filter; package com.jiajiakang.common.filter;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import javax.servlet.ReadListener; import javax.servlet.ReadListener;
import javax.servlet.ServletInputStream; import javax.servlet.ServletInputStream;
import javax.servlet.ServletResponse; import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletRequestWrapper;
import com.ruoyi.common.utils.http.HttpHelper; import com.jiajiakang.common.utils.http.HttpHelper;
/** /**
* 构建可重复读取inputStream的request * 构建可重复读取inputStream的request
* *
* @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");
body = HttpHelper.getBodyString(request).getBytes("UTF-8"); body = HttpHelper.getBodyString(request).getBytes("UTF-8");
} }
@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 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)
{ {
} }
}; };
} }
} }

4
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java → jiajiakang-common/src/main/java/com/jiajiakang/common/filter/XssFilter.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.filter; package com.jiajiakang.common.filter;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@ -13,7 +13,7 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse; import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.utils.StringUtils; import com.jiajiakang.common.utils.StringUtils;
/** /**
* 防止XSS攻击的过滤器 * 防止XSS攻击的过滤器

6
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java → jiajiakang-common/src/main/java/com/jiajiakang/common/filter/XssHttpServletRequestWrapper.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.filter; package com.jiajiakang.common.filter;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
@ -9,8 +9,8 @@ import javax.servlet.http.HttpServletRequestWrapper;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import com.ruoyi.common.utils.StringUtils; import com.jiajiakang.common.utils.StringUtils;
import com.ruoyi.common.utils.html.EscapeUtil; import com.jiajiakang.common.utils.html.EscapeUtil;
/** /**
* XSS过滤处理 * XSS过滤处理

2
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java → jiajiakang-common/src/main/java/com/jiajiakang/common/utils/DateUtils.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.utils; package com.jiajiakang.common.utils;
import java.lang.management.ManagementFactory; import java.lang.management.ManagementFactory;
import java.text.ParseException; import java.text.ParseException;

346
ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java → jiajiakang-common/src/main/java/com/jiajiakang/common/utils/DictUtils.java
View File

@ -1,173 +1,173 @@
package com.ruoyi.common.utils; package com.jiajiakang.common.utils;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import com.ruoyi.common.constant.Constants; import com.jiajiakang.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.SysDictData; import com.jiajiakang.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.redis.RedisCache; import com.jiajiakang.common.core.redis.RedisCache;
import com.ruoyi.common.utils.spring.SpringUtils; import com.jiajiakang.common.utils.spring.SpringUtils;
/** /**
* 字典工具类 * 字典工具类
* *
* @author ruoyi * @author ruoyi
*/ */
public class DictUtils public class DictUtils
{ {
/** /**
* 分隔符 * 分隔符
*/ */
public static final String SEPARATOR = ","; public static final String SEPARATOR = ",";
/** /**
* 设置字典缓存 * 设置字典缓存
* *
* @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)
{ {
SpringUtils.getBean(RedisCache.class).setCacheObject(getCacheKey(key), dictDatas); SpringUtils.getBean(RedisCache.class).setCacheObject(getCacheKey(key), dictDatas);
} }
/** /**
* 获取字典缓存 * 获取字典缓存
* *
* @param key 参数键 * @param key 参数键
* @return dictDatas 字典数据列表 * @return dictDatas 字典数据列表
*/ */
public static List<SysDictData> getDictCache(String key) public static List<SysDictData> getDictCache(String key)
{ {
Object cacheObj = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key)); Object cacheObj = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
if (StringUtils.isNotNull(cacheObj)) if (StringUtils.isNotNull(cacheObj))
{ {
List<SysDictData> dictDatas = StringUtils.cast(cacheObj); List<SysDictData> dictDatas = StringUtils.cast(cacheObj);
return dictDatas; return dictDatas;
} }
return null; return null;
} }
/** /**
* 根据字典类型和字典值获取字典标签 * 根据字典类型和字典值获取字典标签
* *
* @param dictType 字典类型 * @param dictType 字典类型
* @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);
} }
/** /**
* 根据字典类型和字典标签获取字典值 * 根据字典类型和字典标签获取字典值
* *
* @param dictType 字典类型 * @param dictType 字典类型
* @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);
} }
/** /**
* 根据字典类型和字典值获取字典标签 * 根据字典类型和字典值获取字典标签
* *
* @param dictType 字典类型 * @param dictType 字典类型
* @param dictValue 字典值 * @param dictValue 字典值
* @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(separator, dictValue) && StringUtils.isNotEmpty(datas)) if (StringUtils.containsAny(separator, dictValue) && StringUtils.isNotEmpty(datas))
{ {
for (SysDictData dict : datas) for (SysDictData dict : datas)
{ {
for (String value : dictValue.split(separator)) for (String value : dictValue.split(separator))
{ {
if (value.equals(dict.getDictValue())) if (value.equals(dict.getDictValue()))
{ {
propertyString.append(dict.getDictLabel() + separator); propertyString.append(dict.getDictLabel() + separator);
break; break;
} }
} }
} }
} }
else else
{ {
for (SysDictData dict : datas) for (SysDictData dict : datas)
{ {
if (dictValue.equals(dict.getDictValue())) if (dictValue.equals(dict.getDictValue()))
{ {
return dict.getDictLabel(); return dict.getDictLabel();
} }
} }
} }
return StringUtils.stripEnd(propertyString.toString(), separator); return StringUtils.stripEnd(propertyString.toString(), separator);
} }
/** /**
* 根据字典类型和字典标签获取字典值 * 根据字典类型和字典标签获取字典值
* *
* @param dictType 字典类型 * @param dictType 字典类型
* @param dictLabel 字典标签 * @param dictLabel 字典标签
* @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(separator, dictLabel) && StringUtils.isNotEmpty(datas)) if (StringUtils.containsAny(separator, dictLabel) && StringUtils.isNotEmpty(datas))
{ {
for (SysDictData dict : datas) for (SysDictData dict : datas)
{ {
for (String label : dictLabel.split(separator)) for (String label : dictLabel.split(separator))
{ {
if (label.equals(dict.getDictLabel())) if (label.equals(dict.getDictLabel()))
{ {
propertyString.append(dict.getDictValue() + separator); propertyString.append(dict.getDictValue() + separator);
break; break;
} }
} }
} }
} }
else else
{ {
for (SysDictData dict : datas) for (SysDictData dict : datas)
{ {
if (dictLabel.equals(dict.getDictLabel())) if (dictLabel.equals(dict.getDictLabel()))
{ {
return dict.getDictValue(); return dict.getDictValue();
} }
} }
} }
return StringUtils.stripEnd(propertyString.toString(), separator); return StringUtils.stripEnd(propertyString.toString(), separator);
} }
/** /**
* 清空字典缓存 * 清空字典缓存
*/ */
public static void clearDictCache() public static void clearDictCache()
{ {
Collection<String> keys = SpringUtils.getBean(RedisCache.class).keys(Constants.SYS_DICT_KEY + "*"); Collection<String> keys = SpringUtils.getBean(RedisCache.class).keys(Constants.SYS_DICT_KEY + "*");
SpringUtils.getBean(RedisCache.class).deleteObject(keys); SpringUtils.getBean(RedisCache.class).deleteObject(keys);
} }
/** /**
* 设置cache key * 设置cache key
* *
* @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;
} }
} }

80
ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java → jiajiakang-common/src/main/java/com/jiajiakang/common/utils/ExceptionUtil.java
View File

@ -1,40 +1,40 @@
package com.ruoyi.common.utils; package com.jiajiakang.common.utils;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.lang3.exception.ExceptionUtils;
/** /**
* 错误信息处理类。 * 错误信息处理类。
* *
* @author ruoyi * @author ruoyi
*/ */
public class ExceptionUtil public class ExceptionUtil
{ {
/** /**
* 获取exception的详细错误信息。 * 获取exception的详细错误信息。
*/ */
public static String getExceptionMessage(Throwable e) public static String getExceptionMessage(Throwable e)
{ {
StringWriter sw = new StringWriter(); StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw, true)); e.printStackTrace(new PrintWriter(sw, true));
String str = sw.toString(); String str = sw.toString();
return str; return str;
} }
public static String getRootErrorMseeage(Exception e) public static String getRootErrorMseeage(Exception e)
{ {
Throwable root = ExceptionUtils.getRootCause(e); Throwable root = ExceptionUtils.getRootCause(e);
root = (root == null ? e : root); root = (root == null ? e : root);
if (root == null) if (root == null)
{ {
return ""; return "";
} }
String msg = root.getMessage(); String msg = root.getMessage();
if (msg == null) if (msg == null)
{ {
return "null"; return "null";
} }
return StringUtils.defaultString(msg); return StringUtils.defaultString(msg);
} }
} }

2
ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java → jiajiakang-common/src/main/java/com/jiajiakang/common/utils/LogUtils.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.utils; package com.jiajiakang.common.utils;
/** /**
* 处理并记录日志文件 * 处理并记录日志文件

4
ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java → jiajiakang-common/src/main/java/com/jiajiakang/common/utils/MessageUtils.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.common.utils; package com.jiajiakang.common.utils;
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; import com.jiajiakang.common.utils.spring.SpringUtils;
/** /**
* 获取i18n资源文件 * 获取i18n资源文件

8
ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java → jiajiakang-common/src/main/java/com/jiajiakang/common/utils/SecurityUtils.java
View File

@ -1,11 +1,11 @@
package com.ruoyi.common.utils; package com.jiajiakang.common.utils;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import com.ruoyi.common.constant.HttpStatus; import com.jiajiakang.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.model.LoginUser; import com.jiajiakang.common.core.domain.model.LoginUser;
import com.ruoyi.common.exception.CustomException; import com.jiajiakang.common.exception.CustomException;
/** /**
* 安全服务工具类 * 安全服务工具类

4
ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java → jiajiakang-common/src/main/java/com/jiajiakang/common/utils/ServletUtils.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.utils; package com.jiajiakang.common.utils;
import java.io.IOException; import java.io.IOException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -7,7 +7,7 @@ import javax.servlet.http.HttpSession;
import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
import com.ruoyi.common.core.text.Convert; import com.jiajiakang.common.core.text.Convert;
/** /**
* 客户端工具类 * 客户端工具类

4
ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java → jiajiakang-common/src/main/java/com/jiajiakang/common/utils/StringUtils.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.utils; package com.jiajiakang.common.utils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -6,7 +6,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import com.ruoyi.common.core.text.StrFormatter; import com.jiajiakang.common.core.text.StrFormatter;
/** /**
* 字符串工具类 * 字符串工具类

2
ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java → jiajiakang-common/src/main/java/com/jiajiakang/common/utils/Threads.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.utils; package com.jiajiakang.common.utils;
import java.util.concurrent.CancellationException; import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;

220
ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java → jiajiakang-common/src/main/java/com/jiajiakang/common/utils/bean/BeanUtils.java
View File

@ -1,110 +1,110 @@
package com.ruoyi.common.utils.bean; package com.jiajiakang.common.utils.bean;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
/** /**
* Bean 工具类 * Bean 工具类
* *
* @author ruoyi * @author ruoyi
*/ */
public class BeanUtils extends org.springframework.beans.BeanUtils public class BeanUtils extends org.springframework.beans.BeanUtils
{ {
/** Bean方法名中属性名开始的下标 */ /** Bean方法名中属性名开始的下标 */
private static final int BEAN_METHOD_PROP_INDEX = 3; private static final int BEAN_METHOD_PROP_INDEX = 3;
/** * 匹配getter方法的正则表达式 */ /** * 匹配getter方法的正则表达式 */
private static final Pattern GET_PATTERN = Pattern.compile("get(\\p{javaUpperCase}\\w*)"); private static final Pattern GET_PATTERN = Pattern.compile("get(\\p{javaUpperCase}\\w*)");
/** * 匹配setter方法的正则表达式 */ /** * 匹配setter方法的正则表达式 */
private static final Pattern SET_PATTERN = Pattern.compile("set(\\p{javaUpperCase}\\w*)"); private static final Pattern SET_PATTERN = Pattern.compile("set(\\p{javaUpperCase}\\w*)");
/** /**
* Bean属性复制工具方法。 * Bean属性复制工具方法。
* *
* @param dest 目标对象 * @param dest 目标对象
* @param src 源对象 * @param src 源对象
*/ */
public static void copyBeanProp(Object dest, Object src) public static void copyBeanProp(Object dest, Object src)
{ {
try try
{ {
copyProperties(src, dest); copyProperties(src, dest);
} }
catch (Exception e) catch (Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
} }
} }
/** /**
* 获取对象的setter方法。 * 获取对象的setter方法。
* *
* @param obj 对象 * @param obj 对象
* @return 对象的setter方法列表 * @return 对象的setter方法列表
*/ */
public static List<Method> getSetterMethods(Object obj) public static List<Method> getSetterMethods(Object obj)
{ {
// setter方法列表 // setter方法列表
List<Method> setterMethods = new ArrayList<Method>(); List<Method> setterMethods = new ArrayList<Method>();
// 获取所有方法 // 获取所有方法
Method[] methods = obj.getClass().getMethods(); Method[] methods = obj.getClass().getMethods();
// 查找setter方法 // 查找setter方法
for (Method method : methods) for (Method method : methods)
{ {
Matcher m = SET_PATTERN.matcher(method.getName()); Matcher m = SET_PATTERN.matcher(method.getName());
if (m.matches() && (method.getParameterTypes().length == 1)) if (m.matches() && (method.getParameterTypes().length == 1))
{ {
setterMethods.add(method); setterMethods.add(method);
} }
} }
// 返回setter方法列表 // 返回setter方法列表
return setterMethods; return setterMethods;
} }
/** /**
* 获取对象的getter方法。 * 获取对象的getter方法。
* *
* @param obj 对象 * @param obj 对象
* @return 对象的getter方法列表 * @return 对象的getter方法列表
*/ */
public static List<Method> getGetterMethods(Object obj) public static List<Method> getGetterMethods(Object obj)
{ {
// getter方法列表 // getter方法列表
List<Method> getterMethods = new ArrayList<Method>(); List<Method> getterMethods = new ArrayList<Method>();
// 获取所有方法 // 获取所有方法
Method[] methods = obj.getClass().getMethods(); Method[] methods = obj.getClass().getMethods();
// 查找getter方法 // 查找getter方法
for (Method method : methods) for (Method method : methods)
{ {
Matcher m = GET_PATTERN.matcher(method.getName()); Matcher m = GET_PATTERN.matcher(method.getName());
if (m.matches() && (method.getParameterTypes().length == 0)) if (m.matches() && (method.getParameterTypes().length == 0))
{ {
getterMethods.add(method); getterMethods.add(method);
} }
} }
// 返回getter方法列表 // 返回getter方法列表
return getterMethods; return getterMethods;
} }
/** /**
* 检查Bean方法名中的属性名是否相等。<br> * 检查Bean方法名中的属性名是否相等。<br>
* 如getName()和setName()属性名一样，getName()和setAge()属性名不一样。 * 如getName()和setName()属性名一样，getName()和setAge()属性名不一样。
* *
* @param m1 方法名1 * @param m1 方法名1
* @param m2 方法名2 * @param m2 方法名2
* @return 属性名一样返回true，否则返回false * @return 属性名一样返回true，否则返回false
*/ */
public static boolean isMethodPropEquals(String m1, String m2) public static boolean isMethodPropEquals(String m1, String m2)
{ {
return m1.substring(BEAN_METHOD_PROP_INDEX).equals(m2.substring(BEAN_METHOD_PROP_INDEX)); return m1.substring(BEAN_METHOD_PROP_INDEX).equals(m2.substring(BEAN_METHOD_PROP_INDEX));
} }
} }

150
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java → jiajiakang-common/src/main/java/com/jiajiakang/common/utils/file/FileTypeUtils.java
View File

@ -1,76 +1,76 @@
package com.ruoyi.common.utils.file; package com.jiajiakang.common.utils.file;
import java.io.File; import java.io.File;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
/** /**
* 文件类型工具类 * 文件类型工具类
* *
* @author ruoyi * @author ruoyi
*/ */
public class FileTypeUtils public class FileTypeUtils
{ {
/** /**
* 获取文件类型 * 获取文件类型
* <p> * <p>
* 例如: ruoyi.txt, 返回: txt * 例如: ruoyi.txt, 返回: txt
* *
* @param file 文件名 * @param file 文件名
* @return 后缀（不含".") * @return 后缀（不含".")
*/ */
public static String getFileType(File file) public static String getFileType(File file)
{ {
if (null == file) if (null == file)
{ {
return StringUtils.EMPTY; return StringUtils.EMPTY;
} }
return getFileType(file.getName()); return getFileType(file.getName());
} }
/** /**
* 获取文件类型 * 获取文件类型
* <p> * <p>
* 例如: ruoyi.txt, 返回: txt * 例如: ruoyi.txt, 返回: txt
* *
* @param fileName 文件名 * @param fileName 文件名
* @return 后缀（不含".") * @return 后缀（不含".")
*/ */
public static String getFileType(String fileName) public static String getFileType(String fileName)
{ {
int separatorIndex = fileName.lastIndexOf("."); int separatorIndex = fileName.lastIndexOf(".");
if (separatorIndex < 0) if (separatorIndex < 0)
{ {
return ""; return "";
} }
return fileName.substring(separatorIndex + 1).toLowerCase(); return fileName.substring(separatorIndex + 1).toLowerCase();
} }
/** /**
* 获取文件类型 * 获取文件类型
* *
* @param photoByte 文件字节码 * @param photoByte 文件字节码
* @return 后缀（不含".") * @return 后缀（不含".")
*/ */
public static String getFileExtendName(byte[] photoByte) public static String getFileExtendName(byte[] photoByte)
{ {
String strFileExtendName = "JPG"; String strFileExtendName = "JPG";
if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56) if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56)
&& ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97)) && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97))
{ {
strFileExtendName = "GIF"; strFileExtendName = "GIF";
} }
else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70)) else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70))
{ {
strFileExtendName = "JPG"; strFileExtendName = "JPG";
} }
else if ((photoByte[0] == 66) && (photoByte[1] == 77)) else if ((photoByte[0] == 66) && (photoByte[1] == 77))
{ {
strFileExtendName = "BMP"; strFileExtendName = "BMP";
} }
else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71)) else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71))
{ {
strFileExtendName = "PNG"; strFileExtendName = "PNG";
} }
return strFileExtendName; return strFileExtendName;
} }
} }

16
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java → jiajiakang-common/src/main/java/com/jiajiakang/common/utils/file/FileUploadUtils.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.utils.file; package com.jiajiakang.common.utils.file;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -6,13 +6,13 @@ import java.io.IOException;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.FilenameUtils;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.config.RuoYiConfig; import com.jiajiakang.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants; import com.jiajiakang.common.constant.Constants;
import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException; import com.jiajiakang.common.exception.file.FileNameLengthLimitExceededException;
import com.ruoyi.common.exception.file.FileSizeLimitExceededException; import com.jiajiakang.common.exception.file.FileSizeLimitExceededException;
import com.ruoyi.common.exception.file.InvalidExtensionException; import com.jiajiakang.common.exception.file.InvalidExtensionException;
import com.ruoyi.common.utils.DateUtils; import com.jiajiakang.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.jiajiakang.common.utils.StringUtils;
/** /**
* 文件上传工具类 * 文件上传工具类

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