若依 3.0

RuoYi

2020-07-19 cee572f237cb293e4a9070ef458356bc6daa2105

若依 3.0

 .gitignore

 bin/clean.bat

 bin/package.bat

 bin/run.bat

对比新文件
@@ -0,0 +1,14 @@
@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

 doc/若依环境使用手册.docx

Binary files differ

 pom.xml

对比新文件
@@ -0,0 +1,234 @@
<?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>

 ruoyi-admin/pom.xml

对比新文件
@@ -0,0 +1,108 @@
<?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>

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

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

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

文件名从 ruoyi/src/main/java/com/ruoyi/project/common/CaptchaController.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.common;

package com.ruoyi.web.controller.common;



import java.io.ByteArrayOutputStream;

import java.io.IOException;

@@ -8,11 +8,11 @@
import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.RestController;

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.sign.Base64;

import com.ruoyi.framework.redis.RedisCache;

import com.ruoyi.framework.web.domain.AjaxResult;

import com.ruoyi.common.utils.uuid.IdUtils;



/**

 * 验证码操作处理


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/common/CommonController.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.common;

package com.ruoyi.web.controller.common;



import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;

@@ -9,13 +9,13 @@
import org.springframework.web.bind.annotation.PostMapping;

import org.springframework.web.bind.annotation.RestController;

import org.springframework.web.multipart.MultipartFile;

import com.ruoyi.common.config.RuoYiConfig;

import com.ruoyi.common.constant.Constants;

import com.ruoyi.common.core.domain.AjaxResult;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.common.utils.file.FileUploadUtils;

import com.ruoyi.common.utils.file.FileUtils;

import com.ruoyi.framework.config.RuoYiConfig;

import com.ruoyi.framework.config.ServerConfig;

import com.ruoyi.framework.web.domain.AjaxResult;



/**

 * 通用请求处理


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java 修改
@@ -1,11 +1,11 @@
package com.ruoyi.project.monitor.controller;

package com.ruoyi.web.controller.monitor;



import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.framework.web.controller.BaseController;

import com.ruoyi.framework.web.domain.AjaxResult;

import com.ruoyi.common.core.controller.BaseController;

import com.ruoyi.common.core.domain.AjaxResult;

import com.ruoyi.framework.web.domain.Server;



/**


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.monitor.controller;

package com.ruoyi.web.controller.monitor;



import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;

@@ -8,14 +8,14 @@
import org.springframework.web.bind.annotation.PathVariable;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.common.annotation.Log;

import com.ruoyi.common.core.controller.BaseController;

import com.ruoyi.common.core.domain.AjaxResult;

import com.ruoyi.common.core.page.TableDataInfo;

import com.ruoyi.common.enums.BusinessType;

import com.ruoyi.common.utils.poi.ExcelUtil;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

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.monitor.domain.SysLogininfor;

import com.ruoyi.project.monitor.service.ISysLogininforService;

import com.ruoyi.system.domain.SysLogininfor;

import com.ruoyi.system.service.ISysLogininforService;



/**

 * 系统访问记录


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.monitor.controller;

package com.ruoyi.web.controller.monitor;



import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;

@@ -8,14 +8,14 @@
import org.springframework.web.bind.annotation.PathVariable;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.common.annotation.Log;

import com.ruoyi.common.core.controller.BaseController;

import com.ruoyi.common.core.domain.AjaxResult;

import com.ruoyi.common.core.page.TableDataInfo;

import com.ruoyi.common.enums.BusinessType;

import com.ruoyi.common.utils.poi.ExcelUtil;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

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.monitor.domain.SysOperLog;

import com.ruoyi.project.monitor.service.ISysOperLogService;

import com.ruoyi.system.domain.SysOperLog;

import com.ruoyi.system.service.ISysOperLogService;



/**

 * 操作日志记录


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.monitor.controller;

package com.ruoyi.web.controller.monitor;



import java.util.ArrayList;

import java.util.Collection;

@@ -11,17 +11,17 @@
import org.springframework.web.bind.annotation.PathVariable;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.common.annotation.Log;

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.framework.aspectj.lang.annotation.Log;

import com.ruoyi.framework.aspectj.lang.enums.BusinessType;

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;

import com.ruoyi.system.domain.SysUserOnline;

import com.ruoyi.system.service.ISysUserOnlineService;



/**

 * 在线用户监控


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.controller;

package com.ruoyi.web.controller.system;



import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;

@@ -12,16 +12,17 @@
import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.common.annotation.Log;

import com.ruoyi.common.annotation.RepeatSubmit;

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.poi.ExcelUtil;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

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.SysConfig;

import com.ruoyi.project.system.service.ISysConfigService;

import com.ruoyi.system.domain.SysConfig;

import com.ruoyi.system.service.ISysConfigService;



/**

 * 参数配置 信息操作处理

@@ -82,6 +83,7 @@
    @PreAuthorize("@ss.hasPermi('system:config:add')")

    @Log(title = "参数管理", businessType = BusinessType.INSERT)

    @PostMapping

    @RepeatSubmit

    public AjaxResult add(@Validated @RequestBody SysConfig config)

    {

        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.controller;

package com.ruoyi.web.controller.system;



import java.util.Iterator;

import java.util.List;

@@ -14,15 +14,15 @@
import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.common.annotation.Log;

import com.ruoyi.common.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.StringUtils;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

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;

import com.ruoyi.system.service.ISysDeptService;



/**

 * 部门信息


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.controller;

package com.ruoyi.web.controller.system;



import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;

@@ -12,16 +12,16 @@
import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.common.annotation.Log;

import com.ruoyi.common.core.controller.BaseController;

import com.ruoyi.common.core.domain.AjaxResult;

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.poi.ExcelUtil;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

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.SysDictData;

import com.ruoyi.project.system.service.ISysDictDataService;

import com.ruoyi.project.system.service.ISysDictTypeService;

import com.ruoyi.system.service.ISysDictDataService;

import com.ruoyi.system.service.ISysDictTypeService;



/**

 * 数据字典信息


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.controller;

package com.ruoyi.web.controller.system;



import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;

@@ -12,16 +12,16 @@
import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.common.annotation.Log;

import com.ruoyi.common.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.poi.ExcelUtil;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

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;

import com.ruoyi.system.service.ISysDictTypeService;



/**

 * 数据字典信息


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.controller;

package com.ruoyi.web.controller.system;



import java.util.List;

import java.util.Set;

@@ -8,16 +8,16 @@
import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RestController;

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.framework.security.LoginBody;

import com.ruoyi.framework.security.LoginUser;

import com.ruoyi.framework.security.service.SysLoginService;

import com.ruoyi.framework.security.service.SysPermissionService;

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;

import com.ruoyi.framework.web.service.SysLoginService;

import com.ruoyi.framework.web.service.SysPermissionService;

import com.ruoyi.framework.web.service.TokenService;

import com.ruoyi.system.service.ISysMenuService;



/**

 * 登录验证


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.controller;

package com.ruoyi.web.controller.system;



import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;

@@ -12,19 +12,19 @@
import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.common.annotation.Log;

import com.ruoyi.common.constant.Constants;

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.ServletUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

import com.ruoyi.framework.aspectj.lang.enums.BusinessType;

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;

import com.ruoyi.framework.web.service.TokenService;

import com.ruoyi.system.service.ISysMenuService;



/**

 * 菜单信息


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.controller;

package com.ruoyi.web.controller.system;



import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;

@@ -12,14 +12,14 @@
import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.common.annotation.Log;

import com.ruoyi.common.core.controller.BaseController;

import com.ruoyi.common.core.domain.AjaxResult;

import com.ruoyi.common.core.page.TableDataInfo;

import com.ruoyi.common.enums.BusinessType;

import com.ruoyi.common.utils.SecurityUtils;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

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.SysNotice;

import com.ruoyi.project.system.service.ISysNoticeService;

import com.ruoyi.system.domain.SysNotice;

import com.ruoyi.system.service.ISysNoticeService;



/**

 * 公告 信息操作处理


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.controller;

package com.ruoyi.web.controller.system;



import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;

@@ -12,16 +12,16 @@
import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.common.annotation.Log;

import com.ruoyi.common.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.poi.ExcelUtil;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

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.SysPost;

import com.ruoyi.project.system.service.ISysPostService;

import com.ruoyi.system.domain.SysPost;

import com.ruoyi.system.service.ISysPostService;



/**

 * 岗位信息操作处理


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.controller;

package com.ruoyi.web.controller.system;



import java.io.IOException;

import org.springframework.beans.factory.annotation.Autowired;

@@ -10,18 +10,18 @@
import org.springframework.web.bind.annotation.RequestParam;

import org.springframework.web.bind.annotation.RestController;

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.ServletUtils;

import com.ruoyi.common.utils.file.FileUploadUtils;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

import com.ruoyi.framework.aspectj.lang.enums.BusinessType;

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;

import com.ruoyi.framework.web.service.TokenService;

import com.ruoyi.system.service.ISysUserService;



/**

 * 个人信息 业务处理


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.controller;

package com.ruoyi.web.controller.system;



import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;

@@ -12,16 +12,16 @@
import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.common.annotation.Log;

import com.ruoyi.common.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.poi.ExcelUtil;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

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;

import com.ruoyi.system.service.ISysRoleService;



/**

 * 角色信息


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.controller;

package com.ruoyi.web.controller.system;



import java.util.List;

import java.util.stream.Collectors;

@@ -14,23 +14,23 @@
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import org.springframework.web.multipart.MultipartFile;

import com.ruoyi.common.annotation.Log;

import com.ruoyi.common.constant.UserConstants;

import com.ruoyi.common.core.controller.BaseController;

import com.ruoyi.common.core.domain.AjaxResult;

import com.ruoyi.common.core.domain.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.ServletUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.common.utils.poi.ExcelUtil;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

import com.ruoyi.framework.aspectj.lang.enums.BusinessType;

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.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;

import com.ruoyi.framework.web.service.TokenService;

import com.ruoyi.system.service.ISysPostService;

import com.ruoyi.system.service.ISysRoleService;

import com.ruoyi.system.service.ISysUserService;



/**

 * 用户信息


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java

对比新文件
@@ -0,0 +1,24 @@
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-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/tool/swagger/TestController.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.tool.swagger;

package com.ruoyi.web.controller.tool;



import java.util.ArrayList;

import java.util.LinkedHashMap;

@@ -11,9 +11,9 @@
import org.springframework.web.bind.annotation.PutMapping;

import org.springframework.web.bind.annotation.RequestMapping;

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.framework.web.controller.BaseController;

import com.ruoyi.framework.web.domain.AjaxResult;

import io.swagger.annotations.Api;

import io.swagger.annotations.ApiImplicitParam;

import io.swagger.annotations.ApiModel;


 ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.config;

package com.ruoyi.web.core.config;



import java.util.ArrayList;

import java.util.List;

@@ -6,6 +6,7 @@
import org.springframework.beans.factory.annotation.Value;

import org.springframework.context.annotation.Bean;

import org.springframework.context.annotation.Configuration;

import com.ruoyi.common.config.RuoYiConfig;

import io.swagger.annotations.ApiOperation;

import springfox.documentation.builders.ApiInfoBuilder;

import springfox.documentation.builders.PathSelectors;


 ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties

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

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

文件名从 ruoyi/src/main/resources/application.yml 修改
@@ -3,7 +3,7 @@
  # 名称

  name: RuoYi

  # 版本

  version: 2.3.0

  version: 3.0.0

  # 版权年份

  copyrightYear: 2019

  # 实例演示开关

@@ -87,9 +87,9 @@
# MyBatis配置

mybatis:

    # 搜索指定包别名

    typeAliasesPackage: com.ruoyi.project.**.domain

    typeAliasesPackage: com.ruoyi.**.domain

    # 配置mapper的扫描，找到所有的mapper.xml映射文件

    mapperLocations: classpath*:mybatis/**/*Mapper.xml

    mapperLocations: classpath*:mapper/**/*Mapper.xml

    # 加载全局的配置文件

    configLocation: classpath:mybatis/mybatis-config.xml



@@ -115,14 +115,3 @@
  excludes: /system/notice/*

  # 匹配链接

  urlPatterns: /system/*,/monitor/*,/tool/*

  
# 代码生成

gen: 
  # 作者

  author: ruoyi

  # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool

  packageName: com.ruoyi.project.system

  # 自动去除表前缀，默认是true

  autoRemovePre: false

  # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）

  tablePrefix: sys_

 ruoyi-admin/src/main/resources/banner.txt

 ruoyi-admin/src/main/resources/i18n/messages.properties

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

 ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml

 ruoyi-common/pom.xml

对比新文件
@@ -0,0 +1,124 @@
<?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>

 ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.aspectj.lang.annotation;

package com.ruoyi.common.annotation;



import java.lang.annotation.Documented;

import java.lang.annotation.ElementType;


 ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.aspectj.lang.annotation;

package com.ruoyi.common.annotation;



import java.lang.annotation.Documented;

import java.lang.annotation.ElementType;

@@ -6,7 +6,7 @@
import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.Target;

import com.ruoyi.framework.aspectj.lang.enums.DataSourceType;

import com.ruoyi.common.enums.DataSourceType;



/**

 * 自定义多数据源切换注解


 ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.aspectj.lang.annotation;
package com.ruoyi.common.annotation;


import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

 ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excels.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.aspectj.lang.annotation;
package com.ruoyi.common.annotation;


import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

 ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java 修改
@@ -1,12 +1,12 @@
package com.ruoyi.framework.aspectj.lang.annotation;

package com.ruoyi.common.annotation;



import java.lang.annotation.Documented;

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.Target;

import com.ruoyi.framework.aspectj.lang.enums.BusinessType;

import com.ruoyi.framework.aspectj.lang.enums.OperatorType;

import com.ruoyi.common.enums.BusinessType;

import com.ruoyi.common.enums.OperatorType;



/**

 * 自定义操作日志记录注解


 ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.interceptor.annotation;
package com.ruoyi.common.annotation;


import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;

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

文件名从 ruoyi/src/main/java/com/ruoyi/framework/config/RuoYiConfig.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.config;

package com.ruoyi.common.config;



import org.springframework.boot.context.properties.ConfigurationProperties;

import org.springframework.stereotype.Component;


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

文件名从 ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java 修改
@@ -1,7 +1,5 @@
package com.ruoyi.common.constant;



import io.jsonwebtoken.Claims;



/**

 * 通用常量信息

 * 

@@ -92,7 +90,7 @@
    /**

     * 用户名称

     */

    public static final String JWT_USERNAME = Claims.SUBJECT;

    public static final String JWT_USERNAME = "sub";



    /**

     * 用户头像


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

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

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

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

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

文件名从 ruoyi/src/main/java/com/ruoyi/framework/web/controller/BaseController.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.web.controller;

package com.ruoyi.common.core.controller;



import java.beans.PropertyEditorSupport;

import java.util.Date;

@@ -10,13 +10,13 @@
import com.github.pagehelper.PageHelper;

import com.github.pagehelper.PageInfo;

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.StringUtils;

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层通用数据处理

@@ -83,4 +83,12 @@
    {

        return rows > 0 ? AjaxResult.success() : AjaxResult.error();

    }



    /**

     * 页面跳转

     */

    public String redirect(String url)

    {

        return StringUtils.format("redirect:{}", url);

    }

}


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

文件名从 ruoyi/src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.web.domain;

package com.ruoyi.common.core.domain;



import java.util.HashMap;

import com.ruoyi.common.constant.HttpStatus;


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

文件名从 ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.web.domain;

package com.ruoyi.common.core.domain;



import java.io.Serializable;

import java.util.Date;


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

文件名从 ruoyi/src/main/java/com/ruoyi/framework/web/domain/TreeEntity.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.web.domain;

package com.ruoyi.common.core.domain;



import java.util.ArrayList;

import java.util.List;


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

文件名从 ruoyi/src/main/java/com/ruoyi/framework/web/domain/TreeSelect.java 修改
@@ -1,11 +1,11 @@
package com.ruoyi.framework.web.domain;

package com.ruoyi.common.core.domain;



import java.io.Serializable;

import java.util.List;

import java.util.stream.Collectors;

import com.fasterxml.jackson.annotation.JsonInclude;

import com.ruoyi.project.system.domain.SysDept;

import com.ruoyi.project.system.domain.SysMenu;

import com.ruoyi.common.core.domain.entity.SysDept;

import com.ruoyi.common.core.domain.entity.SysMenu;



/**

 * Treeselect树结构实体类


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDept.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.domain;

package com.ruoyi.common.core.domain.entity;



import java.util.ArrayList;

import java.util.List;

@@ -7,7 +7,7 @@
import javax.validation.constraints.Size;

import org.apache.commons.lang3.builder.ToStringBuilder;

import org.apache.commons.lang3.builder.ToStringStyle;

import com.ruoyi.framework.web.domain.BaseEntity;

import com.ruoyi.common.core.domain.BaseEntity;



/**

 * 部门表 sys_dept


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictData.java 修改
@@ -1,13 +1,13 @@
package com.ruoyi.project.system.domain;

package com.ruoyi.common.core.domain.entity;



import javax.validation.constraints.NotBlank;

import javax.validation.constraints.Size;

import org.apache.commons.lang3.builder.ToStringBuilder;

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.framework.aspectj.lang.annotation.Excel;

import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;

import com.ruoyi.framework.web.domain.BaseEntity;

import com.ruoyi.common.core.domain.BaseEntity;



/**

 * 字典数据表 sys_dict_data


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictType.java 修改
@@ -1,12 +1,12 @@
package com.ruoyi.project.system.domain;

package com.ruoyi.common.core.domain.entity;



import javax.validation.constraints.NotBlank;

import javax.validation.constraints.Size;

import org.apache.commons.lang3.builder.ToStringBuilder;

import org.apache.commons.lang3.builder.ToStringStyle;

import com.ruoyi.framework.aspectj.lang.annotation.Excel;

import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;

import com.ruoyi.framework.web.domain.BaseEntity;

import com.ruoyi.common.annotation.Excel;

import com.ruoyi.common.annotation.Excel.ColumnType;

import com.ruoyi.common.core.domain.BaseEntity;



/**

 * 字典类型表 sys_dict_type


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/domain/SysMenu.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.domain;

package com.ruoyi.common.core.domain.entity;



import java.util.ArrayList;

import java.util.List;

@@ -6,7 +6,7 @@
import javax.validation.constraints.Size;

import org.apache.commons.lang3.builder.ToStringBuilder;

import org.apache.commons.lang3.builder.ToStringStyle;

import com.ruoyi.framework.web.domain.BaseEntity;

import com.ruoyi.common.core.domain.BaseEntity;



/**

 * 菜单权限表 sys_menu


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java 修改
@@ -1,12 +1,12 @@
package com.ruoyi.project.system.domain;

package com.ruoyi.common.core.domain.entity;



import javax.validation.constraints.NotBlank;

import javax.validation.constraints.Size;

import org.apache.commons.lang3.builder.ToStringBuilder;

import org.apache.commons.lang3.builder.ToStringStyle;

import com.ruoyi.framework.aspectj.lang.annotation.Excel;

import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;

import com.ruoyi.framework.web.domain.BaseEntity;

import com.ruoyi.common.annotation.Excel;

import com.ruoyi.common.annotation.Excel.ColumnType;

import com.ruoyi.common.core.domain.BaseEntity;



/**

 * 角色表 sys_role


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.domain;

package com.ruoyi.common.core.domain.entity;



import java.util.Date;

import java.util.List;

@@ -9,11 +9,11 @@
import org.apache.commons.lang3.builder.ToStringStyle;

import com.fasterxml.jackson.annotation.JsonIgnore;

import com.fasterxml.jackson.annotation.JsonProperty;

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.web.domain.BaseEntity;

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.core.domain.BaseEntity;



/**

 * 用户对象 sys_user


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

文件名从 ruoyi/src/main/java/com/ruoyi/framework/security/LoginBody.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.security;

package com.ruoyi.common.core.domain.model;



/**

 * 用户登录对象


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

文件名从 ruoyi/src/main/java/com/ruoyi/framework/security/LoginUser.java 修改
@@ -1,11 +1,11 @@
package com.ruoyi.framework.security;

package com.ruoyi.common.core.domain.model;



import java.util.Collection;

import java.util.Set;

import org.springframework.security.core.GrantedAuthority;

import org.springframework.security.core.userdetails.UserDetails;

import com.fasterxml.jackson.annotation.JsonIgnore;

import com.ruoyi.project.system.domain.SysUser;

import com.ruoyi.common.core.domain.entity.SysUser;



/**

 * 登录用户身份权限


 ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/web/page/PageDomain.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.web.page;

package com.ruoyi.common.core.page;



import com.ruoyi.common.utils.StringUtils;



@@ -11,10 +11,13 @@
{

    /** 当前记录起始索引 */

    private Integer pageNum;



    /** 每页显示记录数 */

    private Integer pageSize;



    /** 排序列 */

    private String orderByColumn;



    /** 排序的方向 "desc" 或者 "asc". */

    private String isAsc;




 ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.web.page;

package com.ruoyi.common.core.page;



import java.io.Serializable;

import java.util.List;


 ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/web/page/TableSupport.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.web.page;

package com.ruoyi.common.core.page;



import com.ruoyi.common.utils.ServletUtils;




 ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/redis/RedisCache.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.redis;

package com.ruoyi.common.core.redis;



import java.util.Collection;

import java.util.List;


 ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java

 ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java

 ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java

 ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessStatus.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.aspectj.lang.enums;

package com.ruoyi.common.enums;



/**

 * 操作状态


 ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessType.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.aspectj.lang.enums;

package com.ruoyi.common.enums;



/**

 * 业务操作类型


 ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/DataSourceType.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.aspectj.lang.enums;

package com.ruoyi.common.enums;



/**

 * 数据源


 ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java

 ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/enums/OperatorType.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.aspectj.lang.enums;

package com.ruoyi.common.enums;



/**

 * 操作人类别


 ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java

 ruoyi-common/src/main/java/com/ruoyi/common/exception/BaseException.java

 ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java

 ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java

 ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java

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

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

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

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

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

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

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

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

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

 ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java

 ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java

 ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java

 ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java

 ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java

 ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

 ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java

文件名从 ruoyi/src/main/java/com/ruoyi/common/utils/DictUtils.java 修改
@@ -2,10 +2,11 @@


import java.util.Collection;

import java.util.List;



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.framework.redis.RedisCache;

import com.ruoyi.project.system.domain.SysDictData;



/**

 * 字典工具类


 ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java

 ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java

 ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java

 ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java

文件名从 ruoyi/src/main/java/com/ruoyi/common/utils/SecurityUtils.java 修改
@@ -4,8 +4,8 @@
import org.springframework.security.core.context.SecurityContextHolder;

import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;

import com.ruoyi.common.constant.HttpStatus;

import com.ruoyi.common.core.domain.model.LoginUser;

import com.ruoyi.common.exception.CustomException;

import com.ruoyi.framework.security.LoginUser;



/**

 * 安全服务工具类


 ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java

 ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java

 ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java

 ruoyi-common/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java

 ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java

 ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

文件名从 ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java 修改
@@ -4,14 +4,14 @@
import java.io.IOException;

import org.apache.commons.io.FilenameUtils;

import org.springframework.web.multipart.MultipartFile;

import com.ruoyi.common.config.RuoYiConfig;

import com.ruoyi.common.constant.Constants;

import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException;

import com.ruoyi.common.exception.file.FileSizeLimitExceededException;

import com.ruoyi.common.exception.file.InvalidExtensionException;

import com.ruoyi.common.utils.DateUtils;

import com.ruoyi.common.utils.IdUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.framework.config.RuoYiConfig;

import com.ruoyi.common.utils.uuid.IdUtils;



/**

 * 文件上传工具类


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

 ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java

 ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java

 ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java

 ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java

文件名从 ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java 修改
@@ -6,7 +6,7 @@
import java.io.InputStreamReader;
import java.nio.charset.Charset;
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.LoggerFactory;

@@ -46,7 +46,7 @@
                }
                catch (IOException e)
                {
                    LOGGER.error(ExceptionUtils.getFullStackTrace(e));
                    LOGGER.error(ExceptionUtils.getMessage(e));

                }
            }
        }

 ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java

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

文件名从 ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java 修改
@@ -3,10 +3,10 @@
import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import com.alibaba.fastjson.JSONObject;

import com.ruoyi.common.config.RuoYiConfig;

import com.ruoyi.common.constant.Constants;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.common.utils.http.HttpUtils;

import com.ruoyi.framework.config.RuoYiConfig;



/**

 * 获取地址类


 ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java

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

文件名从 ruoyi/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java 修改
@@ -41,17 +41,17 @@
import org.apache.poi.xssf.usermodel.XSSFDataValidation;
import org.slf4j.Logger;
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.exception.CustomException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
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相关处理

 ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java

 ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java

 ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java

 ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java

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

 ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java

文件名从 ruoyi/src/main/java/com/ruoyi/common/utils/IdUtils.java 修改
@@ -1,6 +1,6 @@
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生成器工具类


 ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java

文件名从 ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.common.core.lang;

package com.ruoyi.common.utils.uuid;



import java.security.MessageDigest;

import java.security.NoSuchAlgorithmException;


 ruoyi-framework/pom.xml

对比新文件
@@ -0,0 +1,62 @@
<?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>

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

文件名从 ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java 修改
@@ -8,15 +8,15 @@
import org.aspectj.lang.annotation.Pointcut;

import org.aspectj.lang.reflect.MethodSignature;

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.StringUtils;

import com.ruoyi.common.utils.spring.SpringUtils;

import com.ruoyi.framework.aspectj.lang.annotation.DataScope;

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;

import com.ruoyi.framework.web.service.TokenService;



/**

 * 数据过滤处理

@@ -58,7 +58,7 @@
    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()

    {

    }


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

文件名从 ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java 修改
@@ -11,8 +11,8 @@
import org.springframework.core.annotation.AnnotationUtils;

import org.springframework.core.annotation.Order;

import org.springframework.stereotype.Component;

import com.ruoyi.common.annotation.DataSource;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.framework.aspectj.lang.annotation.DataSource;

import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder;



/**

@@ -27,8 +27,8 @@
{

    protected Logger logger = LoggerFactory.getLogger(getClass());



    @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.DataSource)"

            + "|| @within(com.ruoyi.framework.aspectj.lang.annotation.DataSource)")

    @Pointcut("@annotation(com.ruoyi.common.annotation.DataSource)"

            + "|| @within(com.ruoyi.common.annotation.DataSource)")

    public void dsPointCut()

    {




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

文件名从 ruoyi/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java 修改
@@ -17,18 +17,18 @@
import org.springframework.web.multipart.MultipartFile;

import org.springframework.web.servlet.HandlerMapping;

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.utils.ServletUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.common.utils.ip.IpUtils;

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.factory.AsyncFactory;

import com.ruoyi.framework.security.LoginUser;

import com.ruoyi.framework.security.service.TokenService;

import com.ruoyi.project.monitor.domain.SysOperLog;

import com.ruoyi.framework.web.service.TokenService;

import com.ruoyi.system.domain.SysOperLog;



/**

 * 操作日志记录处理

@@ -42,7 +42,7 @@
    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()

    {

    }


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

文件名从 ruoyi/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java 修改
@@ -16,7 +16,7 @@
// 表示通过aop框架暴露该代理对象,AopContext能够访问

@EnableAspectJAutoProxy(exposeProxy = true)

// 指定要扫描的Mapper类的包的路径

@MapperScan("com.ruoyi.project.**.mapper")

@MapperScan("com.ruoyi.**.mapper")

public class ApplicationConfig

{

    /**


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

文件名从 ruoyi/src/main/java/com/ruoyi/framework/config/DruidConfig.java 修改
@@ -19,8 +19,8 @@
import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;

import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;

import com.alibaba.druid.util.Utils;

import com.ruoyi.common.enums.DataSourceType;

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.datasource.DynamicDataSource;




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

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

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

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

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

文件名从 ruoyi/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java 修改
@@ -5,6 +5,7 @@
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;

import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;

import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

import com.ruoyi.common.config.RuoYiConfig;

import com.ruoyi.common.constant.Constants;

import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;




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

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

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

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java

 ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java

 ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java

 ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java 修改
@@ -7,9 +7,9 @@
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
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.framework.interceptor.annotation.RepeatSubmit;
import com.ruoyi.framework.web.domain.AjaxResult;

/**
 * 防止重复提交拦截器

 ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java 修改
@@ -7,11 +7,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.core.redis.RedisCache;

import com.ruoyi.common.filter.RepeatedlyRequestWrapper;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpHelper;
import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
import com.ruoyi.framework.redis.RedisCache;

/**
 * 判断请求url和数据是否和上一次相同，

 ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java

 ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java

 ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java 修改
@@ -9,10 +9,10 @@
import com.ruoyi.common.utils.ip.AddressUtils;

import com.ruoyi.common.utils.ip.IpUtils;

import com.ruoyi.common.utils.spring.SpringUtils;

import com.ruoyi.project.monitor.domain.SysLogininfor;

import com.ruoyi.project.monitor.domain.SysOperLog;

import com.ruoyi.project.monitor.service.ISysLogininforService;

import com.ruoyi.project.monitor.service.ISysOperLogService;

import com.ruoyi.system.domain.SysLogininfor;

import com.ruoyi.system.domain.SysOperLog;

import com.ruoyi.system.service.ISysLogininforService;

import com.ruoyi.system.service.ISysOperLogService;

import eu.bitwalker.useragentutils.UserAgent;



/**


 ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java 修改
@@ -11,10 +11,10 @@
import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;

import org.springframework.stereotype.Component;

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.StringUtils;

import com.ruoyi.framework.security.LoginUser;

import com.ruoyi.framework.security.service.TokenService;

import com.ruoyi.framework.web.service.TokenService;



/**

 * token过滤器 验证token有效性


 ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java 修改
@@ -9,9 +9,9 @@
import org.springframework.stereotype.Component;

import com.alibaba.fastjson.JSON;

import com.ruoyi.common.constant.HttpStatus;

import com.ruoyi.common.core.domain.AjaxResult;

import com.ruoyi.common.utils.ServletUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.framework.web.domain.AjaxResult;



/**

 * 认证失败处理类 返回未授权


 ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java 修改
@@ -11,13 +11,13 @@
import com.alibaba.fastjson.JSON;

import com.ruoyi.common.constant.Constants;

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.StringUtils;

import com.ruoyi.framework.manager.AsyncManager;

import com.ruoyi.framework.manager.factory.AsyncFactory;

import com.ruoyi.framework.security.LoginUser;

import com.ruoyi.framework.security.service.TokenService;

import com.ruoyi.framework.web.domain.AjaxResult;

import com.ruoyi.framework.web.service.TokenService;



/**

 * 自定义退出处理类 返回成功


 ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java 修改
@@ -11,11 +11,11 @@
import org.springframework.web.bind.annotation.RestControllerAdvice;

import org.springframework.web.servlet.NoHandlerFoundException;

import com.ruoyi.common.constant.HttpStatus;

import com.ruoyi.common.core.domain.AjaxResult;

import com.ruoyi.common.exception.BaseException;

import com.ruoyi.common.exception.CustomException;

import com.ruoyi.common.exception.DemoModeException;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.framework.web.domain.AjaxResult;



/**

 * 全局异常处理器


 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/security/service/PermissionService.java 修改
@@ -1,13 +1,13 @@
package com.ruoyi.framework.security.service;

package com.ruoyi.framework.web.service;



import java.util.Set;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

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.StringUtils;

import com.ruoyi.framework.security.LoginUser;

import com.ruoyi.project.system.domain.SysRole;



/**

 * RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母


 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.security.service;

package com.ruoyi.framework.web.service;



import javax.annotation.Resource;

import org.springframework.beans.factory.annotation.Autowired;

@@ -8,6 +8,8 @@
import org.springframework.security.core.Authentication;

import org.springframework.stereotype.Component;

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.user.CaptchaException;

import com.ruoyi.common.exception.user.CaptchaExpireException;

@@ -15,8 +17,6 @@
import com.ruoyi.common.utils.MessageUtils;

import com.ruoyi.framework.manager.AsyncManager;

import com.ruoyi.framework.manager.factory.AsyncFactory;

import com.ruoyi.framework.redis.RedisCache;

import com.ruoyi.framework.security.LoginUser;



/**

 * 登录校验方法


 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java 修改
@@ -1,12 +1,12 @@
package com.ruoyi.framework.security.service;

package com.ruoyi.framework.web.service;



import java.util.HashSet;

import java.util.Set;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Component;

import com.ruoyi.project.system.domain.SysUser;

import com.ruoyi.project.system.service.ISysMenuService;

import com.ruoyi.project.system.service.ISysRoleService;

import com.ruoyi.common.core.domain.entity.SysUser;

import com.ruoyi.system.service.ISysMenuService;

import com.ruoyi.system.service.ISysRoleService;



/**

 * 用户权限处理


 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.security.service;

package com.ruoyi.framework.web.service;



import java.util.HashMap;

import java.util.Map;

@@ -8,13 +8,13 @@
import org.springframework.beans.factory.annotation.Value;

import org.springframework.stereotype.Component;

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.StringUtils;

import com.ruoyi.common.utils.ip.AddressUtils;

import com.ruoyi.common.utils.ip.IpUtils;

import com.ruoyi.framework.redis.RedisCache;

import com.ruoyi.framework.security.LoginUser;

import com.ruoyi.common.utils.uuid.IdUtils;

import eu.bitwalker.useragentutils.UserAgent;

import io.jsonwebtoken.Claims;

import io.jsonwebtoken.Jwts;


 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java

文件名从 ruoyi/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.security.service;

package com.ruoyi.framework.web.service;



import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

@@ -7,12 +7,12 @@
import org.springframework.security.core.userdetails.UserDetailsService;

import org.springframework.security.core.userdetails.UsernameNotFoundException;

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.exception.BaseException;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.framework.security.LoginUser;

import com.ruoyi.project.system.domain.SysUser;

import com.ruoyi.project.system.service.ISysUserService;

import com.ruoyi.system.service.ISysUserService;



/**

 * 用户验证处理


 ruoyi-generator/pom.xml

对比新文件
@@ -0,0 +1,34 @@
<?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>

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

文件名从 ruoyi/src/main/java/com/ruoyi/framework/config/GenConfig.java 修改
@@ -1,6 +1,8 @@
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.context.annotation.PropertySource;

import org.springframework.stereotype.Component;



/**

@@ -10,6 +12,7 @@
 */

@Component

@ConfigurationProperties(prefix = "gen")

@PropertySource(value = { "classpath:generator.yml" })

public class GenConfig

{

    /** 作者 */

@@ -18,7 +21,7 @@
    /** 生成包路径 */

    public static String packageName;



    /** 自动去除表前缀，默认是true */

    /** 自动去除表前缀，默认是false */

    public static boolean autoRemovePre;



    /** 表前缀(类名不会包含表前缀) */

@@ -29,6 +32,7 @@
        return author;

    }



    @Value("${author}")

    public void setAuthor(String author)

    {

        GenConfig.author = author;

@@ -39,6 +43,7 @@
        return packageName;

    }



    @Value("${packageName}")

    public void setPackageName(String packageName)

    {

        GenConfig.packageName = packageName;

@@ -49,6 +54,7 @@
        return autoRemovePre;

    }



    @Value("${autoRemovePre}")

    public void setAutoRemovePre(boolean autoRemovePre)

    {

        GenConfig.autoRemovePre = autoRemovePre;

@@ -59,6 +65,7 @@
        return tablePrefix;

    }



    @Value("${tablePrefix}")

    public void setTablePrefix(String tablePrefix)

    {

        GenConfig.tablePrefix = tablePrefix;


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.tool.gen.controller;

package com.ruoyi.generator.controller;



import java.io.IOException;

import java.util.HashMap;

@@ -17,16 +17,16 @@
import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.common.annotation.Log;

import com.ruoyi.common.core.controller.BaseController;

import com.ruoyi.common.core.domain.AjaxResult;

import com.ruoyi.common.core.page.TableDataInfo;

import com.ruoyi.common.core.text.Convert;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

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.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;

import com.ruoyi.common.enums.BusinessType;

import com.ruoyi.generator.domain.GenTable;

import com.ruoyi.generator.domain.GenTableColumn;

import com.ruoyi.generator.service.IGenTableColumnService;

import com.ruoyi.generator.service.IGenTableService;



/**

 * 代码生成 操作处理


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java 修改
@@ -1,12 +1,12 @@
package com.ruoyi.project.tool.gen.domain;

package com.ruoyi.generator.domain;



import java.util.List;

import javax.validation.Valid;

import javax.validation.constraints.NotBlank;

import org.apache.commons.lang3.ArrayUtils;

import com.ruoyi.common.constant.GenConstants;

import com.ruoyi.common.core.domain.BaseEntity;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.framework.web.domain.BaseEntity;



/**

 * 业务表 gen_table


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTableColumn.java 修改
@@ -1,8 +1,8 @@
package com.ruoyi.project.tool.gen.domain;

package com.ruoyi.generator.domain;



import javax.validation.constraints.NotBlank;

import com.ruoyi.common.core.domain.BaseEntity;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.framework.web.domain.BaseEntity;



/**

 * 代码生成业务字段表 gen_table_column


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableColumnMapper.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.tool.gen.mapper;

package com.ruoyi.generator.mapper;



import java.util.List;

import com.ruoyi.project.tool.gen.domain.GenTableColumn;

import com.ruoyi.generator.domain.GenTableColumn;



/**

 * 业务字段 数据层


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableMapper.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.tool.gen.mapper;

package com.ruoyi.generator.mapper;



import java.util.List;

import com.ruoyi.project.tool.gen.domain.GenTable;

import com.ruoyi.generator.domain.GenTable;



/**

 * 业务 数据层


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java 修改
@@ -1,11 +1,11 @@
package com.ruoyi.project.tool.gen.service;

package com.ruoyi.generator.service;



import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

import com.ruoyi.common.core.text.Convert;

import com.ruoyi.project.tool.gen.domain.GenTableColumn;

import com.ruoyi.project.tool.gen.mapper.GenTableColumnMapper;

import com.ruoyi.generator.domain.GenTableColumn;

import com.ruoyi.generator.mapper.GenTableColumnMapper;



/**

 * 业务字段 服务层实现


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.tool.gen.service;

package com.ruoyi.generator.service;



import java.io.ByteArrayOutputStream;

import java.io.IOException;

@@ -24,13 +24,13 @@
import com.ruoyi.common.exception.CustomException;

import com.ruoyi.common.utils.SecurityUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.project.tool.gen.domain.GenTable;

import com.ruoyi.project.tool.gen.domain.GenTableColumn;

import com.ruoyi.project.tool.gen.mapper.GenTableColumnMapper;

import com.ruoyi.project.tool.gen.mapper.GenTableMapper;

import com.ruoyi.project.tool.gen.util.GenUtils;

import com.ruoyi.project.tool.gen.util.VelocityInitializer;

import com.ruoyi.project.tool.gen.util.VelocityUtils;

import com.ruoyi.generator.domain.GenTable;

import com.ruoyi.generator.domain.GenTableColumn;

import com.ruoyi.generator.mapper.GenTableColumnMapper;

import com.ruoyi.generator.mapper.GenTableMapper;

import com.ruoyi.generator.util.GenUtils;

import com.ruoyi.generator.util.VelocityInitializer;

import com.ruoyi.generator.util.VelocityUtils;



/**

 * 业务 服务层实现


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.tool.gen.service;

package com.ruoyi.generator.service;



import java.util.List;

import com.ruoyi.project.tool.gen.domain.GenTableColumn;

import com.ruoyi.generator.domain.GenTableColumn;



/**

 * 业务字段 服务层


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableService.java 修改
@@ -1,8 +1,8 @@
package com.ruoyi.project.tool.gen.service;

package com.ruoyi.generator.service;



import java.util.List;

import java.util.Map;

import com.ruoyi.project.tool.gen.domain.GenTable;

import com.ruoyi.generator.domain.GenTable;



/**

 * 业务 服务层


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java 修改
@@ -1,12 +1,12 @@
package com.ruoyi.project.tool.gen.util;

package com.ruoyi.generator.util;



import java.util.Arrays;

import org.apache.commons.lang3.RegExUtils;

import com.ruoyi.common.constant.GenConstants;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.framework.config.GenConfig;

import com.ruoyi.project.tool.gen.domain.GenTable;

import com.ruoyi.project.tool.gen.domain.GenTableColumn;

import com.ruoyi.generator.config.GenConfig;

import com.ruoyi.generator.domain.GenTable;

import com.ruoyi.generator.domain.GenTableColumn;



/**

 * 代码生成器 工具类


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityInitializer.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.tool.gen.util;

package com.ruoyi.generator.util;



import java.util.Properties;

import org.apache.velocity.app.Velocity;


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

文件名从 ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.tool.gen.util;

package com.ruoyi.generator.util;



import java.util.ArrayList;

import java.util.HashSet;

@@ -8,16 +8,21 @@
import com.ruoyi.common.constant.GenConstants;

import com.ruoyi.common.utils.DateUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.project.tool.gen.domain.GenTable;

import com.ruoyi.project.tool.gen.domain.GenTableColumn;

import com.ruoyi.generator.domain.GenTable;

import com.ruoyi.generator.domain.GenTableColumn;



/**

 * 代码生成模板处理

 * 
 * @author ruoyi

 */

public class VelocityUtils

{

    /** 项目空间路径 */

    private static final String PROJECT_PATH = "main/java";



    /** 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,0 +1,10 @@
# 代码生成

gen: 
  # 作者

  author: ruoyi

  # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool

  packageName: com.ruoyi.system

  # 自动去除表前缀，默认是false

  autoRemovePre: false

  # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）

  tablePrefix: sys_

 ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml

文件名从 ruoyi/src/main/resources/mybatis/tool/GenTableColumnMapper.xml 修改
@@ -2,7 +2,7 @@
<!DOCTYPE mapper

PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

"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">

        <id     property="columnId"       column="column_id"      />


 ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml

文件名从 ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml 修改
@@ -2,7 +2,7 @@
<!DOCTYPE mapper

PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

"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">

        <id     property="tableId"        column="table_id"        />


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

文件名从 ruoyi/src/main/resources/vm/java/controller.java.vm 修改
@@ -11,15 +11,15 @@
import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

import com.ruoyi.framework.aspectj.lang.enums.BusinessType;

import com.ruoyi.common.annotation.Log;

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}.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;

#if($table.crud)

import com.ruoyi.framework.web.page.TableDataInfo;

import com.ruoyi.common.core.page.TableDataInfo;

#elseif($table.tree)

#end




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

文件名从 ruoyi/src/main/resources/vm/java/domain.java.vm 修改
@@ -5,11 +5,11 @@
#end

import org.apache.commons.lang3.builder.ToStringBuilder;

import org.apache.commons.lang3.builder.ToStringStyle;

import com.ruoyi.framework.aspectj.lang.annotation.Excel;

import com.ruoyi.common.annotation.Excel;

#if($table.crud)

import com.ruoyi.framework.web.domain.BaseEntity;

import com.ruoyi.common.core.domain.BaseEntity;

#elseif($table.tree)

import com.ruoyi.framework.web.domain.TreeEntity;

import com.ruoyi.common.core.domain.TreeEntity;

#end



/**


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

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

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

 ruoyi-generator/src/main/resources/vm/js/api.js.vm

 ruoyi-generator/src/main/resources/vm/sql/sql.vm

 ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm

 ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

 ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm

 ruoyi-quartz/pom.xml

对比新文件
@@ -0,0 +1,40 @@
<?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>

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

文件名从 ruoyi/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.config;
package com.ruoyi.quartz.config;


import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

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

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.monitor.controller;
package com.ruoyi.quartz.controller;


import java.util.List;
import org.quartz.SchedulerException;
@@ -12,17 +12,17 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;

import com.ruoyi.common.core.controller.BaseController;

import com.ruoyi.common.core.domain.AjaxResult;

import com.ruoyi.common.core.page.TableDataInfo;

import com.ruoyi.common.enums.BusinessType;

import com.ruoyi.common.exception.job.TaskException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.job.CronUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
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.monitor.domain.SysJob;
import com.ruoyi.project.monitor.service.ISysJobService;
import com.ruoyi.quartz.domain.SysJob;

import com.ruoyi.quartz.service.ISysJobService;

import com.ruoyi.quartz.util.CronUtils;


/**
 * 调度任务信息操作处理

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

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java 修改
@@ -1,21 +1,21 @@
package com.ruoyi.project.monitor.controller;
package com.ruoyi.quartz.controller;


import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
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.GetMapping;

import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.project.monitor.domain.SysJobLog;
import com.ruoyi.project.monitor.service.ISysJobLogService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
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.framework.web.page.TableDataInfo;
import com.ruoyi.quartz.domain.SysJobLog;

import com.ruoyi.quartz.service.ISysJobLogService;


/**
 * 调度日志操作处理

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

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.monitor.domain;
package com.ruoyi.quartz.domain;


import java.io.Serializable;
import java.util.Date;
@@ -7,12 +7,12 @@
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
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.core.domain.BaseEntity;

import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.job.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;
import com.ruoyi.quartz.util.CronUtils;


/**
 * 定时任务调度表 sys_job

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

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysJobLog.java 修改
@@ -1,10 +1,10 @@
package com.ruoyi.project.monitor.domain;
package com.ruoyi.quartz.domain;


import java.util.Date;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
import com.ruoyi.common.annotation.Excel;

import com.ruoyi.common.core.domain.BaseEntity;


/**
 * 定时任务调度日志表 sys_job_log

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

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysJobLogMapper.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.monitor.mapper;
package com.ruoyi.quartz.mapper;


import java.util.List;
import com.ruoyi.project.monitor.domain.SysJobLog;
import com.ruoyi.quartz.domain.SysJobLog;


/**
 * 调度任务日志信息 数据层

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

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysJobMapper.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.monitor.mapper;
package com.ruoyi.quartz.mapper;


import java.util.List;
import com.ruoyi.project.monitor.domain.SysJob;
import com.ruoyi.quartz.domain.SysJob;


/**
 * 调度任务信息 数据层

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

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysJobLogService.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.monitor.service;
package com.ruoyi.quartz.service;


import java.util.List;
import com.ruoyi.project.monitor.domain.SysJobLog;
import com.ruoyi.quartz.domain.SysJobLog;


/**
 * 定时任务调度日志信息信息 服务层

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

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysJobService.java 修改
@@ -1,9 +1,9 @@
package com.ruoyi.project.monitor.service;
package com.ruoyi.quartz.service;


import java.util.List;
import org.quartz.SchedulerException;
import com.ruoyi.common.exception.job.TaskException;
import com.ruoyi.project.monitor.domain.SysJob;
import com.ruoyi.quartz.domain.SysJob;


/**
 * 定时任务调度信息信息 服务层

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

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.java 修改
@@ -1,11 +1,11 @@
package com.ruoyi.project.monitor.service.impl;
package com.ruoyi.quartz.service.impl;


import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.project.monitor.domain.SysJobLog;
import com.ruoyi.project.monitor.mapper.SysJobLogMapper;
import com.ruoyi.project.monitor.service.ISysJobLogService;
import com.ruoyi.quartz.domain.SysJobLog;

import com.ruoyi.quartz.mapper.SysJobLogMapper;

import com.ruoyi.quartz.service.ISysJobLogService;


/**
 * 定时任务调度日志信息 服务层

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

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.monitor.service.impl;
package com.ruoyi.quartz.service.impl;


import java.util.List;
import javax.annotation.PostConstruct;
@@ -11,11 +11,11 @@
import org.springframework.transaction.annotation.Transactional;
import com.ruoyi.common.constant.ScheduleConstants;
import com.ruoyi.common.exception.job.TaskException;
import com.ruoyi.common.utils.job.CronUtils;
import com.ruoyi.common.utils.job.ScheduleUtils;
import com.ruoyi.project.monitor.domain.SysJob;
import com.ruoyi.project.monitor.mapper.SysJobMapper;
import com.ruoyi.project.monitor.service.ISysJobService;
import com.ruoyi.quartz.domain.SysJob;

import com.ruoyi.quartz.mapper.SysJobMapper;

import com.ruoyi.quartz.service.ISysJobService;

import com.ruoyi.quartz.util.CronUtils;

import com.ruoyi.quartz.util.ScheduleUtils;


/**
 * 定时任务调度信息 服务层

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

文件名从 ruoyi/src/main/java/com/ruoyi/framework/task/RyTask.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.framework.task;
package com.ruoyi.quartz.task;


import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.StringUtils;

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

文件名从 ruoyi/src/main/java/com/ruoyi/common/utils/job/AbstractQuartzJob.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.common.utils.job;
package com.ruoyi.quartz.util;


import java.util.Date;
import org.quartz.Job;
@@ -12,9 +12,9 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.project.monitor.domain.SysJob;
import com.ruoyi.project.monitor.domain.SysJobLog;
import com.ruoyi.project.monitor.service.ISysJobLogService;
import com.ruoyi.quartz.domain.SysJob;

import com.ruoyi.quartz.domain.SysJobLog;

import com.ruoyi.quartz.service.ISysJobLogService;


/**
 * 抽象quartz调用

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

文件名从 ruoyi/src/main/java/com/ruoyi/common/utils/job/CronUtils.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.common.utils.job;
package com.ruoyi.quartz.util;


import java.text.ParseException;
import java.util.Date;

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

文件名从 ruoyi/src/main/java/com/ruoyi/common/utils/job/JobInvokeUtil.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.common.utils.job;
package com.ruoyi.quartz.util;


import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -6,7 +6,7 @@
import java.util.List;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.project.monitor.domain.SysJob;
import com.ruoyi.quartz.domain.SysJob;


/**
 * 任务执行工具

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

文件名从 ruoyi/src/main/java/com/ruoyi/common/utils/job/QuartzDisallowConcurrentExecution.java 修改
@@ -1,8 +1,8 @@
package com.ruoyi.common.utils.job;
package com.ruoyi.quartz.util;


import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext;
import com.ruoyi.project.monitor.domain.SysJob;
import com.ruoyi.quartz.domain.SysJob;


/**
 * 定时任务处理（禁止并发执行）

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

文件名从 ruoyi/src/main/java/com/ruoyi/common/utils/job/QuartzJobExecution.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.common.utils.job;
package com.ruoyi.quartz.util;


import org.quartz.JobExecutionContext;
import com.ruoyi.project.monitor.domain.SysJob;
import com.ruoyi.quartz.domain.SysJob;


/**
 * 定时任务处理（允许并发执行）

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

文件名从 ruoyi/src/main/java/com/ruoyi/common/utils/job/ScheduleUtils.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.common.utils.job;
package com.ruoyi.quartz.util;


import org.quartz.CronScheduleBuilder;
import org.quartz.CronTrigger;
@@ -13,7 +13,7 @@
import com.ruoyi.common.constant.ScheduleConstants;
import com.ruoyi.common.exception.job.TaskException;
import com.ruoyi.common.exception.job.TaskException.Code;
import com.ruoyi.project.monitor.domain.SysJob;
import com.ruoyi.quartz.domain.SysJob;


/**
 * 定时任务工具类

 ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml

文件名从 ruoyi/src/main/resources/mybatis/system/SysJobLogMapper.xml 修改
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"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">
        <id     property="jobLogId"       column="job_log_id"      />

 ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml

文件名从 ruoyi/src/main/resources/mybatis/system/SysJobMapper.xml 修改
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"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">
        <id     property="jobId"          column="job_id"          />

 ruoyi-system/pom.xml

对比新文件
@@ -0,0 +1,28 @@
<?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>

 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/domain/SysConfig.java 修改
@@ -1,12 +1,12 @@
package com.ruoyi.project.system.domain;

package com.ruoyi.system.domain;



import javax.validation.constraints.NotBlank;

import javax.validation.constraints.Size;

import org.apache.commons.lang3.builder.ToStringBuilder;

import org.apache.commons.lang3.builder.ToStringStyle;

import com.ruoyi.framework.aspectj.lang.annotation.Excel;

import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;

import com.ruoyi.framework.web.domain.BaseEntity;

import com.ruoyi.common.annotation.Excel;

import com.ruoyi.common.annotation.Excel.ColumnType;

import com.ruoyi.common.core.domain.BaseEntity;



/**

 * 参数配置表 sys_config


 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java 修改
@@ -1,10 +1,10 @@
package com.ruoyi.project.monitor.domain;

package com.ruoyi.system.domain;



import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;

import com.ruoyi.framework.aspectj.lang.annotation.Excel;

import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;

import com.ruoyi.framework.web.domain.BaseEntity;

import com.ruoyi.common.annotation.Excel;

import com.ruoyi.common.annotation.Excel.ColumnType;

import com.ruoyi.common.core.domain.BaseEntity;



/**

 * 系统访问记录表 sys_logininfor


 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/domain/SysNotice.java 修改
@@ -1,10 +1,10 @@
package com.ruoyi.project.system.domain;

package com.ruoyi.system.domain;



import javax.validation.constraints.NotBlank;

import javax.validation.constraints.Size;

import org.apache.commons.lang3.builder.ToStringBuilder;

import org.apache.commons.lang3.builder.ToStringStyle;

import com.ruoyi.framework.web.domain.BaseEntity;

import com.ruoyi.common.core.domain.BaseEntity;



/**

 * 通知公告表 sys_notice


 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java 修改
@@ -1,10 +1,10 @@
package com.ruoyi.project.monitor.domain;

package com.ruoyi.system.domain;



import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;

import com.ruoyi.framework.aspectj.lang.annotation.Excel;

import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;

import com.ruoyi.framework.web.domain.BaseEntity;

import com.ruoyi.common.annotation.Excel;

import com.ruoyi.common.annotation.Excel.ColumnType;

import com.ruoyi.common.core.domain.BaseEntity;



/**

 * 操作日志记录表 oper_log


 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/domain/SysPost.java 修改
@@ -1,12 +1,12 @@
package com.ruoyi.project.system.domain;

package com.ruoyi.system.domain;



import javax.validation.constraints.NotBlank;

import javax.validation.constraints.Size;

import org.apache.commons.lang3.builder.ToStringBuilder;

import org.apache.commons.lang3.builder.ToStringStyle;

import com.ruoyi.framework.aspectj.lang.annotation.Excel;

import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;

import com.ruoyi.framework.web.domain.BaseEntity;

import com.ruoyi.common.annotation.Excel;

import com.ruoyi.common.annotation.Excel.ColumnType;

import com.ruoyi.common.core.domain.BaseEntity;



/**

 * 岗位表 sys_post


 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRoleDept.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.domain;

package com.ruoyi.system.domain;



import org.apache.commons.lang3.builder.ToStringBuilder;

import org.apache.commons.lang3.builder.ToStringStyle;


 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRoleMenu.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.domain;

package com.ruoyi.system.domain;



import org.apache.commons.lang3.builder.ToStringBuilder;

import org.apache.commons.lang3.builder.ToStringStyle;


 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysUserOnline.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.monitor.domain;

package com.ruoyi.system.domain;



/**

 * 当前在线会话


 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUserPost.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.domain;

package com.ruoyi.system.domain;



import org.apache.commons.lang3.builder.ToStringBuilder;

import org.apache.commons.lang3.builder.ToStringStyle;


 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUserRole.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.domain;

package com.ruoyi.system.domain;



import org.apache.commons.lang3.builder.ToStringBuilder;

import org.apache.commons.lang3.builder.ToStringStyle;


 ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/MetaVo.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.domain.vo;

package com.ruoyi.system.domain.vo;



/**

 * 路由显示信息


 ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/RouterVo.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.domain.vo;

package com.ruoyi.system.domain.vo;



import com.fasterxml.jackson.annotation.JsonInclude;

import java.util.List;


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysConfigMapper.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.system.mapper;

package com.ruoyi.system.mapper;



import java.util.List;

import com.ruoyi.project.system.domain.SysConfig;

import com.ruoyi.system.domain.SysConfig;



/**

 * 参数配置 数据层


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java 修改
@@ -1,8 +1,8 @@
package com.ruoyi.project.system.mapper;

package com.ruoyi.system.mapper;



import java.util.List;

import org.apache.ibatis.annotations.Param;

import com.ruoyi.project.system.domain.SysDept;

import com.ruoyi.common.core.domain.entity.SysDept;



/**

 * 部门管理 数据层


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictDataMapper.java 修改
@@ -1,8 +1,8 @@
package com.ruoyi.project.system.mapper;

package com.ruoyi.system.mapper;



import java.util.List;

import org.apache.ibatis.annotations.Param;

import com.ruoyi.project.system.domain.SysDictData;

import com.ruoyi.common.core.domain.entity.SysDictData;



/**

 * 字典表 数据层


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictTypeMapper.java 修改
@@ -1,8 +1,8 @@
package com.ruoyi.project.system.mapper;

package com.ruoyi.system.mapper;



import java.util.List;

import org.apache.ibatis.annotations.Mapper;

import com.ruoyi.project.system.domain.SysDictType;

import com.ruoyi.common.core.domain.entity.SysDictType;



/**

 * 字典表 数据层


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysLogininforMapper.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.monitor.mapper;

package com.ruoyi.system.mapper;



import java.util.List;

import com.ruoyi.project.monitor.domain.SysLogininfor;

import com.ruoyi.system.domain.SysLogininfor;



/**

 * 系统访问日志情况信息 数据层


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysMenuMapper.java 修改
@@ -1,8 +1,8 @@
package com.ruoyi.project.system.mapper;

package com.ruoyi.system.mapper;



import java.util.List;

import org.apache.ibatis.annotations.Param;

import com.ruoyi.project.system.domain.SysMenu;

import com.ruoyi.common.core.domain.entity.SysMenu;



/**

 * 菜单表 数据层


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysNoticeMapper.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.system.mapper;

package com.ruoyi.system.mapper;



import java.util.List;

import com.ruoyi.project.system.domain.SysNotice;

import com.ruoyi.system.domain.SysNotice;



/**

 * 通知公告表 数据层


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/mapper/SysOperLogMapper.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.monitor.mapper;

package com.ruoyi.system.mapper;



import java.util.List;

import com.ruoyi.project.monitor.domain.SysOperLog;

import com.ruoyi.system.domain.SysOperLog;



/**

 * 操作日志 数据层


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysPostMapper.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.system.mapper;

package com.ruoyi.system.mapper;



import java.util.List;

import com.ruoyi.project.system.domain.SysPost;

import com.ruoyi.system.domain.SysPost;



/**

 * 岗位信息 数据层


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysRoleDeptMapper.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.system.mapper;

package com.ruoyi.system.mapper;



import java.util.List;

import com.ruoyi.project.system.domain.SysRoleDept;

import com.ruoyi.system.domain.SysRoleDept;



/**

 * 角色与部门关联表 数据层


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysRoleMapper.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.system.mapper;

package com.ruoyi.system.mapper;



import java.util.List;

import com.ruoyi.project.system.domain.SysRole;

import com.ruoyi.common.core.domain.entity.SysRole;



/**

 * 角色表 数据层


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysRoleMenuMapper.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.system.mapper;

package com.ruoyi.system.mapper;



import java.util.List;

import com.ruoyi.project.system.domain.SysRoleMenu;

import com.ruoyi.system.domain.SysRoleMenu;



/**

 * 角色与菜单关联表 数据层


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java 修改
@@ -1,10 +1,8 @@
package com.ruoyi.project.system.mapper;

package com.ruoyi.system.mapper;



import java.util.List;



import org.apache.ibatis.annotations.Param;



import com.ruoyi.project.system.domain.SysUser;

import com.ruoyi.common.core.domain.entity.SysUser;



/**

 * 用户表 数据层


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserPostMapper.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.system.mapper;

package com.ruoyi.system.mapper;



import java.util.List;

import com.ruoyi.project.system.domain.SysUserPost;

import com.ruoyi.system.domain.SysUserPost;



/**

 * 用户与岗位关联表 数据层


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserRoleMapper.java 修改
@@ -1,8 +1,8 @@
package com.ruoyi.project.system.mapper;

package com.ruoyi.system.mapper;



import java.util.List;

import org.apache.ibatis.annotations.Param;

import com.ruoyi.project.system.domain.SysUserRole;

import com.ruoyi.system.domain.SysUserRole;



/**

 * 用户与角色关联表 数据层


 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.system.service;

package com.ruoyi.system.service;



import java.util.List;

import com.ruoyi.project.system.domain.SysConfig;

import com.ruoyi.system.domain.SysConfig;



/**

 * 参数配置 服务层


 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java 修改
@@ -1,8 +1,8 @@
package com.ruoyi.project.system.service;

package com.ruoyi.system.service;



import java.util.List;

import com.ruoyi.framework.web.domain.TreeSelect;

import com.ruoyi.project.system.domain.SysDept;

import com.ruoyi.common.core.domain.TreeSelect;

import com.ruoyi.common.core.domain.entity.SysDept;



/**

 * 部门管理 服务层


 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.system.service;

package com.ruoyi.system.service;



import java.util.List;

import com.ruoyi.project.system.domain.SysDictData;

import com.ruoyi.common.core.domain.entity.SysDictData;



/**

 * 字典 业务层


 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java 修改
@@ -1,8 +1,8 @@
package com.ruoyi.project.system.service;

package com.ruoyi.system.service;



import java.util.List;

import com.ruoyi.project.system.domain.SysDictData;

import com.ruoyi.project.system.domain.SysDictType;

import com.ruoyi.common.core.domain.entity.SysDictData;

import com.ruoyi.common.core.domain.entity.SysDictType;



/**

 * 字典 业务层


 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysLogininforService.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.monitor.service;

package com.ruoyi.system.service;



import java.util.List;

import com.ruoyi.project.monitor.domain.SysLogininfor;

import com.ruoyi.system.domain.SysLogininfor;



/**

 * 系统访问日志情况信息 服务层


 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/service/ISysMenuService.java 修改
@@ -1,10 +1,10 @@
package com.ruoyi.project.system.service;

package com.ruoyi.system.service;



import java.util.List;

import java.util.Set;

import com.ruoyi.framework.web.domain.TreeSelect;

import com.ruoyi.project.system.domain.SysMenu;

import com.ruoyi.project.system.domain.vo.RouterVo;

import com.ruoyi.common.core.domain.TreeSelect;

import com.ruoyi.common.core.domain.entity.SysMenu;

import com.ruoyi.system.domain.vo.RouterVo;



/**

 * 菜单 业务层


 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/service/ISysNoticeService.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.system.service;

package com.ruoyi.system.service;



import java.util.List;

import com.ruoyi.project.system.domain.SysNotice;

import com.ruoyi.system.domain.SysNotice;



/**

 * 公告 服务层


 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysOperLogService.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.monitor.service;

package com.ruoyi.system.service;



import java.util.List;

import com.ruoyi.project.monitor.domain.SysOperLog;

import com.ruoyi.system.domain.SysOperLog;



/**

 * 操作日志 服务层


 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/service/ISysPostService.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.system.service;

package com.ruoyi.system.service;



import java.util.List;

import com.ruoyi.project.system.domain.SysPost;

import com.ruoyi.system.domain.SysPost;



/**

 * 岗位信息 服务层


 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/service/ISysRoleService.java 修改
@@ -1,8 +1,8 @@
package com.ruoyi.project.system.service;

package com.ruoyi.system.service;



import java.util.List;

import java.util.Set;

import com.ruoyi.project.system.domain.SysRole;

import com.ruoyi.common.core.domain.entity.SysRole;



/**

 * 角色业务层


 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserOnlineService.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.system.service;

package com.ruoyi.system.service;



import com.ruoyi.framework.security.LoginUser;

import com.ruoyi.project.monitor.domain.SysUserOnline;

import com.ruoyi.common.core.domain.model.LoginUser;

import com.ruoyi.system.domain.SysUserOnline;



/**

 * 在线用户 服务层


 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserService.java 修改
@@ -1,7 +1,7 @@
package com.ruoyi.project.system.service;

package com.ruoyi.system.service;



import java.util.List;

import com.ruoyi.project.system.domain.SysUser;

import com.ruoyi.common.core.domain.entity.SysUser;



/**

 * 用户 业务层


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java 修改
@@ -1,18 +1,20 @@
package com.ruoyi.project.system.service.impl;

package com.ruoyi.system.service.impl;



import java.util.Collection;

import java.util.List;

import javax.annotation.PostConstruct;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

import com.ruoyi.common.annotation.DataSource;

import com.ruoyi.common.constant.Constants;

import com.ruoyi.common.constant.UserConstants;

import com.ruoyi.common.core.redis.RedisCache;

import com.ruoyi.common.core.text.Convert;

import com.ruoyi.common.enums.DataSourceType;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.framework.redis.RedisCache;

import com.ruoyi.project.system.domain.SysConfig;

import com.ruoyi.project.system.mapper.SysConfigMapper;

import com.ruoyi.project.system.service.ISysConfigService;

import com.ruoyi.system.domain.SysConfig;

import com.ruoyi.system.mapper.SysConfigMapper;

import com.ruoyi.system.service.ISysConfigService;



/**

 * 参数配置 服务层实现

@@ -48,6 +50,7 @@
     * @return 参数配置信息

     */

    @Override

    @DataSource(DataSourceType.MASTER)

    public SysConfig selectConfigById(Long configId)

    {

        SysConfig config = new SysConfig();


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.service.impl;

package com.ruoyi.system.service.impl;



import java.util.ArrayList;

import java.util.Iterator;

@@ -6,14 +6,14 @@
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

import com.ruoyi.common.annotation.DataScope;

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.utils.StringUtils;

import com.ruoyi.framework.aspectj.lang.annotation.DataScope;

import com.ruoyi.framework.web.domain.TreeSelect;

import com.ruoyi.project.system.domain.SysDept;

import com.ruoyi.project.system.mapper.SysDeptMapper;

import com.ruoyi.project.system.service.ISysDeptService;

import com.ruoyi.system.mapper.SysDeptMapper;

import com.ruoyi.system.service.ISysDeptService;



/**

 * 部门管理 服务实现


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java 修改
@@ -1,12 +1,12 @@
package com.ruoyi.project.system.service.impl;

package com.ruoyi.system.service.impl;



import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

import com.ruoyi.common.core.domain.entity.SysDictData;

import com.ruoyi.common.utils.DictUtils;

import com.ruoyi.project.system.domain.SysDictData;

import com.ruoyi.project.system.mapper.SysDictDataMapper;

import com.ruoyi.project.system.service.ISysDictDataService;

import com.ruoyi.system.mapper.SysDictDataMapper;

import com.ruoyi.system.service.ISysDictDataService;



/**

 * 字典 业务层处理


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.service.impl;

package com.ruoyi.system.service.impl;



import java.util.List;

import javax.annotation.PostConstruct;

@@ -6,14 +6,14 @@
import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

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.utils.DictUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.project.system.domain.SysDictData;

import com.ruoyi.project.system.domain.SysDictType;

import com.ruoyi.project.system.mapper.SysDictDataMapper;

import com.ruoyi.project.system.mapper.SysDictTypeMapper;

import com.ruoyi.project.system.service.ISysDictTypeService;

import com.ruoyi.system.mapper.SysDictDataMapper;

import com.ruoyi.system.mapper.SysDictTypeMapper;

import com.ruoyi.system.service.ISysDictTypeService;



/**

 * 字典 业务层处理


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java 修改
@@ -1,11 +1,11 @@
package com.ruoyi.project.monitor.service.impl;

package com.ruoyi.system.service.impl;



import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

import com.ruoyi.project.monitor.domain.SysLogininfor;

import com.ruoyi.project.monitor.mapper.SysLogininforMapper;

import com.ruoyi.project.monitor.service.ISysLogininforService;

import com.ruoyi.system.domain.SysLogininfor;

import com.ruoyi.system.mapper.SysLogininforMapper;

import com.ruoyi.system.service.ISysLogininforService;



/**

 * 系统访问日志情况信息 服务层处理


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.service.impl;

package com.ruoyi.system.service.impl;



import java.util.ArrayList;

import java.util.Arrays;

@@ -11,16 +11,16 @@
import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

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.StringUtils;

import com.ruoyi.framework.web.domain.TreeSelect;

import com.ruoyi.project.system.domain.SysMenu;

import com.ruoyi.project.system.domain.SysUser;

import com.ruoyi.project.system.domain.vo.MetaVo;

import com.ruoyi.project.system.domain.vo.RouterVo;

import com.ruoyi.project.system.mapper.SysMenuMapper;

import com.ruoyi.project.system.mapper.SysRoleMenuMapper;

import com.ruoyi.project.system.service.ISysMenuService;

import com.ruoyi.system.domain.vo.MetaVo;

import com.ruoyi.system.domain.vo.RouterVo;

import com.ruoyi.system.mapper.SysMenuMapper;

import com.ruoyi.system.mapper.SysRoleMenuMapper;

import com.ruoyi.system.service.ISysMenuService;



/**

 * 菜单 业务层处理


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java 修改
@@ -1,11 +1,11 @@
package com.ruoyi.project.system.service.impl;

package com.ruoyi.system.service.impl;



import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

import com.ruoyi.project.system.domain.SysNotice;

import com.ruoyi.project.system.mapper.SysNoticeMapper;

import com.ruoyi.project.system.service.ISysNoticeService;

import com.ruoyi.system.domain.SysNotice;

import com.ruoyi.system.mapper.SysNoticeMapper;

import com.ruoyi.system.service.ISysNoticeService;



/**

 * 公告 服务层实现


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java 修改
@@ -1,11 +1,11 @@
package com.ruoyi.project.monitor.service.impl;

package com.ruoyi.system.service.impl;



import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

import com.ruoyi.project.monitor.domain.SysOperLog;

import com.ruoyi.project.monitor.mapper.SysOperLogMapper;

import com.ruoyi.project.monitor.service.ISysOperLogService;

import com.ruoyi.system.domain.SysOperLog;

import com.ruoyi.system.mapper.SysOperLogMapper;

import com.ruoyi.system.service.ISysOperLogService;



/**

 * 操作日志 服务层处理


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.service.impl;

package com.ruoyi.system.service.impl;



import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;

@@ -6,10 +6,10 @@
import com.ruoyi.common.constant.UserConstants;

import com.ruoyi.common.exception.CustomException;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.project.system.domain.SysPost;

import com.ruoyi.project.system.mapper.SysPostMapper;

import com.ruoyi.project.system.mapper.SysUserPostMapper;

import com.ruoyi.project.system.service.ISysPostService;

import com.ruoyi.system.domain.SysPost;

import com.ruoyi.system.mapper.SysPostMapper;

import com.ruoyi.system.mapper.SysUserPostMapper;

import com.ruoyi.system.service.ISysPostService;



/**

 * 岗位信息 服务层处理


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.service.impl;

package com.ruoyi.system.service.impl;



import java.util.ArrayList;

import java.util.Arrays;

@@ -8,19 +8,19 @@
import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import com.ruoyi.common.annotation.DataScope;

import com.ruoyi.common.constant.UserConstants;

import com.ruoyi.common.core.domain.entity.SysRole;

import com.ruoyi.common.exception.CustomException;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.common.utils.spring.SpringUtils;

import com.ruoyi.framework.aspectj.lang.annotation.DataScope;

import com.ruoyi.project.system.domain.SysRole;

import com.ruoyi.project.system.domain.SysRoleDept;

import com.ruoyi.project.system.domain.SysRoleMenu;

import com.ruoyi.project.system.mapper.SysRoleDeptMapper;

import com.ruoyi.project.system.mapper.SysRoleMapper;

import com.ruoyi.project.system.mapper.SysRoleMenuMapper;

import com.ruoyi.project.system.mapper.SysUserRoleMapper;

import com.ruoyi.project.system.service.ISysRoleService;

import com.ruoyi.system.domain.SysRoleDept;

import com.ruoyi.system.domain.SysRoleMenu;

import com.ruoyi.system.mapper.SysRoleDeptMapper;

import com.ruoyi.system.mapper.SysRoleMapper;

import com.ruoyi.system.mapper.SysRoleMenuMapper;

import com.ruoyi.system.mapper.SysUserRoleMapper;

import com.ruoyi.system.service.ISysRoleService;



/**

 * 角色 业务层处理


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java 修改
@@ -1,10 +1,10 @@
package com.ruoyi.project.system.service.impl;

package com.ruoyi.system.service.impl;



import org.springframework.stereotype.Service;

import com.ruoyi.common.core.domain.model.LoginUser;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.framework.security.LoginUser;

import com.ruoyi.project.monitor.domain.SysUserOnline;

import com.ruoyi.project.system.service.ISysUserOnlineService;

import com.ruoyi.system.domain.SysUserOnline;

import com.ruoyi.system.service.ISysUserOnlineService;



/**

 * 在线用户 服务层处理


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

文件名从 ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.project.system.service.impl;

package com.ruoyi.system.service.impl;



import java.util.ArrayList;

import java.util.List;

@@ -7,23 +7,23 @@
import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import com.ruoyi.common.annotation.DataScope;

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.utils.SecurityUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.framework.aspectj.lang.annotation.DataScope;

import com.ruoyi.project.system.domain.SysPost;

import com.ruoyi.project.system.domain.SysRole;

import com.ruoyi.project.system.domain.SysUser;

import com.ruoyi.project.system.domain.SysUserPost;

import com.ruoyi.project.system.domain.SysUserRole;

import com.ruoyi.project.system.mapper.SysPostMapper;

import com.ruoyi.project.system.mapper.SysRoleMapper;

import com.ruoyi.project.system.mapper.SysUserMapper;

import com.ruoyi.project.system.mapper.SysUserPostMapper;

import com.ruoyi.project.system.mapper.SysUserRoleMapper;

import com.ruoyi.project.system.service.ISysConfigService;

import com.ruoyi.project.system.service.ISysUserService;

import com.ruoyi.system.domain.SysPost;

import com.ruoyi.system.domain.SysUserPost;

import com.ruoyi.system.domain.SysUserRole;

import com.ruoyi.system.mapper.SysPostMapper;

import com.ruoyi.system.mapper.SysRoleMapper;

import com.ruoyi.system.mapper.SysUserMapper;

import com.ruoyi.system.mapper.SysUserPostMapper;

import com.ruoyi.system.mapper.SysUserRoleMapper;

import com.ruoyi.system.service.ISysConfigService;

import com.ruoyi.system.service.ISysUserService;



/**

 * 用户 业务层处理


 ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml

文件名从 ruoyi/src/main/resources/mybatis/system/SysConfigMapper.xml 修改
@@ -2,7 +2,7 @@
<!DOCTYPE mapper

PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

"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">

        <id     property="configId"      column="config_id"      />


 ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

文件名从 ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml 修改
@@ -2,7 +2,7 @@
<!DOCTYPE mapper

PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

"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">

        <id     property="deptId"     column="dept_id"     />


 ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml

文件名从 ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml 修改
@@ -2,7 +2,7 @@
<!DOCTYPE mapper

PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

"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">

        <id     property="dictCode"   column="dict_code"   />


 ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

文件名从 ruoyi/src/main/resources/mybatis/system/SysDictTypeMapper.xml 修改
@@ -2,7 +2,7 @@
<!DOCTYPE mapper

PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

"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">

        <id     property="dictId"     column="dict_id"     />


 ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml

文件名从 ruoyi/src/main/resources/mybatis/monitor/SysLogininforMapper.xml 修改
@@ -2,7 +2,7 @@
<!DOCTYPE mapper

PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

"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">

        <id     property="infoId"        column="info_id"           />


 ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

文件名从 ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml 修改
@@ -2,7 +2,7 @@
<!DOCTYPE mapper

        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

        "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">

        <id     property="menuId"         column="menu_id"        />


 ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml

文件名从 ruoyi/src/main/resources/mybatis/system/SysNoticeMapper.xml 修改
@@ -2,7 +2,7 @@
<!DOCTYPE mapper

PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

"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">

        <result property="noticeId"       column="notice_id"       />


 ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml

文件名从 ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml 修改
@@ -2,7 +2,7 @@
<!DOCTYPE mapper

PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

"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">

        <id     property="operId"         column="oper_id"        />


 ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml

文件名从 ruoyi/src/main/resources/mybatis/system/SysPostMapper.xml 修改
@@ -2,7 +2,7 @@
<!DOCTYPE mapper

PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

"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">

        <id     property="postId"        column="post_id"       />


 ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml

文件名从 ruoyi/src/main/resources/mybatis/system/SysRoleDeptMapper.xml 修改
@@ -2,7 +2,7 @@
<!DOCTYPE mapper

PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

"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">

        <result property="roleId"     column="role_id"      />


 ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

文件名从 ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml 修改
@@ -2,7 +2,7 @@
<!DOCTYPE mapper

PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

"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">

        <id     property="roleId"       column="role_id"        />


 ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml

文件名从 ruoyi/src/main/resources/mybatis/system/SysRoleMenuMapper.xml 修改
@@ -2,7 +2,7 @@
<!DOCTYPE mapper

PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

"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">

        <result property="roleId"     column="role_id"      />


 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

文件名从 ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml 修改
@@ -2,7 +2,7 @@
<!DOCTYPE mapper

PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

"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">

        <id     property="userId"       column="user_id"      />


 ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml

文件名从 ruoyi/src/main/resources/mybatis/system/SysUserPostMapper.xml 修改
@@ -2,7 +2,7 @@
<!DOCTYPE mapper

PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

"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">

        <result property="userId"     column="user_id"      />


 ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

文件名从 ruoyi/src/main/resources/mybatis/system/SysUserRoleMapper.xml 修改
@@ -2,7 +2,7 @@
<!DOCTYPE mapper

PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

"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">

        <result property="userId"     column="user_id"      />


 ruoyi-ui/package.json

@@ -1,6 +1,6 @@
{

  "name": "ruoyi",

  "version": "2.3.0",

  "version": "3.0.0",

  "description": "若依管理系统",

  "author": "若依",

  "license": "MIT",


 ruoyi/bin/run-tomcat.bat

文件已删除

 ruoyi/pom.xml

文件已删除

 ry.sh

文件名从 ruoyi/ry.sh 修改
@@ -1,6 +1,6 @@
#!/bin/bash



AppName=ruoyi.jar

AppName=ruoyi-admin.jar



#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"


 sql/quartz.sql

 sql/ry_20200629.sql