Skip to content

F
finance-manage
Commit cee572f2 authored by RuoYi's avatar RuoYi
Browse files
Options

若依 3.0

parent 0d341f1a
Show whitespace changes
Inline Side-by-side
Showing with 5935 additions and 5542 deletions
bin/run.bat 0 → 100644
View file @ cee572f2
@echo off
echo.
echo [Ϣ] Web̡
echo.
cd %~dp0
cd ../ruoyi-admin/target
set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
java -jar %JAVA_OPTS% ruoyi-admin.jar
cd bin
pause
\ No newline at end of file
pom.xml 0 → 100644
View file @ cee572f2
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<modelVersion>4.0.0</modelVersion>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
<version>3.0.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依管理系统</description>
<properties>
<ruoyi.version>3.0.0</ruoyi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<mybatis.boot.version>1.3.2</mybatis.boot.version>
<druid.version>1.1.14</druid.version>
<bitwalker.version>1.19</bitwalker.version>
<swagger.version>2.9.2</swagger.version>
<pagehelper.boot.version>1.2.5</pagehelper.boot.version>
<fastjson.version>1.2.70</fastjson.version>
<oshi.version>3.9.1</oshi.version>
<commons.io.version>2.5</commons.io.version>
<commons.fileupload.version>1.3.3</commons.fileupload.version>
<poi.version>3.17</poi.version>
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.0</jwt.version>
</properties>
<!-- 依赖声明 -->
<dependencyManagement>
<dependencies>
<!-- SpringBoot的依赖配置-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.1.1.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!--阿里数据库连接池 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
</dependency>
<!-- 解析客户端操作系统、浏览器等 -->
<dependency>
<groupId>eu.bitwalker</groupId>
<artifactId>UserAgentUtils</artifactId>
<version>${bitwalker.version}</version>
</dependency>
<!-- pagehelper 分页插件 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>${pagehelper.boot.version}</version>
</dependency>
<!-- 获取系统信息 -->
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>${oshi.version}</version>
</dependency>
<!-- swagger2-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger.version}</version>
<exclusions>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- swagger2-UI-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.version}</version>
</dependency>
<!--io常用工具类 -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>
<!--文件上传工具类 -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons.fileupload.version}</version>
</dependency>
<!-- excel工具 -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
</dependency>
<!--velocity代码生成使用模板 -->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity.version}</version>
</dependency>
<!-- 阿里JSON解析器 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
<!--Token生成与解析-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>${jwt.version}</version>
</dependency>
<!-- 定时任务-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-quartz</artifactId>
<version>${ruoyi.version}</version>
</dependency>
<!-- 代码生成-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-generator</artifactId>
<version>${ruoyi.version}</version>
</dependency>
<!-- 核心模块-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-framework</artifactId>
<version>${ruoyi.version}</version>
</dependency>
<!-- 系统模块-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
<version>${ruoyi.version}</version>
</dependency>
<!-- 通用工具-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
<version>${ruoyi.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<modules>
<module>ruoyi-admin</module>
<module>ruoyi-framework</module>
<module>ruoyi-system</module>
<module>ruoyi-quartz</module>
<module>ruoyi-generator</module>
<module>ruoyi-common</module>
</modules>
<packaging>pom</packaging>
<dependencies>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>public</id>
<name>aliyun nexus</name>
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>public</id>
<name>aliyun nexus</name>
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project>
\ No newline at end of file
ruoyi-admin/pom.xml 0 → 100644
View file @ cee572f2
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<artifactId>ruoyi-admin</artifactId>
<description>
web服务入口
</description>
<dependencies>
<!-- spring-boot-devtools -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional> <!-- 表示依赖不会传递 -->
</dependency>
<!-- swagger2-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency>
<!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.21</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
<version>1.5.21</version>
</dependency>
<!-- swagger2-UI-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
<!-- Mysql驱动包 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<!-- 核心模块-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-framework</artifactId>
</dependency>
<!-- 定时任务-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-quartz</artifactId>
</dependency>
<!-- 代码生成-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-generator</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.1.1.RELEASE</version>
<configuration>
<fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
<warName>${project.artifactId}</warName>
</configuration>
</plugin>
</plugins>
<finalName>${project.artifactId}</finalName>
</build>
</project>
\ No newline at end of file
ruoyi/src/main/java/com/ruoyi/project/common/CaptchaController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
View file @ cee572f2
package com.ruoyi.project.common; package com.ruoyi.web.controller.common;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
...@@ -8,11 +8,11 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -8,11 +8,11 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.IdUtils; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.VerifyCodeUtils; import com.ruoyi.common.utils.VerifyCodeUtils;
import com.ruoyi.common.utils.sign.Base64; import com.ruoyi.common.utils.sign.Base64;
import com.ruoyi.framework.redis.RedisCache; import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
/** /**
* 验证码操作处理 * 验证码操作处理
......
ruoyi/src/main/java/com/ruoyi/project/common/CommonController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
View file @ cee572f2
package com.ruoyi.project.common; package com.ruoyi.web.controller.common;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -9,13 +9,13 @@ import org.springframework.web.bind.annotation.GetMapping; ...@@ -9,13 +9,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.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils; import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.framework.config.RuoYiConfig;
import com.ruoyi.framework.config.ServerConfig; import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.framework.web.domain.AjaxResult;
/** /**
* 通用请求处理 * 通用请求处理
......
ruoyi/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
View file @ cee572f2
package com.ruoyi.project.monitor.controller; package com.ruoyi.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.framework.web.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.framework.web.domain.Server; import com.ruoyi.framework.web.domain.Server;
/** /**
......
ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
View file @ cee572f2
package com.ruoyi.project.monitor.controller; package com.ruoyi.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; ...@@ -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.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.system.service.ISysLogininforService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.domain.SysLogininfor;
import com.ruoyi.project.monitor.service.ISysLogininforService;
/** /**
* 系统访问记录 * 系统访问记录
......
ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
View file @ cee572f2
package com.ruoyi.project.monitor.controller; package com.ruoyi.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; ...@@ -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.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.system.service.ISysOperLogService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.domain.SysOperLog;
import com.ruoyi.project.monitor.service.ISysOperLogService;
/** /**
* 操作日志记录 * 操作日志记录
......
ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
View file @ cee572f2
package com.ruoyi.project.monitor.controller; package com.ruoyi.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; ...@@ -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.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.system.domain.SysUserOnline;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.system.service.ISysUserOnlineService;
import com.ruoyi.framework.redis.RedisCache;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.domain.SysUserOnline;
import com.ruoyi.project.system.service.ISysUserOnlineService;
/** /**
* 在线用户监控 * 在线用户监控
......
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
View file @ cee572f2
package com.ruoyi.project.system.controller; package com.ruoyi.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,17 @@ import org.springframework.web.bind.annotation.PutMapping; ...@@ -12,16 +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.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.domain.SysConfig;
import com.ruoyi.project.system.service.ISysConfigService;
/** /**
* 参数配置 信息操作处理 * 参数配置 信息操作处理
...@@ -82,6 +83,7 @@ public class SysConfigController extends BaseController ...@@ -82,6 +83,7 @@ public class SysConfigController extends BaseController
@PreAuthorize("@ss.hasPermi('system:config:add')") @PreAuthorize("@ss.hasPermi('system:config:add')")
@Log(title = "参数管理", businessType = BusinessType.INSERT) @Log(title = "参数管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
@RepeatSubmit
public AjaxResult add(@Validated @RequestBody SysConfig config) public AjaxResult add(@Validated @RequestBody SysConfig config)
{ {
if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
......
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
View file @ cee572f2
package com.ruoyi.project.system.controller; package com.ruoyi.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; ...@@ -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.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.service.ISysDeptService;
/** /**
* 部门信息 * 部门信息
......
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
View file @ cee572f2
package com.ruoyi.project.system.controller; package com.ruoyi.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; ...@@ -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.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.system.service.ISysDictTypeService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.domain.SysDictData;
import com.ruoyi.project.system.service.ISysDictDataService;
import com.ruoyi.project.system.service.ISysDictTypeService;
/** /**
* 数据字典信息 * 数据字典信息
......
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
View file @ cee572f2
package com.ruoyi.project.system.controller; package com.ruoyi.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; ...@@ -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.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.system.service.ISysDictTypeService;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.domain.SysDictType;
import com.ruoyi.project.system.service.ISysDictTypeService;
/** /**
* 数据字典信息 * 数据字典信息
......
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
View file @ cee572f2
package com.ruoyi.project.system.controller; package com.ruoyi.web.controller.system;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
...@@ -8,16 +8,16 @@ import org.springframework.web.bind.annotation.PostMapping; ...@@ -8,16 +8,16 @@ 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.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.framework.security.LoginBody; import com.ruoyi.framework.web.service.SysLoginService;
import com.ruoyi.framework.security.LoginUser; import com.ruoyi.framework.web.service.SysPermissionService;
import com.ruoyi.framework.security.service.SysLoginService; import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.framework.security.service.SysPermissionService; import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.framework.security.service.TokenService;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysMenu;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.service.ISysMenuService;
/** /**
* 登录验证 * 登录验证
......
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
View file @ cee572f2
package com.ruoyi.project.system.controller; package com.ruoyi.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; ...@@ -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.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.security.service.TokenService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysMenu;
import com.ruoyi.project.system.service.ISysMenuService;
/** /**
* 菜单信息 * 菜单信息
......
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
View file @ cee572f2
package com.ruoyi.project.system.controller; package com.ruoyi.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; ...@@ -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.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.system.domain.SysNotice;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.system.service.ISysNoticeService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.domain.SysNotice;
import com.ruoyi.project.system.service.ISysNoticeService;
/** /**
* 公告 信息操作处理 * 公告 信息操作处理
......
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
View file @ cee572f2
package com.ruoyi.project.system.controller; package com.ruoyi.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; ...@@ -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.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.system.domain.SysPost;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.domain.SysPost;
import com.ruoyi.project.system.service.ISysPostService;
/** /**
* 岗位信息操作处理 * 岗位信息操作处理
......
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
View file @ cee572f2
package com.ruoyi.project.system.controller; package com.ruoyi.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; ...@@ -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.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.framework.config.RuoYiConfig;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.security.service.TokenService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.service.ISysUserService;
/** /**
* 个人信息 业务处理 * 个人信息 业务处理
......
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
View file @ cee572f2
package com.ruoyi.project.system.controller; package com.ruoyi.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; ...@@ -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.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.domain.SysRole;
import com.ruoyi.project.system.service.ISysRoleService;
/** /**
* 角色信息 * 角色信息
......
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View file @ cee572f2
package com.ruoyi.project.system.controller; package com.ruoyi.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; ...@@ -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.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.framework.security.LoginUser; import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.framework.security.service.TokenService; import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.domain.SysRole;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.service.ISysPostService;
import com.ruoyi.project.system.service.ISysRoleService;
import com.ruoyi.project.system.service.ISysUserService;
/** /**
* 用户信息 * 用户信息
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java 0 → 100644
View file @ cee572f2
package com.ruoyi.web.controller.tool;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import com.ruoyi.common.core.controller.BaseController;
/**
* swagger 接口
*
* @author ruoyi
*/
@Controller
@RequestMapping("/tool/swagger")
public class SwaggerController extends BaseController
{
@PreAuthorize("@ss.hasPermi('tool:swagger:view')")
@GetMapping()
public String index()
{
return redirect("/swagger-ui.html");
}
}
ruoyi/src/main/java/com/ruoyi/project/tool/swagger/TestController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
View file @ cee572f2
package com.ruoyi.project.tool.swagger; package com.ruoyi.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; ...@@ -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.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
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;
......
ruoyi/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java → ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
View file @ cee572f2
package com.ruoyi.framework.config; package com.ruoyi.web.core.config;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -6,6 +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 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;
......
ruoyi/src/main/resources/application.yml → ruoyi-admin/src/main/resources/application.yml
View file @ cee572f2
...@@ -3,7 +3,7 @@ ruoyi: ...@@ -3,7 +3,7 @@ ruoyi:
# 名称 # 名称
name: RuoYi name: RuoYi
# 版本 # 版本
version: 2.3.0 version: 3.0.0
# 版权年份 # 版权年份
copyrightYear: 2019 copyrightYear: 2019
# 实例演示开关 # 实例演示开关
...@@ -87,9 +87,9 @@ token: ...@@ -87,9 +87,9 @@ token:
# MyBatis配置 # MyBatis配置
mybatis: mybatis:
# 搜索指定包别名 # 搜索指定包别名
typeAliasesPackage: com.ruoyi.project.**.domain typeAliasesPackage: com.ruoyi.**.domain
# 配置mapper的扫描，找到所有的mapper.xml映射文件 # 配置mapper的扫描，找到所有的mapper.xml映射文件
mapperLocations: classpath*:mybatis/**/*Mapper.xml mapperLocations: classpath*:mapper/**/*Mapper.xml
# 加载全局的配置文件 # 加载全局的配置文件
configLocation: classpath:mybatis/mybatis-config.xml configLocation: classpath:mybatis/mybatis-config.xml
...@@ -115,14 +115,3 @@ xss: ...@@ -115,14 +115,3 @@ xss:
excludes: /system/notice/* excludes: /system/notice/*
# 匹配链接 # 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/* urlPatterns: /system/*,/monitor/*,/tool/*
# 代码生成
gen:
# 作者
author: ruoyi
# 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
packageName: com.ruoyi.project.system
# 自动去除表前缀，默认是true
autoRemovePre: false
# 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
tablePrefix: sys_
\ No newline at end of file
ruoyi-common/pom.xml 0 → 100644
View file @ cee572f2
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-common</artifactId>
<description>
common通用工具
</description>
<dependencies>
<!-- Spring框架基本的核心工具 -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
</dependency>
<!-- SpringWeb模块 -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<!-- spring security 安全认证 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<!-- pagehelper 分页插件 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
</dependency>
<!-- 自定义验证注解 -->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
<!--常用工具类 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<!-- JSON工具类 -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<!-- 阿里JSON解析器 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
<!-- io常用工具类 -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<!-- 文件上传工具类 -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</dependency>
<!-- excel工具 -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
</dependency>
<!-- yml解析器 -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>
<!--Token生成与解析-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
</dependency>
<!-- redis 缓存操作 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<!-- pool 对象池 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
</dependency>
<!-- 解析客户端操作系统、浏览器等 -->
<dependency>
<groupId>eu.bitwalker</groupId>
<artifactId>UserAgentUtils</artifactId>
</dependency>
<!-- servlet包 -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java → ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java
View file @ cee572f2
package com.ruoyi.framework.aspectj.lang.annotation; package com.ruoyi.common.annotation;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
......
ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java → ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java
View file @ cee572f2
package com.ruoyi.framework.aspectj.lang.annotation; package com.ruoyi.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; ...@@ -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.framework.aspectj.lang.enums.DataSourceType; import com.ruoyi.common.enums.DataSourceType;
/** /**
* 自定义多数据源切换注解 * 自定义多数据源切换注解
......
ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java → ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
View file @ cee572f2
package com.ruoyi.framework.aspectj.lang.annotation; package com.ruoyi.common.annotation;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
......
ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excels.java → ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java
View file @ cee572f2
package com.ruoyi.framework.aspectj.lang.annotation; package com.ruoyi.common.annotation;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
......
ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java → ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java
View file @ cee572f2
package com.ruoyi.framework.aspectj.lang.annotation; package com.ruoyi.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.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.aspectj.lang.enums.OperatorType; import com.ruoyi.common.enums.OperatorType;
/** /**
* 自定义操作日志记录注解 * 自定义操作日志记录注解
......
ruoyi/src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java → ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
View file @ cee572f2
package com.ruoyi.framework.interceptor.annotation; package com.ruoyi.common.annotation;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
......
ruoyi/src/main/java/com/ruoyi/framework/config/RuoYiConfig.java → ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
View file @ cee572f2
package com.ruoyi.framework.config; package com.ruoyi.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;
......
ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java → ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
View file @ cee572f2
package com.ruoyi.common.constant; package com.ruoyi.common.constant;
import io.jsonwebtoken.Claims;
/** /**
* 通用常量信息 * 通用常量信息
* *
...@@ -92,7 +90,7 @@ public class Constants ...@@ -92,7 +90,7 @@ public class Constants
/** /**
* 用户名称 * 用户名称
*/ */
public static final String JWT_USERNAME = Claims.SUBJECT; public static final String JWT_USERNAME = "sub";
/** /**
* 用户头像 * 用户头像
......
ruoyi/src/main/java/com/ruoyi/framework/web/controller/BaseController.java → ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
View file @ cee572f2
package com.ruoyi.framework.web.controller; package com.ruoyi.common.core.controller;
import java.beans.PropertyEditorSupport; import java.beans.PropertyEditorSupport;
import java.util.Date; import java.util.Date;
...@@ -10,13 +10,13 @@ import org.springframework.web.bind.annotation.InitBinder; ...@@ -10,13 +10,13 @@ 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.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.page.TableSupport;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.sql.SqlUtil; import com.ruoyi.common.utils.sql.SqlUtil;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.PageDomain;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.framework.web.page.TableSupport;
/** /**
* web层通用数据处理 * web层通用数据处理
...@@ -83,4 +83,12 @@ public class BaseController ...@@ -83,4 +83,12 @@ public class BaseController
{ {
return rows > 0 ? AjaxResult.success() : AjaxResult.error(); return rows > 0 ? AjaxResult.success() : AjaxResult.error();
} }
/**
* 页面跳转
*/
public String redirect(String url)
{
return StringUtils.format("redirect:{}", url);
}
} }
ruoyi/src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
View file @ cee572f2
package com.ruoyi.framework.web.domain; package com.ruoyi.common.core.domain;
import java.util.HashMap; import java.util.HashMap;
import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.constant.HttpStatus;
......
ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
View file @ cee572f2
package com.ruoyi.framework.web.domain; package com.ruoyi.common.core.domain;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
......
ruoyi/src/main/java/com/ruoyi/framework/web/domain/TreeEntity.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
View file @ cee572f2
package com.ruoyi.framework.web.domain; package com.ruoyi.common.core.domain;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
......
ruoyi/src/main/java/com/ruoyi/framework/web/domain/TreeSelect.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
View file @ cee572f2
package com.ruoyi.framework.web.domain; package com.ruoyi.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.project.system.domain.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.project.system.domain.SysMenu; import com.ruoyi.common.core.domain.entity.SysMenu;
/** /**
* Treeselect树结构实体类 * Treeselect树结构实体类
......
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDept.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
View file @ cee572f2
package com.ruoyi.project.system.domain; package com.ruoyi.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; ...@@ -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.framework.web.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 部门表 sys_dept * 部门表 sys_dept
......
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictData.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
View file @ cee572f2
package com.ruoyi.project.system.domain; package com.ruoyi.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.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.framework.aspectj.lang.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
import com.ruoyi.framework.web.domain.BaseEntity;
/** /**
* 字典数据表 sys_dict_data * 字典数据表 sys_dict_data
......
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictType.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
View file @ cee572f2
package com.ruoyi.project.system.domain; package com.ruoyi.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.framework.aspectj.lang.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.framework.web.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 字典类型表 sys_dict_type * 字典类型表 sys_dict_type
......
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysMenu.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
View file @ cee572f2
package com.ruoyi.project.system.domain; package com.ruoyi.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; ...@@ -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.framework.web.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 菜单权限表 sys_menu * 菜单权限表 sys_menu
......
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
View file @ cee572f2
package com.ruoyi.project.system.domain; package com.ruoyi.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.framework.aspectj.lang.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.framework.web.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 角色表 sys_role * 角色表 sys_role
......
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
View file @ cee572f2
package com.ruoyi.project.system.domain; package com.ruoyi.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; ...@@ -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.framework.aspectj.lang.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.Type; import com.ruoyi.common.annotation.Excel.Type;
import com.ruoyi.framework.aspectj.lang.annotation.Excels; import com.ruoyi.common.annotation.Excels;
import com.ruoyi.framework.web.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 用户对象 sys_user * 用户对象 sys_user
......
ruoyi/src/main/java/com/ruoyi/framework/security/LoginBody.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
View file @ cee572f2
package com.ruoyi.framework.security; package com.ruoyi.common.core.domain.model;
/** /**
* 用户登录对象 * 用户登录对象
......
ruoyi/src/main/java/com/ruoyi/framework/security/LoginUser.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
View file @ cee572f2
package com.ruoyi.framework.security; package com.ruoyi.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.project.system.domain.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
/** /**
* 登录用户身份权限 * 登录用户身份权限
......
ruoyi/src/main/java/com/ruoyi/framework/web/page/PageDomain.java → ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
View file @ cee572f2
package com.ruoyi.framework.web.page; package com.ruoyi.common.core.page;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
...@@ -11,10 +11,13 @@ public class PageDomain ...@@ -11,10 +11,13 @@ public class PageDomain
{ {
/** 当前记录起始索引 */ /** 当前记录起始索引 */
private Integer pageNum; private Integer pageNum;
/** 每页显示记录数 */ /** 每页显示记录数 */
private Integer pageSize; private Integer pageSize;
/** 排序列 */ /** 排序列 */
private String orderByColumn; private String orderByColumn;
/** 排序的方向 "desc" 或者 "asc". */ /** 排序的方向 "desc" 或者 "asc". */
private String isAsc; private String isAsc;
......
ruoyi/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java → ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
View file @ cee572f2
package com.ruoyi.framework.web.page; package com.ruoyi.common.core.page;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
......
ruoyi/src/main/java/com/ruoyi/framework/web/page/TableSupport.java → ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
View file @ cee572f2
package com.ruoyi.framework.web.page; package com.ruoyi.common.core.page;
import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ServletUtils;
......
ruoyi/src/main/java/com/ruoyi/framework/redis/RedisCache.java → ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
View file @ cee572f2
package com.ruoyi.framework.redis; package com.ruoyi.common.core.redis;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
......
ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessStatus.java → ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java
View file @ cee572f2
package com.ruoyi.framework.aspectj.lang.enums; package com.ruoyi.common.enums;
/** /**
* 操作状态 * 操作状态
......
ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessType.java → ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java
View file @ cee572f2
package com.ruoyi.framework.aspectj.lang.enums; package com.ruoyi.common.enums;
/** /**
* 业务操作类型 * 业务操作类型
......
ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/DataSourceType.java → ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java
View file @ cee572f2
package com.ruoyi.framework.aspectj.lang.enums; package com.ruoyi.common.enums;
/** /**
* 数据源 * 数据源
......
ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/OperatorType.java → ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java
View file @ cee572f2
package com.ruoyi.framework.aspectj.lang.enums; package com.ruoyi.common.enums;
/** /**
* 操作人类别 * 操作人类别
......
ruoyi/src/main/java/com/ruoyi/common/utils/DictUtils.java → ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
View file @ cee572f2
...@@ -2,10 +2,11 @@ package com.ruoyi.common.utils; ...@@ -2,10 +2,11 @@ package com.ruoyi.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.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.redis.RedisCache;
import com.ruoyi.project.system.domain.SysDictData;
/** /**
* 字典工具类 * 字典工具类
......
ruoyi/src/main/java/com/ruoyi/common/utils/SecurityUtils.java → ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
View file @ cee572f2
...@@ -4,8 +4,8 @@ import org.springframework.security.core.Authentication; ...@@ -4,8 +4,8 @@ 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.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.exception.CustomException;
import com.ruoyi.framework.security.LoginUser;
/** /**
* 安全服务工具类 * 安全服务工具类
......
ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java → ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
View file @ cee572f2
...@@ -4,14 +4,14 @@ import java.io.File; ...@@ -4,14 +4,14 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
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.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException; import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException;
import com.ruoyi.common.exception.file.FileSizeLimitExceededException; import com.ruoyi.common.exception.file.FileSizeLimitExceededException;
import com.ruoyi.common.exception.file.InvalidExtensionException; import com.ruoyi.common.exception.file.InvalidExtensionException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.IdUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.config.RuoYiConfig; import com.ruoyi.common.utils.uuid.IdUtils;
/** /**
* 文件上传工具类 * 文件上传工具类
......
ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java → ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
View file @ cee572f2
...@@ -6,7 +6,7 @@ import java.io.InputStream; ...@@ -6,7 +6,7 @@ import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.commons.lang3.exception.ExceptionUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -46,7 +46,7 @@ public class HttpHelper ...@@ -46,7 +46,7 @@ public class HttpHelper
} }
catch (IOException e) catch (IOException e)
{ {
LOGGER.error(ExceptionUtils.getFullStackTrace(e)); LOGGER.error(ExceptionUtils.getMessage(e));
} }
} }
} }
......
ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java → ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
View file @ cee572f2
...@@ -3,10 +3,10 @@ package com.ruoyi.common.utils.ip; ...@@ -3,10 +3,10 @@ package com.ruoyi.common.utils.ip;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils; import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.framework.config.RuoYiConfig;
/** /**
* 获取地址类 * 获取地址类
......
ruoyi/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java → ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
View file @ cee572f2
...@@ -41,17 +41,17 @@ import org.apache.poi.xssf.streaming.SXSSFWorkbook; ...@@ -41,17 +41,17 @@ import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.apache.poi.xssf.usermodel.XSSFDataValidation; import org.apache.poi.xssf.usermodel.XSSFDataValidation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.annotation.Excel.Type;
import com.ruoyi.common.annotation.Excels;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.reflect.ReflectUtils; import com.ruoyi.common.utils.reflect.ReflectUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.Type;
import com.ruoyi.framework.aspectj.lang.annotation.Excels;
import com.ruoyi.framework.config.RuoYiConfig;
import com.ruoyi.framework.web.domain.AjaxResult;
/** /**
* Excel相关处理 * Excel相关处理
......
ruoyi/src/main/java/com/ruoyi/common/utils/IdUtils.java → ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
View file @ cee572f2
package com.ruoyi.common.utils; package com.ruoyi.common.utils.uuid;
import com.ruoyi.common.core.lang.UUID; import com.ruoyi.common.utils.uuid.UUID;
/** /**
* ID生成器工具类 * ID生成器工具类
......
ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java → ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java
View file @ cee572f2
package com.ruoyi.common.core.lang; package com.ruoyi.common.utils.uuid;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
......
ruoyi-framework/pom.xml 0 → 100644
View file @ cee572f2
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-framework</artifactId>
<description>
framework框架核心
</description>
<dependencies>
<!-- SpringBoot Web容器 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- SpringBoot 拦截器 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<!-- 阿里数据库连接池 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
</dependency>
<!-- 获取系统信息 -->
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
</dependency>
<!-- 系统模块-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java → ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
View file @ cee572f2
...@@ -8,15 +8,15 @@ import org.aspectj.lang.annotation.Before; ...@@ -8,15 +8,15 @@ import org.aspectj.lang.annotation.Before;
import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature; import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.DataScope; import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.security.service.TokenService;
import com.ruoyi.framework.web.domain.BaseEntity;
import com.ruoyi.project.system.domain.SysRole;
import com.ruoyi.project.system.domain.SysUser;
/** /**
* 数据过滤处理 * 数据过滤处理
...@@ -58,7 +58,7 @@ public class DataScopeAspect ...@@ -58,7 +58,7 @@ public class DataScopeAspect
public static final String DATA_SCOPE = "dataScope"; public static final String DATA_SCOPE = "dataScope";
// 配置织入点 // 配置织入点
@Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.DataScope)") @Pointcut("@annotation(com.ruoyi.common.annotation.DataScope)")
public void dataScopePointCut() public void dataScopePointCut()
{ {
} }
......
ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java → ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
View file @ cee572f2
...@@ -11,8 +11,8 @@ import org.slf4j.LoggerFactory; ...@@ -11,8 +11,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.ruoyi.common.annotation.DataSource;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.DataSource;
import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder; import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder;
/** /**
...@@ -27,8 +27,8 @@ public class DataSourceAspect ...@@ -27,8 +27,8 @@ public class DataSourceAspect
{ {
protected Logger logger = LoggerFactory.getLogger(getClass()); protected Logger logger = LoggerFactory.getLogger(getClass());
@Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.DataSource)" @Pointcut("@annotation(com.ruoyi.common.annotation.DataSource)"
+ "|| @within(com.ruoyi.framework.aspectj.lang.annotation.DataSource)") + "|| @within(com.ruoyi.common.annotation.DataSource)")
public void dsPointCut() public void dsPointCut()
{ {
......
ruoyi/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java → ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
View file @ cee572f2
...@@ -17,18 +17,18 @@ import org.springframework.stereotype.Component; ...@@ -17,18 +17,18 @@ import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.HandlerMapping;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessStatus;
import com.ruoyi.common.enums.HttpMethod; import com.ruoyi.common.enums.HttpMethod;
import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.ip.IpUtils; import com.ruoyi.common.utils.ip.IpUtils;
import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessStatus;
import com.ruoyi.framework.manager.AsyncManager; import com.ruoyi.framework.manager.AsyncManager;
import com.ruoyi.framework.manager.factory.AsyncFactory; import com.ruoyi.framework.manager.factory.AsyncFactory;
import com.ruoyi.framework.security.LoginUser; import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.framework.security.service.TokenService; import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.project.monitor.domain.SysOperLog;
/** /**
* 操作日志记录处理 * 操作日志记录处理
...@@ -42,7 +42,7 @@ public class LogAspect ...@@ -42,7 +42,7 @@ public class LogAspect
private static final Logger log = LoggerFactory.getLogger(LogAspect.class); private static final Logger log = LoggerFactory.getLogger(LogAspect.class);
// 配置织入点 // 配置织入点
@Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.Log)") @Pointcut("@annotation(com.ruoyi.common.annotation.Log)")
public void logPointCut() public void logPointCut()
{ {
} }
......
ruoyi/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java → ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java
View file @ cee572f2
...@@ -16,7 +16,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; ...@@ -16,7 +16,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
// 表示通过aop框架暴露该代理对象,AopContext能够访问 // 表示通过aop框架暴露该代理对象,AopContext能够访问
@EnableAspectJAutoProxy(exposeProxy = true) @EnableAspectJAutoProxy(exposeProxy = true)
// 指定要扫描的Mapper类的包的路径 // 指定要扫描的Mapper类的包的路径
@MapperScan("com.ruoyi.project.**.mapper") @MapperScan("com.ruoyi.**.mapper")
public class ApplicationConfig public class ApplicationConfig
{ {
/** /**
......
ruoyi/src/main/java/com/ruoyi/framework/config/DruidConfig.java → ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java
View file @ cee572f2
...@@ -19,8 +19,8 @@ import com.alibaba.druid.pool.DruidDataSource; ...@@ -19,8 +19,8 @@ import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
import com.alibaba.druid.util.Utils; import com.alibaba.druid.util.Utils;
import com.ruoyi.common.enums.DataSourceType;
import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.aspectj.lang.enums.DataSourceType;
import com.ruoyi.framework.config.properties.DruidProperties; import com.ruoyi.framework.config.properties.DruidProperties;
import com.ruoyi.framework.datasource.DynamicDataSource; import com.ruoyi.framework.datasource.DynamicDataSource;
......
ruoyi/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java → ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
View file @ cee572f2
...@@ -5,6 +5,7 @@ import org.springframework.context.annotation.Configuration; ...@@ -5,6 +5,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor; import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
......
ruoyi/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java → ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
View file @ cee572f2
...@@ -7,9 +7,9 @@ import org.springframework.stereotype.Component; ...@@ -7,9 +7,9 @@ import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod; import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
import com.ruoyi.framework.web.domain.AjaxResult;
/** /**
* 防止重复提交拦截器 * 防止重复提交拦截器
......
ruoyi/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java → ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
View file @ cee572f2
...@@ -7,11 +7,11 @@ import javax.servlet.http.HttpServletRequest; ...@@ -7,11 +7,11 @@ import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.filter.RepeatedlyRequestWrapper; import com.ruoyi.common.filter.RepeatedlyRequestWrapper;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpHelper; import com.ruoyi.common.utils.http.HttpHelper;
import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor; import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
import com.ruoyi.framework.redis.RedisCache;
/** /**
* 判断请求url和数据是否和上一次相同， * 判断请求url和数据是否和上一次相同，
......
ruoyi/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java → ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
View file @ cee572f2
...@@ -9,10 +9,10 @@ import com.ruoyi.common.utils.ServletUtils; ...@@ -9,10 +9,10 @@ import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.ip.AddressUtils; import com.ruoyi.common.utils.ip.AddressUtils;
import com.ruoyi.common.utils.ip.IpUtils; import com.ruoyi.common.utils.ip.IpUtils;
import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.project.monitor.domain.SysLogininfor; import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.project.monitor.domain.SysOperLog; import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.project.monitor.service.ISysLogininforService; import com.ruoyi.system.service.ISysLogininforService;
import com.ruoyi.project.monitor.service.ISysOperLogService; import com.ruoyi.system.service.ISysOperLogService;
import eu.bitwalker.useragentutils.UserAgent; import eu.bitwalker.useragentutils.UserAgent;
/** /**
......
ruoyi/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java → ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
View file @ cee572f2
...@@ -11,10 +11,10 @@ import org.springframework.security.core.context.SecurityContextHolder; ...@@ -11,10 +11,10 @@ import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter; import org.springframework.web.filter.OncePerRequestFilter;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.security.LoginUser; import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.framework.security.service.TokenService;
/** /**
* token过滤器 验证token有效性 * token过滤器 验证token有效性
......
ruoyi/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java → ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
View file @ cee572f2
...@@ -9,9 +9,9 @@ import org.springframework.security.web.AuthenticationEntryPoint; ...@@ -9,9 +9,9 @@ import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
/** /**
* 认证失败处理类 返回未授权 * 认证失败处理类 返回未授权
......
ruoyi/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java → ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
View file @ cee572f2
...@@ -11,13 +11,13 @@ import org.springframework.security.web.authentication.logout.LogoutSuccessHandl ...@@ -11,13 +11,13 @@ import org.springframework.security.web.authentication.logout.LogoutSuccessHandl
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.manager.AsyncManager; import com.ruoyi.framework.manager.AsyncManager;
import com.ruoyi.framework.manager.factory.AsyncFactory; import com.ruoyi.framework.manager.factory.AsyncFactory;
import com.ruoyi.framework.security.LoginUser; import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.framework.security.service.TokenService;
import com.ruoyi.framework.web.domain.AjaxResult;
/** /**
* 自定义退出处理类 返回成功 * 自定义退出处理类 返回成功
......
ruoyi/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java → ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
View file @ cee572f2
...@@ -11,11 +11,11 @@ import org.springframework.web.bind.annotation.ExceptionHandler; ...@@ -11,11 +11,11 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.servlet.NoHandlerFoundException; import org.springframework.web.servlet.NoHandlerFoundException;
import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.exception.BaseException; import com.ruoyi.common.exception.BaseException;
import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.exception.DemoModeException; import com.ruoyi.common.exception.DemoModeException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
/** /**
* 全局异常处理器 * 全局异常处理器
......
ruoyi/src/main/java/com/ruoyi/framework/security/service/PermissionService.java → ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
View file @ cee572f2
package com.ruoyi.framework.security.service; package com.ruoyi.framework.web.service;
import java.util.Set; import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.project.system.domain.SysRole;
/** /**
* RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母 * RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母
......
ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java → ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
View file @ cee572f2
package com.ruoyi.framework.security.service; package com.ruoyi.framework.web.service;
import javax.annotation.Resource; import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -8,6 +8,8 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio ...@@ -8,6 +8,8 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.exception.user.CaptchaException; import com.ruoyi.common.exception.user.CaptchaException;
import com.ruoyi.common.exception.user.CaptchaExpireException; import com.ruoyi.common.exception.user.CaptchaExpireException;
...@@ -15,8 +17,6 @@ import com.ruoyi.common.exception.user.UserPasswordNotMatchException; ...@@ -15,8 +17,6 @@ import com.ruoyi.common.exception.user.UserPasswordNotMatchException;
import com.ruoyi.common.utils.MessageUtils; import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.framework.manager.AsyncManager; import com.ruoyi.framework.manager.AsyncManager;
import com.ruoyi.framework.manager.factory.AsyncFactory; import com.ruoyi.framework.manager.factory.AsyncFactory;
import com.ruoyi.framework.redis.RedisCache;
import com.ruoyi.framework.security.LoginUser;
/** /**
* 登录校验方法 * 登录校验方法
......
ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java → ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java
View file @ cee572f2
package com.ruoyi.framework.security.service; package com.ruoyi.framework.web.service;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.ruoyi.project.system.domain.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.project.system.service.ISysMenuService; import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.project.system.service.ISysRoleService; import com.ruoyi.system.service.ISysRoleService;
/** /**
* 用户权限处理 * 用户权限处理
......
ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java → ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
View file @ cee572f2
package com.ruoyi.framework.security.service; package com.ruoyi.framework.web.service;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
...@@ -8,13 +8,13 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -8,13 +8,13 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.IdUtils; import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.ip.AddressUtils; import com.ruoyi.common.utils.ip.AddressUtils;
import com.ruoyi.common.utils.ip.IpUtils; import com.ruoyi.common.utils.ip.IpUtils;
import com.ruoyi.framework.redis.RedisCache; import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.framework.security.LoginUser;
import eu.bitwalker.useragentutils.UserAgent; import eu.bitwalker.useragentutils.UserAgent;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts; import io.jsonwebtoken.Jwts;
......
ruoyi/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java → ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
View file @ cee572f2
package com.ruoyi.framework.security.service; package com.ruoyi.framework.web.service;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -7,12 +7,12 @@ import org.springframework.security.core.userdetails.UserDetails; ...@@ -7,12 +7,12 @@ import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.UserStatus; import com.ruoyi.common.enums.UserStatus;
import com.ruoyi.common.exception.BaseException; import com.ruoyi.common.exception.BaseException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.security.LoginUser; import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.service.ISysUserService;
/** /**
* 用户验证处理 * 用户验证处理
......
ruoyi-generator/pom.xml 0 → 100644
View file @ cee572f2
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-generator</artifactId>
<description>
generator代码生成
</description>
<dependencies>
<!--velocity代码生成使用模板 -->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
<!-- 通用工具-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
ruoyi/src/main/java/com/ruoyi/framework/config/GenConfig.java → ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java
View file @ cee572f2
package com.ruoyi.framework.config; package com.ruoyi.generator.config;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.PropertySource;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
...@@ -10,6 +12,7 @@ import org.springframework.stereotype.Component; ...@@ -10,6 +12,7 @@ import org.springframework.stereotype.Component;
*/ */
@Component @Component
@ConfigurationProperties(prefix = "gen") @ConfigurationProperties(prefix = "gen")
@PropertySource(value = { "classpath:generator.yml" })
public class GenConfig public class GenConfig
{ {
/** 作者 */ /** 作者 */
...@@ -18,7 +21,7 @@ public class GenConfig ...@@ -18,7 +21,7 @@ public class GenConfig
/** 生成包路径 */ /** 生成包路径 */
public static String packageName; public static String packageName;
/** 自动去除表前缀，默认是true */ /** 自动去除表前缀，默认是false */
public static boolean autoRemovePre; public static boolean autoRemovePre;
/** 表前缀(类名不会包含表前缀) */ /** 表前缀(类名不会包含表前缀) */
...@@ -29,6 +32,7 @@ public class GenConfig ...@@ -29,6 +32,7 @@ public class GenConfig
return author; return author;
} }
@Value("${author}")
public void setAuthor(String author) public void setAuthor(String author)
{ {
GenConfig.author = author; GenConfig.author = author;
...@@ -39,6 +43,7 @@ public class GenConfig ...@@ -39,6 +43,7 @@ public class GenConfig
return packageName; return packageName;
} }
@Value("${packageName}")
public void setPackageName(String packageName) public void setPackageName(String packageName)
{ {
GenConfig.packageName = packageName; GenConfig.packageName = packageName;
...@@ -49,6 +54,7 @@ public class GenConfig ...@@ -49,6 +54,7 @@ public class GenConfig
return autoRemovePre; return autoRemovePre;
} }
@Value("${autoRemovePre}")
public void setAutoRemovePre(boolean autoRemovePre) public void setAutoRemovePre(boolean autoRemovePre)
{ {
GenConfig.autoRemovePre = autoRemovePre; GenConfig.autoRemovePre = autoRemovePre;
...@@ -59,6 +65,7 @@ public class GenConfig ...@@ -59,6 +65,7 @@ public class GenConfig
return tablePrefix; return tablePrefix;
} }
@Value("${tablePrefix}")
public void setTablePrefix(String tablePrefix) public void setTablePrefix(String tablePrefix)
{ {
GenConfig.tablePrefix = tablePrefix; GenConfig.tablePrefix = tablePrefix;
......
ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java → ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
View file @ cee572f2
package com.ruoyi.project.tool.gen.controller; package com.ruoyi.generator.controller;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
...@@ -17,16 +17,16 @@ import org.springframework.web.bind.annotation.PutMapping; ...@@ -17,16 +17,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.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.core.text.Convert;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.framework.web.controller.BaseController; import com.ruoyi.generator.domain.GenTableColumn;
import com.ruoyi.framework.web.domain.AjaxResult; import com.ruoyi.generator.service.IGenTableColumnService;
import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.generator.service.IGenTableService;
import com.ruoyi.project.tool.gen.domain.GenTable;
import com.ruoyi.project.tool.gen.domain.GenTableColumn;
import com.ruoyi.project.tool.gen.service.IGenTableColumnService;
import com.ruoyi.project.tool.gen.service.IGenTableService;
/** /**
* 代码生成 操作处理 * 代码生成 操作处理
......
ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java → ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
View file @ cee572f2
package com.ruoyi.project.tool.gen.domain; package com.ruoyi.generator.domain;
import java.util.List; import java.util.List;
import javax.validation.Valid; import javax.validation.Valid;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import com.ruoyi.common.constant.GenConstants; import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.domain.BaseEntity;
/** /**
* 业务表 gen_table * 业务表 gen_table
......
ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTableColumn.java → ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
View file @ cee572f2
package com.ruoyi.project.tool.gen.domain; package com.ruoyi.generator.domain;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.domain.BaseEntity;
/** /**
* 代码生成业务字段表 gen_table_column * 代码生成业务字段表 gen_table_column
......
ruoyi/src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableColumnMapper.java → ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java
View file @ cee572f2
package com.ruoyi.project.tool.gen.mapper; package com.ruoyi.generator.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.project.tool.gen.domain.GenTableColumn; import com.ruoyi.generator.domain.GenTableColumn;
/** /**
* 业务字段 数据层 * 业务字段 数据层
......
ruoyi/src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableMapper.java → ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java
View file @ cee572f2
package com.ruoyi.project.tool.gen.mapper; package com.ruoyi.generator.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.project.tool.gen.domain.GenTable; import com.ruoyi.generator.domain.GenTable;
/** /**
* 业务 数据层 * 业务 数据层
......
ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java → ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java
View file @ cee572f2
package com.ruoyi.project.tool.gen.service; package com.ruoyi.generator.service;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.core.text.Convert;
import com.ruoyi.project.tool.gen.domain.GenTableColumn; import com.ruoyi.generator.domain.GenTableColumn;
import com.ruoyi.project.tool.gen.mapper.GenTableColumnMapper; import com.ruoyi.generator.mapper.GenTableColumnMapper;
/** /**
* 业务字段 服务层实现 * 业务字段 服务层实现
......
ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java → ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
View file @ cee572f2
package com.ruoyi.project.tool.gen.service; package com.ruoyi.generator.service;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
...@@ -24,13 +24,13 @@ import com.ruoyi.common.constant.GenConstants; ...@@ -24,13 +24,13 @@ import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.tool.gen.domain.GenTable; import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.project.tool.gen.domain.GenTableColumn; import com.ruoyi.generator.domain.GenTableColumn;
import com.ruoyi.project.tool.gen.mapper.GenTableColumnMapper; import com.ruoyi.generator.mapper.GenTableColumnMapper;
import com.ruoyi.project.tool.gen.mapper.GenTableMapper; import com.ruoyi.generator.mapper.GenTableMapper;
import com.ruoyi.project.tool.gen.util.GenUtils; import com.ruoyi.generator.util.GenUtils;
import com.ruoyi.project.tool.gen.util.VelocityInitializer; import com.ruoyi.generator.util.VelocityInitializer;
import com.ruoyi.project.tool.gen.util.VelocityUtils; import com.ruoyi.generator.util.VelocityUtils;
/** /**
* 业务 服务层实现 * 业务 服务层实现
......
ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java → ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java
View file @ cee572f2
package com.ruoyi.project.tool.gen.service; package com.ruoyi.generator.service;
import java.util.List; import java.util.List;
import com.ruoyi.project.tool.gen.domain.GenTableColumn; import com.ruoyi.generator.domain.GenTableColumn;
/** /**
* 业务字段 服务层 * 业务字段 服务层
......
ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableService.java → ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java
View file @ cee572f2
package com.ruoyi.project.tool.gen.service; package com.ruoyi.generator.service;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.ruoyi.project.tool.gen.domain.GenTable; import com.ruoyi.generator.domain.GenTable;
/** /**
* 业务 服务层 * 业务 服务层
......
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java → ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
View file @ cee572f2
package com.ruoyi.project.tool.gen.util; package com.ruoyi.generator.util;
import java.util.Arrays; import java.util.Arrays;
import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.RegExUtils;
import com.ruoyi.common.constant.GenConstants; import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.config.GenConfig; import com.ruoyi.generator.config.GenConfig;
import com.ruoyi.project.tool.gen.domain.GenTable; import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.project.tool.gen.domain.GenTableColumn; import com.ruoyi.generator.domain.GenTableColumn;
/** /**
* 代码生成器 工具类 * 代码生成器 工具类
......
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityInitializer.java → ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
View file @ cee572f2
package com.ruoyi.project.tool.gen.util; package com.ruoyi.generator.util;
import java.util.Properties; import java.util.Properties;
import org.apache.velocity.app.Velocity; import org.apache.velocity.app.Velocity;
......
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java → ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
View file @ cee572f2
package com.ruoyi.project.tool.gen.util; package com.ruoyi.generator.util;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
...@@ -8,16 +8,21 @@ import com.alibaba.fastjson.JSONObject; ...@@ -8,16 +8,21 @@ import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.constant.GenConstants; import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.tool.gen.domain.GenTable; import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.project.tool.gen.domain.GenTableColumn; import com.ruoyi.generator.domain.GenTableColumn;
/**
* 代码生成模板处理
*
* @author ruoyi
*/
public class VelocityUtils public class VelocityUtils
{ {
/** 项目空间路径 */ /** 项目空间路径 */
private static final String PROJECT_PATH = "main/java"; private static final String PROJECT_PATH = "main/java";
/** mybatis空间路径 */ /** mybatis空间路径 */
private static final String MYBATIS_PATH = "main/resources/mybatis"; private static final String MYBATIS_PATH = "main/resources/mapper";
/** /**
* 设置模板变量信息 * 设置模板变量信息
......
ruoyi-generator/src/main/resources/generator.yml 0 → 100644
View file @ cee572f2
# 代码生成
gen:
# 作者
author: ruoyi
# 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
packageName: com.ruoyi.system
# 自动去除表前缀，默认是false
autoRemovePre: false
# 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
tablePrefix: sys_
\ No newline at end of file
ruoyi/src/main/resources/mybatis/tool/GenTableColumnMapper.xml → ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
View file @ cee572f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.tool.gen.mapper.GenTableColumnMapper"> <mapper namespace="com.ruoyi.generator.mapper.GenTableColumnMapper">
<resultMap type="GenTableColumn" id="GenTableColumnResult"> <resultMap type="GenTableColumn" id="GenTableColumnResult">
<id property="columnId" column="column_id" /> <id property="columnId" column="column_id" />
......
ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml → ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
View file @ cee572f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.tool.gen.mapper.GenTableMapper"> <mapper namespace="com.ruoyi.generator.mapper.GenTableMapper">
<resultMap type="GenTable" id="GenTableResult"> <resultMap type="GenTable" id="GenTableResult">
<id property="tableId" column="table_id" /> <id property="tableId" column="table_id" />
......
ruoyi/src/main/resources/vm/java/controller.java.vm → ruoyi-generator/src/main/resources/vm/java/controller.java.vm
View file @ cee572f2
...@@ -11,15 +11,15 @@ import org.springframework.web.bind.annotation.PathVariable; ...@@ -11,15 +11,15 @@ import org.springframework.web.bind.annotation.PathVariable;
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.framework.aspectj.lang.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import ${packageName}.domain.${ClassName}; import ${packageName}.domain.${ClassName};
import ${packageName}.service.I${ClassName}Service; import ${packageName}.service.I${ClassName}Service;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
#if($table.crud) #if($table.crud)
import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
#elseif($table.tree) #elseif($table.tree)
#end #end
......
ruoyi/src/main/resources/vm/java/domain.java.vm → ruoyi-generator/src/main/resources/vm/java/domain.java.vm
View file @ cee572f2
...@@ -5,11 +5,11 @@ import ${import}; ...@@ -5,11 +5,11 @@ import ${import};
#end #end
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.framework.aspectj.lang.annotation.Excel; import com.ruoyi.common.annotation.Excel;
#if($table.crud) #if($table.crud)
import com.ruoyi.framework.web.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
#elseif($table.tree) #elseif($table.tree)
import com.ruoyi.framework.web.domain.TreeEntity; import com.ruoyi.common.core.domain.TreeEntity;
#end #end
/** /**
......
ruoyi-quartz/pom.xml 0 → 100644
View file @ cee572f2
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-quartz</artifactId>
<description>
quartz定时任务
</description>
<dependencies>
<!-- 定时任务 -->
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<exclusions>
<exclusion>
<groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- 通用工具-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
ruoyi/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
View file @ cee572f2
package com.ruoyi.framework.config; package com.ruoyi.quartz.config;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
......
ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
View file @ cee572f2
package com.ruoyi.project.monitor.controller; package com.ruoyi.quartz.controller;
import java.util.List; import java.util.List;
import org.quartz.SchedulerException; import org.quartz.SchedulerException;
...@@ -12,17 +12,17 @@ import org.springframework.web.bind.annotation.PutMapping; ...@@ -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.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.job.TaskException; import com.ruoyi.common.exception.job.TaskException;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.job.CronUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.quartz.domain.SysJob;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.quartz.service.ISysJobService;
import com.ruoyi.framework.web.controller.BaseController; import com.ruoyi.quartz.util.CronUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.domain.SysJob;
import com.ruoyi.project.monitor.service.ISysJobService;
/** /**
* 调度任务信息操作处理 * 调度任务信息操作处理
......
ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
View file @ cee572f2
package com.ruoyi.project.monitor.controller; package com.ruoyi.quartz.controller;
import java.util.List; import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.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.framework.aspectj.lang.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.project.monitor.domain.SysJobLog; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.project.monitor.service.ISysJobLogService; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.framework.web.controller.BaseController; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.quartz.domain.SysJobLog;
import com.ruoyi.quartz.service.ISysJobLogService;
/** /**
* 调度日志操作处理 * 调度日志操作处理
......
ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
View file @ cee572f2
package com.ruoyi.project.monitor.domain; package com.ruoyi.quartz.domain;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
...@@ -7,12 +7,12 @@ import javax.validation.constraints.Size; ...@@ -7,12 +7,12 @@ 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.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.constant.ScheduleConstants; import com.ruoyi.common.constant.ScheduleConstants;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.job.CronUtils; import com.ruoyi.quartz.util.CronUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
import com.ruoyi.framework.web.domain.BaseEntity;
/** /**
* 定时任务调度表 sys_job * 定时任务调度表 sys_job
......
ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJobLog.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java
View file @ cee572f2
package com.ruoyi.project.monitor.domain; package com.ruoyi.quartz.domain;
import java.util.Date; import java.util.Date;
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.framework.aspectj.lang.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 定时任务调度日志表 sys_job_log * 定时任务调度日志表 sys_job_log
......
ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysJobLogMapper.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java
View file @ cee572f2
package com.ruoyi.project.monitor.mapper; package com.ruoyi.quartz.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.project.monitor.domain.SysJobLog; import com.ruoyi.quartz.domain.SysJobLog;
/** /**
* 调度任务日志信息 数据层 * 调度任务日志信息 数据层
......
ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysJobMapper.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java
View file @ cee572f2
package com.ruoyi.project.monitor.mapper; package com.ruoyi.quartz.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.project.monitor.domain.SysJob; import com.ruoyi.quartz.domain.SysJob;
/** /**
* 调度任务信息 数据层 * 调度任务信息 数据层
......
ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysJobLogService.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java
View file @ cee572f2
package com.ruoyi.project.monitor.service; package com.ruoyi.quartz.service;
import java.util.List; import java.util.List;
import com.ruoyi.project.monitor.domain.SysJobLog; import com.ruoyi.quartz.domain.SysJobLog;
/** /**
* 定时任务调度日志信息信息 服务层 * 定时任务调度日志信息信息 服务层
......
ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysJobService.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java
View file @ cee572f2
package com.ruoyi.project.monitor.service; package com.ruoyi.quartz.service;
import java.util.List; import java.util.List;
import org.quartz.SchedulerException; import org.quartz.SchedulerException;
import com.ruoyi.common.exception.job.TaskException; import com.ruoyi.common.exception.job.TaskException;
import com.ruoyi.project.monitor.domain.SysJob; import com.ruoyi.quartz.domain.SysJob;
/** /**
* 定时任务调度信息信息 服务层 * 定时任务调度信息信息 服务层
......
ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java
View file @ cee572f2
package com.ruoyi.project.monitor.service.impl; package com.ruoyi.quartz.service.impl;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.project.monitor.domain.SysJobLog; import com.ruoyi.quartz.domain.SysJobLog;
import com.ruoyi.project.monitor.mapper.SysJobLogMapper; import com.ruoyi.quartz.mapper.SysJobLogMapper;
import com.ruoyi.project.monitor.service.ISysJobLogService; import com.ruoyi.quartz.service.ISysJobLogService;
/** /**
* 定时任务调度日志信息 服务层 * 定时任务调度日志信息 服务层
......
ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java
View file @ cee572f2
package com.ruoyi.project.monitor.service.impl; package com.ruoyi.quartz.service.impl;
import java.util.List; import java.util.List;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
...@@ -11,11 +11,11 @@ import org.springframework.stereotype.Service; ...@@ -11,11 +11,11 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ruoyi.common.constant.ScheduleConstants; import com.ruoyi.common.constant.ScheduleConstants;
import com.ruoyi.common.exception.job.TaskException; import com.ruoyi.common.exception.job.TaskException;
import com.ruoyi.common.utils.job.CronUtils; import com.ruoyi.quartz.domain.SysJob;
import com.ruoyi.common.utils.job.ScheduleUtils; import com.ruoyi.quartz.mapper.SysJobMapper;
import com.ruoyi.project.monitor.domain.SysJob; import com.ruoyi.quartz.service.ISysJobService;
import com.ruoyi.project.monitor.mapper.SysJobMapper; import com.ruoyi.quartz.util.CronUtils;
import com.ruoyi.project.monitor.service.ISysJobService; import com.ruoyi.quartz.util.ScheduleUtils;
/** /**
* 定时任务调度信息 服务层 * 定时任务调度信息 服务层
......
ruoyi/src/main/java/com/ruoyi/framework/task/RyTask.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
View file @ cee572f2
package com.ruoyi.framework.task; package com.ruoyi.quartz.task;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
......
ruoyi/src/main/java/com/ruoyi/common/utils/job/AbstractQuartzJob.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java
View file @ cee572f2
package com.ruoyi.common.utils.job; package com.ruoyi.quartz.util;
import java.util.Date; import java.util.Date;
import org.quartz.Job; import org.quartz.Job;
...@@ -12,9 +12,9 @@ import com.ruoyi.common.utils.ExceptionUtil; ...@@ -12,9 +12,9 @@ import com.ruoyi.common.utils.ExceptionUtil;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.project.monitor.domain.SysJob; import com.ruoyi.quartz.domain.SysJob;
import com.ruoyi.project.monitor.domain.SysJobLog; import com.ruoyi.quartz.domain.SysJobLog;
import com.ruoyi.project.monitor.service.ISysJobLogService; import com.ruoyi.quartz.service.ISysJobLogService;
/** /**
* 抽象quartz调用 * 抽象quartz调用
......
ruoyi/src/main/java/com/ruoyi/common/utils/job/CronUtils.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java
View file @ cee572f2
package com.ruoyi.common.utils.job; package com.ruoyi.quartz.util;
import java.text.ParseException; import java.text.ParseException;
import java.util.Date; import java.util.Date;
......
ruoyi/src/main/java/com/ruoyi/common/utils/job/JobInvokeUtil.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
View file @ cee572f2
package com.ruoyi.common.utils.job; package com.ruoyi.quartz.util;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
...@@ -6,7 +6,7 @@ import java.util.LinkedList; ...@@ -6,7 +6,7 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.project.monitor.domain.SysJob; import com.ruoyi.quartz.domain.SysJob;
/** /**
* 任务执行工具 * 任务执行工具
......
ruoyi/src/main/java/com/ruoyi/common/utils/job/QuartzDisallowConcurrentExecution.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java
View file @ cee572f2
package com.ruoyi.common.utils.job; package com.ruoyi.quartz.util;
import org.quartz.DisallowConcurrentExecution; import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext; import org.quartz.JobExecutionContext;
import com.ruoyi.project.monitor.domain.SysJob; import com.ruoyi.quartz.domain.SysJob;
/** /**
* 定时任务处理（禁止并发执行） * 定时任务处理（禁止并发执行）
......
ruoyi/src/main/java/com/ruoyi/common/utils/job/QuartzJobExecution.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java
View file @ cee572f2
package com.ruoyi.common.utils.job; package com.ruoyi.quartz.util;
import org.quartz.JobExecutionContext; import org.quartz.JobExecutionContext;
import com.ruoyi.project.monitor.domain.SysJob; import com.ruoyi.quartz.domain.SysJob;
/** /**
* 定时任务处理（允许并发执行） * 定时任务处理（允许并发执行）
......
ruoyi/src/main/java/com/ruoyi/common/utils/job/ScheduleUtils.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
View file @ cee572f2
package com.ruoyi.common.utils.job; package com.ruoyi.quartz.util;
import org.quartz.CronScheduleBuilder; import org.quartz.CronScheduleBuilder;
import org.quartz.CronTrigger; import org.quartz.CronTrigger;
...@@ -13,7 +13,7 @@ import org.quartz.TriggerKey; ...@@ -13,7 +13,7 @@ import org.quartz.TriggerKey;
import com.ruoyi.common.constant.ScheduleConstants; import com.ruoyi.common.constant.ScheduleConstants;
import com.ruoyi.common.exception.job.TaskException; import com.ruoyi.common.exception.job.TaskException;
import com.ruoyi.common.exception.job.TaskException.Code; import com.ruoyi.common.exception.job.TaskException.Code;
import com.ruoyi.project.monitor.domain.SysJob; import com.ruoyi.quartz.domain.SysJob;
/** /**
* 定时任务工具类 * 定时任务工具类
......
ruoyi/src/main/resources/mybatis/system/SysJobLogMapper.xml → ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
View file @ cee572f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.monitor.mapper.SysJobLogMapper"> <mapper namespace="com.ruoyi.quartz.mapper.SysJobLogMapper">
<resultMap type="SysJobLog" id="SysJobLogResult"> <resultMap type="SysJobLog" id="SysJobLogResult">
<id property="jobLogId" column="job_log_id" /> <id property="jobLogId" column="job_log_id" />
......
ruoyi/src/main/resources/mybatis/system/SysJobMapper.xml → ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
View file @ cee572f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.monitor.mapper.SysJobMapper"> <mapper namespace="com.ruoyi.quartz.mapper.SysJobMapper">
<resultMap type="SysJob" id="SysJobResult"> <resultMap type="SysJob" id="SysJobResult">
<id property="jobId" column="job_id" /> <id property="jobId" column="job_id" />
......
ruoyi-system/pom.xml 0 → 100644
View file @ cee572f2
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-system</artifactId>
<description>
system系统模块
</description>
<dependencies>
<!-- 通用工具-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysConfig.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
View file @ cee572f2
package com.ruoyi.project.system.domain; package com.ruoyi.system.domain;
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.framework.aspectj.lang.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.framework.web.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 参数配置表 sys_config * 参数配置表 sys_config
......
ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
View file @ cee572f2
package com.ruoyi.project.monitor.domain; package com.ruoyi.system.domain;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.framework.web.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 系统访问记录表 sys_logininfor * 系统访问记录表 sys_logininfor
......
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysNotice.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
View file @ cee572f2
package com.ruoyi.project.system.domain; package com.ruoyi.system.domain;
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.framework.web.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 通知公告表 sys_notice * 通知公告表 sys_notice
......
ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
View file @ cee572f2
package com.ruoyi.project.monitor.domain; package com.ruoyi.system.domain;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.framework.web.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 操作日志记录表 oper_log * 操作日志记录表 oper_log
......
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysPost.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
View file @ cee572f2
package com.ruoyi.project.system.domain; package com.ruoyi.system.domain;
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.framework.aspectj.lang.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.framework.web.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 岗位表 sys_post * 岗位表 sys_post
......
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRoleDept.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
View file @ cee572f2
package com.ruoyi.project.system.domain; package com.ruoyi.system.domain;
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;
......
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRoleMenu.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
View file @ cee572f2
package com.ruoyi.project.system.domain; package com.ruoyi.system.domain;
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;
......
ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysUserOnline.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
View file @ cee572f2
package com.ruoyi.project.monitor.domain; package com.ruoyi.system.domain;
/** /**
* 当前在线会话 * 当前在线会话
......
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUserPost.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
View file @ cee572f2
package com.ruoyi.project.system.domain; package com.ruoyi.system.domain;
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;
......
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUserRole.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
View file @ cee572f2
package com.ruoyi.project.system.domain; package com.ruoyi.system.domain;
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;
......
ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/MetaVo.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
View file @ cee572f2
package com.ruoyi.project.system.domain.vo; package com.ruoyi.system.domain.vo;
/** /**
* 路由显示信息 * 路由显示信息
......
ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/RouterVo.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
View file @ cee572f2
package com.ruoyi.project.system.domain.vo; package com.ruoyi.system.domain.vo;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List; import java.util.List;
......
ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysConfigMapper.java → ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
View file @ cee572f2
package com.ruoyi.project.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.project.system.domain.SysConfig; import com.ruoyi.system.domain.SysConfig;
/** /**
* 参数配置 数据层 * 参数配置 数据层
......
ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java → ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
View file @ cee572f2
package com.ruoyi.project.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.ruoyi.project.system.domain.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
/** /**
* 部门管理 数据层 * 部门管理 数据层
......
ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictDataMapper.java → ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java
View file @ cee572f2
package com.ruoyi.project.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.ruoyi.project.system.domain.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
/** /**
* 字典表 数据层 * 字典表 数据层
......
ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictTypeMapper.java → ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
View file @ cee572f2
package com.ruoyi.project.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import com.ruoyi.project.system.domain.SysDictType; import com.ruoyi.common.core.domain.entity.SysDictType;
/** /**
* 字典表 数据层 * 字典表 数据层
......
ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysLogininforMapper.java → ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java
View file @ cee572f2
package com.ruoyi.project.monitor.mapper; package com.ruoyi.system.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.project.monitor.domain.SysLogininfor; import com.ruoyi.system.domain.SysLogininfor;
/** /**
* 系统访问日志情况信息 数据层 * 系统访问日志情况信息 数据层
......
ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysMenuMapper.java → ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
View file @ cee572f2
package com.ruoyi.project.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.ruoyi.project.system.domain.SysMenu; import com.ruoyi.common.core.domain.entity.SysMenu;
/** /**
* 菜单表 数据层 * 菜单表 数据层
......
ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysNoticeMapper.java → ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java
View file @ cee572f2
package com.ruoyi.project.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.project.system.domain.SysNotice; import com.ruoyi.system.domain.SysNotice;
/** /**
* 通知公告表 数据层 * 通知公告表 数据层
......
ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysOperLogMapper.java → ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java
View file @ cee572f2
package com.ruoyi.project.monitor.mapper; package com.ruoyi.system.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.project.monitor.domain.SysOperLog; import com.ruoyi.system.domain.SysOperLog;
/** /**
* 操作日志 数据层 * 操作日志 数据层
......
ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysPostMapper.java → ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
View file @ cee572f2
package com.ruoyi.project.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.project.system.domain.SysPost; import com.ruoyi.system.domain.SysPost;
/** /**
* 岗位信息 数据层 * 岗位信息 数据层
......
ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysRoleDeptMapper.java → ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java
View file @ cee572f2
package com.ruoyi.project.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.project.system.domain.SysRoleDept; import com.ruoyi.system.domain.SysRoleDept;
/** /**
* 角色与部门关联表 数据层 * 角色与部门关联表 数据层
......
ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysRoleMapper.java → ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
View file @ cee572f2
package com.ruoyi.project.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.project.system.domain.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
/** /**
* 角色表 数据层 * 角色表 数据层
......
ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysRoleMenuMapper.java → ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
View file @ cee572f2
package com.ruoyi.project.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.project.system.domain.SysRoleMenu; import com.ruoyi.system.domain.SysRoleMenu;
/** /**
* 角色与菜单关联表 数据层 * 角色与菜单关联表 数据层
......
ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java → ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
View file @ cee572f2
package com.ruoyi.project.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.project.system.domain.SysUser;
/** /**
* 用户表 数据层 * 用户表 数据层
......
ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserPostMapper.java → ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
View file @ cee572f2
package com.ruoyi.project.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.project.system.domain.SysUserPost; import com.ruoyi.system.domain.SysUserPost;
/** /**
* 用户与岗位关联表 数据层 * 用户与岗位关联表 数据层
......
ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserRoleMapper.java → ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
View file @ cee572f2
package com.ruoyi.project.system.mapper; package com.ruoyi.system.mapper;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.ruoyi.project.system.domain.SysUserRole; import com.ruoyi.system.domain.SysUserRole;
/** /**
* 用户与角色关联表 数据层 * 用户与角色关联表 数据层
......
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
View file @ cee572f2
package com.ruoyi.project.system.service; package com.ruoyi.system.service;
import java.util.List; import java.util.List;
import com.ruoyi.project.system.domain.SysConfig; import com.ruoyi.system.domain.SysConfig;
/** /**
* 参数配置 服务层 * 参数配置 服务层
......
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
View file @ cee572f2
package com.ruoyi.project.system.service; package com.ruoyi.system.service;
import java.util.List; import java.util.List;
import com.ruoyi.framework.web.domain.TreeSelect; import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.project.system.domain.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
/** /**
* 部门管理 服务层 * 部门管理 服务层
......
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
View file @ cee572f2
package com.ruoyi.project.system.service; package com.ruoyi.system.service;
import java.util.List; import java.util.List;
import com.ruoyi.project.system.domain.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
/** /**
* 字典 业务层 * 字典 业务层
......
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
View file @ cee572f2
package com.ruoyi.project.system.service; package com.ruoyi.system.service;
import java.util.List; import java.util.List;
import com.ruoyi.project.system.domain.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.project.system.domain.SysDictType; import com.ruoyi.common.core.domain.entity.SysDictType;
/** /**
* 字典 业务层 * 字典 业务层
......
ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysLogininforService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
View file @ cee572f2
package com.ruoyi.project.monitor.service; package com.ruoyi.system.service;
import java.util.List; import java.util.List;
import com.ruoyi.project.monitor.domain.SysLogininfor; import com.ruoyi.system.domain.SysLogininfor;
/** /**
* 系统访问日志情况信息 服务层 * 系统访问日志情况信息 服务层
......
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysMenuService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
View file @ cee572f2
package com.ruoyi.project.system.service; package com.ruoyi.system.service;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import com.ruoyi.framework.web.domain.TreeSelect; import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.project.system.domain.SysMenu; import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.project.system.domain.vo.RouterVo; import com.ruoyi.system.domain.vo.RouterVo;
/** /**
* 菜单 业务层 * 菜单 业务层
......
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysNoticeService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java
View file @ cee572f2
package com.ruoyi.project.system.service; package com.ruoyi.system.service;
import java.util.List; import java.util.List;
import com.ruoyi.project.system.domain.SysNotice; import com.ruoyi.system.domain.SysNotice;
/** /**
* 公告 服务层 * 公告 服务层
......
ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysOperLogService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java
View file @ cee572f2
package com.ruoyi.project.monitor.service; package com.ruoyi.system.service;
import java.util.List; import java.util.List;
import com.ruoyi.project.monitor.domain.SysOperLog; import com.ruoyi.system.domain.SysOperLog;
/** /**
* 操作日志 服务层 * 操作日志 服务层
......
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysPostService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
View file @ cee572f2
package com.ruoyi.project.system.service; package com.ruoyi.system.service;
import java.util.List; import java.util.List;
import com.ruoyi.project.system.domain.SysPost; import com.ruoyi.system.domain.SysPost;
/** /**
* 岗位信息 服务层 * 岗位信息 服务层
......
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysRoleService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
View file @ cee572f2
package com.ruoyi.project.system.service; package com.ruoyi.system.service;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import com.ruoyi.project.system.domain.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
/** /**
* 角色业务层 * 角色业务层
......
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserOnlineService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java
View file @ cee572f2
package com.ruoyi.project.system.service; package com.ruoyi.system.service;
import com.ruoyi.framework.security.LoginUser; import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.project.monitor.domain.SysUserOnline; import com.ruoyi.system.domain.SysUserOnline;
/** /**
* 在线用户 服务层 * 在线用户 服务层
......
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
View file @ cee572f2
package com.ruoyi.project.system.service; package com.ruoyi.system.service;
import java.util.List; import java.util.List;
import com.ruoyi.project.system.domain.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
/** /**
* 用户 业务层 * 用户 业务层
......
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
View file @ cee572f2
package com.ruoyi.project.system.service.impl; package com.ruoyi.system.service.impl;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.common.annotation.DataSource;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.DataSourceType;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.redis.RedisCache; import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.project.system.domain.SysConfig; import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.project.system.mapper.SysConfigMapper; import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.project.system.service.ISysConfigService;
/** /**
* 参数配置 服务层实现 * 参数配置 服务层实现
...@@ -48,6 +50,7 @@ public class SysConfigServiceImpl implements ISysConfigService ...@@ -48,6 +50,7 @@ public class SysConfigServiceImpl implements ISysConfigService
* @return 参数配置信息 * @return 参数配置信息
*/ */
@Override @Override
@DataSource(DataSourceType.MASTER)
public SysConfig selectConfigById(Long configId) public SysConfig selectConfigById(Long configId)
{ {
SysConfig config = new SysConfig(); SysConfig config = new SysConfig();
......
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
View file @ cee572f2
package com.ruoyi.project.system.service.impl; package com.ruoyi.system.service.impl;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
...@@ -6,14 +6,14 @@ import java.util.List; ...@@ -6,14 +6,14 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.DataScope; import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.framework.web.domain.TreeSelect; import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.service.ISysDeptService;
/** /**
* 部门管理 服务实现 * 部门管理 服务实现
......
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
View file @ cee572f2
package com.ruoyi.project.system.service.impl; package com.ruoyi.system.service.impl;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.utils.DictUtils; import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.project.system.domain.SysDictData; import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.project.system.mapper.SysDictDataMapper; import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.project.system.service.ISysDictDataService;
/** /**
* 字典 业务层处理 * 字典 业务层处理
......
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
View file @ cee572f2
package com.ruoyi.project.system.service.impl; package com.ruoyi.system.service.impl;
import java.util.List; import java.util.List;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
...@@ -6,14 +6,14 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -6,14 +6,14 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.DictUtils; import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.system.domain.SysDictData; import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.project.system.domain.SysDictType; import com.ruoyi.system.mapper.SysDictTypeMapper;
import com.ruoyi.project.system.mapper.SysDictDataMapper; import com.ruoyi.system.service.ISysDictTypeService;
import com.ruoyi.project.system.mapper.SysDictTypeMapper;
import com.ruoyi.project.system.service.ISysDictTypeService;
/** /**
* 字典 业务层处理 * 字典 业务层处理
......
ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
View file @ cee572f2
package com.ruoyi.project.monitor.service.impl; package com.ruoyi.system.service.impl;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.project.monitor.domain.SysLogininfor; import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.project.monitor.mapper.SysLogininforMapper; import com.ruoyi.system.mapper.SysLogininforMapper;
import com.ruoyi.project.monitor.service.ISysLogininforService; import com.ruoyi.system.service.ISysLogininforService;
/** /**
* 系统访问日志情况信息 服务层处理 * 系统访问日志情况信息 服务层处理
......
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
View file @ cee572f2
package com.ruoyi.project.system.service.impl; package com.ruoyi.system.service.impl;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
...@@ -11,16 +11,16 @@ import java.util.stream.Collectors; ...@@ -11,16 +11,16 @@ import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.domain.TreeSelect; import com.ruoyi.system.domain.vo.MetaVo;
import com.ruoyi.project.system.domain.SysMenu; import com.ruoyi.system.domain.vo.RouterVo;
import com.ruoyi.project.system.domain.SysUser; import com.ruoyi.system.mapper.SysMenuMapper;
import com.ruoyi.project.system.domain.vo.MetaVo; import com.ruoyi.system.mapper.SysRoleMenuMapper;
import com.ruoyi.project.system.domain.vo.RouterVo; import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.project.system.mapper.SysMenuMapper;
import com.ruoyi.project.system.mapper.SysRoleMenuMapper;
import com.ruoyi.project.system.service.ISysMenuService;
/** /**
* 菜单 业务层处理 * 菜单 业务层处理
......
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
View file @ cee572f2
package com.ruoyi.project.system.service.impl; package com.ruoyi.system.service.impl;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.project.system.domain.SysNotice; import com.ruoyi.system.domain.SysNotice;
import com.ruoyi.project.system.mapper.SysNoticeMapper; import com.ruoyi.system.mapper.SysNoticeMapper;
import com.ruoyi.project.system.service.ISysNoticeService; import com.ruoyi.system.service.ISysNoticeService;
/** /**
* 公告 服务层实现 * 公告 服务层实现
......
ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
View file @ cee572f2
package com.ruoyi.project.monitor.service.impl; package com.ruoyi.system.service.impl;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.project.monitor.domain.SysOperLog; import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.project.monitor.mapper.SysOperLogMapper; import com.ruoyi.system.mapper.SysOperLogMapper;
import com.ruoyi.project.monitor.service.ISysOperLogService; import com.ruoyi.system.service.ISysOperLogService;
/** /**
* 操作日志 服务层处理 * 操作日志 服务层处理
......
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
View file @ cee572f2
package com.ruoyi.project.system.service.impl; package com.ruoyi.system.service.impl;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -6,10 +6,10 @@ import org.springframework.stereotype.Service; ...@@ -6,10 +6,10 @@ import org.springframework.stereotype.Service;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.system.domain.SysPost; import com.ruoyi.system.domain.SysPost;
import com.ruoyi.project.system.mapper.SysPostMapper; import com.ruoyi.system.mapper.SysPostMapper;
import com.ruoyi.project.system.mapper.SysUserPostMapper; import com.ruoyi.system.mapper.SysUserPostMapper;
import com.ruoyi.project.system.service.ISysPostService; import com.ruoyi.system.service.ISysPostService;
/** /**
* 岗位信息 服务层处理 * 岗位信息 服务层处理
......
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
View file @ cee572f2
package com.ruoyi.project.system.service.impl; package com.ruoyi.system.service.impl;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
...@@ -8,19 +8,19 @@ import java.util.Set; ...@@ -8,19 +8,19 @@ import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.DataScope; import com.ruoyi.system.domain.SysRoleDept;
import com.ruoyi.project.system.domain.SysRole; import com.ruoyi.system.domain.SysRoleMenu;
import com.ruoyi.project.system.domain.SysRoleDept; import com.ruoyi.system.mapper.SysRoleDeptMapper;
import com.ruoyi.project.system.domain.SysRoleMenu; import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.project.system.mapper.SysRoleDeptMapper; import com.ruoyi.system.mapper.SysRoleMenuMapper;
import com.ruoyi.project.system.mapper.SysRoleMapper; import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.project.system.mapper.SysRoleMenuMapper; import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.project.system.mapper.SysUserRoleMapper;
import com.ruoyi.project.system.service.ISysRoleService;
/** /**
* 角色 业务层处理 * 角色 业务层处理
......
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
View file @ cee572f2
package com.ruoyi.project.system.service.impl; package com.ruoyi.system.service.impl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.security.LoginUser; import com.ruoyi.system.domain.SysUserOnline;
import com.ruoyi.project.monitor.domain.SysUserOnline; import com.ruoyi.system.service.ISysUserOnlineService;
import com.ruoyi.project.system.service.ISysUserOnlineService;
/** /**
* 在线用户 服务层处理 * 在线用户 服务层处理
......
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View file @ cee572f2
package com.ruoyi.project.system.service.impl; package com.ruoyi.system.service.impl;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -7,23 +7,23 @@ import org.slf4j.LoggerFactory; ...@@ -7,23 +7,23 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.DataScope; import com.ruoyi.system.domain.SysPost;
import com.ruoyi.project.system.domain.SysPost; import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.project.system.domain.SysRole; import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.project.system.domain.SysUser; import com.ruoyi.system.mapper.SysPostMapper;
import com.ruoyi.project.system.domain.SysUserPost; import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.project.system.domain.SysUserRole; import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.project.system.mapper.SysPostMapper; import com.ruoyi.system.mapper.SysUserPostMapper;
import com.ruoyi.project.system.mapper.SysRoleMapper; import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.project.system.mapper.SysUserMapper; import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.project.system.mapper.SysUserPostMapper; import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.project.system.mapper.SysUserRoleMapper;
import com.ruoyi.project.system.service.ISysConfigService;
import com.ruoyi.project.system.service.ISysUserService;
/** /**
* 用户 业务层处理 * 用户 业务层处理
......
ruoyi/src/main/resources/mybatis/system/SysConfigMapper.xml → ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
View file @ cee572f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.system.mapper.SysConfigMapper"> <mapper namespace="com.ruoyi.system.mapper.SysConfigMapper">
<resultMap type="SysConfig" id="SysConfigResult"> <resultMap type="SysConfig" id="SysConfigResult">
<id property="configId" column="config_id" /> <id property="configId" column="config_id" />
......
ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml → ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
View file @ cee572f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.system.mapper.SysDeptMapper"> <mapper namespace="com.ruoyi.system.mapper.SysDeptMapper">
<resultMap type="SysDept" id="SysDeptResult"> <resultMap type="SysDept" id="SysDeptResult">
<id property="deptId" column="dept_id" /> <id property="deptId" column="dept_id" />
......
ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml → ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
View file @ cee572f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.system.mapper.SysDictDataMapper"> <mapper namespace="com.ruoyi.system.mapper.SysDictDataMapper">
<resultMap type="SysDictData" id="SysDictDataResult"> <resultMap type="SysDictData" id="SysDictDataResult">
<id property="dictCode" column="dict_code" /> <id property="dictCode" column="dict_code" />
......
ruoyi/src/main/resources/mybatis/system/SysDictTypeMapper.xml → ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
View file @ cee572f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.system.mapper.SysDictTypeMapper"> <mapper namespace="com.ruoyi.system.mapper.SysDictTypeMapper">
<resultMap type="SysDictType" id="SysDictTypeResult"> <resultMap type="SysDictType" id="SysDictTypeResult">
<id property="dictId" column="dict_id" /> <id property="dictId" column="dict_id" />
......
ruoyi/src/main/resources/mybatis/monitor/SysLogininforMapper.xml → ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
View file @ cee572f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.monitor.mapper.SysLogininforMapper"> <mapper namespace="com.ruoyi.system.mapper.SysLogininforMapper">
<resultMap type="SysLogininfor" id="SysLogininforResult"> <resultMap type="SysLogininfor" id="SysLogininforResult">
<id property="infoId" column="info_id" /> <id property="infoId" column="info_id" />
......
ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml → ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
View file @ cee572f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.system.mapper.SysMenuMapper"> <mapper namespace="com.ruoyi.system.mapper.SysMenuMapper">
<resultMap type="SysMenu" id="SysMenuResult"> <resultMap type="SysMenu" id="SysMenuResult">
<id property="menuId" column="menu_id" /> <id property="menuId" column="menu_id" />
......
ruoyi/src/main/resources/mybatis/system/SysNoticeMapper.xml → ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
View file @ cee572f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.system.mapper.SysNoticeMapper"> <mapper namespace="com.ruoyi.system.mapper.SysNoticeMapper">
<resultMap type="SysNotice" id="SysNoticeResult"> <resultMap type="SysNotice" id="SysNoticeResult">
<result property="noticeId" column="notice_id" /> <result property="noticeId" column="notice_id" />
......
ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml → ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
View file @ cee572f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.monitor.mapper.SysOperLogMapper"> <mapper namespace="com.ruoyi.system.mapper.SysOperLogMapper">
<resultMap type="SysOperLog" id="SysOperLogResult"> <resultMap type="SysOperLog" id="SysOperLogResult">
<id property="operId" column="oper_id" /> <id property="operId" column="oper_id" />
......
ruoyi/src/main/resources/mybatis/system/SysPostMapper.xml → ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
View file @ cee572f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.system.mapper.SysPostMapper"> <mapper namespace="com.ruoyi.system.mapper.SysPostMapper">
<resultMap type="SysPost" id="SysPostResult"> <resultMap type="SysPost" id="SysPostResult">
<id property="postId" column="post_id" /> <id property="postId" column="post_id" />
......
ruoyi/src/main/resources/mybatis/system/SysRoleDeptMapper.xml → ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
View file @ cee572f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.system.mapper.SysRoleDeptMapper"> <mapper namespace="com.ruoyi.system.mapper.SysRoleDeptMapper">
<resultMap type="SysRoleDept" id="SysRoleDeptResult"> <resultMap type="SysRoleDept" id="SysRoleDeptResult">
<result property="roleId" column="role_id" /> <result property="roleId" column="role_id" />
......
ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml → ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
View file @ cee572f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.system.mapper.SysRoleMapper"> <mapper namespace="com.ruoyi.system.mapper.SysRoleMapper">
<resultMap type="SysRole" id="SysRoleResult"> <resultMap type="SysRole" id="SysRoleResult">
<id property="roleId" column="role_id" /> <id property="roleId" column="role_id" />
......
ruoyi/src/main/resources/mybatis/system/SysRoleMenuMapper.xml → ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
View file @ cee572f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.system.mapper.SysRoleMenuMapper"> <mapper namespace="com.ruoyi.system.mapper.SysRoleMenuMapper">
<resultMap type="SysRoleMenu" id="SysRoleMenuResult"> <resultMap type="SysRoleMenu" id="SysRoleMenuResult">
<result property="roleId" column="role_id" /> <result property="roleId" column="role_id" />
......
ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml → ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View file @ cee572f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.system.mapper.SysUserMapper"> <mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
<resultMap type="SysUser" id="SysUserResult"> <resultMap type="SysUser" id="SysUserResult">
<id property="userId" column="user_id" /> <id property="userId" column="user_id" />
......
ruoyi/src/main/resources/mybatis/system/SysUserPostMapper.xml → ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
View file @ cee572f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.system.mapper.SysUserPostMapper"> <mapper namespace="com.ruoyi.system.mapper.SysUserPostMapper">
<resultMap type="SysUserPost" id="SysUserPostResult"> <resultMap type="SysUserPost" id="SysUserPostResult">
<result property="userId" column="user_id" /> <result property="userId" column="user_id" />
......
ruoyi/src/main/resources/mybatis/system/SysUserRoleMapper.xml → ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
View file @ cee572f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.system.mapper.SysUserRoleMapper"> <mapper namespace="com.ruoyi.system.mapper.SysUserRoleMapper">
<resultMap type="SysUserRole" id="SysUserRoleResult"> <resultMap type="SysUserRole" id="SysUserRoleResult">
<result property="userId" column="user_id" /> <result property="userId" column="user_id" />
......
ruoyi-ui/package.json
View file @ cee572f2
{ {
"name": "ruoyi", "name": "ruoyi",
"version": "2.3.0", "version": "3.0.0",
"description": "若依管理系统", "description": "若依管理系统",
"author": "若依", "author": "若依",
"license": "MIT", "license": "MIT",
......
ruoyi/bin/run-tomcat.bat deleted 100644 → 0
View file @ 0d341f1a
@echo off
echo.
echo [Ϣ] ʹ Spring Boot Tomcat Web ̡
echo.
%~d0
cd %~dp0
cd ..
title %cd%
set MAVEN_OPTS=%MAVEN_OPTS% -Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
call mvn clean spring-boot:run -Dmaven.test.skip=true -U
pause
\ No newline at end of file
ruoyi/pom.xml deleted 100644 → 0
View file @ 0d341f1a
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<modelVersion>4.0.0</modelVersion>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
<version>2.3.0</version>
<packaging>jar</packaging>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依管理系统</description>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.1.RELEASE</version>
<relativePath />
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version>
<pagehelper.spring.boot.starter.version>1.2.5</pagehelper.spring.boot.starter.version>
<fastjson.version>1.2.70</fastjson.version>
<druid.version>1.1.14</druid.version>
<commons.io.version>2.5</commons.io.version>
<commons.fileupload.version>1.3.3</commons.fileupload.version>
<bitwalker.version>1.19</bitwalker.version>
<jwt.version>0.9.0</jwt.version>
<swagger.version>2.9.2</swagger.version>
<poi.version>3.17</poi.version>
<oshi.version>3.9.1</oshi.version>
<velocity.version>1.7</velocity.version>
</properties>
<dependencies>
<!-- SpringBoot 核心包 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<!-- SpringBoot 测试 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<!-- SpringBoot 拦截器 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<!-- SpringBoot Web容器 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- spring-boot-devtools -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional> <!-- 表示依赖不会传递 -->
</dependency>
<!-- spring security 安全认证 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<!-- redis 缓存操作 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<!-- pool 对象池 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
</dependency>
<!-- Mysql驱动包 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<scope>runtime</scope>
</dependency>
<!-- SpringBoot集成mybatis框架 -->
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>${mybatis.spring.boot.starter.version}</version>
</dependency>
<!-- pagehelper 分页插件 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>${pagehelper.spring.boot.starter.version}</version>
</dependency>
<!--阿里数据库连接池 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
</dependency>
<!--常用工具类 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<!--io常用工具类 -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>
<!--文件上传工具类 -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons.fileupload.version}</version>
</dependency>
<!-- 解析客户端操作系统、浏览器等 -->
<dependency>
<groupId>eu.bitwalker</groupId>
<artifactId>UserAgentUtils</artifactId>
<version>${bitwalker.version}</version>
</dependency>
<!-- 阿里JSON解析器 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
<!--Spring框架基本的核心工具-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
</dependency>
<!--Token生成与解析-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>${jwt.version}</version>
</dependency>
<!-- swagger2-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger.version}</version>
<exclusions>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.21</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
<version>1.5.21</version>
</dependency>
<!-- swagger2-UI-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.version}</version>
</dependency>
<!-- 获取系统信息 -->
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>${oshi.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
</dependency>
<!-- excel工具 -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
</dependency>
<!--velocity代码生成使用模板 -->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity.version}</version>
</dependency>
<!-- 定时任务 -->
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<exclusions>
<exclusion>
<groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>public</id>
<name>aliyun nexus</name>
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>public</id>
<name>aliyun nexus</name>
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project>
\ No newline at end of file
ruoyi/ry.sh → ry.sh
View file @ cee572f2
#!/bin/bash #!/bin/bash
AppName=ruoyi.jar AppName=ruoyi-admin.jar
#JVM参数 #JVM参数
JVM_OPTS="-Dname=$AppName -Duser.timezone=Asia/Shanghai -Xms512M -Xmx512M -XX:PermSize=256M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC" JVM_OPTS="-Dname=$AppName -Duser.timezone=Asia/Shanghai -Xms512M -Xmx512M -XX:PermSize=256M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment