diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 637f8f1..7d08822 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,13 +7,13 @@ - + \ No newline at end of file diff --git a/README.md b/README.md index d3287c3..d39da8b 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,19 @@

logo

-

RuoYi改造版 v3.8.7

+

jg改造版 v3.8.7

基于SpringBoot+Vue前后端分离的Java快速开发框架

- - - + + +

## 平台简介 -* 本仓库为RuoYi-Vue的单应用版本，保持同步更新。 -* 配套前端代码地址[RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue/tree/master/ruoyi-ui)，技术栈（[Vue2](https://cn.vuejs.org) + [Element](https://github.com/ElemeFE/element) + [Vue CLI](https://cli.vuejs.org/zh)）。 -* 配套前端代码地址[RuoYi-Vue3](https://github.com/yangzongzhuan/RuoYi-Vue3)，技术栈（[Vue3](https://v3.cn.vuejs.org) + [Element Plus](https://element-plus.org/zh-CN) + [Vite](https://cn.vitejs.dev)）。 +* 本仓库为jg-Vue的单应用版本，保持同步更新。 +* 配套前端代码地址[jg-Vue](https://gitee.com/y_project/jg-Vue/tree/master/jg-ui)，技术栈（[Vue2](https://cn.vuejs.org) + [Element](https://github.com/ElemeFE/element) + [Vue CLI](https://cli.vuejs.org/zh)）。 +* 配套前端代码地址[jg-Vue3](https://github.com/yangzongzhuan/jg-Vue3)，技术栈（[Vue3](https://v3.cn.vuejs.org) + [Element Plus](https://element-plus.org/zh-CN) + [Vite](https://cn.vitejs.dev)）。 * 前端采用Vue、Element UI。 * 后端采用Spring Boot、Spring Security、Redis & Jwt。 * 权限认证使用Jwt，支持多终端认证系统。 diff --git a/pom.xml b/pom.xml index 5cf9711..5a66bef 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.ruoyi - ruoyi + com.jg + jg 3.8.7 jar - ruoyi - http://www.ruoyi.vip - 若依管理系统 + jg + + JG管理系统 org.springframework.boot diff --git a/ry.bat b/ry.bat index d523e8c..a483e56 100644 --- a/ry.bat +++ b/ry.bat @@ -1,21 +1,21 @@ @echo off -rem jarƽĿ¼ -set AppName=ruoyi.jar +rem jarƽ��Ŀ¼ +set AppName=jg.jar -rem JVM +rem JVM���� set JVM_OPTS="-Dname=%AppName% -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC" ECHO. - ECHO. [1] %AppName% - ECHO. [2] ر%AppName% - ECHO. [3] %AppName% - ECHO. [4] ״̬ %AppName% - ECHO. [5] + ECHO. [1] ����%AppName% + ECHO. [2] �ر�%AppName% + ECHO. [3] ����%AppName% + ECHO. [4] ����״̬ %AppName% + ECHO. [5] �� �� ECHO. -ECHO.ѡĿ: +ECHO.������ѡ����Ŀ�����: set /p ID= IF "%id%"=="1" GOTO start IF "%id%"=="2" GOTO stop @@ -35,11 +35,11 @@ PAUSE start javaw %JVM_OPTS% -jar %AppName% -echo starting +echo starting���� echo Start %AppName% success... goto:eof -rem stopͨjpspid +rem ����stopͨ��jps�������pid���������� :stop for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do ( set pid=%%a @@ -48,7 +48,7 @@ rem if not defined pid (echo process %AppName% does not exists) else ( echo prepare to kill %image_name% echo start kill %pid% ... - rem ݽIDkill + rem ���ݽ���ID��kill���� taskkill /f /pid %pid% ) goto:eof diff --git a/ry.sh b/ry.sh index 393bf9d..20e149f 100644 --- a/ry.sh +++ b/ry.sh @@ -1,6 +1,6 @@ #!/bin/sh # ./ry.sh start 启动 stop 停止 restart 重启 status 状态 -AppName=target/ruoyi.jar +AppName=target/jg.jar # JVM参数 JVM_OPTS="-Dname=$AppName -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC" diff --git a/sql/ry_20231130.sql b/sql/ry_20231130.sql index 452c2fc..af43ee7 100644 --- a/sql/ry_20231130.sql +++ b/sql/ry_20231130.sql @@ -160,7 +160,7 @@ create table sys_menu ( insert into sys_menu values('1', '系统管理', '0', '1', 'system', null, '', 1, 0, 'M', '0', '0', '', 'system', 'admin', sysdate(), '', null, '系统管理目录'); insert into sys_menu values('2', '系统监控', '0', '2', 'monitor', null, '', 1, 0, 'M', '0', '0', '', 'monitor', 'admin', sysdate(), '', null, '系统监控目录'); insert into sys_menu values('3', '系统工具', '0', '3', 'tool', null, '', 1, 0, 'M', '0', '0', '', 'tool', 'admin', sysdate(), '', null, '系统工具目录'); -insert into sys_menu values('4', '若依官网', '0', '4', 'http://ruoyi.vip', null, '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, '若依官网地址'); +insert into sys_menu values('4', '若依官网', '0', '4', 'http://jg.vip', null, '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, '若依官网地址'); -- 二级菜单 insert into sys_menu values('100', '用户管理', '1', '1', 'user', 'system/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 'admin', sysdate(), '', null, '用户管理菜单'); insert into sys_menu values('101', '角色管理', '1', '2', 'role', 'system/role/index', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 'admin', sysdate(), '', null, '角色管理菜单'); diff --git a/src/main/java/com/ruoyi/RuoYiApplication.java b/src/main/java/com/jg/JGApplication.java similarity index 95% rename from src/main/java/com/ruoyi/RuoYiApplication.java rename to src/main/java/com/jg/JGApplication.java index cc2efb9..4346b54 100644 --- a/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/src/main/java/com/jg/JGApplication.java @@ -1,4 +1,4 @@ -package com.ruoyi; +package com.jg; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; @@ -14,20 +14,20 @@ import java.net.UnknownHostException; /** * 启动程序 * - * @author ruoyi + * @author jg */ @Slf4j @EnableScheduling @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) -public class RuoYiApplication +public class JGApplication { public static void main(String[] args) throws UnknownHostException { - ConfigurableApplicationContext application = SpringApplication.run(RuoYiApplication.class, args); + ConfigurableApplicationContext application = SpringApplication.run(JGApplication.class, args); Environment env = application.getEnvironment(); String ip = InetAddress.getLocalHost().getHostAddress(); String port = env.getProperty("server.port"); // System.setProperty("spring.devtools.restart.enabled", "false"); -// SpringApplication.run(RuoYiApplication.class, args); +// SpringApplication.run(jgApplication.class, args); System.out.println(" ████████ ██ ██████ ██ ████████ ██ ██ \n" + " ██░░░░░░ ██████ ░░ █████ ░█░░░░██ ░██ ██░░░░░░ ░██ ░██ \n" + "░██ ░██░░░██ ██████ ██ ███████ ██░░░██░█ ░██ ██████ ██████ ██████░██ ██████ ██████ ██████ ██████\n" + diff --git a/src/main/java/com/ruoyi/RuoYiServletInitializer.java b/src/main/java/com/jg/JGServletInitializer.java similarity index 64% rename from src/main/java/com/ruoyi/RuoYiServletInitializer.java rename to src/main/java/com/jg/JGServletInitializer.java index 6de67dc..139908c 100644 --- a/src/main/java/com/ruoyi/RuoYiServletInitializer.java +++ b/src/main/java/com/jg/JGServletInitializer.java @@ -1,4 +1,4 @@ -package com.ruoyi; +package com.jg; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; @@ -6,13 +6,13 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer /** * web容器中进行部署 * - * @author ruoyi + * @author jg */ -public class RuoYiServletInitializer extends SpringBootServletInitializer +public class JGServletInitializer extends SpringBootServletInitializer { @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(RuoYiApplication.class); + return application.sources(JGApplication.class); } } diff --git a/src/main/java/com/ruoyi/common/constant/CacheConstants.java b/src/main/java/com/jg/common/constant/CacheConstants.java similarity index 94% rename from src/main/java/com/ruoyi/common/constant/CacheConstants.java rename to src/main/java/com/jg/common/constant/CacheConstants.java index 0080343..a1be77c 100644 --- a/src/main/java/com/ruoyi/common/constant/CacheConstants.java +++ b/src/main/java/com/jg/common/constant/CacheConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.jg.common.constant; /** * 缓存的key 常量 * - * @author ruoyi + * @author jg */ public class CacheConstants { diff --git a/src/main/java/com/ruoyi/common/constant/Constants.java b/src/main/java/com/jg/common/constant/Constants.java similarity index 91% rename from src/main/java/com/ruoyi/common/constant/Constants.java rename to src/main/java/com/jg/common/constant/Constants.java index fb736c5..cdf545a 100644 --- a/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/src/main/java/com/jg/common/constant/Constants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.jg.common.constant; import java.util.Locale; import io.jsonwebtoken.Claims; @@ -6,7 +6,7 @@ import io.jsonwebtoken.Claims; /** * 通用常量信息 * - * @author ruoyi + * @author jg */ public class Constants { @@ -158,16 +158,16 @@ public class Constants /** * 自动识别json对象白名单配置（仅允许解析的包名，范围越小越安全） */ - public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.ruoyi" }; + public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.jg" }; /** * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加） */ - public static final String[] JOB_WHITELIST_STR = { "com.ruoyi.framework.task" }; + public static final String[] JOB_WHITELIST_STR = { "com.jg.framework.task" }; /** * 定时任务违规的字符 */ public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml", - "org.springframework", "org.apache", "com.ruoyi.common.utils.file", "com.ruoyi.framework.config", "com.ruoyi.project.tool" }; + "org.springframework", "org.apache", "com.jg.common.utils.file", "com.jg.framework.config", "com.jg.project.tool" }; } diff --git a/src/main/java/com/ruoyi/common/constant/GenConstants.java b/src/main/java/com/jg/common/constant/GenConstants.java similarity index 98% rename from src/main/java/com/ruoyi/common/constant/GenConstants.java rename to src/main/java/com/jg/common/constant/GenConstants.java index 7d899d4..2f5bfce 100644 --- a/src/main/java/com/ruoyi/common/constant/GenConstants.java +++ b/src/main/java/com/jg/common/constant/GenConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.jg.common.constant; /** * 代码生成通用常量 * - * @author ruoyi + * @author jg */ public class GenConstants { diff --git a/src/main/java/com/ruoyi/common/constant/HttpStatus.java b/src/main/java/com/jg/common/constant/HttpStatus.java similarity index 96% rename from src/main/java/com/ruoyi/common/constant/HttpStatus.java rename to src/main/java/com/jg/common/constant/HttpStatus.java index a983c77..9dfbc5a 100644 --- a/src/main/java/com/ruoyi/common/constant/HttpStatus.java +++ b/src/main/java/com/jg/common/constant/HttpStatus.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.jg.common.constant; /** * 返回状态码 * - * @author ruoyi + * @author jg */ public class HttpStatus { diff --git a/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java b/src/main/java/com/jg/common/constant/ScheduleConstants.java similarity index 94% rename from src/main/java/com/ruoyi/common/constant/ScheduleConstants.java rename to src/main/java/com/jg/common/constant/ScheduleConstants.java index 62ad815..e4b9473 100644 --- a/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java +++ b/src/main/java/com/jg/common/constant/ScheduleConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.jg.common.constant; /** * 任务调度通用常量 * - * @author ruoyi + * @author jg */ public class ScheduleConstants { diff --git a/src/main/java/com/ruoyi/common/constant/UserConstants.java b/src/main/java/com/jg/common/constant/UserConstants.java similarity index 97% rename from src/main/java/com/ruoyi/common/constant/UserConstants.java rename to src/main/java/com/jg/common/constant/UserConstants.java index 96b149c..36215a9 100644 --- a/src/main/java/com/ruoyi/common/constant/UserConstants.java +++ b/src/main/java/com/jg/common/constant/UserConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.jg.common.constant; /** * 用户常量信息 * - * @author ruoyi + * @author jg */ public class UserConstants { diff --git a/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/src/main/java/com/jg/common/core/text/CharsetKit.java similarity index 95% rename from src/main/java/com/ruoyi/common/core/text/CharsetKit.java rename to src/main/java/com/jg/common/core/text/CharsetKit.java index 84124aa..36fcd93 100644 --- a/src/main/java/com/ruoyi/common/core/text/CharsetKit.java +++ b/src/main/java/com/jg/common/core/text/CharsetKit.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.core.text; +package com.jg.common.core.text; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import com.ruoyi.common.utils.StringUtils; +import com.jg.common.utils.StringUtils; /** * 字符集工具类 * - * @author ruoyi + * @author jg */ public class CharsetKit { diff --git a/src/main/java/com/ruoyi/common/core/text/Convert.java b/src/main/java/com/jg/common/core/text/Convert.java similarity index 99% rename from src/main/java/com/ruoyi/common/core/text/Convert.java rename to src/main/java/com/jg/common/core/text/Convert.java index 0066112..9c711d1 100644 --- a/src/main/java/com/ruoyi/common/core/text/Convert.java +++ b/src/main/java/com/jg/common/core/text/Convert.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.text; +package com.jg.common.core.text; import java.math.BigDecimal; import java.math.BigInteger; @@ -7,13 +7,13 @@ import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.text.NumberFormat; import java.util.Set; -import com.ruoyi.common.utils.StringUtils; +import com.jg.common.utils.StringUtils; import org.apache.commons.lang3.ArrayUtils; /** * 类型转换器 * - * @author ruoyi + * @author jg */ public class Convert { diff --git a/src/main/java/com/ruoyi/common/core/text/StrFormatter.java b/src/main/java/com/jg/common/core/text/StrFormatter.java similarity index 97% rename from src/main/java/com/ruoyi/common/core/text/StrFormatter.java rename to src/main/java/com/jg/common/core/text/StrFormatter.java index c78ac77..3e57dc1 100644 --- a/src/main/java/com/ruoyi/common/core/text/StrFormatter.java +++ b/src/main/java/com/jg/common/core/text/StrFormatter.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.text; +package com.jg.common.core.text; -import com.ruoyi.common.utils.StringUtils; +import com.jg.common.utils.StringUtils; /** * 字符串格式化 * - * @author ruoyi + * @author jg */ public class StrFormatter { diff --git a/src/main/java/com/ruoyi/common/enums/HttpMethod.java b/src/main/java/com/jg/common/enums/HttpMethod.java similarity index 93% rename from src/main/java/com/ruoyi/common/enums/HttpMethod.java rename to src/main/java/com/jg/common/enums/HttpMethod.java index be6f739..aaab972 100644 --- a/src/main/java/com/ruoyi/common/enums/HttpMethod.java +++ b/src/main/java/com/jg/common/enums/HttpMethod.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.jg.common.enums; import java.util.HashMap; import java.util.Map; @@ -7,7 +7,7 @@ import org.springframework.lang.Nullable; /** * 请求方式 * - * @author ruoyi + * @author jg */ public enum HttpMethod { diff --git a/src/main/java/com/ruoyi/common/enums/UserStatus.java b/src/main/java/com/jg/common/enums/UserStatus.java similarity index 89% rename from src/main/java/com/ruoyi/common/enums/UserStatus.java rename to src/main/java/com/jg/common/enums/UserStatus.java index d7ff44a..1ff7779 100644 --- a/src/main/java/com/ruoyi/common/enums/UserStatus.java +++ b/src/main/java/com/jg/common/enums/UserStatus.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.jg.common.enums; /** * 用户状态 * - * @author ruoyi + * @author jg */ public enum UserStatus { diff --git a/src/main/java/com/ruoyi/common/exception/DemoModeException.java b/src/main/java/com/jg/common/exception/DemoModeException.java similarity index 78% rename from src/main/java/com/ruoyi/common/exception/DemoModeException.java rename to src/main/java/com/jg/common/exception/DemoModeException.java index f6ad2ab..55a545a 100644 --- a/src/main/java/com/ruoyi/common/exception/DemoModeException.java +++ b/src/main/java/com/jg/common/exception/DemoModeException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.jg.common.exception; /** * 演示模式异常 * - * @author ruoyi + * @author jg */ public class DemoModeException extends RuntimeException { diff --git a/src/main/java/com/ruoyi/common/exception/GlobalException.java b/src/main/java/com/jg/common/exception/GlobalException.java similarity index 94% rename from src/main/java/com/ruoyi/common/exception/GlobalException.java rename to src/main/java/com/jg/common/exception/GlobalException.java index 81a71b5..5ad678b 100644 --- a/src/main/java/com/ruoyi/common/exception/GlobalException.java +++ b/src/main/java/com/jg/common/exception/GlobalException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.jg.common.exception; /** * 全局异常 * - * @author ruoyi + * @author jg */ public class GlobalException extends RuntimeException { diff --git a/src/main/java/com/ruoyi/common/exception/ServiceException.java b/src/main/java/com/jg/common/exception/ServiceException.java similarity index 95% rename from src/main/java/com/ruoyi/common/exception/ServiceException.java rename to src/main/java/com/jg/common/exception/ServiceException.java index fcc7ab6..b19522e 100644 --- a/src/main/java/com/ruoyi/common/exception/ServiceException.java +++ b/src/main/java/com/jg/common/exception/ServiceException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.jg.common.exception; /** * 业务异常 * - * @author ruoyi + * @author jg */ public final class ServiceException extends RuntimeException { diff --git a/src/main/java/com/ruoyi/common/exception/UtilException.java b/src/main/java/com/jg/common/exception/UtilException.java similarity index 89% rename from src/main/java/com/ruoyi/common/exception/UtilException.java rename to src/main/java/com/jg/common/exception/UtilException.java index 980fa46..a27d8f7 100644 --- a/src/main/java/com/ruoyi/common/exception/UtilException.java +++ b/src/main/java/com/jg/common/exception/UtilException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.jg.common.exception; /** * 工具类异常 * - * @author ruoyi + * @author jg */ public class UtilException extends RuntimeException { diff --git a/src/main/java/com/ruoyi/common/exception/base/BaseException.java b/src/main/java/com/jg/common/exception/base/BaseException.java similarity index 92% rename from src/main/java/com/ruoyi/common/exception/base/BaseException.java rename to src/main/java/com/jg/common/exception/base/BaseException.java index b55d72e..bc45d62 100644 --- a/src/main/java/com/ruoyi/common/exception/base/BaseException.java +++ b/src/main/java/com/jg/common/exception/base/BaseException.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.exception.base; +package com.jg.common.exception.base; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; +import com.jg.common.utils.MessageUtils; +import com.jg.common.utils.StringUtils; /** * 基础异常 * - * @author ruoyi + * @author jg */ public class BaseException extends RuntimeException { diff --git a/src/main/java/com/ruoyi/common/exception/file/FileException.java b/src/main/java/com/jg/common/exception/file/FileException.java similarity index 69% rename from src/main/java/com/ruoyi/common/exception/file/FileException.java rename to src/main/java/com/jg/common/exception/file/FileException.java index 871f09b..770d554 100644 --- a/src/main/java/com/ruoyi/common/exception/file/FileException.java +++ b/src/main/java/com/jg/common/exception/file/FileException.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.exception.file; +package com.jg.common.exception.file; -import com.ruoyi.common.exception.base.BaseException; +import com.jg.common.exception.base.BaseException; /** * 文件信息异常类 * - * @author ruoyi + * @author jg */ public class FileException extends BaseException { diff --git a/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java b/src/main/java/com/jg/common/exception/file/FileNameLengthLimitExceededException.java similarity index 85% rename from src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java rename to src/main/java/com/jg/common/exception/file/FileNameLengthLimitExceededException.java index 70e0ec9..4baf51b 100644 --- a/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java +++ b/src/main/java/com/jg/common/exception/file/FileNameLengthLimitExceededException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.file; +package com.jg.common.exception.file; /** * 文件名称超长限制异常类 * - * @author ruoyi + * @author jg */ public class FileNameLengthLimitExceededException extends FileException { diff --git a/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java b/src/main/java/com/jg/common/exception/file/FileSizeLimitExceededException.java similarity index 84% rename from src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java rename to src/main/java/com/jg/common/exception/file/FileSizeLimitExceededException.java index ec6ab05..1e75266 100644 --- a/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java +++ b/src/main/java/com/jg/common/exception/file/FileSizeLimitExceededException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.file; +package com.jg.common.exception.file; /** * 文件名大小限制异常类 * - * @author ruoyi + * @author jg */ public class FileSizeLimitExceededException extends FileException { diff --git a/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java b/src/main/java/com/jg/common/exception/file/FileUploadException.java similarity index 94% rename from src/main/java/com/ruoyi/common/exception/file/FileUploadException.java rename to src/main/java/com/jg/common/exception/file/FileUploadException.java index f45e7ef..b352cc9 100644 --- a/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java +++ b/src/main/java/com/jg/common/exception/file/FileUploadException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.file; +package com.jg.common.exception.file; import java.io.PrintStream; import java.io.PrintWriter; @@ -6,7 +6,7 @@ import java.io.PrintWriter; /** * 文件上传异常类 * - * @author ruoyi + * @author jg */ public class FileUploadException extends Exception { diff --git a/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java b/src/main/java/com/jg/common/exception/file/InvalidExtensionException.java similarity index 97% rename from src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java rename to src/main/java/com/jg/common/exception/file/InvalidExtensionException.java index 011f308..9990d0f 100644 --- a/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java +++ b/src/main/java/com/jg/common/exception/file/InvalidExtensionException.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.exception.file; +package com.jg.common.exception.file; import java.util.Arrays; /** * 文件上传 误异常类 * - * @author ruoyi + * @author jg */ public class InvalidExtensionException extends FileUploadException { diff --git a/src/main/java/com/ruoyi/common/exception/job/TaskException.java b/src/main/java/com/jg/common/exception/job/TaskException.java similarity index 91% rename from src/main/java/com/ruoyi/common/exception/job/TaskException.java rename to src/main/java/com/jg/common/exception/job/TaskException.java index a567b40..05560bd 100644 --- a/src/main/java/com/ruoyi/common/exception/job/TaskException.java +++ b/src/main/java/com/jg/common/exception/job/TaskException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.job; +package com.jg.common.exception.job; /** * 计划策略异常 * - * @author ruoyi + * @author jg */ public class TaskException extends Exception { diff --git a/src/main/java/com/ruoyi/common/exception/user/BlackListException.java b/src/main/java/com/jg/common/exception/user/BlackListException.java similarity index 79% rename from src/main/java/com/ruoyi/common/exception/user/BlackListException.java rename to src/main/java/com/jg/common/exception/user/BlackListException.java index 2bf5038..ab1e4f2 100644 --- a/src/main/java/com/ruoyi/common/exception/user/BlackListException.java +++ b/src/main/java/com/jg/common/exception/user/BlackListException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.jg.common.exception.user; /** * 黑名单IP异常类 * - * @author ruoyi + * @author jg */ public class BlackListException extends UserException { diff --git a/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java b/src/main/java/com/jg/common/exception/user/CaptchaException.java similarity index 80% rename from src/main/java/com/ruoyi/common/exception/user/CaptchaException.java rename to src/main/java/com/jg/common/exception/user/CaptchaException.java index 389dbc7..8403c58 100644 --- a/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java +++ b/src/main/java/com/jg/common/exception/user/CaptchaException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.jg.common.exception.user; /** * 验证码错误异常类 * - * @author ruoyi + * @author jg */ public class CaptchaException extends UserException { diff --git a/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java b/src/main/java/com/jg/common/exception/user/CaptchaExpireException.java similarity index 81% rename from src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java rename to src/main/java/com/jg/common/exception/user/CaptchaExpireException.java index 85f9486..9a23421 100644 --- a/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java +++ b/src/main/java/com/jg/common/exception/user/CaptchaExpireException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.jg.common.exception.user; /** * 验证码失效异常类 * - * @author ruoyi + * @author jg */ public class CaptchaExpireException extends UserException { diff --git a/src/main/java/com/ruoyi/common/exception/user/UserException.java b/src/main/java/com/jg/common/exception/user/UserException.java similarity index 69% rename from src/main/java/com/ruoyi/common/exception/user/UserException.java rename to src/main/java/com/jg/common/exception/user/UserException.java index c292d70..ec903e5 100644 --- a/src/main/java/com/ruoyi/common/exception/user/UserException.java +++ b/src/main/java/com/jg/common/exception/user/UserException.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.exception.user; +package com.jg.common.exception.user; -import com.ruoyi.common.exception.base.BaseException; +import com.jg.common.exception.base.BaseException; /** * 用户信息异常类 * - * @author ruoyi + * @author jg */ public class UserException extends BaseException { diff --git a/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java b/src/main/java/com/jg/common/exception/user/UserNotExistsException.java similarity index 80% rename from src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java rename to src/main/java/com/jg/common/exception/user/UserNotExistsException.java index eff8181..e79986c 100644 --- a/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java +++ b/src/main/java/com/jg/common/exception/user/UserNotExistsException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.jg.common.exception.user; /** * 用户不存在异常类 * - * @author ruoyi + * @author jg */ public class UserNotExistsException extends UserException { diff --git a/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/src/main/java/com/jg/common/exception/user/UserPasswordNotMatchException.java similarity index 83% rename from src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java rename to src/main/java/com/jg/common/exception/user/UserPasswordNotMatchException.java index a7f3e5f..9835199 100644 --- a/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java +++ b/src/main/java/com/jg/common/exception/user/UserPasswordNotMatchException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.jg.common.exception.user; /** * 用户密码不正确或不符合规范异常类 * - * @author ruoyi + * @author jg */ public class UserPasswordNotMatchException extends UserException { diff --git a/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java b/src/main/java/com/jg/common/exception/user/UserPasswordRetryLimitExceedException.java similarity index 86% rename from src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java rename to src/main/java/com/jg/common/exception/user/UserPasswordRetryLimitExceedException.java index c887cf1..32f121e 100644 --- a/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java +++ b/src/main/java/com/jg/common/exception/user/UserPasswordRetryLimitExceedException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.jg.common.exception.user; /** * 用户错误最大次数异常类 * - * @author ruoyi + * @author jg */ public class UserPasswordRetryLimitExceedException extends UserException { diff --git a/src/main/java/com/ruoyi/common/filter/PropertyPreExcludeFilter.java b/src/main/java/com/jg/common/filter/PropertyPreExcludeFilter.java similarity index 89% rename from src/main/java/com/ruoyi/common/filter/PropertyPreExcludeFilter.java rename to src/main/java/com/jg/common/filter/PropertyPreExcludeFilter.java index e1e431b..b333616 100644 --- a/src/main/java/com/ruoyi/common/filter/PropertyPreExcludeFilter.java +++ b/src/main/java/com/jg/common/filter/PropertyPreExcludeFilter.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.filter; +package com.jg.common.filter; import com.alibaba.fastjson2.filter.SimplePropertyPreFilter; /** * 排除JSON敏感属性 * - * @author ruoyi + * @author jg */ public class PropertyPreExcludeFilter extends SimplePropertyPreFilter { diff --git a/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java b/src/main/java/com/jg/common/filter/RepeatableFilter.java similarity index 93% rename from src/main/java/com/ruoyi/common/filter/RepeatableFilter.java rename to src/main/java/com/jg/common/filter/RepeatableFilter.java index a1bcfe2..b311a1e 100644 --- a/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java +++ b/src/main/java/com/jg/common/filter/RepeatableFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.jg.common.filter; import java.io.IOException; import javax.servlet.Filter; @@ -9,12 +9,12 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import org.springframework.http.MediaType; -import com.ruoyi.common.utils.StringUtils; +import com.jg.common.utils.StringUtils; /** * Repeatable 过滤器 * - * @author ruoyi + * @author jg */ public class RepeatableFilter implements Filter { diff --git a/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java b/src/main/java/com/jg/common/filter/RepeatedlyRequestWrapper.java similarity index 92% rename from src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java rename to src/main/java/com/jg/common/filter/RepeatedlyRequestWrapper.java index 407d1ba..a1c05b8 100644 --- a/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java +++ b/src/main/java/com/jg/common/filter/RepeatedlyRequestWrapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.jg.common.filter; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -9,13 +9,13 @@ import javax.servlet.ServletInputStream; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import com.ruoyi.common.utils.http.HttpHelper; -import com.ruoyi.common.constant.Constants; +import com.jg.common.utils.http.HttpHelper; +import com.jg.common.constant.Constants; /** * 构建可重复读取inputStream的request * - * @author ruoyi + * @author jg */ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper { diff --git a/src/main/java/com/ruoyi/common/filter/XssFilter.java b/src/main/java/com/jg/common/filter/XssFilter.java similarity index 93% rename from src/main/java/com/ruoyi/common/filter/XssFilter.java rename to src/main/java/com/jg/common/filter/XssFilter.java index 9052f0d..55ba433 100644 --- a/src/main/java/com/ruoyi/common/filter/XssFilter.java +++ b/src/main/java/com/jg/common/filter/XssFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.jg.common.filter; import java.io.IOException; import java.util.ArrayList; @@ -11,13 +11,13 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.enums.HttpMethod; +import com.jg.common.utils.StringUtils; +import com.jg.common.enums.HttpMethod; /** * 防止XSS攻击的过滤器 * - * @author ruoyi + * @author jg */ public class XssFilter implements Filter { diff --git a/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java b/src/main/java/com/jg/common/filter/XssHttpServletRequestWrapper.java similarity index 95% rename from src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java rename to src/main/java/com/jg/common/filter/XssHttpServletRequestWrapper.java index 05149f0..a942744 100644 --- a/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java +++ b/src/main/java/com/jg/common/filter/XssHttpServletRequestWrapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.jg.common.filter; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -9,13 +9,13 @@ import javax.servlet.http.HttpServletRequestWrapper; import org.apache.commons.io.IOUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.html.EscapeUtil; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.html.EscapeUtil; /** * XSS过滤处理 * - * @author ruoyi + * @author jg */ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { diff --git a/src/main/java/com/ruoyi/common/utils/Arith.java b/src/main/java/com/jg/common/utils/Arith.java similarity index 98% rename from src/main/java/com/ruoyi/common/utils/Arith.java rename to src/main/java/com/jg/common/utils/Arith.java index 48a650e..4b03cd9 100644 --- a/src/main/java/com/ruoyi/common/utils/Arith.java +++ b/src/main/java/com/jg/common/utils/Arith.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.jg.common.utils; import java.math.BigDecimal; import java.math.RoundingMode; @@ -6,7 +6,7 @@ import java.math.RoundingMode; /** * 精确的浮点数运算 * - * @author ruoyi + * @author jg */ public class Arith { diff --git a/src/main/java/com/ruoyi/common/utils/DateUtils.java b/src/main/java/com/jg/common/utils/DateUtils.java similarity index 99% rename from src/main/java/com/ruoyi/common/utils/DateUtils.java rename to src/main/java/com/jg/common/utils/DateUtils.java index fb2ae21..3210c20 100644 --- a/src/main/java/com/ruoyi/common/utils/DateUtils.java +++ b/src/main/java/com/jg/common/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.jg.common.utils; import java.lang.management.ManagementFactory; import java.text.ParseException; @@ -14,7 +14,7 @@ import org.apache.commons.lang3.time.DateFormatUtils; /** * 时间工具类 * - * @author ruoyi + * @author jg */ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { diff --git a/src/main/java/com/ruoyi/common/utils/DictUtils.java b/src/main/java/com/jg/common/utils/DictUtils.java similarity index 95% rename from src/main/java/com/ruoyi/common/utils/DictUtils.java rename to src/main/java/com/jg/common/utils/DictUtils.java index d9f811e..072d4a0 100644 --- a/src/main/java/com/ruoyi/common/utils/DictUtils.java +++ b/src/main/java/com/jg/common/utils/DictUtils.java @@ -1,17 +1,17 @@ -package com.ruoyi.common.utils; +package com.jg.common.utils; import java.util.Collection; import java.util.List; import com.alibaba.fastjson2.JSONArray; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.redis.RedisCache; -import com.ruoyi.project.system.domain.SysDictData; +import com.jg.common.constant.CacheConstants; +import com.jg.common.utils.spring.SpringUtils; +import com.jg.framework.redis.RedisCache; +import com.jg.project.system.domain.SysDictData; /** * 字典工具类 * - * @author ruoyi + * @author jg */ public class DictUtils { diff --git a/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java b/src/main/java/com/jg/common/utils/ExceptionUtil.java similarity index 94% rename from src/main/java/com/ruoyi/common/utils/ExceptionUtil.java rename to src/main/java/com/jg/common/utils/ExceptionUtil.java index 214e4a0..5098032 100644 --- a/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java +++ b/src/main/java/com/jg/common/utils/ExceptionUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.jg.common.utils; import java.io.PrintWriter; import java.io.StringWriter; @@ -7,7 +7,7 @@ import org.apache.commons.lang3.exception.ExceptionUtils; /** * 错误信息处理类。 * - * @author ruoyi + * @author jg */ public class ExceptionUtil { diff --git a/src/main/java/com/ruoyi/common/utils/ListPage.java b/src/main/java/com/jg/common/utils/ListPage.java similarity index 96% rename from src/main/java/com/ruoyi/common/utils/ListPage.java rename to src/main/java/com/jg/common/utils/ListPage.java index 570ea37..c5f0976 100644 --- a/src/main/java/com/ruoyi/common/utils/ListPage.java +++ b/src/main/java/com/jg/common/utils/ListPage.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.jg.common.utils; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/ruoyi/common/utils/LogUtils.java b/src/main/java/com/jg/common/utils/LogUtils.java similarity index 82% rename from src/main/java/com/ruoyi/common/utils/LogUtils.java rename to src/main/java/com/jg/common/utils/LogUtils.java index 0de30c6..5029b9e 100644 --- a/src/main/java/com/ruoyi/common/utils/LogUtils.java +++ b/src/main/java/com/jg/common/utils/LogUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils; +package com.jg.common.utils; /** * 处理并记录日志文件 * - * @author ruoyi + * @author jg */ public class LogUtils { diff --git a/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/src/main/java/com/jg/common/utils/MessageUtils.java similarity index 86% rename from src/main/java/com/ruoyi/common/utils/MessageUtils.java rename to src/main/java/com/jg/common/utils/MessageUtils.java index 7dac75a..f9cfb62 100644 --- a/src/main/java/com/ruoyi/common/utils/MessageUtils.java +++ b/src/main/java/com/jg/common/utils/MessageUtils.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.utils; +package com.jg.common.utils; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.jg.common.utils.spring.SpringUtils; /** * 获取i18n资源文件 * - * @author ruoyi + * @author jg */ public class MessageUtils { diff --git a/src/main/java/com/ruoyi/common/utils/PageUtils.java b/src/main/java/com/jg/common/utils/PageUtils.java similarity index 79% rename from src/main/java/com/ruoyi/common/utils/PageUtils.java rename to src/main/java/com/jg/common/utils/PageUtils.java index b5349aa..db1871b 100644 --- a/src/main/java/com/ruoyi/common/utils/PageUtils.java +++ b/src/main/java/com/jg/common/utils/PageUtils.java @@ -1,14 +1,14 @@ -package com.ruoyi.common.utils; +package com.jg.common.utils; import com.github.pagehelper.PageHelper; -import com.ruoyi.common.utils.sql.SqlUtil; -import com.ruoyi.framework.web.page.PageDomain; -import com.ruoyi.framework.web.page.TableSupport; +import com.jg.common.utils.sql.SqlUtil; +import com.jg.framework.web.page.PageDomain; +import com.jg.framework.web.page.TableSupport; /** * 分页工具类 * - * @author ruoyi + * @author jg */ public class PageUtils extends PageHelper { diff --git a/src/main/java/com/ruoyi/common/utils/QueryPage.java b/src/main/java/com/jg/common/utils/QueryPage.java similarity index 97% rename from src/main/java/com/ruoyi/common/utils/QueryPage.java rename to src/main/java/com/jg/common/utils/QueryPage.java index 304ce94..0ff502c 100644 --- a/src/main/java/com/ruoyi/common/utils/QueryPage.java +++ b/src/main/java/com/jg/common/utils/QueryPage.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.jg.common.utils; import com.alibaba.fastjson2.JSON; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/src/main/java/com/jg/common/utils/SecurityUtils.java similarity index 93% rename from src/main/java/com/ruoyi/common/utils/SecurityUtils.java rename to src/main/java/com/jg/common/utils/SecurityUtils.java index 467c9a1..c52ffda 100644 --- a/src/main/java/com/ruoyi/common/utils/SecurityUtils.java +++ b/src/main/java/com/jg/common/utils/SecurityUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.jg.common.utils; import java.util.Collection; import java.util.List; @@ -7,16 +7,16 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.util.PatternMatchUtils; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.framework.security.LoginUser; -import com.ruoyi.project.system.domain.SysRole; +import com.jg.common.constant.Constants; +import com.jg.common.constant.HttpStatus; +import com.jg.common.exception.ServiceException; +import com.jg.framework.security.LoginUser; +import com.jg.project.system.domain.SysRole; /** * 安全服务工具类 * - * @author ruoyi + * @author jg */ public class SecurityUtils { diff --git a/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/src/main/java/com/jg/common/utils/ServletUtils.java similarity index 97% rename from src/main/java/com/ruoyi/common/utils/ServletUtils.java rename to src/main/java/com/jg/common/utils/ServletUtils.java index febb603..9c3811d 100644 --- a/src/main/java/com/ruoyi/common/utils/ServletUtils.java +++ b/src/main/java/com/jg/common/utils/ServletUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.jg.common.utils; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -14,13 +14,13 @@ import javax.servlet.http.HttpSession; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.text.Convert; +import com.jg.common.constant.Constants; +import com.jg.common.core.text.Convert; /** * 客户端工具类 * - * @author ruoyi + * @author jg */ public class ServletUtils { diff --git a/src/main/java/com/ruoyi/common/utils/StringUtils.java b/src/main/java/com/jg/common/utils/StringUtils.java similarity index 99% rename from src/main/java/com/ruoyi/common/utils/StringUtils.java rename to src/main/java/com/jg/common/utils/StringUtils.java index ae435d2..7f659b0 100644 --- a/src/main/java/com/ruoyi/common/utils/StringUtils.java +++ b/src/main/java/com/jg/common/utils/StringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.jg.common.utils; import java.util.ArrayList; import java.util.Collection; @@ -7,13 +7,13 @@ import java.util.List; import java.util.Map; import java.util.Set; import org.springframework.util.AntPathMatcher; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.text.StrFormatter; +import com.jg.common.constant.Constants; +import com.jg.common.core.text.StrFormatter; /** * 字符串工具类 * - * @author ruoyi + * @author jg */ public class StringUtils extends org.apache.commons.lang3.StringUtils { diff --git a/src/main/java/com/ruoyi/common/utils/Threads.java b/src/main/java/com/jg/common/utils/Threads.java similarity index 98% rename from src/main/java/com/ruoyi/common/utils/Threads.java rename to src/main/java/com/jg/common/utils/Threads.java index 71fe6d5..a941bab 100644 --- a/src/main/java/com/ruoyi/common/utils/Threads.java +++ b/src/main/java/com/jg/common/utils/Threads.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.jg.common.utils; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; @@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory; /** * 线程相关工具类. * - * @author ruoyi + * @author jg */ public class Threads { diff --git a/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java b/src/main/java/com/jg/common/utils/bean/BeanUtils.java similarity index 98% rename from src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java rename to src/main/java/com/jg/common/utils/bean/BeanUtils.java index 4463662..46cd71b 100644 --- a/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java +++ b/src/main/java/com/jg/common/utils/bean/BeanUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.bean; +package com.jg.common.utils.bean; import java.lang.reflect.Method; import java.util.ArrayList; @@ -9,7 +9,7 @@ import java.util.regex.Pattern; /** * Bean 工具类 * - * @author ruoyi + * @author jg */ public class BeanUtils extends org.springframework.beans.BeanUtils { diff --git a/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java b/src/main/java/com/jg/common/utils/bean/BeanValidators.java similarity index 92% rename from src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java rename to src/main/java/com/jg/common/utils/bean/BeanValidators.java index 80bfed7..583695c 100644 --- a/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java +++ b/src/main/java/com/jg/common/utils/bean/BeanValidators.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.bean; +package com.jg.common.utils.bean; import java.util.Set; import javax.validation.ConstraintViolation; @@ -8,7 +8,7 @@ import javax.validation.Validator; /** * bean对象属性验证 * - * @author ruoyi + * @author jg */ public class BeanValidators { diff --git a/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java b/src/main/java/com/jg/common/utils/file/FileTypeUtils.java similarity index 93% rename from src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java rename to src/main/java/com/jg/common/utils/file/FileTypeUtils.java index 68130b9..eeb1fa7 100644 --- a/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java +++ b/src/main/java/com/jg/common/utils/file/FileTypeUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.jg.common.utils.file; import java.io.File; import org.apache.commons.lang3.StringUtils; @@ -6,14 +6,14 @@ import org.apache.commons.lang3.StringUtils; /** * 文件类型工具类 * - * @author ruoyi + * @author jg */ public class FileTypeUtils { /** * 获取文件类型 *

- * 例如: ruoyi.txt, 返回: txt + * 例如: jg.txt, 返回: txt * * @param file 文件名 * @return 后缀（不含".") @@ -30,7 +30,7 @@ public class FileTypeUtils /** * 获取文件类型 *

- * 例如: ruoyi.txt, 返回: txt + * 例如: jg.txt, 返回: txt * * @param fileName 文件名 * @return 后缀（不含".") diff --git a/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/src/main/java/com/jg/common/utils/file/FileUploadUtils.java similarity index 91% rename from src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java rename to src/main/java/com/jg/common/utils/file/FileUploadUtils.java index e13dcb3..cc33a9c 100644 --- a/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java +++ b/src/main/java/com/jg/common/utils/file/FileUploadUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.jg.common.utils.file; import java.io.File; import java.io.IOException; @@ -6,19 +6,19 @@ import java.nio.file.Paths; import java.util.Objects; import org.apache.commons.io.FilenameUtils; import org.springframework.web.multipart.MultipartFile; -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.StringUtils; -import com.ruoyi.common.utils.uuid.Seq; -import com.ruoyi.framework.config.RuoYiConfig; +import com.jg.common.constant.Constants; +import com.jg.common.exception.file.FileNameLengthLimitExceededException; +import com.jg.common.exception.file.FileSizeLimitExceededException; +import com.jg.common.exception.file.InvalidExtensionException; +import com.jg.common.utils.DateUtils; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.uuid.Seq; +import com.jg.framework.config.JGConfig; /** * 文件上传工具类 * - * @author ruoyi + * @author jg */ public class FileUploadUtils { @@ -35,7 +35,7 @@ public class FileUploadUtils /** * 默认上传的地址 */ - private static String defaultBaseDir = RuoYiConfig.getProfile(); + private static String defaultBaseDir = JGConfig.getProfile(); public static void setDefaultBaseDir(String defaultBaseDir) { @@ -142,7 +142,7 @@ public class FileUploadUtils public static final String getPathFileName(String uploadDir, String fileName) throws IOException { - int dirLastIndex = RuoYiConfig.getProfile().length() + 1; + int dirLastIndex = JGConfig.getProfile().length() + 1; String currentDir = StringUtils.substring(uploadDir, dirLastIndex); return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName; } diff --git a/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/src/main/java/com/jg/common/utils/file/FileUtils.java similarity index 95% rename from src/main/java/com/ruoyi/common/utils/file/FileUtils.java rename to src/main/java/com/jg/common/utils/file/FileUtils.java index f6ef349..9a07536 100644 --- a/src/main/java/com/ruoyi/common/utils/file/FileUtils.java +++ b/src/main/java/com/jg/common/utils/file/FileUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.jg.common.utils.file; import java.io.File; import java.io.FileInputStream; @@ -14,15 +14,15 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ArrayUtils; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.uuid.IdUtils; -import com.ruoyi.framework.config.RuoYiConfig; +import com.jg.common.utils.DateUtils; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.uuid.IdUtils; +import com.jg.framework.config.JGConfig; /** * 文件处理工具类 * - * @author ruoyi + * @author jg */ public class FileUtils { @@ -73,7 +73,7 @@ public class FileUtils */ public static String writeImportBytes(byte[] data) throws IOException { - return writeBytes(data, RuoYiConfig.getImportPath()); + return writeBytes(data, JGConfig.getImportPath()); } /** @@ -256,7 +256,7 @@ public class FileUtils } /** - * 获取文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi.png + * 获取文件名称 /profile/upload/2022/04/16/jg.png -- jg.png * * @param fileName 路径名称 * @return 没有文件路径的名称 @@ -274,7 +274,7 @@ public class FileUtils } /** - * 获取不带后缀文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi + * 获取不带后缀文件名称 /profile/upload/2022/04/16/jg.png -- jg * * @param fileName 路径名称 * @return 没有文件路径和后缀的名称 diff --git a/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java b/src/main/java/com/jg/common/utils/file/ImageUtils.java similarity index 90% rename from src/main/java/com/ruoyi/common/utils/file/ImageUtils.java rename to src/main/java/com/jg/common/utils/file/ImageUtils.java index 857736d..1638fa3 100644 --- a/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java +++ b/src/main/java/com/jg/common/utils/file/ImageUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.jg.common.utils.file; import java.io.ByteArrayInputStream; import java.io.FileInputStream; @@ -9,14 +9,14 @@ import java.util.Arrays; import org.apache.poi.util.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.config.RuoYiConfig; +import com.jg.common.constant.Constants; +import com.jg.common.utils.StringUtils; +import com.jg.framework.config.JGConfig; /** * 图片处理工具类 * - * @author ruoyi + * @author jg */ public class ImageUtils { @@ -79,7 +79,7 @@ public class ImageUtils else { // 本机地址 - String localPath = RuoYiConfig.getProfile(); + String localPath = JGConfig.getProfile(); String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX); in = new FileInputStream(downloadPath); } diff --git a/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/src/main/java/com/jg/common/utils/file/MimeTypeUtils.java similarity index 96% rename from src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java rename to src/main/java/com/jg/common/utils/file/MimeTypeUtils.java index f968f1a..e16bb19 100644 --- a/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java +++ b/src/main/java/com/jg/common/utils/file/MimeTypeUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils.file; +package com.jg.common.utils.file; /** * 媒体类型工具类 * - * @author ruoyi + * @author jg */ public class MimeTypeUtils { diff --git a/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java b/src/main/java/com/jg/common/utils/html/EscapeUtil.java similarity index 97% rename from src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java rename to src/main/java/com/jg/common/utils/html/EscapeUtil.java index f52e83e..c5fe108 100644 --- a/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java +++ b/src/main/java/com/jg/common/utils/html/EscapeUtil.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.utils.html; +package com.jg.common.utils.html; -import com.ruoyi.common.utils.StringUtils; +import com.jg.common.utils.StringUtils; /** * 转义和反转义工具类 * - * @author ruoyi + * @author jg */ public class EscapeUtil { diff --git a/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java b/src/main/java/com/jg/common/utils/html/HTMLFilter.java similarity index 99% rename from src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java rename to src/main/java/com/jg/common/utils/html/HTMLFilter.java index 63f1c9d..6f075fe 100644 --- a/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java +++ b/src/main/java/com/jg/common/utils/html/HTMLFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.html; +package com.jg.common.utils.html; import java.util.ArrayList; import java.util.Collections; @@ -13,7 +13,7 @@ import java.util.regex.Pattern; /** * HTML过滤器，用于去除XSS漏洞隐患。 * - * @author ruoyi + * @author jg */ public final class HTMLFilter { diff --git a/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java b/src/main/java/com/jg/common/utils/http/HttpHelper.java similarity index 96% rename from src/main/java/com/ruoyi/common/utils/http/HttpHelper.java rename to src/main/java/com/jg/common/utils/http/HttpHelper.java index 589d123..a1f977e 100644 --- a/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java +++ b/src/main/java/com/jg/common/utils/http/HttpHelper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.http; +package com.jg.common.utils.http; import java.io.BufferedReader; import java.io.IOException; @@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory; /** * 通用http工具封装 * - * @author ruoyi + * @author jg */ public class HttpHelper { diff --git a/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/src/main/java/com/jg/common/utils/http/HttpUtils.java similarity index 98% rename from src/main/java/com/ruoyi/common/utils/http/HttpUtils.java rename to src/main/java/com/jg/common/utils/http/HttpUtils.java index ef5eb28..0bba86f 100644 --- a/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java +++ b/src/main/java/com/jg/common/utils/http/HttpUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.http; +package com.jg.common.utils.http; import java.io.BufferedReader; import java.io.IOException; @@ -19,13 +19,13 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.StringUtils; +import com.jg.common.constant.Constants; +import com.jg.common.utils.StringUtils; /** * 通用http发送方法 * - * @author ruoyi + * @author jg */ public class HttpUtils { diff --git a/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/src/main/java/com/jg/common/utils/ip/AddressUtils.java similarity index 83% rename from src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java rename to src/main/java/com/jg/common/utils/ip/AddressUtils.java index 31c3388..89c80de 100644 --- a/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java +++ b/src/main/java/com/jg/common/utils/ip/AddressUtils.java @@ -1,18 +1,18 @@ -package com.ruoyi.common.utils.ip; +package com.jg.common.utils.ip; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -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; +import com.jg.common.constant.Constants; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.http.HttpUtils; +import com.jg.framework.config.JGConfig; /** * 获取地址类 * - * @author ruoyi + * @author jg */ public class AddressUtils { @@ -31,7 +31,7 @@ public class AddressUtils { return "内网IP"; } - if (RuoYiConfig.isAddressEnabled()) + if (JGConfig.isAddressEnabled()) { try { diff --git a/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java b/src/main/java/com/jg/common/utils/ip/IpUtils.java similarity index 98% rename from src/main/java/com/ruoyi/common/utils/ip/IpUtils.java rename to src/main/java/com/jg/common/utils/ip/IpUtils.java index 8e89e30..f3ea4df 100644 --- a/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java +++ b/src/main/java/com/jg/common/utils/ip/IpUtils.java @@ -1,15 +1,15 @@ -package com.ruoyi.common.utils.ip; +package com.jg.common.utils.ip; import java.net.InetAddress; import java.net.UnknownHostException; import javax.servlet.http.HttpServletRequest; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; +import com.jg.common.utils.ServletUtils; +import com.jg.common.utils.StringUtils; /** * 获取IP方法 * - * @author ruoyi + * @author jg */ public class IpUtils { diff --git a/src/main/java/com/ruoyi/common/utils/job/AbstractQuartzJob.java b/src/main/java/com/jg/common/utils/job/AbstractQuartzJob.java similarity index 85% rename from src/main/java/com/ruoyi/common/utils/job/AbstractQuartzJob.java rename to src/main/java/com/jg/common/utils/job/AbstractQuartzJob.java index ec7e622..7b707e2 100644 --- a/src/main/java/com/ruoyi/common/utils/job/AbstractQuartzJob.java +++ b/src/main/java/com/jg/common/utils/job/AbstractQuartzJob.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.job; +package com.jg.common.utils.job; import java.util.Date; import org.quartz.Job; @@ -6,20 +6,20 @@ import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.utils.ExceptionUtil; -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.jg.common.constant.Constants; +import com.jg.common.constant.ScheduleConstants; +import com.jg.common.utils.ExceptionUtil; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.bean.BeanUtils; +import com.jg.common.utils.spring.SpringUtils; +import com.jg.project.monitor.domain.SysJob; +import com.jg.project.monitor.domain.SysJobLog; +import com.jg.project.monitor.service.ISysJobLogService; /** * 抽象quartz调用 * - * @author ruoyi + * @author jg */ public abstract class AbstractQuartzJob implements Job { diff --git a/src/main/java/com/ruoyi/common/utils/job/CronUtils.java b/src/main/java/com/jg/common/utils/job/CronUtils.java similarity index 96% rename from src/main/java/com/ruoyi/common/utils/job/CronUtils.java rename to src/main/java/com/jg/common/utils/job/CronUtils.java index 0763a8d..1eeaf01 100644 --- a/src/main/java/com/ruoyi/common/utils/job/CronUtils.java +++ b/src/main/java/com/jg/common/utils/job/CronUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.job; +package com.jg.common.utils.job; import java.text.ParseException; import java.util.Date; @@ -7,7 +7,7 @@ import org.quartz.CronExpression; /** * cron表达式工具类 * - * @author ruoyi + * @author jg * */ public class CronUtils diff --git a/src/main/java/com/ruoyi/common/utils/job/JobInvokeUtil.java b/src/main/java/com/jg/common/utils/job/JobInvokeUtil.java similarity index 96% rename from src/main/java/com/ruoyi/common/utils/job/JobInvokeUtil.java rename to src/main/java/com/jg/common/utils/job/JobInvokeUtil.java index 0d8f74b..9f98f38 100644 --- a/src/main/java/com/ruoyi/common/utils/job/JobInvokeUtil.java +++ b/src/main/java/com/jg/common/utils/job/JobInvokeUtil.java @@ -1,17 +1,17 @@ -package com.ruoyi.common.utils.job; +package com.jg.common.utils.job; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.LinkedList; 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.jg.common.utils.StringUtils; +import com.jg.common.utils.spring.SpringUtils; +import com.jg.project.monitor.domain.SysJob; /** * 任务执行工具 * - * @author ruoyi + * @author jg */ public class JobInvokeUtil { diff --git a/src/main/java/com/ruoyi/common/utils/job/QuartzDisallowConcurrentExecution.java b/src/main/java/com/jg/common/utils/job/QuartzDisallowConcurrentExecution.java similarity index 80% rename from src/main/java/com/ruoyi/common/utils/job/QuartzDisallowConcurrentExecution.java rename to src/main/java/com/jg/common/utils/job/QuartzDisallowConcurrentExecution.java index 7097088..f110c09 100644 --- a/src/main/java/com/ruoyi/common/utils/job/QuartzDisallowConcurrentExecution.java +++ b/src/main/java/com/jg/common/utils/job/QuartzDisallowConcurrentExecution.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.utils.job; +package com.jg.common.utils.job; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; -import com.ruoyi.project.monitor.domain.SysJob; +import com.jg.project.monitor.domain.SysJob; /** * 定时任务处理（禁止并发执行） * - * @author ruoyi + * @author jg * */ @DisallowConcurrentExecution diff --git a/src/main/java/com/ruoyi/common/utils/job/QuartzJobExecution.java b/src/main/java/com/jg/common/utils/job/QuartzJobExecution.java similarity index 76% rename from src/main/java/com/ruoyi/common/utils/job/QuartzJobExecution.java rename to src/main/java/com/jg/common/utils/job/QuartzJobExecution.java index 55aa7e0..70cac1d 100644 --- a/src/main/java/com/ruoyi/common/utils/job/QuartzJobExecution.java +++ b/src/main/java/com/jg/common/utils/job/QuartzJobExecution.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.utils.job; +package com.jg.common.utils.job; import org.quartz.JobExecutionContext; -import com.ruoyi.project.monitor.domain.SysJob; +import com.jg.project.monitor.domain.SysJob; /** * 定时任务处理（允许并发执行） * - * @author ruoyi + * @author jg * */ public class QuartzJobExecution extends AbstractQuartzJob diff --git a/src/main/java/com/ruoyi/common/utils/job/ScheduleUtils.java b/src/main/java/com/jg/common/utils/job/ScheduleUtils.java similarity index 92% rename from src/main/java/com/ruoyi/common/utils/job/ScheduleUtils.java rename to src/main/java/com/jg/common/utils/job/ScheduleUtils.java index 0353ea2..47f643f 100644 --- a/src/main/java/com/ruoyi/common/utils/job/ScheduleUtils.java +++ b/src/main/java/com/jg/common/utils/job/ScheduleUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.job; +package com.jg.common.utils.job; import org.quartz.CronScheduleBuilder; import org.quartz.CronTrigger; @@ -10,18 +10,18 @@ import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.quartz.TriggerBuilder; import org.quartz.TriggerKey; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.common.exception.job.TaskException.Code; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.project.monitor.domain.SysJob; +import com.jg.common.constant.Constants; +import com.jg.common.constant.ScheduleConstants; +import com.jg.common.exception.job.TaskException; +import com.jg.common.exception.job.TaskException.Code; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.spring.SpringUtils; +import com.jg.project.monitor.domain.SysJob; /** * 定时任务工具类 * - * @author ruoyi + * @author jg * */ public class ScheduleUtils diff --git a/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java b/src/main/java/com/jg/common/utils/poi/ExcelHandlerAdapter.java similarity index 90% rename from src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java rename to src/main/java/com/jg/common/utils/poi/ExcelHandlerAdapter.java index ccab288..be0e5dc 100644 --- a/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java +++ b/src/main/java/com/jg/common/utils/poi/ExcelHandlerAdapter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.poi; +package com.jg.common.utils.poi; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Workbook; @@ -6,7 +6,7 @@ import org.apache.poi.ss.usermodel.Workbook; /** * Excel数据格式处理适配器 * - * @author ruoyi + * @author jg */ public interface ExcelHandlerAdapter { diff --git a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/src/main/java/com/jg/common/utils/poi/ExcelUtil.java similarity index 98% rename from src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java rename to src/main/java/com/jg/common/utils/poi/ExcelUtil.java index 99517d6..ad3f35c 100644 --- a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/src/main/java/com/jg/common/utils/poi/ExcelUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.poi; +package com.jg.common.utils.poi; import java.io.File; import java.io.FileOutputStream; @@ -70,26 +70,26 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.UtilException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileTypeUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.common.utils.file.ImageUtils; -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; +import com.jg.common.core.text.Convert; +import com.jg.common.exception.UtilException; +import com.jg.common.utils.DateUtils; +import com.jg.common.utils.DictUtils; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.file.FileTypeUtils; +import com.jg.common.utils.file.FileUtils; +import com.jg.common.utils.file.ImageUtils; +import com.jg.common.utils.reflect.ReflectUtils; +import com.jg.framework.aspectj.lang.annotation.Excel; +import com.jg.framework.aspectj.lang.annotation.Excel.ColumnType; +import com.jg.framework.aspectj.lang.annotation.Excel.Type; +import com.jg.framework.aspectj.lang.annotation.Excels; +import com.jg.framework.config.JGConfig; +import com.jg.framework.web.domain.AjaxResult; /** * Excel相关处理 * - * @author ruoyi + * @author jg */ public class ExcelUtil { @@ -1393,7 +1393,7 @@ public class ExcelUtil */ public String getAbsoluteFile(String filename) { - String downloadPath = RuoYiConfig.getDownloadPath() + filename; + String downloadPath = JGConfig.getDownloadPath() + filename; File desc = new File(downloadPath); if (!desc.getParentFile().exists()) { diff --git a/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/src/main/java/com/jg/common/utils/reflect/ReflectUtils.java similarity index 99% rename from src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java rename to src/main/java/com/jg/common/utils/reflect/ReflectUtils.java index b19953e..c88109c 100644 --- a/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java +++ b/src/main/java/com/jg/common/utils/reflect/ReflectUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.reflect; +package com.jg.common.utils.reflect; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -12,13 +12,13 @@ import org.apache.commons.lang3.Validate; import org.apache.poi.ss.usermodel.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.DateUtils; +import com.jg.common.core.text.Convert; +import com.jg.common.utils.DateUtils; /** * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. * - * @author ruoyi + * @author jg */ @SuppressWarnings("rawtypes") public class ReflectUtils diff --git a/src/main/java/com/ruoyi/common/utils/sign/Base64.java b/src/main/java/com/jg/common/utils/sign/Base64.java similarity index 99% rename from src/main/java/com/ruoyi/common/utils/sign/Base64.java rename to src/main/java/com/jg/common/utils/sign/Base64.java index ca1cd92..aec53fd 100644 --- a/src/main/java/com/ruoyi/common/utils/sign/Base64.java +++ b/src/main/java/com/jg/common/utils/sign/Base64.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils.sign; +package com.jg.common.utils.sign; /** * Base64工具类 * - * @author ruoyi + * @author jg */ public final class Base64 { diff --git a/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java b/src/main/java/com/jg/common/utils/sign/Md5Utils.java similarity index 96% rename from src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java rename to src/main/java/com/jg/common/utils/sign/Md5Utils.java index c1c58db..03d68ab 100644 --- a/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java +++ b/src/main/java/com/jg/common/utils/sign/Md5Utils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.sign; +package com.jg.common.utils.sign; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; @@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory; /** * Md5加密方法 * - * @author ruoyi + * @author jg */ public class Md5Utils { diff --git a/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/src/main/java/com/jg/common/utils/spring/SpringUtils.java similarity index 97% rename from src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java rename to src/main/java/com/jg/common/utils/spring/SpringUtils.java index f290ec3..de9d757 100644 --- a/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java +++ b/src/main/java/com/jg/common/utils/spring/SpringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.spring; +package com.jg.common.utils.spring; import org.springframework.aop.framework.AopContext; import org.springframework.beans.BeansException; @@ -8,12 +8,12 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.StringUtils; +import com.jg.common.utils.StringUtils; /** * spring工具类 方便在非spring管理环境中获取bean * - * @author ruoyi + * @author jg */ @Component public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware diff --git a/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/src/main/java/com/jg/common/utils/sql/SqlUtil.java similarity index 92% rename from src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java rename to src/main/java/com/jg/common/utils/sql/SqlUtil.java index 93b0347..6c3a32d 100644 --- a/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java +++ b/src/main/java/com/jg/common/utils/sql/SqlUtil.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.utils.sql; +package com.jg.common.utils.sql; -import com.ruoyi.common.exception.UtilException; -import com.ruoyi.common.utils.StringUtils; +import com.jg.common.exception.UtilException; +import com.jg.common.utils.StringUtils; /** * sql操作工具类 * - * @author ruoyi + * @author jg */ public class SqlUtil { diff --git a/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java b/src/main/java/com/jg/common/utils/uuid/IdUtils.java similarity index 94% rename from src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java rename to src/main/java/com/jg/common/utils/uuid/IdUtils.java index 2c84427..cd10e27 100644 --- a/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java +++ b/src/main/java/com/jg/common/utils/uuid/IdUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils.uuid; +package com.jg.common.utils.uuid; /** * ID生成器工具类 * - * @author ruoyi + * @author jg */ public class IdUtils { diff --git a/src/main/java/com/ruoyi/common/utils/uuid/Seq.java b/src/main/java/com/jg/common/utils/uuid/Seq.java similarity index 93% rename from src/main/java/com/ruoyi/common/utils/uuid/Seq.java rename to src/main/java/com/jg/common/utils/uuid/Seq.java index bf99611..c17e7f6 100644 --- a/src/main/java/com/ruoyi/common/utils/uuid/Seq.java +++ b/src/main/java/com/jg/common/utils/uuid/Seq.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.utils.uuid; +package com.jg.common.utils.uuid; import java.util.concurrent.atomic.AtomicInteger; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; +import com.jg.common.utils.DateUtils; +import com.jg.common.utils.StringUtils; /** - * @author ruoyi 序列生成类 + * @author jg 序列生成类 */ public class Seq { diff --git a/src/main/java/com/ruoyi/common/utils/uuid/UUID.java b/src/main/java/com/jg/common/utils/uuid/UUID.java similarity index 99% rename from src/main/java/com/ruoyi/common/utils/uuid/UUID.java rename to src/main/java/com/jg/common/utils/uuid/UUID.java index acc3a6f..9915642 100644 --- a/src/main/java/com/ruoyi/common/utils/uuid/UUID.java +++ b/src/main/java/com/jg/common/utils/uuid/UUID.java @@ -1,16 +1,16 @@ -package com.ruoyi.common.utils.uuid; +package com.jg.common.utils.uuid; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; -import com.ruoyi.common.exception.UtilException; +import com.jg.common.exception.UtilException; /** * 提供通用唯一识别码（universally unique identifier）（UUID）实现 * - * @author ruoyi + * @author jg */ public final class UUID implements java.io.Serializable, Comparable { diff --git a/src/main/java/com/ruoyi/common/xss/Xss.java b/src/main/java/com/jg/common/xss/Xss.java similarity index 93% rename from src/main/java/com/ruoyi/common/xss/Xss.java rename to src/main/java/com/jg/common/xss/Xss.java index 7bfdf04..7ebe534 100644 --- a/src/main/java/com/ruoyi/common/xss/Xss.java +++ b/src/main/java/com/jg/common/xss/Xss.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.xss; +package com.jg.common.xss; import javax.validation.Constraint; import javax.validation.Payload; @@ -10,7 +10,7 @@ import java.lang.annotation.Target; /** * 自定义xss校验注解 * - * @author ruoyi + * @author jg */ @Retention(RetentionPolicy.RUNTIME) @Target(value = { ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER }) diff --git a/src/main/java/com/ruoyi/common/xss/XssValidator.java b/src/main/java/com/jg/common/xss/XssValidator.java similarity index 91% rename from src/main/java/com/ruoyi/common/xss/XssValidator.java rename to src/main/java/com/jg/common/xss/XssValidator.java index 42f425c..eff5bb2 100644 --- a/src/main/java/com/ruoyi/common/xss/XssValidator.java +++ b/src/main/java/com/jg/common/xss/XssValidator.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.xss; +package com.jg.common.xss; -import com.ruoyi.common.utils.StringUtils; +import com.jg.common.utils.StringUtils; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import java.util.regex.Matcher; @@ -9,7 +9,7 @@ import java.util.regex.Pattern; /** * 自定义xss校验注解实现 * - * @author ruoyi + * @author jg */ public class XssValidator implements ConstraintValidator { diff --git a/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/src/main/java/com/jg/framework/aspectj/DataScopeAspect.java similarity index 91% rename from src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java rename to src/main/java/com/jg/framework/aspectj/DataScopeAspect.java index 134f7d2..ec2fa7e 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java +++ b/src/main/java/com/jg/framework/aspectj/DataScopeAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.jg.framework.aspectj; import java.util.ArrayList; import java.util.List; @@ -6,20 +6,20 @@ import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.aspectj.lang.annotation.DataScope; -import com.ruoyi.framework.security.LoginUser; -import com.ruoyi.framework.security.context.PermissionContextHolder; -import com.ruoyi.framework.web.domain.BaseEntity; -import com.ruoyi.project.system.domain.SysRole; -import com.ruoyi.project.system.domain.SysUser; +import com.jg.common.core.text.Convert; +import com.jg.common.utils.SecurityUtils; +import com.jg.common.utils.StringUtils; +import com.jg.framework.aspectj.lang.annotation.DataScope; +import com.jg.framework.security.LoginUser; +import com.jg.framework.security.context.PermissionContextHolder; +import com.jg.framework.web.domain.BaseEntity; +import com.jg.project.system.domain.SysRole; +import com.jg.project.system.domain.SysUser; /** * 数据过滤处理 * - * @author ruoyi + * @author jg */ @Aspect @Component diff --git a/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/src/main/java/com/jg/framework/aspectj/DataSourceAspect.java similarity index 81% rename from src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java rename to src/main/java/com/jg/framework/aspectj/DataSourceAspect.java index c2bb892..740804c 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java +++ b/src/main/java/com/jg/framework/aspectj/DataSourceAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.jg.framework.aspectj; import java.util.Objects; import org.aspectj.lang.ProceedingJoinPoint; @@ -11,14 +11,14 @@ import org.slf4j.LoggerFactory; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.aspectj.lang.annotation.DataSource; -import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder; +import com.jg.common.utils.StringUtils; +import com.jg.framework.aspectj.lang.annotation.DataSource; +import com.jg.framework.datasource.DynamicDataSourceContextHolder; /** * 多数据源处理 * - * @author ruoyi + * @author jg */ @Aspect @Order(1) @@ -27,8 +27,8 @@ public class DataSourceAspect { 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.jg.framework.aspectj.lang.annotation.DataSource)" + + "|| @within(com.jg.framework.aspectj.lang.annotation.DataSource)") public void dsPointCut() { diff --git a/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/src/main/java/com/jg/framework/aspectj/LogAspect.java similarity index 92% rename from src/main/java/com/ruoyi/framework/aspectj/LogAspect.java rename to src/main/java/com/jg/framework/aspectj/LogAspect.java index e62f421..c736a6e 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/src/main/java/com/jg/framework/aspectj/LogAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.jg.framework.aspectj; import java.util.Collection; import java.util.Map; @@ -17,24 +17,24 @@ import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.enums.HttpMethod; -import com.ruoyi.common.filter.PropertyPreExcludeFilter; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.IpUtils; -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.project.monitor.domain.SysOperLog; -import com.ruoyi.project.system.domain.SysUser; +import com.jg.common.enums.HttpMethod; +import com.jg.common.filter.PropertyPreExcludeFilter; +import com.jg.common.utils.SecurityUtils; +import com.jg.common.utils.ServletUtils; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.ip.IpUtils; +import com.jg.framework.aspectj.lang.annotation.Log; +import com.jg.framework.aspectj.lang.enums.BusinessStatus; +import com.jg.framework.manager.AsyncManager; +import com.jg.framework.manager.factory.AsyncFactory; +import com.jg.framework.security.LoginUser; +import com.jg.project.monitor.domain.SysOperLog; +import com.jg.project.system.domain.SysUser; /** * 操作日志记录处理 * - * @author ruoyi + * @author jg */ @Aspect @Component diff --git a/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java b/src/main/java/com/jg/framework/aspectj/RateLimiterAspect.java similarity index 89% rename from src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java rename to src/main/java/com/jg/framework/aspectj/RateLimiterAspect.java index 820c34b..0a6f03b 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java +++ b/src/main/java/com/jg/framework/aspectj/RateLimiterAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.jg.framework.aspectj; import java.lang.reflect.Method; import java.util.Collections; @@ -13,16 +13,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.script.RedisScript; import org.springframework.stereotype.Component; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.framework.aspectj.lang.annotation.RateLimiter; -import com.ruoyi.framework.aspectj.lang.enums.LimitType; +import com.jg.common.exception.ServiceException; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.ip.IpUtils; +import com.jg.framework.aspectj.lang.annotation.RateLimiter; +import com.jg.framework.aspectj.lang.enums.LimitType; /** * 限流处理 * - * @author ruoyi + * @author jg */ @Aspect @Component diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Anonymous.java b/src/main/java/com/jg/framework/aspectj/lang/annotation/Anonymous.java similarity index 84% rename from src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Anonymous.java rename to src/main/java/com/jg/framework/aspectj/lang/annotation/Anonymous.java index 2fb432c..a0fa9fb 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Anonymous.java +++ b/src/main/java/com/jg/framework/aspectj/lang/annotation/Anonymous.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj.lang.annotation; +package com.jg.framework.aspectj.lang.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -9,7 +9,7 @@ import java.lang.annotation.Target; /** * 匿名访问不鉴权注解 * - * @author ruoyi + * @author jg */ @Target({ ElementType.METHOD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java b/src/main/java/com/jg/framework/aspectj/lang/annotation/DataScope.java similarity index 91% rename from src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java rename to src/main/java/com/jg/framework/aspectj/lang/annotation/DataScope.java index eff418f..4f61d5b 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java +++ b/src/main/java/com/jg/framework/aspectj/lang/annotation/DataScope.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj.lang.annotation; +package com.jg.framework.aspectj.lang.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -9,7 +9,7 @@ import java.lang.annotation.Target; /** * 数据权限过滤注解 * - * @author ruoyi + * @author jg */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java b/src/main/java/com/jg/framework/aspectj/lang/annotation/DataSource.java similarity index 83% rename from src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java rename to src/main/java/com/jg/framework/aspectj/lang/annotation/DataSource.java index e5a780e..67252fb 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java +++ b/src/main/java/com/jg/framework/aspectj/lang/annotation/DataSource.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj.lang.annotation; +package com.jg.framework.aspectj.lang.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -6,14 +6,14 @@ import java.lang.annotation.Inherited; 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.jg.framework.aspectj.lang.enums.DataSourceType; /** * 自定义多数据源切换注解 * * 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准 * - * @author ruoyi + * @author jg */ @Target({ ElementType.METHOD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java b/src/main/java/com/jg/framework/aspectj/lang/annotation/Excel.java similarity index 97% rename from src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java rename to src/main/java/com/jg/framework/aspectj/lang/annotation/Excel.java index b11514f..00cacfa 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java +++ b/src/main/java/com/jg/framework/aspectj/lang/annotation/Excel.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj.lang.annotation; +package com.jg.framework.aspectj.lang.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -7,12 +7,12 @@ import java.lang.annotation.Target; import java.math.BigDecimal; import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.IndexedColors; -import com.ruoyi.common.utils.poi.ExcelHandlerAdapter; +import com.jg.common.utils.poi.ExcelHandlerAdapter; /** * 自定义导出Excel数据注解 * - * @author ruoyi + * @author jg */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excels.java b/src/main/java/com/jg/framework/aspectj/lang/annotation/Excels.java similarity index 81% rename from src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excels.java rename to src/main/java/com/jg/framework/aspectj/lang/annotation/Excels.java index fdcd9da..011dbd8 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excels.java +++ b/src/main/java/com/jg/framework/aspectj/lang/annotation/Excels.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj.lang.annotation; +package com.jg.framework.aspectj.lang.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** * Excel注解集 * - * @author ruoyi + * @author jg */ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java b/src/main/java/com/jg/framework/aspectj/lang/annotation/Log.java similarity index 83% rename from src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java rename to src/main/java/com/jg/framework/aspectj/lang/annotation/Log.java index 984d369..b6ad657 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java +++ b/src/main/java/com/jg/framework/aspectj/lang/annotation/Log.java @@ -1,17 +1,17 @@ -package com.ruoyi.framework.aspectj.lang.annotation; +package com.jg.framework.aspectj.lang.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.jg.framework.aspectj.lang.enums.BusinessType; +import com.jg.framework.aspectj.lang.enums.OperatorType; /** * 自定义操作日志记录注解 * - * @author ruoyi + * @author jg * */ @Target({ ElementType.PARAMETER, ElementType.METHOD }) diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/RateLimiter.java b/src/main/java/com/jg/framework/aspectj/lang/annotation/RateLimiter.java similarity index 79% rename from src/main/java/com/ruoyi/framework/aspectj/lang/annotation/RateLimiter.java rename to src/main/java/com/jg/framework/aspectj/lang/annotation/RateLimiter.java index 5aa6af6..67f4ed8 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/RateLimiter.java +++ b/src/main/java/com/jg/framework/aspectj/lang/annotation/RateLimiter.java @@ -1,17 +1,17 @@ -package com.ruoyi.framework.aspectj.lang.annotation; +package com.jg.framework.aspectj.lang.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.framework.aspectj.lang.enums.LimitType; +import com.jg.common.constant.CacheConstants; +import com.jg.framework.aspectj.lang.enums.LimitType; /** * 限流注解 * - * @author ruoyi + * @author jg */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessStatus.java b/src/main/java/com/jg/framework/aspectj/lang/enums/BusinessStatus.java similarity index 69% rename from src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessStatus.java rename to src/main/java/com/jg/framework/aspectj/lang/enums/BusinessStatus.java index 2e1c7af..1a1a68d 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessStatus.java +++ b/src/main/java/com/jg/framework/aspectj/lang/enums/BusinessStatus.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.aspectj.lang.enums; +package com.jg.framework.aspectj.lang.enums; /** * 操作状态 * - * @author ruoyi + * @author jg * */ public enum BusinessStatus diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessType.java b/src/main/java/com/jg/framework/aspectj/lang/enums/BusinessType.java similarity index 88% rename from src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessType.java rename to src/main/java/com/jg/framework/aspectj/lang/enums/BusinessType.java index 2810215..4aa00c7 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessType.java +++ b/src/main/java/com/jg/framework/aspectj/lang/enums/BusinessType.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.aspectj.lang.enums; +package com.jg.framework.aspectj.lang.enums; /** * 业务操作类型 * - * @author ruoyi + * @author jg */ public enum BusinessType { diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/DataSourceType.java b/src/main/java/com/jg/framework/aspectj/lang/enums/DataSourceType.java similarity index 68% rename from src/main/java/com/ruoyi/framework/aspectj/lang/enums/DataSourceType.java rename to src/main/java/com/jg/framework/aspectj/lang/enums/DataSourceType.java index 103cd80..34d6fd5 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/DataSourceType.java +++ b/src/main/java/com/jg/framework/aspectj/lang/enums/DataSourceType.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.aspectj.lang.enums; +package com.jg.framework.aspectj.lang.enums; /** * 数据源 * - * @author ruoyi + * @author jg */ public enum DataSourceType { diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/LimitType.java b/src/main/java/com/jg/framework/aspectj/lang/enums/LimitType.java similarity index 73% rename from src/main/java/com/ruoyi/framework/aspectj/lang/enums/LimitType.java rename to src/main/java/com/jg/framework/aspectj/lang/enums/LimitType.java index 599312d..cbe4eb4 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/LimitType.java +++ b/src/main/java/com/jg/framework/aspectj/lang/enums/LimitType.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.aspectj.lang.enums; +package com.jg.framework.aspectj.lang.enums; /** * 限流类型 * - * @author ruoyi + * @author jg */ public enum LimitType diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/OperatorType.java b/src/main/java/com/jg/framework/aspectj/lang/enums/OperatorType.java similarity index 75% rename from src/main/java/com/ruoyi/framework/aspectj/lang/enums/OperatorType.java rename to src/main/java/com/jg/framework/aspectj/lang/enums/OperatorType.java index e3d87db..ac62d45 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/OperatorType.java +++ b/src/main/java/com/jg/framework/aspectj/lang/enums/OperatorType.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.aspectj.lang.enums; +package com.jg.framework.aspectj.lang.enums; /** * 操作人类别 * - * @author ruoyi + * @author jg */ public enum OperatorType { diff --git a/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/src/main/java/com/jg/framework/config/ApplicationConfig.java similarity index 89% rename from src/main/java/com/ruoyi/framework/config/ApplicationConfig.java rename to src/main/java/com/jg/framework/config/ApplicationConfig.java index 55de6f7..cbe69b8 100644 --- a/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java +++ b/src/main/java/com/jg/framework/config/ApplicationConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jg.framework.config; import java.util.TimeZone; import org.mybatis.spring.annotation.MapperScan; @@ -10,13 +10,13 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; /** * 程序注解配置 * - * @author ruoyi + * @author jg */ @Configuration // 表示通过aop框架暴露该代理对象,AopContext能够访问 @EnableAspectJAutoProxy(exposeProxy = true) // 指定要扫描的Mapper类的包的路径 -@MapperScan("com.ruoyi.project.**.mapper") +@MapperScan("com.jg.project.**.mapper") public class ApplicationConfig { /** diff --git a/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java b/src/main/java/com/jg/framework/config/CaptchaConfig.java similarity index 96% rename from src/main/java/com/ruoyi/framework/config/CaptchaConfig.java rename to src/main/java/com/jg/framework/config/CaptchaConfig.java index 43e78ae..43d81eb 100644 --- a/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java +++ b/src/main/java/com/jg/framework/config/CaptchaConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jg.framework.config; import java.util.Properties; import org.springframework.context.annotation.Bean; @@ -10,7 +10,7 @@ import static com.google.code.kaptcha.Constants.*; /** * 验证码配置 * - * @author ruoyi + * @author jg */ @Configuration public class CaptchaConfig @@ -63,7 +63,7 @@ public class CaptchaConfig // KAPTCHA_SESSION_KEY properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath"); // 验证码文本生成器 - properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.ruoyi.framework.config.KaptchaTextCreator"); + properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.jg.framework.config.KaptchaTextCreator"); // 验证码文本字符间距 默认为2 properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3"); // 验证码文本字符长度 默认为5 diff --git a/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/src/main/java/com/jg/framework/config/DruidConfig.java similarity index 94% rename from src/main/java/com/ruoyi/framework/config/DruidConfig.java rename to src/main/java/com/jg/framework/config/DruidConfig.java index 7a8fd82..4855405 100644 --- a/src/main/java/com/ruoyi/framework/config/DruidConfig.java +++ b/src/main/java/com/jg/framework/config/DruidConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jg.framework.config; import java.io.IOException; import java.util.HashMap; @@ -19,15 +19,15 @@ import com.alibaba.druid.pool.DruidDataSource; 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.utils.spring.SpringUtils; -import com.ruoyi.framework.aspectj.lang.enums.DataSourceType; -import com.ruoyi.framework.config.properties.DruidProperties; -import com.ruoyi.framework.datasource.DynamicDataSource; +import com.jg.common.utils.spring.SpringUtils; +import com.jg.framework.aspectj.lang.enums.DataSourceType; +import com.jg.framework.config.properties.DruidProperties; +import com.jg.framework.datasource.DynamicDataSource; /** * druid 配置多数据源 * - * @author ruoyi + * @author jg */ @Configuration public class DruidConfig diff --git a/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java b/src/main/java/com/jg/framework/config/FastJson2JsonRedisSerializer.java similarity index 93% rename from src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java rename to src/main/java/com/jg/framework/config/FastJson2JsonRedisSerializer.java index 4adbb7f..0083e00 100644 --- a/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java +++ b/src/main/java/com/jg/framework/config/FastJson2JsonRedisSerializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jg.framework.config; import java.nio.charset.Charset; import org.springframework.data.redis.serializer.RedisSerializer; @@ -7,12 +7,12 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONReader; import com.alibaba.fastjson2.JSONWriter; import com.alibaba.fastjson2.filter.Filter; -import com.ruoyi.common.constant.Constants; +import com.jg.common.constant.Constants; /** * Redis使用FastJson序列化 * - * @author ruoyi + * @author jg */ public class FastJson2JsonRedisSerializer implements RedisSerializer { diff --git a/src/main/java/com/ruoyi/framework/config/FilterConfig.java b/src/main/java/com/jg/framework/config/FilterConfig.java similarity index 90% rename from src/main/java/com/ruoyi/framework/config/FilterConfig.java rename to src/main/java/com/jg/framework/config/FilterConfig.java index bb14c04..5791683 100644 --- a/src/main/java/com/ruoyi/framework/config/FilterConfig.java +++ b/src/main/java/com/jg/framework/config/FilterConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jg.framework.config; import java.util.HashMap; import java.util.Map; @@ -8,14 +8,14 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.ruoyi.common.filter.RepeatableFilter; -import com.ruoyi.common.filter.XssFilter; -import com.ruoyi.common.utils.StringUtils; +import com.jg.common.filter.RepeatableFilter; +import com.jg.common.filter.XssFilter; +import com.jg.common.utils.StringUtils; /** * Filter配置 * - * @author ruoyi + * @author jg */ @Configuration public class FilterConfig diff --git a/src/main/java/com/ruoyi/framework/config/GenConfig.java b/src/main/java/com/jg/framework/config/GenConfig.java similarity index 96% rename from src/main/java/com/ruoyi/framework/config/GenConfig.java rename to src/main/java/com/jg/framework/config/GenConfig.java index ef4456b..19510a0 100644 --- a/src/main/java/com/ruoyi/framework/config/GenConfig.java +++ b/src/main/java/com/jg/framework/config/GenConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jg.framework.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; /** * 读取代码生成相关配置 * - * @author ruoyi + * @author jg */ @Component @ConfigurationProperties(prefix = "gen") diff --git a/src/main/java/com/ruoyi/framework/config/I18nConfig.java b/src/main/java/com/jg/framework/config/I18nConfig.java similarity index 92% rename from src/main/java/com/ruoyi/framework/config/I18nConfig.java rename to src/main/java/com/jg/framework/config/I18nConfig.java index 163fd01..81b12f4 100644 --- a/src/main/java/com/ruoyi/framework/config/I18nConfig.java +++ b/src/main/java/com/jg/framework/config/I18nConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jg.framework.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -7,12 +7,12 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; import org.springframework.web.servlet.i18n.SessionLocaleResolver; -import com.ruoyi.common.constant.Constants; +import com.jg.common.constant.Constants; /** * 资源文件配置加载 * - * @author ruoyi + * @author jg */ @Configuration public class I18nConfig implements WebMvcConfigurer diff --git a/src/main/java/com/ruoyi/framework/config/RuoYiConfig.java b/src/main/java/com/jg/framework/config/JGConfig.java similarity index 89% rename from src/main/java/com/ruoyi/framework/config/RuoYiConfig.java rename to src/main/java/com/jg/framework/config/JGConfig.java index fe1407e..5465970 100644 --- a/src/main/java/com/ruoyi/framework/config/RuoYiConfig.java +++ b/src/main/java/com/jg/framework/config/JGConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jg.framework.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -6,11 +6,11 @@ import org.springframework.stereotype.Component; /** * 读取项目相关配置 * - * @author ruoyi + * @author jg */ @Component -@ConfigurationProperties(prefix = "ruoyi") -public class RuoYiConfig +@ConfigurationProperties(prefix = "jg") +public class JGConfig { /** 项目名称 */ private String name; @@ -64,7 +64,7 @@ public class RuoYiConfig public void setProfile(String profile) { - RuoYiConfig.profile = profile; + JGConfig.profile = profile; } public static boolean isAddressEnabled() @@ -74,7 +74,7 @@ public class RuoYiConfig public void setAddressEnabled(boolean addressEnabled) { - RuoYiConfig.addressEnabled = addressEnabled; + JGConfig.addressEnabled = addressEnabled; } /** diff --git a/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java b/src/main/java/com/jg/framework/config/KaptchaTextCreator.java similarity index 97% rename from src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java rename to src/main/java/com/jg/framework/config/KaptchaTextCreator.java index d2902f4..17bc18e 100644 --- a/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java +++ b/src/main/java/com/jg/framework/config/KaptchaTextCreator.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jg.framework.config; import java.util.Random; import com.google.code.kaptcha.text.impl.DefaultTextCreator; @@ -6,7 +6,7 @@ import com.google.code.kaptcha.text.impl.DefaultTextCreator; /** * 验证码文本生成器 * - * @author ruoyi + * @author jg */ public class KaptchaTextCreator extends DefaultTextCreator { diff --git a/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java b/src/main/java/com/jg/framework/config/MybatisPlusConfig.java similarity index 97% rename from src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java rename to src/main/java/com/jg/framework/config/MybatisPlusConfig.java index cdf29d0..a15e2db 100644 --- a/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java +++ b/src/main/java/com/jg/framework/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jg.framework.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; @@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; /** * Mybatis Plus 配置 * - * @author ruoyi + * @author jg */ @EnableTransactionManagement(proxyTargetClass = true) @Configuration diff --git a/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/src/main/java/com/jg/framework/config/RedisConfig.java similarity index 97% rename from src/main/java/com/ruoyi/framework/config/RedisConfig.java rename to src/main/java/com/jg/framework/config/RedisConfig.java index 3f4f485..37073fd 100644 --- a/src/main/java/com/ruoyi/framework/config/RedisConfig.java +++ b/src/main/java/com/jg/framework/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jg.framework.config; import org.springframework.cache.annotation.CachingConfigurerSupport; import org.springframework.cache.annotation.EnableCaching; @@ -12,7 +12,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; /** * redis配置 * - * @author ruoyi + * @author jg */ @Configuration @EnableCaching diff --git a/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/src/main/java/com/jg/framework/config/ResourcesConfig.java similarity index 90% rename from src/main/java/com/ruoyi/framework/config/ResourcesConfig.java rename to src/main/java/com/jg/framework/config/ResourcesConfig.java index 41c2f8b..ceb3809 100644 --- a/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java +++ b/src/main/java/com/jg/framework/config/ResourcesConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jg.framework.config; import java.util.concurrent.TimeUnit; import org.springframework.beans.factory.annotation.Autowired; @@ -11,13 +11,13 @@ import org.springframework.web.filter.CorsFilter; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor; +import com.jg.common.constant.Constants; +import com.jg.framework.interceptor.RepeatSubmitInterceptor; /** * 通用配置 * - * @author ruoyi + * @author jg */ @Configuration public class ResourcesConfig implements WebMvcConfigurer @@ -30,7 +30,7 @@ public class ResourcesConfig implements WebMvcConfigurer { /** 本地文件上传路径 */ registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**") - .addResourceLocations("file:" + RuoYiConfig.getProfile() + "/"); + .addResourceLocations("file:" + JGConfig.getProfile() + "/"); /** swagger配置 */ registry.addResourceHandler("/swagger-ui/**") diff --git a/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java b/src/main/java/com/jg/framework/config/ScheduleConfig.java similarity index 92% rename from src/main/java/com/ruoyi/framework/config/ScheduleConfig.java rename to src/main/java/com/jg/framework/config/ScheduleConfig.java index 347247a..94dd66a 100644 --- a/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java +++ b/src/main/java/com/jg/framework/config/ScheduleConfig.java @@ -1,4 +1,4 @@ -//package com.ruoyi.framework.config; +//package com.jg.framework.config; // //import org.springframework.context.annotation.Bean; //import org.springframework.context.annotation.Configuration; @@ -9,7 +9,7 @@ ///** // * 定时任务配置（单机部署建议默认走内存，如需集群需要创建qrtz数据库表/打开类注释） // * -// * @author ruoyi +// * @author jg // */ //@Configuration //public class ScheduleConfig @@ -22,7 +22,7 @@ // // // quartz参数 // Properties prop = new Properties(); -// prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler"); +// prop.put("org.quartz.scheduler.instanceName", "jgScheduler"); // prop.put("org.quartz.scheduler.instanceId", "AUTO"); // // 线程池配置 // prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool"); @@ -42,7 +42,7 @@ // prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_"); // factory.setQuartzProperties(prop); // -// factory.setSchedulerName("RuoyiScheduler"); +// factory.setSchedulerName("jgScheduler"); // // 延时启动 // factory.setStartupDelay(1); // factory.setApplicationContextSchedulerContextKey("applicationContextKey"); diff --git a/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/src/main/java/com/jg/framework/config/SecurityConfig.java similarity index 94% rename from src/main/java/com/ruoyi/framework/config/SecurityConfig.java rename to src/main/java/com/jg/framework/config/SecurityConfig.java index 2125853..11c3256 100644 --- a/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/src/main/java/com/jg/framework/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jg.framework.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -15,15 +15,15 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.security.web.authentication.logout.LogoutFilter; import org.springframework.web.filter.CorsFilter; -import com.ruoyi.framework.config.properties.PermitAllUrlProperties; -import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter; -import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl; -import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl; +import com.jg.framework.config.properties.PermitAllUrlProperties; +import com.jg.framework.security.filter.JwtAuthenticationTokenFilter; +import com.jg.framework.security.handle.AuthenticationEntryPointImpl; +import com.jg.framework.security.handle.LogoutSuccessHandlerImpl; /** * spring security配置 * - * @author ruoyi + * @author jg */ @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) public class SecurityConfig extends WebSecurityConfigurerAdapter diff --git a/src/main/java/com/ruoyi/framework/config/ServerConfig.java b/src/main/java/com/jg/framework/config/ServerConfig.java similarity index 88% rename from src/main/java/com/ruoyi/framework/config/ServerConfig.java rename to src/main/java/com/jg/framework/config/ServerConfig.java index b5b7de3..77d2525 100644 --- a/src/main/java/com/ruoyi/framework/config/ServerConfig.java +++ b/src/main/java/com/jg/framework/config/ServerConfig.java @@ -1,13 +1,13 @@ -package com.ruoyi.framework.config; +package com.jg.framework.config; import javax.servlet.http.HttpServletRequest; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.ServletUtils; +import com.jg.common.utils.ServletUtils; /** * 服务相关配置 * - * @author ruoyi + * @author jg */ @Component public class ServerConfig diff --git a/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java b/src/main/java/com/jg/framework/config/SwaggerConfig.java similarity index 91% rename from src/main/java/com/ruoyi/framework/config/SwaggerConfig.java rename to src/main/java/com/jg/framework/config/SwaggerConfig.java index 01073ad..76b48d9 100644 --- a/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java +++ b/src/main/java/com/jg/framework/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.jg.framework.config; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import io.swagger.annotations.ApiOperation; import io.swagger.models.auth.In; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; @@ -25,7 +24,7 @@ import springfox.documentation.spring.web.plugins.Docket; /** * Swagger2的接口配置 * - * @author ruoyi + * @author jg */ @Configuration public class SwaggerConfig { @@ -33,7 +32,7 @@ public class SwaggerConfig { * 系统基础配置 */ @Autowired - private RuoYiConfig ruoyiConfig; + private JGConfig jgConfig; /** * 是否开启swagger @@ -62,8 +61,8 @@ public class SwaggerConfig { // 扫描所有有注解的api，用这种方式更灵活 // .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) // 扫描指定包中的swagger注解 - .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger") - .or(RequestHandlerSelectors.basePackage("com.ruoyi.project.about.controller"))) + .apis(RequestHandlerSelectors.basePackage("com.jg.project.tool.swagger") + .or(RequestHandlerSelectors.basePackage("com.jg.project.about.controller"))) // 扫描所有 .apis(RequestHandlerSelectors.any()) .paths(PathSelectors.any()) .build() @@ -118,9 +117,9 @@ public class SwaggerConfig { // 描述 .description("描述：用于管理后台信息...") // 作者信息 - .contact(new Contact(ruoyiConfig.getName(), null, null)) + .contact(new Contact(jgConfig.getName(), null, null)) // 版本 - .version("版本号:" + ruoyiConfig.getVersion()) + .version("版本号:" + jgConfig.getVersion()) .build(); } } diff --git a/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/src/main/java/com/jg/framework/config/ThreadPoolConfig.java similarity index 95% rename from src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java rename to src/main/java/com/jg/framework/config/ThreadPoolConfig.java index 7840141..fea231d 100644 --- a/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java +++ b/src/main/java/com/jg/framework/config/ThreadPoolConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.config; +package com.jg.framework.config; -import com.ruoyi.common.utils.Threads; +import com.jg.common.utils.Threads; import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -12,7 +12,7 @@ import java.util.concurrent.ThreadPoolExecutor; /** * 线程池配置 * - * @author ruoyi + * @author jg **/ @Configuration public class ThreadPoolConfig diff --git a/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java b/src/main/java/com/jg/framework/config/properties/DruidProperties.java similarity index 98% rename from src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java rename to src/main/java/com/jg/framework/config/properties/DruidProperties.java index c8a5c8a..9f519e9 100644 --- a/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java +++ b/src/main/java/com/jg/framework/config/properties/DruidProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.jg.framework.config.properties; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; @@ -7,7 +7,7 @@ import com.alibaba.druid.pool.DruidDataSource; /** * druid 配置属性 * - * @author ruoyi + * @author jg */ @Configuration public class DruidProperties diff --git a/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java b/src/main/java/com/jg/framework/config/properties/PermitAllUrlProperties.java similarity index 95% rename from src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java rename to src/main/java/com/jg/framework/config/properties/PermitAllUrlProperties.java index a913610..40eacd2 100644 --- a/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java +++ b/src/main/java/com/jg/framework/config/properties/PermitAllUrlProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.jg.framework.config.properties; import java.util.ArrayList; import java.util.List; @@ -16,12 +16,12 @@ import org.springframework.core.annotation.AnnotationUtils; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; -import com.ruoyi.framework.aspectj.lang.annotation.Anonymous; +import com.jg.framework.aspectj.lang.annotation.Anonymous; /** * 设置Anonymous注解允许匿名访问的url * - * @author ruoyi + * @author jg */ @Configuration public class PermitAllUrlProperties implements InitializingBean, ApplicationContextAware diff --git a/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java b/src/main/java/com/jg/framework/datasource/DynamicDataSource.java similarity index 91% rename from src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java rename to src/main/java/com/jg/framework/datasource/DynamicDataSource.java index e70b8cf..7b45177 100644 --- a/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java +++ b/src/main/java/com/jg/framework/datasource/DynamicDataSource.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.datasource; +package com.jg.framework.datasource; import java.util.Map; import javax.sql.DataSource; @@ -7,7 +7,7 @@ import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; /** * 动态数据源 * - * @author ruoyi + * @author jg */ public class DynamicDataSource extends AbstractRoutingDataSource { diff --git a/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java b/src/main/java/com/jg/framework/datasource/DynamicDataSourceContextHolder.java similarity index 94% rename from src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java rename to src/main/java/com/jg/framework/datasource/DynamicDataSourceContextHolder.java index 9770af6..44d3926 100644 --- a/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java +++ b/src/main/java/com/jg/framework/datasource/DynamicDataSourceContextHolder.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.datasource; +package com.jg.framework.datasource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory; /** * 数据源切换处理 * - * @author ruoyi + * @author jg */ public class DynamicDataSourceContextHolder { diff --git a/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java b/src/main/java/com/jg/framework/interceptor/RepeatSubmitInterceptor.java similarity index 88% rename from src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java rename to src/main/java/com/jg/framework/interceptor/RepeatSubmitInterceptor.java index d8ac4c9..d1880b9 100644 --- a/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java +++ b/src/main/java/com/jg/framework/interceptor/RepeatSubmitInterceptor.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.interceptor; +package com.jg.framework.interceptor; import java.lang.reflect.Method; import javax.servlet.http.HttpServletRequest; @@ -7,14 +7,14 @@ import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.framework.interceptor.annotation.RepeatSubmit; -import com.ruoyi.framework.web.domain.AjaxResult; +import com.jg.common.utils.ServletUtils; +import com.jg.framework.interceptor.annotation.RepeatSubmit; +import com.jg.framework.web.domain.AjaxResult; /** * 防止重复提交拦截器 * - * @author ruoyi + * @author jg */ @Component public abstract class RepeatSubmitInterceptor implements HandlerInterceptor diff --git a/src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java b/src/main/java/com/jg/framework/interceptor/annotation/RepeatSubmit.java similarity index 90% rename from src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java rename to src/main/java/com/jg/framework/interceptor/annotation/RepeatSubmit.java index 1191d21..39f2ac9 100644 --- a/src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java +++ b/src/main/java/com/jg/framework/interceptor/annotation/RepeatSubmit.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.interceptor.annotation; +package com.jg.framework.interceptor.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -10,7 +10,7 @@ import java.lang.annotation.Target; /** * 自定义注解防止表单重复提交 * - * @author ruoyi + * @author jg * */ @Inherited diff --git a/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java b/src/main/java/com/jg/framework/interceptor/impl/SameUrlDataInterceptor.java similarity index 89% rename from src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java rename to src/main/java/com/jg/framework/interceptor/impl/SameUrlDataInterceptor.java index 299eff7..5d7c549 100644 --- a/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java +++ b/src/main/java/com/jg/framework/interceptor/impl/SameUrlDataInterceptor.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.interceptor.impl; +package com.jg.framework.interceptor.impl; import java.util.HashMap; import java.util.Map; @@ -8,19 +8,19 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.constant.CacheConstants; -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.interceptor.annotation.RepeatSubmit; -import com.ruoyi.framework.redis.RedisCache; +import com.jg.common.constant.CacheConstants; +import com.jg.common.filter.RepeatedlyRequestWrapper; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.http.HttpHelper; +import com.jg.framework.interceptor.RepeatSubmitInterceptor; +import com.jg.framework.interceptor.annotation.RepeatSubmit; +import com.jg.framework.redis.RedisCache; /** * 判断请求url和数据是否和上一次相同， * 如果和上次相同，则是重复提交表单。 有效时间为10秒内。 * - * @author ruoyi + * @author jg */ @Component public class SameUrlDataInterceptor extends RepeatSubmitInterceptor diff --git a/src/main/java/com/ruoyi/framework/manager/AsyncManager.java b/src/main/java/com/jg/framework/manager/AsyncManager.java similarity index 87% rename from src/main/java/com/ruoyi/framework/manager/AsyncManager.java rename to src/main/java/com/jg/framework/manager/AsyncManager.java index 7387a02..9a6a935 100644 --- a/src/main/java/com/ruoyi/framework/manager/AsyncManager.java +++ b/src/main/java/com/jg/framework/manager/AsyncManager.java @@ -1,15 +1,15 @@ -package com.ruoyi.framework.manager; +package com.jg.framework.manager; import java.util.TimerTask; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import com.ruoyi.common.utils.Threads; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.jg.common.utils.Threads; +import com.jg.common.utils.spring.SpringUtils; /** * 异步任务管理器 * - * @author ruoyi + * @author jg */ public class AsyncManager { diff --git a/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java b/src/main/java/com/jg/framework/manager/ShutdownManager.java similarity index 93% rename from src/main/java/com/ruoyi/framework/manager/ShutdownManager.java rename to src/main/java/com/jg/framework/manager/ShutdownManager.java index e36ca3c..23b9460 100644 --- a/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java +++ b/src/main/java/com/jg/framework/manager/ShutdownManager.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.manager; +package com.jg.framework.manager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -8,7 +8,7 @@ import javax.annotation.PreDestroy; /** * 确保应用退出时能关闭后台线程 * - * @author ruoyi + * @author jg */ @Component public class ShutdownManager diff --git a/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/src/main/java/com/jg/framework/manager/factory/AsyncFactory.java similarity index 83% rename from src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java rename to src/main/java/com/jg/framework/manager/factory/AsyncFactory.java index 1360b40..ac5f9e0 100644 --- a/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java +++ b/src/main/java/com/jg/framework/manager/factory/AsyncFactory.java @@ -1,25 +1,25 @@ -package com.ruoyi.framework.manager.factory; +package com.jg.framework.manager.factory; import java.util.TimerTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.LogUtils; -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.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.jg.common.constant.Constants; +import com.jg.common.utils.LogUtils; +import com.jg.common.utils.ServletUtils; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.ip.AddressUtils; +import com.jg.common.utils.ip.IpUtils; +import com.jg.common.utils.spring.SpringUtils; +import com.jg.project.monitor.domain.SysLogininfor; +import com.jg.project.monitor.domain.SysOperLog; +import com.jg.project.monitor.service.ISysLogininforService; +import com.jg.project.monitor.service.ISysOperLogService; import eu.bitwalker.useragentutils.UserAgent; /** * 异步工厂（产生任务用） * - * @author ruoyi + * @author jg */ public class AsyncFactory { diff --git a/src/main/java/com/ruoyi/framework/redis/RedisCache.java b/src/main/java/com/jg/framework/redis/RedisCache.java similarity index 99% rename from src/main/java/com/ruoyi/framework/redis/RedisCache.java rename to src/main/java/com/jg/framework/redis/RedisCache.java index 0aebd37..8db609d 100644 --- a/src/main/java/com/ruoyi/framework/redis/RedisCache.java +++ b/src/main/java/com/jg/framework/redis/RedisCache.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.redis; +package com.jg.framework.redis; import java.util.Collection; import java.util.Iterator; @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; /** * spring redis 工具类 * - * @author ruoyi + * @author jg **/ @SuppressWarnings(value = { "unchecked", "rawtypes" }) @Component diff --git a/src/main/java/com/ruoyi/framework/security/LoginBody.java b/src/main/java/com/jg/framework/security/LoginBody.java similarity index 94% rename from src/main/java/com/ruoyi/framework/security/LoginBody.java rename to src/main/java/com/jg/framework/security/LoginBody.java index ddfac39..a0a2990 100644 --- a/src/main/java/com/ruoyi/framework/security/LoginBody.java +++ b/src/main/java/com/jg/framework/security/LoginBody.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.security; +package com.jg.framework.security; /** * 用户登录对象 * - * @author ruoyi + * @author jg */ public class LoginBody { diff --git a/src/main/java/com/ruoyi/framework/security/LoginUser.java b/src/main/java/com/jg/framework/security/LoginUser.java similarity index 97% rename from src/main/java/com/ruoyi/framework/security/LoginUser.java rename to src/main/java/com/jg/framework/security/LoginUser.java index 6445e09..66c3647 100644 --- a/src/main/java/com/ruoyi/framework/security/LoginUser.java +++ b/src/main/java/com/jg/framework/security/LoginUser.java @@ -1,16 +1,16 @@ -package com.ruoyi.framework.security; +package com.jg.framework.security; import java.util.Collection; import java.util.Set; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import com.alibaba.fastjson2.annotation.JSONField; -import com.ruoyi.project.system.domain.SysUser; +import com.jg.project.system.domain.SysUser; /** * 登录用户身份权限 * - * @author ruoyi + * @author jg */ public class LoginUser implements UserDetails { diff --git a/src/main/java/com/ruoyi/framework/security/RegisterBody.java b/src/main/java/com/jg/framework/security/RegisterBody.java similarity index 60% rename from src/main/java/com/ruoyi/framework/security/RegisterBody.java rename to src/main/java/com/jg/framework/security/RegisterBody.java index 42be381..4c9c062 100644 --- a/src/main/java/com/ruoyi/framework/security/RegisterBody.java +++ b/src/main/java/com/jg/framework/security/RegisterBody.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.security; +package com.jg.framework.security; /** * 用户注册对象 * - * @author ruoyi + * @author jg */ public class RegisterBody extends LoginBody { diff --git a/src/main/java/com/ruoyi/framework/security/context/AuthenticationContextHolder.java b/src/main/java/com/jg/framework/security/context/AuthenticationContextHolder.java similarity index 89% rename from src/main/java/com/ruoyi/framework/security/context/AuthenticationContextHolder.java rename to src/main/java/com/jg/framework/security/context/AuthenticationContextHolder.java index 6c776ce..690bda7 100644 --- a/src/main/java/com/ruoyi/framework/security/context/AuthenticationContextHolder.java +++ b/src/main/java/com/jg/framework/security/context/AuthenticationContextHolder.java @@ -1,11 +1,11 @@ -package com.ruoyi.framework.security.context; +package com.jg.framework.security.context; import org.springframework.security.core.Authentication; /** * 身份验证信息 * - * @author ruoyi + * @author jg */ public class AuthenticationContextHolder { diff --git a/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java b/src/main/java/com/jg/framework/security/context/PermissionContextHolder.java similarity index 87% rename from src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java rename to src/main/java/com/jg/framework/security/context/PermissionContextHolder.java index 5472f3d..1ee9646 100644 --- a/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java +++ b/src/main/java/com/jg/framework/security/context/PermissionContextHolder.java @@ -1,13 +1,13 @@ -package com.ruoyi.framework.security.context; +package com.jg.framework.security.context; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; -import com.ruoyi.common.core.text.Convert; +import com.jg.common.core.text.Convert; /** * 权限信息 * - * @author ruoyi + * @author jg */ public class PermissionContextHolder { diff --git a/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java b/src/main/java/com/jg/framework/security/filter/JwtAuthenticationTokenFilter.java similarity index 86% rename from src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java rename to src/main/java/com/jg/framework/security/filter/JwtAuthenticationTokenFilter.java index fa8a654..a65a2a3 100644 --- a/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java +++ b/src/main/java/com/jg/framework/security/filter/JwtAuthenticationTokenFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.filter; +package com.jg.framework.security.filter; import java.io.IOException; import javax.servlet.FilterChain; @@ -11,15 +11,15 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; -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.jg.common.utils.SecurityUtils; +import com.jg.common.utils.StringUtils; +import com.jg.framework.security.LoginUser; +import com.jg.framework.security.service.TokenService; /** * token过滤器 验证token有效性 * - * @author ruoyi + * @author jg */ @Component public class JwtAuthenticationTokenFilter extends OncePerRequestFilter diff --git a/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java b/src/main/java/com/jg/framework/security/handle/AuthenticationEntryPointImpl.java similarity index 80% rename from src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java rename to src/main/java/com/jg/framework/security/handle/AuthenticationEntryPointImpl.java index f605021..05f1c8b 100644 --- a/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java +++ b/src/main/java/com/jg/framework/security/handle/AuthenticationEntryPointImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.handle; +package com.jg.framework.security.handle; import java.io.IOException; import java.io.Serializable; @@ -8,15 +8,15 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.domain.AjaxResult; +import com.jg.common.constant.HttpStatus; +import com.jg.common.utils.ServletUtils; +import com.jg.common.utils.StringUtils; +import com.jg.framework.web.domain.AjaxResult; /** * 认证失败处理类 返回未授权 * - * @author ruoyi + * @author jg */ @Component public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, Serializable diff --git a/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java b/src/main/java/com/jg/framework/security/handle/LogoutSuccessHandlerImpl.java similarity index 76% rename from src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java rename to src/main/java/com/jg/framework/security/handle/LogoutSuccessHandlerImpl.java index 16328d4..4b37a3e 100644 --- a/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java +++ b/src/main/java/com/jg/framework/security/handle/LogoutSuccessHandlerImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.handle; +package com.jg.framework.security.handle; import java.io.IOException; import javax.servlet.ServletException; @@ -9,19 +9,19 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.constant.Constants; -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.jg.common.constant.Constants; +import com.jg.common.utils.ServletUtils; +import com.jg.common.utils.StringUtils; +import com.jg.framework.manager.AsyncManager; +import com.jg.framework.manager.factory.AsyncFactory; +import com.jg.framework.security.LoginUser; +import com.jg.framework.security.service.TokenService; +import com.jg.framework.web.domain.AjaxResult; /** * 自定义退出处理类 返回成功 * - * @author ruoyi + * @author jg */ @Configuration public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler diff --git a/src/main/java/com/ruoyi/framework/security/service/PermissionService.java b/src/main/java/com/jg/framework/security/service/PermissionService.java similarity index 90% rename from src/main/java/com/ruoyi/framework/security/service/PermissionService.java rename to src/main/java/com/jg/framework/security/service/PermissionService.java index 426d0a7..5f20195 100644 --- a/src/main/java/com/ruoyi/framework/security/service/PermissionService.java +++ b/src/main/java/com/jg/framework/security/service/PermissionService.java @@ -1,19 +1,19 @@ -package com.ruoyi.framework.security.service; +package com.jg.framework.security.service; import java.util.Set; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.security.LoginUser; -import com.ruoyi.framework.security.context.PermissionContextHolder; -import com.ruoyi.project.system.domain.SysRole; +import com.jg.common.constant.Constants; +import com.jg.common.utils.SecurityUtils; +import com.jg.common.utils.StringUtils; +import com.jg.framework.security.LoginUser; +import com.jg.framework.security.context.PermissionContextHolder; +import com.jg.project.system.domain.SysRole; /** - * RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母 + * jg首创 自定义权限实现，ss取自SpringSecurity首字母 * - * @author ruoyi + * @author jg */ @Service("ss") public class PermissionService diff --git a/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java b/src/main/java/com/jg/framework/security/service/SysLoginService.java similarity index 83% rename from src/main/java/com/ruoyi/framework/security/service/SysLoginService.java rename to src/main/java/com/jg/framework/security/service/SysLoginService.java index 1b3464d..6886d67 100644 --- a/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java +++ b/src/main/java/com/jg/framework/security/service/SysLoginService.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.service; +package com.jg.framework.security.service; import javax.annotation.Resource; import org.springframework.beans.factory.annotation.Autowired; @@ -7,32 +7,32 @@ import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.exception.user.BlackListException; -import com.ruoyi.common.exception.user.CaptchaException; -import com.ruoyi.common.exception.user.CaptchaExpireException; -import com.ruoyi.common.exception.user.UserNotExistsException; -import com.ruoyi.common.exception.user.UserPasswordNotMatchException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.IpUtils; -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; -import com.ruoyi.framework.security.context.AuthenticationContextHolder; -import com.ruoyi.project.system.domain.SysUser; -import com.ruoyi.project.system.service.ISysConfigService; -import com.ruoyi.project.system.service.ISysUserService; +import com.jg.common.constant.CacheConstants; +import com.jg.common.constant.Constants; +import com.jg.common.constant.UserConstants; +import com.jg.common.exception.ServiceException; +import com.jg.common.exception.user.BlackListException; +import com.jg.common.exception.user.CaptchaException; +import com.jg.common.exception.user.CaptchaExpireException; +import com.jg.common.exception.user.UserNotExistsException; +import com.jg.common.exception.user.UserPasswordNotMatchException; +import com.jg.common.utils.DateUtils; +import com.jg.common.utils.MessageUtils; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.ip.IpUtils; +import com.jg.framework.manager.AsyncManager; +import com.jg.framework.manager.factory.AsyncFactory; +import com.jg.framework.redis.RedisCache; +import com.jg.framework.security.LoginUser; +import com.jg.framework.security.context.AuthenticationContextHolder; +import com.jg.project.system.domain.SysUser; +import com.jg.project.system.service.ISysConfigService; +import com.jg.project.system.service.ISysUserService; /** * 登录校验方法 * - * @author ruoyi + * @author jg */ @Component public class SysLoginService diff --git a/src/main/java/com/ruoyi/framework/security/service/SysPasswordService.java b/src/main/java/com/jg/framework/security/service/SysPasswordService.java similarity index 82% rename from src/main/java/com/ruoyi/framework/security/service/SysPasswordService.java rename to src/main/java/com/jg/framework/security/service/SysPasswordService.java index 9a61731..05035ed 100644 --- a/src/main/java/com/ruoyi/framework/security/service/SysPasswordService.java +++ b/src/main/java/com/jg/framework/security/service/SysPasswordService.java @@ -1,22 +1,22 @@ -package com.ruoyi.framework.security.service; +package com.jg.framework.security.service; import java.util.concurrent.TimeUnit; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.exception.user.UserPasswordNotMatchException; -import com.ruoyi.common.exception.user.UserPasswordRetryLimitExceedException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.framework.redis.RedisCache; -import com.ruoyi.framework.security.context.AuthenticationContextHolder; -import com.ruoyi.project.system.domain.SysUser; +import com.jg.common.constant.CacheConstants; +import com.jg.common.exception.user.UserPasswordNotMatchException; +import com.jg.common.exception.user.UserPasswordRetryLimitExceedException; +import com.jg.common.utils.SecurityUtils; +import com.jg.framework.redis.RedisCache; +import com.jg.framework.security.context.AuthenticationContextHolder; +import com.jg.project.system.domain.SysUser; /** * 登录密码方法 * - * @author ruoyi + * @author jg */ @Component public class SysPasswordService diff --git a/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java b/src/main/java/com/jg/framework/security/service/SysPermissionService.java similarity index 87% rename from src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java rename to src/main/java/com/jg/framework/security/service/SysPermissionService.java index 4b80431..c410a8a 100644 --- a/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java +++ b/src/main/java/com/jg/framework/security/service/SysPermissionService.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.service; +package com.jg.framework.security.service; import java.util.HashSet; import java.util.List; @@ -6,15 +6,15 @@ import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import com.ruoyi.project.system.domain.SysRole; -import com.ruoyi.project.system.domain.SysUser; -import com.ruoyi.project.system.service.ISysMenuService; -import com.ruoyi.project.system.service.ISysRoleService; +import com.jg.project.system.domain.SysRole; +import com.jg.project.system.domain.SysUser; +import com.jg.project.system.service.ISysMenuService; +import com.jg.project.system.service.ISysRoleService; /** * 用户权限处理 * - * @author ruoyi + * @author jg */ @Component public class SysPermissionService diff --git a/src/main/java/com/ruoyi/framework/security/service/SysRegisterService.java b/src/main/java/com/jg/framework/security/service/SysRegisterService.java similarity index 78% rename from src/main/java/com/ruoyi/framework/security/service/SysRegisterService.java rename to src/main/java/com/jg/framework/security/service/SysRegisterService.java index c8c7509..e12500f 100644 --- a/src/main/java/com/ruoyi/framework/security/service/SysRegisterService.java +++ b/src/main/java/com/jg/framework/security/service/SysRegisterService.java @@ -1,27 +1,27 @@ -package com.ruoyi.framework.security.service; +package com.jg.framework.security.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.exception.user.CaptchaException; -import com.ruoyi.common.exception.user.CaptchaExpireException; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.framework.redis.RedisCache; -import com.ruoyi.framework.security.RegisterBody; -import com.ruoyi.project.system.domain.SysUser; -import com.ruoyi.project.system.service.ISysConfigService; -import com.ruoyi.project.system.service.ISysUserService; +import com.jg.common.constant.CacheConstants; +import com.jg.common.constant.Constants; +import com.jg.common.constant.UserConstants; +import com.jg.common.exception.user.CaptchaException; +import com.jg.common.exception.user.CaptchaExpireException; +import com.jg.common.utils.MessageUtils; +import com.jg.common.utils.SecurityUtils; +import com.jg.common.utils.StringUtils; +import com.jg.framework.manager.AsyncManager; +import com.jg.framework.manager.factory.AsyncFactory; +import com.jg.framework.redis.RedisCache; +import com.jg.framework.security.RegisterBody; +import com.jg.project.system.domain.SysUser; +import com.jg.project.system.service.ISysConfigService; +import com.jg.project.system.service.ISysUserService; /** * 注册校验方法 * - * @author ruoyi + * @author jg */ @Component public class SysRegisterService diff --git a/src/main/java/com/ruoyi/framework/security/service/TokenService.java b/src/main/java/com/jg/framework/security/service/TokenService.java similarity index 92% rename from src/main/java/com/ruoyi/framework/security/service/TokenService.java rename to src/main/java/com/jg/framework/security/service/TokenService.java index 81d0159..bd20873 100644 --- a/src/main/java/com/ruoyi/framework/security/service/TokenService.java +++ b/src/main/java/com/jg/framework/security/service/TokenService.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.service; +package com.jg.framework.security.service; import java.util.HashMap; import java.util.Map; @@ -9,15 +9,15 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.Constants; -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.common.utils.uuid.IdUtils; -import com.ruoyi.framework.redis.RedisCache; -import com.ruoyi.framework.security.LoginUser; +import com.jg.common.constant.CacheConstants; +import com.jg.common.constant.Constants; +import com.jg.common.utils.ServletUtils; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.ip.AddressUtils; +import com.jg.common.utils.ip.IpUtils; +import com.jg.common.utils.uuid.IdUtils; +import com.jg.framework.redis.RedisCache; +import com.jg.framework.security.LoginUser; import eu.bitwalker.useragentutils.UserAgent; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; @@ -26,7 +26,7 @@ import io.jsonwebtoken.SignatureAlgorithm; /** * token验证处理 * - * @author ruoyi + * @author jg */ @Component public class TokenService diff --git a/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java b/src/main/java/com/jg/framework/security/service/UserDetailsServiceImpl.java similarity index 82% rename from src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java rename to src/main/java/com/jg/framework/security/service/UserDetailsServiceImpl.java index 82960c6..88e7683 100644 --- a/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java +++ b/src/main/java/com/jg/framework/security/service/UserDetailsServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.service; +package com.jg.framework.security.service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -6,18 +6,18 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.stereotype.Service; -import com.ruoyi.common.enums.UserStatus; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.MessageUtils; -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.jg.common.enums.UserStatus; +import com.jg.common.exception.ServiceException; +import com.jg.common.utils.MessageUtils; +import com.jg.common.utils.StringUtils; +import com.jg.framework.security.LoginUser; +import com.jg.project.system.domain.SysUser; +import com.jg.project.system.service.ISysUserService; /** * 用户验证处理 * - * @author ruoyi + * @author jg */ @Service public class UserDetailsServiceImpl implements UserDetailsService diff --git a/src/main/java/com/ruoyi/framework/task/RyTask.java b/src/main/java/com/jg/framework/task/RyTask.java similarity index 86% rename from src/main/java/com/ruoyi/framework/task/RyTask.java rename to src/main/java/com/jg/framework/task/RyTask.java index eb7f5b9..646c4ad 100644 --- a/src/main/java/com/ruoyi/framework/task/RyTask.java +++ b/src/main/java/com/jg/framework/task/RyTask.java @@ -1,12 +1,12 @@ -package com.ruoyi.framework.task; +package com.jg.framework.task; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.StringUtils; +import com.jg.common.utils.StringUtils; /** * 定时任务调度测试 * - * @author ruoyi + * @author jg */ @Component("ryTask") public class RyTask diff --git a/src/main/java/com/ruoyi/framework/web/controller/BaseController.java b/src/main/java/com/jg/framework/web/controller/BaseController.java similarity index 86% rename from src/main/java/com/ruoyi/framework/web/controller/BaseController.java rename to src/main/java/com/jg/framework/web/controller/BaseController.java index 79ed4df..bb112b1 100644 --- a/src/main/java/com/ruoyi/framework/web/controller/BaseController.java +++ b/src/main/java/com/jg/framework/web/controller/BaseController.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.controller; +package com.jg.framework.web.controller; import java.beans.PropertyEditorSupport; import java.util.Date; @@ -9,22 +9,22 @@ import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.sql.SqlUtil; -import com.ruoyi.framework.security.LoginUser; -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; +import com.jg.common.constant.HttpStatus; +import com.jg.common.utils.DateUtils; +import com.jg.common.utils.PageUtils; +import com.jg.common.utils.SecurityUtils; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.sql.SqlUtil; +import com.jg.framework.security.LoginUser; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.framework.web.page.PageDomain; +import com.jg.framework.web.page.TableDataInfo; +import com.jg.framework.web.page.TableSupport; /** * web层通用数据处理 * - * @author ruoyi + * @author jg */ public class BaseController { diff --git a/src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java b/src/main/java/com/jg/framework/web/domain/AjaxResult.java similarity index 96% rename from src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java rename to src/main/java/com/jg/framework/web/domain/AjaxResult.java index 579dd59..c00efee 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java +++ b/src/main/java/com/jg/framework/web/domain/AjaxResult.java @@ -1,14 +1,14 @@ -package com.ruoyi.framework.web.domain; +package com.jg.framework.web.domain; import java.util.HashMap; import java.util.Objects; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.utils.StringUtils; +import com.jg.common.constant.HttpStatus; +import com.jg.common.utils.StringUtils; /** * 操作消息提醒 * - * @author ruoyi + * @author jg */ public class AjaxResult extends HashMap { diff --git a/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java b/src/main/java/com/jg/framework/web/domain/BaseEntity.java similarity index 97% rename from src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java rename to src/main/java/com/jg/framework/web/domain/BaseEntity.java index 0cd6233..eb2454e 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java +++ b/src/main/java/com/jg/framework/web/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.domain; +package com.jg.framework.web.domain; import java.io.Serializable; import java.util.Date; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; /** * Entity基类 * - * @author ruoyi + * @author jg */ public class BaseEntity implements Serializable { diff --git a/src/main/java/com/ruoyi/framework/web/domain/R.java b/src/main/java/com/jg/framework/web/domain/R.java similarity index 97% rename from src/main/java/com/ruoyi/framework/web/domain/R.java rename to src/main/java/com/jg/framework/web/domain/R.java index ceb225f..8d3d769 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/R.java +++ b/src/main/java/com/jg/framework/web/domain/R.java @@ -1,14 +1,14 @@ -package com.ruoyi.framework.web.domain; +package com.jg.framework.web.domain; import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonInclude; -import com.ruoyi.common.constant.HttpStatus; +import com.jg.common.constant.HttpStatus; /** * 响应信息主体 * - * @author ruoyi + * @author jg */ public class R implements Serializable { diff --git a/src/main/java/com/ruoyi/framework/web/domain/Server.java b/src/main/java/com/jg/framework/web/domain/Server.java similarity index 93% rename from src/main/java/com/ruoyi/framework/web/domain/Server.java rename to src/main/java/com/jg/framework/web/domain/Server.java index 63b03da..d0b91d6 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/Server.java +++ b/src/main/java/com/jg/framework/web/domain/Server.java @@ -1,16 +1,16 @@ -package com.ruoyi.framework.web.domain; +package com.jg.framework.web.domain; import java.net.UnknownHostException; import java.util.LinkedList; import java.util.List; import java.util.Properties; -import com.ruoyi.common.utils.Arith; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.framework.web.domain.server.Cpu; -import com.ruoyi.framework.web.domain.server.Jvm; -import com.ruoyi.framework.web.domain.server.Mem; -import com.ruoyi.framework.web.domain.server.Sys; -import com.ruoyi.framework.web.domain.server.SysFile; +import com.jg.common.utils.Arith; +import com.jg.common.utils.ip.IpUtils; +import com.jg.framework.web.domain.server.Cpu; +import com.jg.framework.web.domain.server.Jvm; +import com.jg.framework.web.domain.server.Mem; +import com.jg.framework.web.domain.server.Sys; +import com.jg.framework.web.domain.server.SysFile; import oshi.SystemInfo; import oshi.hardware.CentralProcessor; import oshi.hardware.CentralProcessor.TickType; @@ -24,7 +24,7 @@ import oshi.util.Util; /** * 服务器相关信息 * - * @author ruoyi + * @author jg */ public class Server { diff --git a/src/main/java/com/ruoyi/framework/web/domain/TreeEntity.java b/src/main/java/com/jg/framework/web/domain/TreeEntity.java similarity index 95% rename from src/main/java/com/ruoyi/framework/web/domain/TreeEntity.java rename to src/main/java/com/jg/framework/web/domain/TreeEntity.java index b071425..6feccde 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/TreeEntity.java +++ b/src/main/java/com/jg/framework/web/domain/TreeEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.domain; +package com.jg.framework.web.domain; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import java.util.List; /** * Tree基类 * - * @author ruoyi + * @author jg */ public class TreeEntity extends BaseEntity { diff --git a/src/main/java/com/ruoyi/framework/web/domain/TreeSelect.java b/src/main/java/com/jg/framework/web/domain/TreeSelect.java similarity index 90% rename from src/main/java/com/ruoyi/framework/web/domain/TreeSelect.java rename to src/main/java/com/jg/framework/web/domain/TreeSelect.java index 680d65b..4fd4def 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/TreeSelect.java +++ b/src/main/java/com/jg/framework/web/domain/TreeSelect.java @@ -1,16 +1,16 @@ -package com.ruoyi.framework.web.domain; +package com.jg.framework.web.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.jg.project.system.domain.SysDept; +import com.jg.project.system.domain.SysMenu; /** * Treeselect树结构实体类 * - * @author ruoyi + * @author jg */ public class TreeSelect implements Serializable { diff --git a/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java b/src/main/java/com/jg/framework/web/domain/server/Cpu.java similarity index 93% rename from src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java rename to src/main/java/com/jg/framework/web/domain/server/Cpu.java index a13a66c..24cb682 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java +++ b/src/main/java/com/jg/framework/web/domain/server/Cpu.java @@ -1,11 +1,11 @@ -package com.ruoyi.framework.web.domain.server; +package com.jg.framework.web.domain.server; -import com.ruoyi.common.utils.Arith; +import com.jg.common.utils.Arith; /** * CPU相关信息 * - * @author ruoyi + * @author jg */ public class Cpu { diff --git a/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java b/src/main/java/com/jg/framework/web/domain/server/Jvm.java similarity index 93% rename from src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java rename to src/main/java/com/jg/framework/web/domain/server/Jvm.java index 1fdc6ac..bab6957 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java +++ b/src/main/java/com/jg/framework/web/domain/server/Jvm.java @@ -1,13 +1,13 @@ -package com.ruoyi.framework.web.domain.server; +package com.jg.framework.web.domain.server; import java.lang.management.ManagementFactory; -import com.ruoyi.common.utils.Arith; -import com.ruoyi.common.utils.DateUtils; +import com.jg.common.utils.Arith; +import com.jg.common.utils.DateUtils; /** * JVM相关信息 * - * @author ruoyi + * @author jg */ public class Jvm { diff --git a/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java b/src/main/java/com/jg/framework/web/domain/server/Mem.java similarity index 89% rename from src/main/java/com/ruoyi/framework/web/domain/server/Mem.java rename to src/main/java/com/jg/framework/web/domain/server/Mem.java index 13eec52..7f2b87e 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java +++ b/src/main/java/com/jg/framework/web/domain/server/Mem.java @@ -1,11 +1,11 @@ -package com.ruoyi.framework.web.domain.server; +package com.jg.framework.web.domain.server; -import com.ruoyi.common.utils.Arith; +import com.jg.common.utils.Arith; /** * 內存相关信息 * - * @author ruoyi + * @author jg */ public class Mem { diff --git a/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java b/src/main/java/com/jg/framework/web/domain/server/Sys.java similarity index 94% rename from src/main/java/com/ruoyi/framework/web/domain/server/Sys.java rename to src/main/java/com/jg/framework/web/domain/server/Sys.java index 45d64d9..15cd0f3 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java +++ b/src/main/java/com/jg/framework/web/domain/server/Sys.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.web.domain.server; +package com.jg.framework.web.domain.server; /** * 系统相关信息 * - * @author ruoyi + * @author jg */ public class Sys { diff --git a/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java b/src/main/java/com/jg/framework/web/domain/server/SysFile.java similarity index 96% rename from src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java rename to src/main/java/com/jg/framework/web/domain/server/SysFile.java index 1320cde..9ea6ee6 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java +++ b/src/main/java/com/jg/framework/web/domain/server/SysFile.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.web.domain.server; +package com.jg.framework.web.domain.server; /** * 系统文件相关信息 * - * @author ruoyi + * @author jg */ public class SysFile { diff --git a/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/src/main/java/com/jg/framework/web/exception/GlobalExceptionHandler.java similarity index 94% rename from src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java rename to src/main/java/com/jg/framework/web/exception/GlobalExceptionHandler.java index 06343a3..9a6208f 100644 --- a/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/jg/framework/web/exception/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.exception; +package com.jg.framework.web.exception; import javax.servlet.http.HttpServletRequest; import org.slf4j.Logger; @@ -11,16 +11,16 @@ import org.springframework.web.bind.MissingPathVariableException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.exception.DemoModeException; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.domain.AjaxResult; +import com.jg.common.constant.HttpStatus; +import com.jg.common.exception.DemoModeException; +import com.jg.common.exception.ServiceException; +import com.jg.common.utils.StringUtils; +import com.jg.framework.web.domain.AjaxResult; /** * 全局异常处理器 * - * @author ruoyi + * @author jg */ @RestControllerAdvice public class GlobalExceptionHandler diff --git a/src/main/java/com/ruoyi/framework/web/page/PageDomain.java b/src/main/java/com/jg/framework/web/page/PageDomain.java similarity index 94% rename from src/main/java/com/ruoyi/framework/web/page/PageDomain.java rename to src/main/java/com/jg/framework/web/page/PageDomain.java index 27df44c..b916107 100644 --- a/src/main/java/com/ruoyi/framework/web/page/PageDomain.java +++ b/src/main/java/com/jg/framework/web/page/PageDomain.java @@ -1,11 +1,11 @@ -package com.ruoyi.framework.web.page; +package com.jg.framework.web.page; -import com.ruoyi.common.utils.StringUtils; +import com.jg.common.utils.StringUtils; /** * 分页数据 * - * @author ruoyi + * @author jg */ public class PageDomain { diff --git a/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java b/src/main/java/com/jg/framework/web/page/TableDataInfo.java similarity index 95% rename from src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java rename to src/main/java/com/jg/framework/web/page/TableDataInfo.java index c44e527..1df99f9 100644 --- a/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java +++ b/src/main/java/com/jg/framework/web/page/TableDataInfo.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.page; +package com.jg.framework.web.page; import java.io.Serializable; import java.util.List; @@ -6,7 +6,7 @@ import java.util.List; /** * 表格分页数据对象 * - * @author ruoyi + * @author jg */ public class TableDataInfo implements Serializable { diff --git a/src/main/java/com/ruoyi/framework/web/page/TableSupport.java b/src/main/java/com/jg/framework/web/page/TableSupport.java similarity index 89% rename from src/main/java/com/ruoyi/framework/web/page/TableSupport.java rename to src/main/java/com/jg/framework/web/page/TableSupport.java index 8433d10..a35ac7c 100644 --- a/src/main/java/com/ruoyi/framework/web/page/TableSupport.java +++ b/src/main/java/com/jg/framework/web/page/TableSupport.java @@ -1,12 +1,12 @@ -package com.ruoyi.framework.web.page; +package com.jg.framework.web.page; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.ServletUtils; +import com.jg.common.core.text.Convert; +import com.jg.common.utils.ServletUtils; /** * 表格数据处理 * - * @author ruoyi + * @author jg */ public class TableSupport { diff --git a/src/main/java/com/ruoyi/project/about/controller/AboutPartThreeController.java b/src/main/java/com/jg/project/about/controller/AboutPartThreeController.java similarity index 87% rename from src/main/java/com/ruoyi/project/about/controller/AboutPartThreeController.java rename to src/main/java/com/jg/project/about/controller/AboutPartThreeController.java index 65be97c..3825852 100644 --- a/src/main/java/com/ruoyi/project/about/controller/AboutPartThreeController.java +++ b/src/main/java/com/jg/project/about/controller/AboutPartThreeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.about.controller; +package com.jg.project.about.controller; import java.util.List; import javax.annotation.Resource; @@ -7,12 +7,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.ruoyi.common.utils.ListPage; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.utils.QueryPage; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.project.about.mapper.AboutPartThreeMapper; +import com.jg.common.utils.ListPage; +import com.jg.common.utils.PageUtils; +import com.jg.common.utils.QueryPage; +import com.jg.framework.web.controller.BaseController; +import com.jg.framework.web.page.TableDataInfo; +import com.jg.project.about.mapper.AboutPartThreeMapper; import lombok.extern.slf4j.Slf4j; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -22,9 +22,9 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.project.about.domain.AboutPartThree; -import com.ruoyi.project.about.service.IAboutPartThreeService; -import com.ruoyi.framework.web.domain.R; +import com.jg.project.about.domain.AboutPartThree; +import com.jg.project.about.service.IAboutPartThreeService; +import com.jg.framework.web.domain.R; /** * 关于第三部分Controller diff --git a/src/main/java/com/ruoyi/project/about/domain/AboutPartThree.java b/src/main/java/com/jg/project/about/domain/AboutPartThree.java similarity index 98% rename from src/main/java/com/ruoyi/project/about/domain/AboutPartThree.java rename to src/main/java/com/jg/project/about/domain/AboutPartThree.java index a3ce119..b150f07 100644 --- a/src/main/java/com/ruoyi/project/about/domain/AboutPartThree.java +++ b/src/main/java/com/jg/project/about/domain/AboutPartThree.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.about.domain; +package com.jg.project.about.domain; import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/src/main/java/com/ruoyi/project/about/mapper/AboutPartThreeMapper.java b/src/main/java/com/jg/project/about/mapper/AboutPartThreeMapper.java similarity index 77% rename from src/main/java/com/ruoyi/project/about/mapper/AboutPartThreeMapper.java rename to src/main/java/com/jg/project/about/mapper/AboutPartThreeMapper.java index 350dd30..36dfe1f 100644 --- a/src/main/java/com/ruoyi/project/about/mapper/AboutPartThreeMapper.java +++ b/src/main/java/com/jg/project/about/mapper/AboutPartThreeMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.project.about.mapper; +package com.jg.project.about.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.project.about.domain.AboutPartThree; +import com.jg.project.about.domain.AboutPartThree; import java.util.List; diff --git a/src/main/java/com/ruoyi/project/about/service/IAboutPartThreeService.java b/src/main/java/com/jg/project/about/service/IAboutPartThreeService.java similarity index 77% rename from src/main/java/com/ruoyi/project/about/service/IAboutPartThreeService.java rename to src/main/java/com/jg/project/about/service/IAboutPartThreeService.java index 797ef0f..7371d23 100644 --- a/src/main/java/com/ruoyi/project/about/service/IAboutPartThreeService.java +++ b/src/main/java/com/jg/project/about/service/IAboutPartThreeService.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.about.service; +package com.jg.project.about.service; -import com.ruoyi.project.about.domain.AboutPartThree; +import com.jg.project.about.domain.AboutPartThree; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/src/main/java/com/ruoyi/project/about/service/impl/AboutPartThreeServiceImpl.java b/src/main/java/com/jg/project/about/service/impl/AboutPartThreeServiceImpl.java similarity index 68% rename from src/main/java/com/ruoyi/project/about/service/impl/AboutPartThreeServiceImpl.java rename to src/main/java/com/jg/project/about/service/impl/AboutPartThreeServiceImpl.java index 28d207f..836f679 100644 --- a/src/main/java/com/ruoyi/project/about/service/impl/AboutPartThreeServiceImpl.java +++ b/src/main/java/com/jg/project/about/service/impl/AboutPartThreeServiceImpl.java @@ -1,12 +1,14 @@ -package com.ruoyi.project.about.service.impl; +package com.jg.project.about.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.project.about.mapper.AboutPartThreeMapper; -import com.ruoyi.project.about.domain.AboutPartThree; -import com.ruoyi.project.about.service.IAboutPartThreeService; +import com.jg.project.about.mapper.AboutPartThreeMapper; +import com.jg.project.about.domain.AboutPartThree; +import com.jg.project.about.service.IAboutPartThreeService; +import jdk.nashorn.internal.ir.annotations.Reference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** @@ -17,7 +19,8 @@ import java.util.List; */ @Service public class AboutPartThreeServiceImpl extends ServiceImpl implements IAboutPartThreeService { - @Autowired + + @Resource private AboutPartThreeMapper aboutPartThreeMapper; @Override diff --git a/src/main/java/com/ruoyi/project/common/CaptchaController.java b/src/main/java/com/jg/project/common/CaptchaController.java similarity index 86% rename from src/main/java/com/ruoyi/project/common/CaptchaController.java rename to src/main/java/com/jg/project/common/CaptchaController.java index 0948ce3..24f7fd2 100644 --- a/src/main/java/com/ruoyi/project/common/CaptchaController.java +++ b/src/main/java/com/jg/project/common/CaptchaController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.common; +package com.jg.project.common; import java.awt.image.BufferedImage; import java.io.IOException; @@ -12,18 +12,18 @@ import org.springframework.util.FastByteArrayOutputStream; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import com.google.code.kaptcha.Producer; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.sign.Base64; -import com.ruoyi.common.utils.uuid.IdUtils; -import com.ruoyi.framework.redis.RedisCache; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.project.system.service.ISysConfigService; +import com.jg.common.constant.CacheConstants; +import com.jg.common.constant.Constants; +import com.jg.common.utils.sign.Base64; +import com.jg.common.utils.uuid.IdUtils; +import com.jg.framework.redis.RedisCache; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.project.system.service.ISysConfigService; /** * 验证码操作处理 * - * @author ruoyi + * @author jg */ @RestController public class CaptchaController @@ -38,7 +38,7 @@ public class CaptchaController private RedisCache redisCache; // 验证码类型 - @Value("${ruoyi.captchaType}") + @Value("${jg.captchaType}") private String captchaType; @Autowired diff --git a/src/main/java/com/ruoyi/project/common/CommonController.java b/src/main/java/com/jg/project/common/CommonController.java similarity index 89% rename from src/main/java/com/ruoyi/project/common/CommonController.java rename to src/main/java/com/jg/project/common/CommonController.java index b48e02e..d42498a 100644 --- a/src/main/java/com/ruoyi/project/common/CommonController.java +++ b/src/main/java/com/jg/project/common/CommonController.java @@ -1,9 +1,11 @@ -package com.ruoyi.project.common; +package com.jg.project.common; import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.jg.framework.config.JGConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -13,18 +15,17 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.constant.Constants; -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; +import com.jg.common.constant.Constants; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.file.FileUploadUtils; +import com.jg.common.utils.file.FileUtils; +import com.jg.framework.config.ServerConfig; +import com.jg.framework.web.domain.AjaxResult; /** * 通用请求处理 * - * @author ruoyi + * @author jg */ @RestController @RequestMapping("/common") @@ -53,7 +54,7 @@ public class CommonController throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName)); } String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1); - String filePath = RuoYiConfig.getDownloadPath() + fileName; + String filePath = JGConfig.getDownloadPath() + fileName; response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); FileUtils.setAttachmentResponseHeader(response, realFileName); @@ -78,7 +79,7 @@ public class CommonController try { // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); + String filePath = JGConfig.getUploadPath(); // 上传并返回新文件名称 String fileName = FileUploadUtils.upload(filePath, file); String url = serverConfig.getUrl() + fileName; @@ -104,7 +105,7 @@ public class CommonController try { // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); + String filePath = JGConfig.getUploadPath(); List urls = new ArrayList(); List fileNames = new ArrayList(); List newFileNames = new ArrayList(); @@ -146,7 +147,7 @@ public class CommonController throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource)); } // 本地资源路径 - String localPath = RuoYiConfig.getProfile(); + String localPath = JGConfig.getProfile(); // 数据库资源地址 String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX); // 下载名称 diff --git a/src/main/java/com/ruoyi/project/monitor/controller/CacheController.java b/src/main/java/com/jg/project/monitor/controller/CacheController.java similarity index 94% rename from src/main/java/com/ruoyi/project/monitor/controller/CacheController.java rename to src/main/java/com/jg/project/monitor/controller/CacheController.java index fdb04ef..8d216cf 100644 --- a/src/main/java/com/ruoyi/project/monitor/controller/CacheController.java +++ b/src/main/java/com/jg/project/monitor/controller/CacheController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.monitor.controller; +package com.jg.project.monitor.controller; import java.util.ArrayList; import java.util.Collection; @@ -16,15 +16,15 @@ 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.common.constant.CacheConstants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.project.monitor.domain.SysCache; +import com.jg.common.constant.CacheConstants; +import com.jg.common.utils.StringUtils; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.project.monitor.domain.SysCache; /** * 缓存监控 * - * @author ruoyi + * @author jg */ @RestController @RequestMapping("/monitor/cache") diff --git a/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java b/src/main/java/com/jg/project/monitor/controller/ServerController.java similarity index 79% rename from src/main/java/com/ruoyi/project/monitor/controller/ServerController.java rename to src/main/java/com/jg/project/monitor/controller/ServerController.java index e1f55f1..21750f9 100644 --- a/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java +++ b/src/main/java/com/jg/project/monitor/controller/ServerController.java @@ -1,16 +1,16 @@ -package com.ruoyi.project.monitor.controller; +package com.jg.project.monitor.controller; 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.domain.AjaxResult; -import com.ruoyi.framework.web.domain.Server; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.framework.web.domain.Server; /** * 服务器监控 * - * @author ruoyi + * @author jg */ @RestController @RequestMapping("/monitor/server") diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java b/src/main/java/com/jg/project/monitor/controller/SysJobController.java similarity index 90% rename from src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java rename to src/main/java/com/jg/project/monitor/controller/SysJobController.java index 5fb2bbd..b43613a 100644 --- a/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java +++ b/src/main/java/com/jg/project/monitor/controller/SysJobController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.monitor.controller; +package com.jg.project.monitor.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -13,24 +13,24 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.job.CronUtils; -import com.ruoyi.common.utils.job.ScheduleUtils; -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.jg.common.constant.Constants; +import com.jg.common.exception.job.TaskException; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.job.CronUtils; +import com.jg.common.utils.job.ScheduleUtils; +import com.jg.common.utils.poi.ExcelUtil; +import com.jg.framework.aspectj.lang.annotation.Log; +import com.jg.framework.aspectj.lang.enums.BusinessType; +import com.jg.framework.web.controller.BaseController; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.framework.web.page.TableDataInfo; +import com.jg.project.monitor.domain.SysJob; +import com.jg.project.monitor.service.ISysJobService; /** * 调度任务信息操作处理 * - * @author ruoyi + * @author jg */ @RestController @RequestMapping("/monitor/job") diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java b/src/main/java/com/jg/project/monitor/controller/SysJobLogController.java similarity index 84% rename from src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java rename to src/main/java/com/jg/project/monitor/controller/SysJobLogController.java index 2061c55..7cb686e 100644 --- a/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java +++ b/src/main/java/com/jg/project/monitor/controller/SysJobLogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.monitor.controller; +package com.jg.project.monitor.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -10,19 +10,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -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.SysJobLog; -import com.ruoyi.project.monitor.service.ISysJobLogService; +import com.jg.common.utils.poi.ExcelUtil; +import com.jg.framework.aspectj.lang.annotation.Log; +import com.jg.framework.aspectj.lang.enums.BusinessType; +import com.jg.framework.web.controller.BaseController; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.framework.web.page.TableDataInfo; +import com.jg.project.monitor.domain.SysJobLog; +import com.jg.project.monitor.service.ISysJobLogService; /** * 调度日志操作处理 * - * @author ruoyi + * @author jg */ @RestController @RequestMapping("/monitor/jobLog") diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java b/src/main/java/com/jg/project/monitor/controller/SysLogininforController.java similarity index 81% rename from src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java rename to src/main/java/com/jg/project/monitor/controller/SysLogininforController.java index 4371d9a..c590d5e 100644 --- a/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java +++ b/src/main/java/com/jg/project/monitor/controller/SysLogininforController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.monitor.controller; +package com.jg.project.monitor.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -10,20 +10,20 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -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.service.SysPasswordService; -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.jg.common.utils.poi.ExcelUtil; +import com.jg.framework.aspectj.lang.annotation.Log; +import com.jg.framework.aspectj.lang.enums.BusinessType; +import com.jg.framework.security.service.SysPasswordService; +import com.jg.framework.web.controller.BaseController; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.framework.web.page.TableDataInfo; +import com.jg.project.monitor.domain.SysLogininfor; +import com.jg.project.monitor.service.ISysLogininforService; /** * 系统访问记录 * - * @author ruoyi + * @author jg */ @RestController @RequestMapping("/monitor/logininfor") diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java b/src/main/java/com/jg/project/monitor/controller/SysOperlogController.java similarity index 80% rename from src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java rename to src/main/java/com/jg/project/monitor/controller/SysOperlogController.java index 703077e..2d1bf24 100644 --- a/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java +++ b/src/main/java/com/jg/project/monitor/controller/SysOperlogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.monitor.controller; +package com.jg.project.monitor.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -10,19 +10,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -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.jg.common.utils.poi.ExcelUtil; +import com.jg.framework.aspectj.lang.annotation.Log; +import com.jg.framework.aspectj.lang.enums.BusinessType; +import com.jg.framework.web.controller.BaseController; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.framework.web.page.TableDataInfo; +import com.jg.project.monitor.domain.SysOperLog; +import com.jg.project.monitor.service.ISysOperLogService; /** * 操作日志记录 * - * @author ruoyi + * @author jg */ @RestController @RequestMapping("/monitor/operlog") diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java b/src/main/java/com/jg/project/monitor/controller/SysUserOnlineController.java similarity index 79% rename from src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java rename to src/main/java/com/jg/project/monitor/controller/SysUserOnlineController.java index 913d93f..4cd57f9 100644 --- a/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java +++ b/src/main/java/com/jg/project/monitor/controller/SysUserOnlineController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.monitor.controller; +package com.jg.project.monitor.controller; import java.util.ArrayList; import java.util.Collection; @@ -11,22 +11,22 @@ 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.common.constant.CacheConstants; -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.jg.common.constant.CacheConstants; +import com.jg.common.utils.StringUtils; +import com.jg.framework.aspectj.lang.annotation.Log; +import com.jg.framework.aspectj.lang.enums.BusinessType; +import com.jg.framework.redis.RedisCache; +import com.jg.framework.security.LoginUser; +import com.jg.framework.web.controller.BaseController; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.framework.web.page.TableDataInfo; +import com.jg.project.monitor.domain.SysUserOnline; +import com.jg.project.system.service.ISysUserOnlineService; /** * 在线用户监控 * - * @author ruoyi + * @author jg */ @RestController @RequestMapping("/monitor/online") diff --git a/src/main/java/com/ruoyi/project/monitor/domain/SysCache.java b/src/main/java/com/jg/project/monitor/domain/SysCache.java similarity index 93% rename from src/main/java/com/ruoyi/project/monitor/domain/SysCache.java rename to src/main/java/com/jg/project/monitor/domain/SysCache.java index ac32647..730847b 100644 --- a/src/main/java/com/ruoyi/project/monitor/domain/SysCache.java +++ b/src/main/java/com/jg/project/monitor/domain/SysCache.java @@ -1,11 +1,11 @@ -package com.ruoyi.project.monitor.domain; +package com.jg.project.monitor.domain; -import com.ruoyi.common.utils.StringUtils; +import com.jg.common.utils.StringUtils; /** * 缓存信息 * - * @author ruoyi + * @author jg */ public class SysCache { diff --git a/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java b/src/main/java/com/jg/project/monitor/domain/SysJob.java similarity index 91% rename from src/main/java/com/ruoyi/project/monitor/domain/SysJob.java rename to src/main/java/com/jg/project/monitor/domain/SysJob.java index 25e77f2..9e0d9a2 100644 --- a/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java +++ b/src/main/java/com/jg/project/monitor/domain/SysJob.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.monitor.domain; +package com.jg.project.monitor.domain; import java.util.Date; import javax.validation.constraints.NotBlank; @@ -6,17 +6,17 @@ import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.constant.ScheduleConstants; -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.jg.common.constant.ScheduleConstants; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.job.CronUtils; +import com.jg.framework.aspectj.lang.annotation.Excel; +import com.jg.framework.aspectj.lang.annotation.Excel.ColumnType; +import com.jg.framework.web.domain.BaseEntity; /** * 定时任务调度表 sys_job * - * @author ruoyi + * @author jg */ public class SysJob extends BaseEntity { diff --git a/src/main/java/com/ruoyi/project/monitor/domain/SysJobLog.java b/src/main/java/com/jg/project/monitor/domain/SysJobLog.java similarity index 94% rename from src/main/java/com/ruoyi/project/monitor/domain/SysJobLog.java rename to src/main/java/com/jg/project/monitor/domain/SysJobLog.java index c7a3cd2..7538431 100644 --- a/src/main/java/com/ruoyi/project/monitor/domain/SysJobLog.java +++ b/src/main/java/com/jg/project/monitor/domain/SysJobLog.java @@ -1,15 +1,15 @@ -package com.ruoyi.project.monitor.domain; +package com.jg.project.monitor.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.jg.framework.aspectj.lang.annotation.Excel; +import com.jg.framework.web.domain.BaseEntity; /** * 定时任务调度日志表 sys_job_log * - * @author ruoyi + * @author jg */ public class SysJobLog extends BaseEntity { diff --git a/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java b/src/main/java/com/jg/project/monitor/domain/SysLogininfor.java similarity index 91% rename from src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java rename to src/main/java/com/jg/project/monitor/domain/SysLogininfor.java index 147a0a5..82c5dc5 100644 --- a/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java +++ b/src/main/java/com/jg/project/monitor/domain/SysLogininfor.java @@ -1,15 +1,15 @@ -package com.ruoyi.project.monitor.domain; +package com.jg.project.monitor.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.jg.framework.aspectj.lang.annotation.Excel; +import com.jg.framework.aspectj.lang.annotation.Excel.ColumnType; +import com.jg.framework.web.domain.BaseEntity; /** * 系统访问记录表 sys_logininfor * - * @author ruoyi + * @author jg */ public class SysLogininfor extends BaseEntity { diff --git a/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java b/src/main/java/com/jg/project/monitor/domain/SysOperLog.java similarity index 95% rename from src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java rename to src/main/java/com/jg/project/monitor/domain/SysOperLog.java index 5dad339..ac2c77f 100644 --- a/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java +++ b/src/main/java/com/jg/project/monitor/domain/SysOperLog.java @@ -1,15 +1,15 @@ -package com.ruoyi.project.monitor.domain; +package com.jg.project.monitor.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.jg.framework.aspectj.lang.annotation.Excel; +import com.jg.framework.aspectj.lang.annotation.Excel.ColumnType; +import com.jg.framework.web.domain.BaseEntity; /** * 操作日志记录表 oper_log * - * @author ruoyi + * @author jg */ public class SysOperLog extends BaseEntity { diff --git a/src/main/java/com/ruoyi/project/monitor/domain/SysUserOnline.java b/src/main/java/com/jg/project/monitor/domain/SysUserOnline.java similarity index 96% rename from src/main/java/com/ruoyi/project/monitor/domain/SysUserOnline.java rename to src/main/java/com/jg/project/monitor/domain/SysUserOnline.java index 387d49c..7ec79fe 100644 --- a/src/main/java/com/ruoyi/project/monitor/domain/SysUserOnline.java +++ b/src/main/java/com/jg/project/monitor/domain/SysUserOnline.java @@ -1,9 +1,9 @@ -package com.ruoyi.project.monitor.domain; +package com.jg.project.monitor.domain; /** * 当前在线会话 * - * @author ruoyi + * @author jg */ public class SysUserOnline { diff --git a/src/main/java/com/ruoyi/project/monitor/mapper/SysJobLogMapper.java b/src/main/java/com/jg/project/monitor/mapper/SysJobLogMapper.java similarity index 91% rename from src/main/java/com/ruoyi/project/monitor/mapper/SysJobLogMapper.java rename to src/main/java/com/jg/project/monitor/mapper/SysJobLogMapper.java index 39137dd..07df7c6 100644 --- a/src/main/java/com/ruoyi/project/monitor/mapper/SysJobLogMapper.java +++ b/src/main/java/com/jg/project/monitor/mapper/SysJobLogMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.monitor.mapper; +package com.jg.project.monitor.mapper; import java.util.List; -import com.ruoyi.project.monitor.domain.SysJobLog; +import com.jg.project.monitor.domain.SysJobLog; /** * 调度任务日志信息 数据层 * - * @author ruoyi + * @author jg */ public interface SysJobLogMapper { diff --git a/src/main/java/com/ruoyi/project/monitor/mapper/SysJobMapper.java b/src/main/java/com/jg/project/monitor/mapper/SysJobMapper.java similarity index 92% rename from src/main/java/com/ruoyi/project/monitor/mapper/SysJobMapper.java rename to src/main/java/com/jg/project/monitor/mapper/SysJobMapper.java index ab11461..a30918b 100644 --- a/src/main/java/com/ruoyi/project/monitor/mapper/SysJobMapper.java +++ b/src/main/java/com/jg/project/monitor/mapper/SysJobMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.monitor.mapper; +package com.jg.project.monitor.mapper; import java.util.List; -import com.ruoyi.project.monitor.domain.SysJob; +import com.jg.project.monitor.domain.SysJob; /** * 调度任务信息 数据层 * - * @author ruoyi + * @author jg */ public interface SysJobMapper { diff --git a/src/main/java/com/ruoyi/project/monitor/mapper/SysLogininforMapper.java b/src/main/java/com/jg/project/monitor/mapper/SysLogininforMapper.java similarity index 87% rename from src/main/java/com/ruoyi/project/monitor/mapper/SysLogininforMapper.java rename to src/main/java/com/jg/project/monitor/mapper/SysLogininforMapper.java index 05b8c9b..009048d 100644 --- a/src/main/java/com/ruoyi/project/monitor/mapper/SysLogininforMapper.java +++ b/src/main/java/com/jg/project/monitor/mapper/SysLogininforMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.monitor.mapper; +package com.jg.project.monitor.mapper; import java.util.List; -import com.ruoyi.project.monitor.domain.SysLogininfor; +import com.jg.project.monitor.domain.SysLogininfor; /** * 系统访问日志情况信息 数据层 * - * @author ruoyi + * @author jg */ public interface SysLogininforMapper { diff --git a/src/main/java/com/ruoyi/project/monitor/mapper/SysOperLogMapper.java b/src/main/java/com/jg/project/monitor/mapper/SysOperLogMapper.java similarity index 88% rename from src/main/java/com/ruoyi/project/monitor/mapper/SysOperLogMapper.java rename to src/main/java/com/jg/project/monitor/mapper/SysOperLogMapper.java index ed5d573..f1bc671 100644 --- a/src/main/java/com/ruoyi/project/monitor/mapper/SysOperLogMapper.java +++ b/src/main/java/com/jg/project/monitor/mapper/SysOperLogMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.monitor.mapper; +package com.jg.project.monitor.mapper; import java.util.List; -import com.ruoyi.project.monitor.domain.SysOperLog; +import com.jg.project.monitor.domain.SysOperLog; /** * 操作日志 数据层 * - * @author ruoyi + * @author jg */ public interface SysOperLogMapper { diff --git a/src/main/java/com/ruoyi/project/monitor/service/ISysJobLogService.java b/src/main/java/com/jg/project/monitor/service/ISysJobLogService.java similarity index 90% rename from src/main/java/com/ruoyi/project/monitor/service/ISysJobLogService.java rename to src/main/java/com/jg/project/monitor/service/ISysJobLogService.java index 85561e7..21ef36a 100644 --- a/src/main/java/com/ruoyi/project/monitor/service/ISysJobLogService.java +++ b/src/main/java/com/jg/project/monitor/service/ISysJobLogService.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.monitor.service; +package com.jg.project.monitor.service; import java.util.List; -import com.ruoyi.project.monitor.domain.SysJobLog; +import com.jg.project.monitor.domain.SysJobLog; /** * 定时任务调度日志信息信息 服务层 * - * @author ruoyi + * @author jg */ public interface ISysJobLogService { diff --git a/src/main/java/com/ruoyi/project/monitor/service/ISysJobService.java b/src/main/java/com/jg/project/monitor/service/ISysJobService.java similarity index 93% rename from src/main/java/com/ruoyi/project/monitor/service/ISysJobService.java rename to src/main/java/com/jg/project/monitor/service/ISysJobService.java index d834f67..ec84d1e 100644 --- a/src/main/java/com/ruoyi/project/monitor/service/ISysJobService.java +++ b/src/main/java/com/jg/project/monitor/service/ISysJobService.java @@ -1,14 +1,14 @@ -package com.ruoyi.project.monitor.service; +package com.jg.project.monitor.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.jg.common.exception.job.TaskException; +import com.jg.project.monitor.domain.SysJob; /** * 定时任务调度信息信息 服务层 * - * @author ruoyi + * @author jg */ public interface ISysJobService { diff --git a/src/main/java/com/ruoyi/project/monitor/service/ISysLogininforService.java b/src/main/java/com/jg/project/monitor/service/ISysLogininforService.java similarity index 87% rename from src/main/java/com/ruoyi/project/monitor/service/ISysLogininforService.java rename to src/main/java/com/jg/project/monitor/service/ISysLogininforService.java index ac51166..868d694 100644 --- a/src/main/java/com/ruoyi/project/monitor/service/ISysLogininforService.java +++ b/src/main/java/com/jg/project/monitor/service/ISysLogininforService.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.monitor.service; +package com.jg.project.monitor.service; import java.util.List; -import com.ruoyi.project.monitor.domain.SysLogininfor; +import com.jg.project.monitor.domain.SysLogininfor; /** * 系统访问日志情况信息 服务层 * - * @author ruoyi + * @author jg */ public interface ISysLogininforService { diff --git a/src/main/java/com/ruoyi/project/monitor/service/ISysOperLogService.java b/src/main/java/com/jg/project/monitor/service/ISysOperLogService.java similarity index 88% rename from src/main/java/com/ruoyi/project/monitor/service/ISysOperLogService.java rename to src/main/java/com/jg/project/monitor/service/ISysOperLogService.java index 0e63d8d..4f8def6 100644 --- a/src/main/java/com/ruoyi/project/monitor/service/ISysOperLogService.java +++ b/src/main/java/com/jg/project/monitor/service/ISysOperLogService.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.monitor.service; +package com.jg.project.monitor.service; import java.util.List; -import com.ruoyi.project.monitor.domain.SysOperLog; +import com.jg.project.monitor.domain.SysOperLog; /** * 操作日志 服务层 * - * @author ruoyi + * @author jg */ public interface ISysOperLogService { diff --git a/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.java b/src/main/java/com/jg/project/monitor/service/impl/SysJobLogServiceImpl.java similarity index 88% rename from src/main/java/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.java rename to src/main/java/com/jg/project/monitor/service/impl/SysJobLogServiceImpl.java index 991cf81..73c414d 100644 --- a/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.java +++ b/src/main/java/com/jg/project/monitor/service/impl/SysJobLogServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.project.monitor.service.impl; +package com.jg.project.monitor.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.jg.project.monitor.domain.SysJobLog; +import com.jg.project.monitor.mapper.SysJobLogMapper; +import com.jg.project.monitor.service.ISysJobLogService; /** * 定时任务调度日志信息 服务层 * - * @author ruoyi + * @author jg */ @Service public class SysJobLogServiceImpl implements ISysJobLogService diff --git a/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java b/src/main/java/com/jg/project/monitor/service/impl/SysJobServiceImpl.java similarity index 94% rename from src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java rename to src/main/java/com/jg/project/monitor/service/impl/SysJobServiceImpl.java index 4f2bec5..5b347a6 100644 --- a/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java +++ b/src/main/java/com/jg/project/monitor/service/impl/SysJobServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.monitor.service.impl; +package com.jg.project.monitor.service.impl; import java.util.List; import javax.annotation.PostConstruct; @@ -9,18 +9,18 @@ import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; 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.jg.common.constant.ScheduleConstants; +import com.jg.common.exception.job.TaskException; +import com.jg.common.utils.job.CronUtils; +import com.jg.common.utils.job.ScheduleUtils; +import com.jg.project.monitor.domain.SysJob; +import com.jg.project.monitor.mapper.SysJobMapper; +import com.jg.project.monitor.service.ISysJobService; /** * 定时任务调度信息 服务层 * - * @author ruoyi + * @author jg */ @Service public class SysJobServiceImpl implements ISysJobService diff --git a/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java b/src/main/java/com/jg/project/monitor/service/impl/SysLogininforServiceImpl.java similarity index 84% rename from src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java rename to src/main/java/com/jg/project/monitor/service/impl/SysLogininforServiceImpl.java index e9b099f..f86f5a7 100644 --- a/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java +++ b/src/main/java/com/jg/project/monitor/service/impl/SysLogininforServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.project.monitor.service.impl; +package com.jg.project.monitor.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.jg.project.monitor.domain.SysLogininfor; +import com.jg.project.monitor.mapper.SysLogininforMapper; +import com.jg.project.monitor.service.ISysLogininforService; /** * 系统访问日志情况信息 服务层处理 * - * @author ruoyi + * @author jg */ @Service public class SysLogininforServiceImpl implements ISysLogininforService diff --git a/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java b/src/main/java/com/jg/project/monitor/service/impl/SysOperLogServiceImpl.java similarity index 86% rename from src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java rename to src/main/java/com/jg/project/monitor/service/impl/SysOperLogServiceImpl.java index bed9d8d..9fa2498 100644 --- a/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java +++ b/src/main/java/com/jg/project/monitor/service/impl/SysOperLogServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.project.monitor.service.impl; +package com.jg.project.monitor.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.jg.project.monitor.domain.SysOperLog; +import com.jg.project.monitor.mapper.SysOperLogMapper; +import com.jg.project.monitor.service.ISysOperLogService; /** * 操作日志 服务层处理 * - * @author ruoyi + * @author jg */ @Service public class SysOperLogServiceImpl implements ISysOperLogService diff --git a/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java b/src/main/java/com/jg/project/system/controller/SysConfigController.java similarity index 89% rename from src/main/java/com/ruoyi/project/system/controller/SysConfigController.java rename to src/main/java/com/jg/project/system/controller/SysConfigController.java index a4df558..ea3e1b4 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java +++ b/src/main/java/com/jg/project/system/controller/SysConfigController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.jg.project.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -13,19 +13,19 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.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.jg.common.utils.poi.ExcelUtil; +import com.jg.framework.aspectj.lang.annotation.Log; +import com.jg.framework.aspectj.lang.enums.BusinessType; +import com.jg.framework.web.controller.BaseController; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.framework.web.page.TableDataInfo; +import com.jg.project.system.domain.SysConfig; +import com.jg.project.system.service.ISysConfigService; /** * 参数配置 信息操作处理 * - * @author ruoyi + * @author jg */ @RestController @RequestMapping("/system/config") diff --git a/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java b/src/main/java/com/jg/project/system/controller/SysDeptController.java similarity index 89% rename from src/main/java/com/ruoyi/project/system/controller/SysDeptController.java rename to src/main/java/com/jg/project/system/controller/SysDeptController.java index 30eee7d..b48b57f 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java +++ b/src/main/java/com/jg/project/system/controller/SysDeptController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.jg.project.system.controller; import java.util.List; import org.apache.commons.lang3.ArrayUtils; @@ -13,19 +13,19 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.constant.UserConstants; -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.jg.common.constant.UserConstants; +import com.jg.common.utils.StringUtils; +import com.jg.framework.aspectj.lang.annotation.Log; +import com.jg.framework.aspectj.lang.enums.BusinessType; +import com.jg.framework.web.controller.BaseController; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.project.system.domain.SysDept; +import com.jg.project.system.service.ISysDeptService; /** * 部门信息 * - * @author ruoyi + * @author jg */ @RestController @RequestMapping("/system/dept") diff --git a/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java b/src/main/java/com/jg/project/system/controller/SysDictDataController.java similarity index 85% rename from src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java rename to src/main/java/com/jg/project/system/controller/SysDictDataController.java index c76a214..ed3fcfb 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java +++ b/src/main/java/com/jg/project/system/controller/SysDictDataController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.jg.project.system.controller; import java.util.ArrayList; import java.util.List; @@ -14,21 +14,21 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.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.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.jg.common.utils.StringUtils; +import com.jg.common.utils.poi.ExcelUtil; +import com.jg.framework.aspectj.lang.annotation.Log; +import com.jg.framework.aspectj.lang.enums.BusinessType; +import com.jg.framework.web.controller.BaseController; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.framework.web.page.TableDataInfo; +import com.jg.project.system.domain.SysDictData; +import com.jg.project.system.service.ISysDictDataService; +import com.jg.project.system.service.ISysDictTypeService; /** * 数据字典信息 * - * @author ruoyi + * @author jg */ @RestController @RequestMapping("/system/dict/data") diff --git a/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java b/src/main/java/com/jg/project/system/controller/SysDictTypeController.java similarity index 88% rename from src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java rename to src/main/java/com/jg/project/system/controller/SysDictTypeController.java index c3a4d0c..fb21899 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java +++ b/src/main/java/com/jg/project/system/controller/SysDictTypeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.jg.project.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -13,19 +13,19 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.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.jg.common.utils.poi.ExcelUtil; +import com.jg.framework.aspectj.lang.annotation.Log; +import com.jg.framework.aspectj.lang.enums.BusinessType; +import com.jg.framework.web.controller.BaseController; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.framework.web.page.TableDataInfo; +import com.jg.project.system.domain.SysDictType; +import com.jg.project.system.service.ISysDictTypeService; /** * 数据字典信息 * - * @author ruoyi + * @author jg */ @RestController @RequestMapping("/system/dict/type") diff --git a/src/main/java/com/ruoyi/project/system/controller/SysIndexController.java b/src/main/java/com/jg/project/system/controller/SysIndexController.java similarity index 61% rename from src/main/java/com/ruoyi/project/system/controller/SysIndexController.java rename to src/main/java/com/jg/project/system/controller/SysIndexController.java index 5b587e2..14afe75 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysIndexController.java +++ b/src/main/java/com/jg/project/system/controller/SysIndexController.java @@ -1,22 +1,23 @@ -package com.ruoyi.project.system.controller; +package com.jg.project.system.controller; +import com.jg.framework.config.JGConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.config.RuoYiConfig; +import com.jg.common.utils.StringUtils; + /** * 首页 * - * @author ruoyi + * @author jg */ @RestController public class SysIndexController { /** 系统基础配置 */ @Autowired - private RuoYiConfig ruoyiConfig; + private JGConfig jgConfig; /** * 访问首页，提示语 @@ -24,6 +25,6 @@ public class SysIndexController @RequestMapping("/") public String index() { - return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion()); + return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", jgConfig.getName(), jgConfig.getVersion()); } } diff --git a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/src/main/java/com/jg/project/system/controller/SysLoginController.java similarity index 79% rename from src/main/java/com/ruoyi/project/system/controller/SysLoginController.java rename to src/main/java/com/jg/project/system/controller/SysLoginController.java index 2e707af..efbb2bf 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java +++ b/src/main/java/com/jg/project/system/controller/SysLoginController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.jg.project.system.controller; import java.util.List; import java.util.Set; @@ -7,20 +7,20 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.framework.security.LoginBody; -import com.ruoyi.framework.security.service.SysLoginService; -import com.ruoyi.framework.security.service.SysPermissionService; -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.jg.common.constant.Constants; +import com.jg.common.utils.SecurityUtils; +import com.jg.framework.security.LoginBody; +import com.jg.framework.security.service.SysLoginService; +import com.jg.framework.security.service.SysPermissionService; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.project.system.domain.SysMenu; +import com.jg.project.system.domain.SysUser; +import com.jg.project.system.service.ISysMenuService; /** * 登录验证 * - * @author ruoyi + * @author jg */ @RestController public class SysLoginController diff --git a/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java b/src/main/java/com/jg/project/system/controller/SysMenuController.java similarity index 90% rename from src/main/java/com/ruoyi/project/system/controller/SysMenuController.java rename to src/main/java/com/jg/project/system/controller/SysMenuController.java index 1e2ccf0..8a54360 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java +++ b/src/main/java/com/jg/project/system/controller/SysMenuController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.jg.project.system.controller; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.constant.UserConstants; -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.SysMenu; -import com.ruoyi.project.system.service.ISysMenuService; +import com.jg.common.constant.UserConstants; +import com.jg.common.utils.StringUtils; +import com.jg.framework.aspectj.lang.annotation.Log; +import com.jg.framework.aspectj.lang.enums.BusinessType; +import com.jg.framework.web.controller.BaseController; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.project.system.domain.SysMenu; +import com.jg.project.system.service.ISysMenuService; /** * 菜单信息 * - * @author ruoyi + * @author jg */ @RestController @RequestMapping("/system/menu") diff --git a/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java b/src/main/java/com/jg/project/system/controller/SysNoticeController.java similarity index 85% rename from src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java rename to src/main/java/com/jg/project/system/controller/SysNoticeController.java index 6519ae3..352f6e4 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java +++ b/src/main/java/com/jg/project/system/controller/SysNoticeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.jg.project.system.controller; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,18 +12,18 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.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.jg.framework.aspectj.lang.annotation.Log; +import com.jg.framework.aspectj.lang.enums.BusinessType; +import com.jg.framework.web.controller.BaseController; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.framework.web.page.TableDataInfo; +import com.jg.project.system.domain.SysNotice; +import com.jg.project.system.service.ISysNoticeService; /** * 公告 信息操作处理 * - * @author ruoyi + * @author jg */ @RestController @RequestMapping("/system/notice") diff --git a/src/main/java/com/ruoyi/project/system/controller/SysPostController.java b/src/main/java/com/jg/project/system/controller/SysPostController.java similarity index 88% rename from src/main/java/com/ruoyi/project/system/controller/SysPostController.java rename to src/main/java/com/jg/project/system/controller/SysPostController.java index 6bf46a1..523f76a 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysPostController.java +++ b/src/main/java/com/jg/project/system/controller/SysPostController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.jg.project.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -13,19 +13,19 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.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.jg.common.utils.poi.ExcelUtil; +import com.jg.framework.aspectj.lang.annotation.Log; +import com.jg.framework.aspectj.lang.enums.BusinessType; +import com.jg.framework.web.controller.BaseController; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.framework.web.page.TableDataInfo; +import com.jg.project.system.domain.SysPost; +import com.jg.project.system.service.ISysPostService; /** * 岗位信息操作处理 * - * @author ruoyi + * @author jg */ @RestController @RequestMapping("/system/post") diff --git a/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java b/src/main/java/com/jg/project/system/controller/SysProfileController.java similarity index 83% rename from src/main/java/com/ruoyi/project/system/controller/SysProfileController.java rename to src/main/java/com/jg/project/system/controller/SysProfileController.java index c56c92e..740c64b 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java +++ b/src/main/java/com/jg/project/system/controller/SysProfileController.java @@ -1,5 +1,6 @@ -package com.ruoyi.project.system.controller; +package com.jg.project.system.controller; +import com.jg.framework.config.JGConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -9,24 +10,23 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.common.utils.file.MimeTypeUtils; -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.jg.common.utils.SecurityUtils; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.file.FileUploadUtils; +import com.jg.common.utils.file.MimeTypeUtils; +import com.jg.framework.aspectj.lang.annotation.Log; +import com.jg.framework.aspectj.lang.enums.BusinessType; +import com.jg.framework.security.LoginUser; +import com.jg.framework.security.service.TokenService; +import com.jg.framework.web.controller.BaseController; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.project.system.domain.SysUser; +import com.jg.project.system.service.ISysUserService; /** * 个人信息 业务处理 * - * @author ruoyi + * @author jg */ @RestController @RequestMapping("/system/user/profile") @@ -121,7 +121,7 @@ public class SysProfileController extends BaseController if (!file.isEmpty()) { LoginUser loginUser = getLoginUser(); - String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION); + String avatar = FileUploadUtils.upload(JGConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION); if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) { AjaxResult ajax = AjaxResult.success(); diff --git a/src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java b/src/main/java/com/jg/project/system/controller/SysRegisterController.java similarity index 69% rename from src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java rename to src/main/java/com/jg/project/system/controller/SysRegisterController.java index d8f570a..1d0aaff 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java +++ b/src/main/java/com/jg/project/system/controller/SysRegisterController.java @@ -1,20 +1,20 @@ -package com.ruoyi.project.system.controller; +package com.jg.project.system.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.security.RegisterBody; -import com.ruoyi.framework.security.service.SysRegisterService; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.project.system.service.ISysConfigService; +import com.jg.common.utils.StringUtils; +import com.jg.framework.security.RegisterBody; +import com.jg.framework.security.service.SysRegisterService; +import com.jg.framework.web.controller.BaseController; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.project.system.service.ISysConfigService; /** * 注册验证 * - * @author ruoyi + * @author jg */ @RestController public class SysRegisterController extends BaseController diff --git a/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java b/src/main/java/com/jg/project/system/controller/SysRoleController.java similarity index 89% rename from src/main/java/com/ruoyi/project/system/controller/SysRoleController.java rename to src/main/java/com/jg/project/system/controller/SysRoleController.java index 046bea7..4de9b82 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java +++ b/src/main/java/com/jg/project/system/controller/SysRoleController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.jg.project.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -13,28 +13,28 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.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.SysPermissionService; -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.SysDept; -import com.ruoyi.project.system.domain.SysRole; -import com.ruoyi.project.system.domain.SysUser; -import com.ruoyi.project.system.domain.SysUserRole; -import com.ruoyi.project.system.service.ISysDeptService; -import com.ruoyi.project.system.service.ISysRoleService; -import com.ruoyi.project.system.service.ISysUserService; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.poi.ExcelUtil; +import com.jg.framework.aspectj.lang.annotation.Log; +import com.jg.framework.aspectj.lang.enums.BusinessType; +import com.jg.framework.security.LoginUser; +import com.jg.framework.security.service.SysPermissionService; +import com.jg.framework.security.service.TokenService; +import com.jg.framework.web.controller.BaseController; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.framework.web.page.TableDataInfo; +import com.jg.project.system.domain.SysDept; +import com.jg.project.system.domain.SysRole; +import com.jg.project.system.domain.SysUser; +import com.jg.project.system.domain.SysUserRole; +import com.jg.project.system.service.ISysDeptService; +import com.jg.project.system.service.ISysRoleService; +import com.jg.project.system.service.ISysUserService; /** * 角色信息 * - * @author ruoyi + * @author jg */ @RestController @RequestMapping("/system/role") diff --git a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/src/main/java/com/jg/project/system/controller/SysUserController.java similarity index 91% rename from src/main/java/com/ruoyi/project/system/controller/SysUserController.java rename to src/main/java/com/jg/project/system/controller/SysUserController.java index 88586ce..29207ca 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java +++ b/src/main/java/com/jg/project/system/controller/SysUserController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.jg.project.system.controller; import java.util.List; import java.util.stream.Collectors; @@ -16,26 +16,26 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.utils.SecurityUtils; -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.web.controller.BaseController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.project.system.domain.SysDept; -import com.ruoyi.project.system.domain.SysRole; -import com.ruoyi.project.system.domain.SysUser; -import com.ruoyi.project.system.service.ISysDeptService; -import com.ruoyi.project.system.service.ISysPostService; -import com.ruoyi.project.system.service.ISysRoleService; -import com.ruoyi.project.system.service.ISysUserService; +import com.jg.common.utils.SecurityUtils; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.poi.ExcelUtil; +import com.jg.framework.aspectj.lang.annotation.Log; +import com.jg.framework.aspectj.lang.enums.BusinessType; +import com.jg.framework.web.controller.BaseController; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.framework.web.page.TableDataInfo; +import com.jg.project.system.domain.SysDept; +import com.jg.project.system.domain.SysRole; +import com.jg.project.system.domain.SysUser; +import com.jg.project.system.service.ISysDeptService; +import com.jg.project.system.service.ISysPostService; +import com.jg.project.system.service.ISysRoleService; +import com.jg.project.system.service.ISysUserService; /** * 用户信息 * - * @author ruoyi + * @author jg */ @RestController @RequestMapping("/system/user") diff --git a/src/main/java/com/ruoyi/project/system/domain/SysConfig.java b/src/main/java/com/jg/project/system/domain/SysConfig.java similarity index 92% rename from src/main/java/com/ruoyi/project/system/domain/SysConfig.java rename to src/main/java/com/jg/project/system/domain/SysConfig.java index f9b290b..43d02ab 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysConfig.java +++ b/src/main/java/com/jg/project/system/domain/SysConfig.java @@ -1,17 +1,17 @@ -package com.ruoyi.project.system.domain; +package com.jg.project.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.jg.framework.aspectj.lang.annotation.Excel; +import com.jg.framework.aspectj.lang.annotation.Excel.ColumnType; +import com.jg.framework.web.domain.BaseEntity; /** * 参数配置表 sys_config * - * @author ruoyi + * @author jg */ public class SysConfig extends BaseEntity { diff --git a/src/main/java/com/ruoyi/project/system/domain/SysDept.java b/src/main/java/com/jg/project/system/domain/SysDept.java similarity index 97% rename from src/main/java/com/ruoyi/project/system/domain/SysDept.java rename to src/main/java/com/jg/project/system/domain/SysDept.java index e97e9e8..b7fc9f1 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysDept.java +++ b/src/main/java/com/jg/project/system/domain/SysDept.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.domain; +package com.jg.project.system.domain; import java.util.ArrayList; import java.util.List; @@ -8,12 +8,12 @@ import javax.validation.constraints.NotNull; 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.jg.framework.web.domain.BaseEntity; /** * 部门表 sys_dept * - * @author ruoyi + * @author jg */ public class SysDept extends BaseEntity { diff --git a/src/main/java/com/ruoyi/project/system/domain/SysDictData.java b/src/main/java/com/jg/project/system/domain/SysDictData.java similarity index 93% rename from src/main/java/com/ruoyi/project/system/domain/SysDictData.java rename to src/main/java/com/jg/project/system/domain/SysDictData.java index b0a9a44..5878f79 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysDictData.java +++ b/src/main/java/com/jg/project/system/domain/SysDictData.java @@ -1,18 +1,18 @@ -package com.ruoyi.project.system.domain; +package com.jg.project.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.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.jg.common.constant.UserConstants; +import com.jg.framework.aspectj.lang.annotation.Excel; +import com.jg.framework.aspectj.lang.annotation.Excel.ColumnType; +import com.jg.framework.web.domain.BaseEntity; /** * 字典数据表 sys_dict_data * - * @author ruoyi + * @author jg */ public class SysDictData extends BaseEntity { diff --git a/src/main/java/com/ruoyi/project/system/domain/SysDictType.java b/src/main/java/com/jg/project/system/domain/SysDictType.java similarity index 91% rename from src/main/java/com/ruoyi/project/system/domain/SysDictType.java rename to src/main/java/com/jg/project/system/domain/SysDictType.java index 745296f..cb4cc5c 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysDictType.java +++ b/src/main/java/com/jg/project/system/domain/SysDictType.java @@ -1,18 +1,18 @@ -package com.ruoyi.project.system.domain; +package com.jg.project.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; 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.jg.framework.aspectj.lang.annotation.Excel; +import com.jg.framework.aspectj.lang.annotation.Excel.ColumnType; +import com.jg.framework.web.domain.BaseEntity; /** * 字典类型表 sys_dict_type * - * @author ruoyi + * @author jg */ public class SysDictType extends BaseEntity { diff --git a/src/main/java/com/ruoyi/project/system/domain/SysMenu.java b/src/main/java/com/jg/project/system/domain/SysMenu.java similarity index 98% rename from src/main/java/com/ruoyi/project/system/domain/SysMenu.java rename to src/main/java/com/jg/project/system/domain/SysMenu.java index 7aa7bbc..6efb5f2 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysMenu.java +++ b/src/main/java/com/jg/project/system/domain/SysMenu.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.domain; +package com.jg.project.system.domain; import java.util.ArrayList; import java.util.List; @@ -7,12 +7,12 @@ import javax.validation.constraints.NotNull; 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.jg.framework.web.domain.BaseEntity; /** * 菜单权限表 sys_menu * - * @author ruoyi + * @author jg */ public class SysMenu extends BaseEntity { diff --git a/src/main/java/com/ruoyi/project/system/domain/SysNotice.java b/src/main/java/com/jg/project/system/domain/SysNotice.java similarity index 94% rename from src/main/java/com/ruoyi/project/system/domain/SysNotice.java rename to src/main/java/com/jg/project/system/domain/SysNotice.java index 8b315a0..65ee9fa 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysNotice.java +++ b/src/main/java/com/jg/project/system/domain/SysNotice.java @@ -1,16 +1,16 @@ -package com.ruoyi.project.system.domain; +package com.jg.project.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.common.xss.Xss; -import com.ruoyi.framework.web.domain.BaseEntity; +import com.jg.common.xss.Xss; +import com.jg.framework.web.domain.BaseEntity; /** * 通知公告表 sys_notice * - * @author ruoyi + * @author jg */ public class SysNotice extends BaseEntity { diff --git a/src/main/java/com/ruoyi/project/system/domain/SysPost.java b/src/main/java/com/jg/project/system/domain/SysPost.java similarity index 92% rename from src/main/java/com/ruoyi/project/system/domain/SysPost.java rename to src/main/java/com/jg/project/system/domain/SysPost.java index eb403ff..27733d6 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysPost.java +++ b/src/main/java/com/jg/project/system/domain/SysPost.java @@ -1,18 +1,18 @@ -package com.ruoyi.project.system.domain; +package com.jg.project.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; 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.jg.framework.aspectj.lang.annotation.Excel; +import com.jg.framework.aspectj.lang.annotation.Excel.ColumnType; +import com.jg.framework.web.domain.BaseEntity; /** * 岗位表 sys_post * - * @author ruoyi + * @author jg */ public class SysPost extends BaseEntity { diff --git a/src/main/java/com/ruoyi/project/system/domain/SysRole.java b/src/main/java/com/jg/project/system/domain/SysRole.java similarity index 95% rename from src/main/java/com/ruoyi/project/system/domain/SysRole.java rename to src/main/java/com/jg/project/system/domain/SysRole.java index 71e817c..9836141 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysRole.java +++ b/src/main/java/com/jg/project/system/domain/SysRole.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.domain; +package com.jg.project.system.domain; import java.util.Set; import javax.validation.constraints.NotBlank; @@ -6,14 +6,14 @@ import javax.validation.constraints.NotNull; 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.jg.framework.aspectj.lang.annotation.Excel; +import com.jg.framework.aspectj.lang.annotation.Excel.ColumnType; +import com.jg.framework.web.domain.BaseEntity; /** * 角色表 sys_role * - * @author ruoyi + * @author jg */ public class SysRole extends BaseEntity { diff --git a/src/main/java/com/ruoyi/project/system/domain/SysRoleDept.java b/src/main/java/com/jg/project/system/domain/SysRoleDept.java similarity index 93% rename from src/main/java/com/ruoyi/project/system/domain/SysRoleDept.java rename to src/main/java/com/jg/project/system/domain/SysRoleDept.java index 5cbeed4..300f045 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysRoleDept.java +++ b/src/main/java/com/jg/project/system/domain/SysRoleDept.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.domain; +package com.jg.project.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 角色和部门关联 sys_role_dept * - * @author ruoyi + * @author jg */ public class SysRoleDept { diff --git a/src/main/java/com/ruoyi/project/system/domain/SysRoleMenu.java b/src/main/java/com/jg/project/system/domain/SysRoleMenu.java similarity index 93% rename from src/main/java/com/ruoyi/project/system/domain/SysRoleMenu.java rename to src/main/java/com/jg/project/system/domain/SysRoleMenu.java index 2772cbb..8968ac9 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysRoleMenu.java +++ b/src/main/java/com/jg/project/system/domain/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.domain; +package com.jg.project.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 角色和菜单关联 sys_role_menu * - * @author ruoyi + * @author jg */ public class SysRoleMenu { diff --git a/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/src/main/java/com/jg/project/system/domain/SysUser.java similarity index 94% rename from src/main/java/com/ruoyi/project/system/domain/SysUser.java rename to src/main/java/com/jg/project/system/domain/SysUser.java index 83db00b..52cdb08 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysUser.java +++ b/src/main/java/com/jg/project/system/domain/SysUser.java @@ -1,21 +1,21 @@ -package com.ruoyi.project.system.domain; +package com.jg.project.system.domain; import java.util.Date; import java.util.List; import javax.validation.constraints.*; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.xss.Xss; -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.jg.common.xss.Xss; +import com.jg.framework.aspectj.lang.annotation.Excel; +import com.jg.framework.aspectj.lang.annotation.Excel.ColumnType; +import com.jg.framework.aspectj.lang.annotation.Excel.Type; +import com.jg.framework.aspectj.lang.annotation.Excels; +import com.jg.framework.web.domain.BaseEntity; /** * 用户对象 sys_user * - * @author ruoyi + * @author jg */ public class SysUser extends BaseEntity { diff --git a/src/main/java/com/ruoyi/project/system/domain/SysUserPost.java b/src/main/java/com/jg/project/system/domain/SysUserPost.java similarity index 93% rename from src/main/java/com/ruoyi/project/system/domain/SysUserPost.java rename to src/main/java/com/jg/project/system/domain/SysUserPost.java index 2633a2f..ecfff27 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysUserPost.java +++ b/src/main/java/com/jg/project/system/domain/SysUserPost.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.domain; +package com.jg.project.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 用户和岗位关联 sys_user_post * - * @author ruoyi + * @author jg */ public class SysUserPost { diff --git a/src/main/java/com/ruoyi/project/system/domain/SysUserRole.java b/src/main/java/com/jg/project/system/domain/SysUserRole.java similarity index 93% rename from src/main/java/com/ruoyi/project/system/domain/SysUserRole.java rename to src/main/java/com/jg/project/system/domain/SysUserRole.java index 3be4829..50bf014 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysUserRole.java +++ b/src/main/java/com/jg/project/system/domain/SysUserRole.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.domain; +package com.jg.project.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 用户和角色关联 sys_user_role * - * @author ruoyi + * @author jg */ public class SysUserRole { diff --git a/src/main/java/com/ruoyi/project/system/domain/vo/MetaVo.java b/src/main/java/com/jg/project/system/domain/vo/MetaVo.java similarity index 94% rename from src/main/java/com/ruoyi/project/system/domain/vo/MetaVo.java rename to src/main/java/com/jg/project/system/domain/vo/MetaVo.java index 68a51d9..7a507ab 100644 --- a/src/main/java/com/ruoyi/project/system/domain/vo/MetaVo.java +++ b/src/main/java/com/jg/project/system/domain/vo/MetaVo.java @@ -1,11 +1,11 @@ -package com.ruoyi.project.system.domain.vo; +package com.jg.project.system.domain.vo; -import com.ruoyi.common.utils.StringUtils; +import com.jg.common.utils.StringUtils; /** * 路由显示信息 * - * @author ruoyi + * @author jg */ public class MetaVo { diff --git a/src/main/java/com/ruoyi/project/system/domain/vo/RouterVo.java b/src/main/java/com/jg/project/system/domain/vo/RouterVo.java similarity index 97% rename from src/main/java/com/ruoyi/project/system/domain/vo/RouterVo.java rename to src/main/java/com/jg/project/system/domain/vo/RouterVo.java index fc98c71..68d637b 100644 --- a/src/main/java/com/ruoyi/project/system/domain/vo/RouterVo.java +++ b/src/main/java/com/jg/project/system/domain/vo/RouterVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.domain.vo; +package com.jg.project.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; import java.util.List; @@ -6,7 +6,7 @@ import java.util.List; /** * 路由配置信息 * - * @author ruoyi + * @author jg */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public class RouterVo diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysConfigMapper.java b/src/main/java/com/jg/project/system/mapper/SysConfigMapper.java similarity index 93% rename from src/main/java/com/ruoyi/project/system/mapper/SysConfigMapper.java rename to src/main/java/com/jg/project/system/mapper/SysConfigMapper.java index 1569594..0f7dd67 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysConfigMapper.java +++ b/src/main/java/com/jg/project/system/mapper/SysConfigMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.system.mapper; +package com.jg.project.system.mapper; import java.util.List; -import com.ruoyi.project.system.domain.SysConfig; +import com.jg.project.system.domain.SysConfig; /** * 参数配置 数据层 * - * @author ruoyi + * @author jg */ public interface SysConfigMapper { diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java b/src/main/java/com/jg/project/system/mapper/SysDeptMapper.java similarity index 96% rename from src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java rename to src/main/java/com/jg/project/system/mapper/SysDeptMapper.java index e5a5265..2705a41 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java +++ b/src/main/java/com/jg/project/system/mapper/SysDeptMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.project.system.mapper; +package com.jg.project.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.project.system.domain.SysDept; +import com.jg.project.system.domain.SysDept; /** * 部门管理 数据层 * - * @author ruoyi + * @author jg */ public interface SysDeptMapper { diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysDictDataMapper.java b/src/main/java/com/jg/project/system/mapper/SysDictDataMapper.java similarity index 95% rename from src/main/java/com/ruoyi/project/system/mapper/SysDictDataMapper.java rename to src/main/java/com/jg/project/system/mapper/SysDictDataMapper.java index 4977bb4..d0c25d5 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysDictDataMapper.java +++ b/src/main/java/com/jg/project/system/mapper/SysDictDataMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.project.system.mapper; +package com.jg.project.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.project.system.domain.SysDictData; +import com.jg.project.system.domain.SysDictData; /** * 字典表 数据层 * - * @author ruoyi + * @author jg */ public interface SysDictDataMapper { diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysDictTypeMapper.java b/src/main/java/com/jg/project/system/mapper/SysDictTypeMapper.java similarity index 93% rename from src/main/java/com/ruoyi/project/system/mapper/SysDictTypeMapper.java rename to src/main/java/com/jg/project/system/mapper/SysDictTypeMapper.java index 9eeb4d3..79ad73a 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysDictTypeMapper.java +++ b/src/main/java/com/jg/project/system/mapper/SysDictTypeMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.system.mapper; +package com.jg.project.system.mapper; import java.util.List; -import com.ruoyi.project.system.domain.SysDictType; +import com.jg.project.system.domain.SysDictType; /** * 字典表 数据层 * - * @author ruoyi + * @author jg */ public interface SysDictTypeMapper { diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysMenuMapper.java b/src/main/java/com/jg/project/system/mapper/SysMenuMapper.java similarity index 96% rename from src/main/java/com/ruoyi/project/system/mapper/SysMenuMapper.java rename to src/main/java/com/jg/project/system/mapper/SysMenuMapper.java index 8b6dcf5..62d4e20 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysMenuMapper.java +++ b/src/main/java/com/jg/project/system/mapper/SysMenuMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.project.system.mapper; +package com.jg.project.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.project.system.domain.SysMenu; +import com.jg.project.system.domain.SysMenu; /** * 菜单表 数据层 * - * @author ruoyi + * @author jg */ public interface SysMenuMapper { diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysNoticeMapper.java b/src/main/java/com/jg/project/system/mapper/SysNoticeMapper.java similarity index 90% rename from src/main/java/com/ruoyi/project/system/mapper/SysNoticeMapper.java rename to src/main/java/com/jg/project/system/mapper/SysNoticeMapper.java index b80c50b..00ad2c8 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysNoticeMapper.java +++ b/src/main/java/com/jg/project/system/mapper/SysNoticeMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.system.mapper; +package com.jg.project.system.mapper; import java.util.List; -import com.ruoyi.project.system.domain.SysNotice; +import com.jg.project.system.domain.SysNotice; /** * 通知公告表 数据层 * - * @author ruoyi + * @author jg */ public interface SysNoticeMapper { diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysPostMapper.java b/src/main/java/com/jg/project/system/mapper/SysPostMapper.java similarity index 94% rename from src/main/java/com/ruoyi/project/system/mapper/SysPostMapper.java rename to src/main/java/com/jg/project/system/mapper/SysPostMapper.java index ba468bb..b84b7fe 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysPostMapper.java +++ b/src/main/java/com/jg/project/system/mapper/SysPostMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.system.mapper; +package com.jg.project.system.mapper; import java.util.List; -import com.ruoyi.project.system.domain.SysPost; +import com.jg.project.system.domain.SysPost; /** * 岗位信息 数据层 * - * @author ruoyi + * @author jg */ public interface SysPostMapper { diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysRoleDeptMapper.java b/src/main/java/com/jg/project/system/mapper/SysRoleDeptMapper.java similarity index 88% rename from src/main/java/com/ruoyi/project/system/mapper/SysRoleDeptMapper.java rename to src/main/java/com/jg/project/system/mapper/SysRoleDeptMapper.java index 77ead08..550624a 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysRoleDeptMapper.java +++ b/src/main/java/com/jg/project/system/mapper/SysRoleDeptMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.system.mapper; +package com.jg.project.system.mapper; import java.util.List; -import com.ruoyi.project.system.domain.SysRoleDept; +import com.jg.project.system.domain.SysRoleDept; /** * 角色与部门关联表 数据层 * - * @author ruoyi + * @author jg */ public interface SysRoleDeptMapper { diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysRoleMapper.java b/src/main/java/com/jg/project/system/mapper/SysRoleMapper.java similarity index 95% rename from src/main/java/com/ruoyi/project/system/mapper/SysRoleMapper.java rename to src/main/java/com/jg/project/system/mapper/SysRoleMapper.java index 0f65731..37f3a4d 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysRoleMapper.java +++ b/src/main/java/com/jg/project/system/mapper/SysRoleMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.system.mapper; +package com.jg.project.system.mapper; import java.util.List; -import com.ruoyi.project.system.domain.SysRole; +import com.jg.project.system.domain.SysRole; /** * 角色表 数据层 * - * @author ruoyi + * @author jg */ public interface SysRoleMapper { diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysRoleMenuMapper.java b/src/main/java/com/jg/project/system/mapper/SysRoleMenuMapper.java similarity index 88% rename from src/main/java/com/ruoyi/project/system/mapper/SysRoleMenuMapper.java rename to src/main/java/com/jg/project/system/mapper/SysRoleMenuMapper.java index 92247c3..46b24e3 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysRoleMenuMapper.java +++ b/src/main/java/com/jg/project/system/mapper/SysRoleMenuMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.system.mapper; +package com.jg.project.system.mapper; import java.util.List; -import com.ruoyi.project.system.domain.SysRoleMenu; +import com.jg.project.system.domain.SysRoleMenu; /** * 角色与菜单关联表 数据层 * - * @author ruoyi + * @author jg */ public interface SysRoleMenuMapper { diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java b/src/main/java/com/jg/project/system/mapper/SysUserMapper.java similarity index 96% rename from src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java rename to src/main/java/com/jg/project/system/mapper/SysUserMapper.java index f3a4cd2..b0819b0 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java +++ b/src/main/java/com/jg/project/system/mapper/SysUserMapper.java @@ -1,15 +1,15 @@ -package com.ruoyi.project.system.mapper; +package com.jg.project.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.project.system.domain.SysUser; +import com.jg.project.system.domain.SysUser; /** * 用户表 数据层 * - * @author ruoyi + * @author jg */ public interface SysUserMapper { diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysUserPostMapper.java b/src/main/java/com/jg/project/system/mapper/SysUserPostMapper.java similarity index 88% rename from src/main/java/com/ruoyi/project/system/mapper/SysUserPostMapper.java rename to src/main/java/com/jg/project/system/mapper/SysUserPostMapper.java index 5653e1d..a598651 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysUserPostMapper.java +++ b/src/main/java/com/jg/project/system/mapper/SysUserPostMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.system.mapper; +package com.jg.project.system.mapper; import java.util.List; -import com.ruoyi.project.system.domain.SysUserPost; +import com.jg.project.system.domain.SysUserPost; /** * 用户与岗位关联表 数据层 * - * @author ruoyi + * @author jg */ public interface SysUserPostMapper { diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysUserRoleMapper.java b/src/main/java/com/jg/project/system/mapper/SysUserRoleMapper.java similarity index 92% rename from src/main/java/com/ruoyi/project/system/mapper/SysUserRoleMapper.java rename to src/main/java/com/jg/project/system/mapper/SysUserRoleMapper.java index e535905..bc2fe17 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysUserRoleMapper.java +++ b/src/main/java/com/jg/project/system/mapper/SysUserRoleMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.project.system.mapper; +package com.jg.project.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.project.system.domain.SysUserRole; +import com.jg.project.system.domain.SysUserRole; /** * 用户与角色关联表 数据层 * - * @author ruoyi + * @author jg */ public interface SysUserRoleMapper { diff --git a/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java b/src/main/java/com/jg/project/system/service/ISysConfigService.java similarity index 94% rename from src/main/java/com/ruoyi/project/system/service/ISysConfigService.java rename to src/main/java/com/jg/project/system/service/ISysConfigService.java index 70e5fa5..ab884a9 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java +++ b/src/main/java/com/jg/project/system/service/ISysConfigService.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.system.service; +package com.jg.project.system.service; import java.util.List; -import com.ruoyi.project.system.domain.SysConfig; +import com.jg.project.system.domain.SysConfig; /** * 参数配置 服务层 * - * @author ruoyi + * @author jg */ public interface ISysConfigService { diff --git a/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java b/src/main/java/com/jg/project/system/service/ISysDeptService.java similarity index 94% rename from src/main/java/com/ruoyi/project/system/service/ISysDeptService.java rename to src/main/java/com/jg/project/system/service/ISysDeptService.java index ca27753..0524c83 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java +++ b/src/main/java/com/jg/project/system/service/ISysDeptService.java @@ -1,13 +1,13 @@ -package com.ruoyi.project.system.service; +package com.jg.project.system.service; import java.util.List; -import com.ruoyi.framework.web.domain.TreeSelect; -import com.ruoyi.project.system.domain.SysDept; +import com.jg.framework.web.domain.TreeSelect; +import com.jg.project.system.domain.SysDept; /** * 部门管理 服务层 * - * @author ruoyi + * @author jg */ public interface ISysDeptService { diff --git a/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java b/src/main/java/com/jg/project/system/service/ISysDictDataService.java similarity index 92% rename from src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java rename to src/main/java/com/jg/project/system/service/ISysDictDataService.java index e3be8bb..8dedb4b 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java +++ b/src/main/java/com/jg/project/system/service/ISysDictDataService.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.system.service; +package com.jg.project.system.service; import java.util.List; -import com.ruoyi.project.system.domain.SysDictData; +import com.jg.project.system.domain.SysDictData; /** * 字典 业务层 * - * @author ruoyi + * @author jg */ public interface ISysDictDataService { diff --git a/src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java b/src/main/java/com/jg/project/system/service/ISysDictTypeService.java similarity index 92% rename from src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java rename to src/main/java/com/jg/project/system/service/ISysDictTypeService.java index 0a834d5..62f47fc 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java +++ b/src/main/java/com/jg/project/system/service/ISysDictTypeService.java @@ -1,13 +1,13 @@ -package com.ruoyi.project.system.service; +package com.jg.project.system.service; import java.util.List; -import com.ruoyi.project.system.domain.SysDictData; -import com.ruoyi.project.system.domain.SysDictType; +import com.jg.project.system.domain.SysDictData; +import com.jg.project.system.domain.SysDictType; /** * 字典 业务层 * - * @author ruoyi + * @author jg */ public interface ISysDictTypeService { diff --git a/src/main/java/com/ruoyi/project/system/service/ISysMenuService.java b/src/main/java/com/jg/project/system/service/ISysMenuService.java similarity index 93% rename from src/main/java/com/ruoyi/project/system/service/ISysMenuService.java rename to src/main/java/com/jg/project/system/service/ISysMenuService.java index 405ef70..6dedf00 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysMenuService.java +++ b/src/main/java/com/jg/project/system/service/ISysMenuService.java @@ -1,15 +1,15 @@ -package com.ruoyi.project.system.service; +package com.jg.project.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.jg.framework.web.domain.TreeSelect; +import com.jg.project.system.domain.SysMenu; +import com.jg.project.system.domain.vo.RouterVo; /** * 菜单 业务层 * - * @author ruoyi + * @author jg */ public interface ISysMenuService { diff --git a/src/main/java/com/ruoyi/project/system/service/ISysNoticeService.java b/src/main/java/com/jg/project/system/service/ISysNoticeService.java similarity index 90% rename from src/main/java/com/ruoyi/project/system/service/ISysNoticeService.java rename to src/main/java/com/jg/project/system/service/ISysNoticeService.java index 3f74551..5f9d736 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysNoticeService.java +++ b/src/main/java/com/jg/project/system/service/ISysNoticeService.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.system.service; +package com.jg.project.system.service; import java.util.List; -import com.ruoyi.project.system.domain.SysNotice; +import com.jg.project.system.domain.SysNotice; /** * 公告 服务层 * - * @author ruoyi + * @author jg */ public interface ISysNoticeService { diff --git a/src/main/java/com/ruoyi/project/system/service/ISysPostService.java b/src/main/java/com/jg/project/system/service/ISysPostService.java similarity index 94% rename from src/main/java/com/ruoyi/project/system/service/ISysPostService.java rename to src/main/java/com/jg/project/system/service/ISysPostService.java index 95b9373..3bc883e 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysPostService.java +++ b/src/main/java/com/jg/project/system/service/ISysPostService.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.system.service; +package com.jg.project.system.service; import java.util.List; -import com.ruoyi.project.system.domain.SysPost; +import com.jg.project.system.domain.SysPost; /** * 岗位信息 服务层 * - * @author ruoyi + * @author jg */ public interface ISysPostService { diff --git a/src/main/java/com/ruoyi/project/system/service/ISysRoleService.java b/src/main/java/com/jg/project/system/service/ISysRoleService.java similarity index 95% rename from src/main/java/com/ruoyi/project/system/service/ISysRoleService.java rename to src/main/java/com/jg/project/system/service/ISysRoleService.java index 7be3094..2138732 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysRoleService.java +++ b/src/main/java/com/jg/project/system/service/ISysRoleService.java @@ -1,14 +1,14 @@ -package com.ruoyi.project.system.service; +package com.jg.project.system.service; import java.util.List; import java.util.Set; -import com.ruoyi.project.system.domain.SysRole; -import com.ruoyi.project.system.domain.SysUserRole; +import com.jg.project.system.domain.SysRole; +import com.jg.project.system.domain.SysUserRole; /** * 角色业务层 * - * @author ruoyi + * @author jg */ public interface ISysRoleService { diff --git a/src/main/java/com/ruoyi/project/system/service/ISysUserOnlineService.java b/src/main/java/com/jg/project/system/service/ISysUserOnlineService.java similarity index 86% rename from src/main/java/com/ruoyi/project/system/service/ISysUserOnlineService.java rename to src/main/java/com/jg/project/system/service/ISysUserOnlineService.java index 7974ae7..70b9681 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysUserOnlineService.java +++ b/src/main/java/com/jg/project/system/service/ISysUserOnlineService.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.system.service; +package com.jg.project.system.service; -import com.ruoyi.framework.security.LoginUser; -import com.ruoyi.project.monitor.domain.SysUserOnline; +import com.jg.framework.security.LoginUser; +import com.jg.project.monitor.domain.SysUserOnline; /** * 在线用户 服务层 * - * @author ruoyi + * @author jg */ public interface ISysUserOnlineService { diff --git a/src/main/java/com/ruoyi/project/system/service/ISysUserService.java b/src/main/java/com/jg/project/system/service/ISysUserService.java similarity index 97% rename from src/main/java/com/ruoyi/project/system/service/ISysUserService.java rename to src/main/java/com/jg/project/system/service/ISysUserService.java index 0369fa8..c01a879 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysUserService.java +++ b/src/main/java/com/jg/project/system/service/ISysUserService.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.system.service; +package com.jg.project.system.service; import java.util.List; -import com.ruoyi.project.system.domain.SysUser; +import com.jg.project.system.domain.SysUser; /** * 用户 业务层 * - * @author ruoyi + * @author jg */ public interface ISysUserService { diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java b/src/main/java/com/jg/project/system/service/impl/SysConfigServiceImpl.java similarity index 91% rename from src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java rename to src/main/java/com/jg/project/system/service/impl/SysConfigServiceImpl.java index a8fa2bc..85fca7f 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/com/jg/project/system/service/impl/SysConfigServiceImpl.java @@ -1,24 +1,24 @@ -package com.ruoyi.project.system.service.impl; +package com.jg.project.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.constant.CacheConstants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.ServiceException; -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.jg.common.constant.CacheConstants; +import com.jg.common.constant.UserConstants; +import com.jg.common.core.text.Convert; +import com.jg.common.exception.ServiceException; +import com.jg.common.utils.StringUtils; +import com.jg.framework.redis.RedisCache; +import com.jg.project.system.domain.SysConfig; +import com.jg.project.system.mapper.SysConfigMapper; +import com.jg.project.system.service.ISysConfigService; /** * 参数配置 服务层实现 * - * @author ruoyi + * @author jg */ @Service public class SysConfigServiceImpl implements ISysConfigService diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java b/src/main/java/com/jg/project/system/service/impl/SysDeptServiceImpl.java similarity index 92% rename from src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java rename to src/main/java/com/jg/project/system/service/impl/SysDeptServiceImpl.java index 147831c..2ac832c 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java +++ b/src/main/java/com/jg/project/system/service/impl/SysDeptServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.service.impl; +package com.jg.project.system.service.impl; import java.util.ArrayList; import java.util.Iterator; @@ -6,25 +6,25 @@ import java.util.List; import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -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.web.domain.TreeSelect; -import com.ruoyi.project.system.domain.SysDept; -import com.ruoyi.project.system.domain.SysRole; -import com.ruoyi.project.system.domain.SysUser; -import com.ruoyi.project.system.mapper.SysDeptMapper; -import com.ruoyi.project.system.mapper.SysRoleMapper; -import com.ruoyi.project.system.service.ISysDeptService; +import com.jg.common.constant.UserConstants; +import com.jg.common.core.text.Convert; +import com.jg.common.exception.ServiceException; +import com.jg.common.utils.SecurityUtils; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.spring.SpringUtils; +import com.jg.framework.aspectj.lang.annotation.DataScope; +import com.jg.framework.web.domain.TreeSelect; +import com.jg.project.system.domain.SysDept; +import com.jg.project.system.domain.SysRole; +import com.jg.project.system.domain.SysUser; +import com.jg.project.system.mapper.SysDeptMapper; +import com.jg.project.system.mapper.SysRoleMapper; +import com.jg.project.system.service.ISysDeptService; /** * 部门管理 服务实现 * - * @author ruoyi + * @author jg */ @Service public class SysDeptServiceImpl implements ISysDeptService diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java b/src/main/java/com/jg/project/system/service/impl/SysDictDataServiceImpl.java similarity index 90% rename from src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java rename to src/main/java/com/jg/project/system/service/impl/SysDictDataServiceImpl.java index 111df9e..31a0691 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java +++ b/src/main/java/com/jg/project/system/service/impl/SysDictDataServiceImpl.java @@ -1,17 +1,17 @@ -package com.ruoyi.project.system.service.impl; +package com.jg.project.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -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.jg.common.utils.DictUtils; +import com.jg.project.system.domain.SysDictData; +import com.jg.project.system.mapper.SysDictDataMapper; +import com.jg.project.system.service.ISysDictDataService; /** * 字典 业务层处理 * - * @author ruoyi + * @author jg */ @Service public class SysDictDataServiceImpl implements ISysDictDataService diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java b/src/main/java/com/jg/project/system/service/impl/SysDictTypeServiceImpl.java similarity index 91% rename from src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java rename to src/main/java/com/jg/project/system/service/impl/SysDictTypeServiceImpl.java index fe6380f..74c5767 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java +++ b/src/main/java/com/jg/project/system/service/impl/SysDictTypeServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.service.impl; +package com.jg.project.system.service.impl; import java.util.Comparator; import java.util.List; @@ -8,20 +8,20 @@ import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.exception.ServiceException; -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.jg.common.constant.UserConstants; +import com.jg.common.exception.ServiceException; +import com.jg.common.utils.DictUtils; +import com.jg.common.utils.StringUtils; +import com.jg.project.system.domain.SysDictData; +import com.jg.project.system.domain.SysDictType; +import com.jg.project.system.mapper.SysDictDataMapper; +import com.jg.project.system.mapper.SysDictTypeMapper; +import com.jg.project.system.service.ISysDictTypeService; /** * 字典 业务层处理 * - * @author ruoyi + * @author jg */ @Service public class SysDictTypeServiceImpl implements ISysDictTypeService diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/jg/project/system/service/impl/SysMenuServiceImpl.java similarity index 95% rename from src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java rename to src/main/java/com/jg/project/system/service/impl/SysMenuServiceImpl.java index 48d4e00..f6d1753 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/jg/project/system/service/impl/SysMenuServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.service.impl; +package com.jg.project.system.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -10,25 +10,25 @@ import java.util.Set; import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -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.SysRole; -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.SysRoleMapper; -import com.ruoyi.project.system.mapper.SysRoleMenuMapper; -import com.ruoyi.project.system.service.ISysMenuService; +import com.jg.common.constant.Constants; +import com.jg.common.constant.UserConstants; +import com.jg.common.utils.SecurityUtils; +import com.jg.common.utils.StringUtils; +import com.jg.framework.web.domain.TreeSelect; +import com.jg.project.system.domain.SysMenu; +import com.jg.project.system.domain.SysRole; +import com.jg.project.system.domain.SysUser; +import com.jg.project.system.domain.vo.MetaVo; +import com.jg.project.system.domain.vo.RouterVo; +import com.jg.project.system.mapper.SysMenuMapper; +import com.jg.project.system.mapper.SysRoleMapper; +import com.jg.project.system.mapper.SysRoleMenuMapper; +import com.jg.project.system.service.ISysMenuService; /** * 菜单 业务层处理 * - * @author ruoyi + * @author jg */ @Service public class SysMenuServiceImpl implements ISysMenuService diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java b/src/main/java/com/jg/project/system/service/impl/SysNoticeServiceImpl.java similarity index 88% rename from src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java rename to src/main/java/com/jg/project/system/service/impl/SysNoticeServiceImpl.java index 2e9bf00..2ec0418 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java +++ b/src/main/java/com/jg/project/system/service/impl/SysNoticeServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.project.system.service.impl; +package com.jg.project.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.jg.project.system.domain.SysNotice; +import com.jg.project.system.mapper.SysNoticeMapper; +import com.jg.project.system.service.ISysNoticeService; /** * 公告 服务层实现 * - * @author ruoyi + * @author jg */ @Service public class SysNoticeServiceImpl implements ISysNoticeService diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java b/src/main/java/com/jg/project/system/service/impl/SysPostServiceImpl.java similarity index 90% rename from src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java rename to src/main/java/com/jg/project/system/service/impl/SysPostServiceImpl.java index 49640c8..403ba4d 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java +++ b/src/main/java/com/jg/project/system/service/impl/SysPostServiceImpl.java @@ -1,20 +1,20 @@ -package com.ruoyi.project.system.service.impl; +package com.jg.project.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.exception.ServiceException; -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.jg.common.constant.UserConstants; +import com.jg.common.exception.ServiceException; +import com.jg.common.utils.StringUtils; +import com.jg.project.system.domain.SysPost; +import com.jg.project.system.mapper.SysPostMapper; +import com.jg.project.system.mapper.SysUserPostMapper; +import com.jg.project.system.service.ISysPostService; /** * 岗位信息 服务层处理 * - * @author ruoyi + * @author jg */ @Service public class SysPostServiceImpl implements ISysPostService diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java b/src/main/java/com/jg/project/system/service/impl/SysRoleServiceImpl.java similarity index 91% rename from src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java rename to src/main/java/com/jg/project/system/service/impl/SysRoleServiceImpl.java index b45eee8..2d76e77 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/jg/project/system/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.service.impl; +package com.jg.project.system.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -8,27 +8,27 @@ import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -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.domain.SysUser; -import com.ruoyi.project.system.domain.SysUserRole; -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.jg.common.constant.UserConstants; +import com.jg.common.exception.ServiceException; +import com.jg.common.utils.SecurityUtils; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.spring.SpringUtils; +import com.jg.framework.aspectj.lang.annotation.DataScope; +import com.jg.project.system.domain.SysRole; +import com.jg.project.system.domain.SysRoleDept; +import com.jg.project.system.domain.SysRoleMenu; +import com.jg.project.system.domain.SysUser; +import com.jg.project.system.domain.SysUserRole; +import com.jg.project.system.mapper.SysRoleDeptMapper; +import com.jg.project.system.mapper.SysRoleMapper; +import com.jg.project.system.mapper.SysRoleMenuMapper; +import com.jg.project.system.mapper.SysUserRoleMapper; +import com.jg.project.system.service.ISysRoleService; /** * 角色 业务层处理 * - * @author ruoyi + * @author jg */ @Service public class SysRoleServiceImpl implements ISysRoleService diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java b/src/main/java/com/jg/project/system/service/impl/SysUserOnlineServiceImpl.java similarity index 90% rename from src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java rename to src/main/java/com/jg/project/system/service/impl/SysUserOnlineServiceImpl.java index de38b5f..35e1b8f 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java +++ b/src/main/java/com/jg/project/system/service/impl/SysUserOnlineServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.project.system.service.impl; +package com.jg.project.system.service.impl; import org.springframework.stereotype.Service; -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.jg.common.utils.StringUtils; +import com.jg.framework.security.LoginUser; +import com.jg.project.monitor.domain.SysUserOnline; +import com.jg.project.system.service.ISysUserOnlineService; /** * 在线用户 服务层处理 * - * @author ruoyi + * @author jg */ @Service public class SysUserOnlineServiceImpl implements ISysUserOnlineService diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/jg/project/system/service/impl/SysUserServiceImpl.java similarity index 93% rename from src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java rename to src/main/java/com/jg/project/system/service/impl/SysUserServiceImpl.java index 40d652d..48de4e0 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/jg/project/system/service/impl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.service.impl; +package com.jg.project.system.service.impl; import java.util.ArrayList; import java.util.List; @@ -10,30 +10,30 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.bean.BeanValidators; -import com.ruoyi.common.utils.spring.SpringUtils; -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.jg.common.constant.UserConstants; +import com.jg.common.exception.ServiceException; +import com.jg.common.utils.SecurityUtils; +import com.jg.common.utils.StringUtils; +import com.jg.common.utils.bean.BeanValidators; +import com.jg.common.utils.spring.SpringUtils; +import com.jg.framework.aspectj.lang.annotation.DataScope; +import com.jg.project.system.domain.SysPost; +import com.jg.project.system.domain.SysRole; +import com.jg.project.system.domain.SysUser; +import com.jg.project.system.domain.SysUserPost; +import com.jg.project.system.domain.SysUserRole; +import com.jg.project.system.mapper.SysPostMapper; +import com.jg.project.system.mapper.SysRoleMapper; +import com.jg.project.system.mapper.SysUserMapper; +import com.jg.project.system.mapper.SysUserPostMapper; +import com.jg.project.system.mapper.SysUserRoleMapper; +import com.jg.project.system.service.ISysConfigService; +import com.jg.project.system.service.ISysUserService; /** * 用户 业务层处理 * - * @author ruoyi + * @author jg */ @Service public class SysUserServiceImpl implements ISysUserService diff --git a/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java b/src/main/java/com/jg/project/tool/gen/controller/GenController.java similarity index 92% rename from src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java rename to src/main/java/com/jg/project/tool/gen/controller/GenController.java index 8689b37..36fbe5f 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java +++ b/src/main/java/com/jg/project/tool/gen/controller/GenController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.tool.gen.controller; +package com.jg.project.tool.gen.controller; import java.io.IOException; import java.util.ArrayList; @@ -23,23 +23,23 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.sql.SqlUtil; -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.jg.common.core.text.Convert; +import com.jg.common.utils.SecurityUtils; +import com.jg.common.utils.sql.SqlUtil; +import com.jg.framework.aspectj.lang.annotation.Log; +import com.jg.framework.aspectj.lang.enums.BusinessType; +import com.jg.framework.web.controller.BaseController; +import com.jg.framework.web.domain.AjaxResult; +import com.jg.framework.web.page.TableDataInfo; +import com.jg.project.tool.gen.domain.GenTable; +import com.jg.project.tool.gen.domain.GenTableColumn; +import com.jg.project.tool.gen.service.IGenTableColumnService; +import com.jg.project.tool.gen.service.IGenTableService; /** * 代码生成 操作处理 * - * @author ruoyi + * @author jg */ @RestController @RequestMapping("/tool/gen") @@ -251,7 +251,7 @@ public class GenController extends BaseController response.reset(); response.addHeader("Access-Control-Allow-Origin", "*"); response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); - response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); + response.setHeader("Content-Disposition", "attachment; filename=\"jg.zip\""); response.addHeader("Content-Length", "" + data.length); response.setContentType("application/octet-stream; charset=UTF-8"); IOUtils.write(data, response.getOutputStream()); diff --git a/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java b/src/main/java/com/jg/project/tool/gen/domain/GenTable.java similarity index 97% rename from src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java rename to src/main/java/com/jg/project/tool/gen/domain/GenTable.java index 321d134..fafdad6 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java +++ b/src/main/java/com/jg/project/tool/gen/domain/GenTable.java @@ -1,17 +1,17 @@ -package com.ruoyi.project.tool.gen.domain; +package com.jg.project.tool.gen.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.utils.StringUtils; -import com.ruoyi.framework.web.domain.BaseEntity; +import com.jg.common.constant.GenConstants; +import com.jg.common.utils.StringUtils; +import com.jg.framework.web.domain.BaseEntity; /** * 业务表 gen_table * - * @author ruoyi + * @author jg */ public class GenTable extends BaseEntity { diff --git a/src/main/java/com/ruoyi/project/tool/gen/domain/GenTableColumn.java b/src/main/java/com/jg/project/tool/gen/domain/GenTableColumn.java similarity index 98% rename from src/main/java/com/ruoyi/project/tool/gen/domain/GenTableColumn.java rename to src/main/java/com/jg/project/tool/gen/domain/GenTableColumn.java index cf275fe..50da5cf 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/domain/GenTableColumn.java +++ b/src/main/java/com/jg/project/tool/gen/domain/GenTableColumn.java @@ -1,13 +1,13 @@ -package com.ruoyi.project.tool.gen.domain; +package com.jg.project.tool.gen.domain; import javax.validation.constraints.NotBlank; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.domain.BaseEntity; +import com.jg.common.utils.StringUtils; +import com.jg.framework.web.domain.BaseEntity; /** * 代码生成业务字段表 gen_table_column * - * @author ruoyi + * @author jg */ public class GenTableColumn extends BaseEntity { diff --git a/src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableColumnMapper.java b/src/main/java/com/jg/project/tool/gen/mapper/GenTableColumnMapper.java similarity index 91% rename from src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableColumnMapper.java rename to src/main/java/com/jg/project/tool/gen/mapper/GenTableColumnMapper.java index 0124c7b..3e71bac 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableColumnMapper.java +++ b/src/main/java/com/jg/project/tool/gen/mapper/GenTableColumnMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.tool.gen.mapper; +package com.jg.project.tool.gen.mapper; import java.util.List; -import com.ruoyi.project.tool.gen.domain.GenTableColumn; +import com.jg.project.tool.gen.domain.GenTableColumn; /** * 业务字段 数据层 * - * @author ruoyi + * @author jg */ public interface GenTableColumnMapper { diff --git a/src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableMapper.java b/src/main/java/com/jg/project/tool/gen/mapper/GenTableMapper.java similarity index 93% rename from src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableMapper.java rename to src/main/java/com/jg/project/tool/gen/mapper/GenTableMapper.java index b574de9..6cdeb92 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableMapper.java +++ b/src/main/java/com/jg/project/tool/gen/mapper/GenTableMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.tool.gen.mapper; +package com.jg.project.tool.gen.mapper; import java.util.List; -import com.ruoyi.project.tool.gen.domain.GenTable; +import com.jg.project.tool.gen.domain.GenTable; /** * 业务 数据层 * - * @author ruoyi + * @author jg */ public interface GenTableMapper { diff --git a/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java b/src/main/java/com/jg/project/tool/gen/service/GenTableColumnServiceImpl.java similarity index 86% rename from src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java rename to src/main/java/com/jg/project/tool/gen/service/GenTableColumnServiceImpl.java index 446a0df..d61d816 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java +++ b/src/main/java/com/jg/project/tool/gen/service/GenTableColumnServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.project.tool.gen.service; +package com.jg.project.tool.gen.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.jg.common.core.text.Convert; +import com.jg.project.tool.gen.domain.GenTableColumn; +import com.jg.project.tool.gen.mapper.GenTableColumnMapper; /** * 业务字段 服务层实现 * - * @author ruoyi + * @author jg */ @Service public class GenTableColumnServiceImpl implements IGenTableColumnService diff --git a/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java b/src/main/java/com/jg/project/tool/gen/service/GenTableServiceImpl.java similarity index 96% rename from src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java rename to src/main/java/com/jg/project/tool/gen/service/GenTableServiceImpl.java index e07d6d9..53be3df 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java +++ b/src/main/java/com/jg/project/tool/gen/service/GenTableServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.tool.gen.service; +package com.jg.project.tool.gen.service; import java.io.ByteArrayOutputStream; import java.io.File; @@ -23,23 +23,23 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.text.CharsetKit; -import com.ruoyi.common.exception.ServiceException; -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.jg.common.constant.Constants; +import com.jg.common.constant.GenConstants; +import com.jg.common.core.text.CharsetKit; +import com.jg.common.exception.ServiceException; +import com.jg.common.utils.StringUtils; +import com.jg.project.tool.gen.domain.GenTable; +import com.jg.project.tool.gen.domain.GenTableColumn; +import com.jg.project.tool.gen.mapper.GenTableColumnMapper; +import com.jg.project.tool.gen.mapper.GenTableMapper; +import com.jg.project.tool.gen.util.GenUtils; +import com.jg.project.tool.gen.util.VelocityInitializer; +import com.jg.project.tool.gen.util.VelocityUtils; /** * 业务 服务层实现 * - * @author ruoyi + * @author jg */ @Service public class GenTableServiceImpl implements IGenTableService diff --git a/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java b/src/main/java/com/jg/project/tool/gen/service/IGenTableColumnService.java similarity index 88% rename from src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java rename to src/main/java/com/jg/project/tool/gen/service/IGenTableColumnService.java index d87b023..8b974f0 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java +++ b/src/main/java/com/jg/project/tool/gen/service/IGenTableColumnService.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.tool.gen.service; +package com.jg.project.tool.gen.service; import java.util.List; -import com.ruoyi.project.tool.gen.domain.GenTableColumn; +import com.jg.project.tool.gen.domain.GenTableColumn; /** * 业务字段 服务层 * - * @author ruoyi + * @author jg */ public interface IGenTableColumnService { diff --git a/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableService.java b/src/main/java/com/jg/project/tool/gen/service/IGenTableService.java similarity index 95% rename from src/main/java/com/ruoyi/project/tool/gen/service/IGenTableService.java rename to src/main/java/com/jg/project/tool/gen/service/IGenTableService.java index 845e49e..867cbc8 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableService.java +++ b/src/main/java/com/jg/project/tool/gen/service/IGenTableService.java @@ -1,13 +1,13 @@ -package com.ruoyi.project.tool.gen.service; +package com.jg.project.tool.gen.service; import java.util.List; import java.util.Map; -import com.ruoyi.project.tool.gen.domain.GenTable; +import com.jg.project.tool.gen.domain.GenTable; /** * 业务 服务层 * - * @author ruoyi + * @author jg */ public interface IGenTableService { diff --git a/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java b/src/main/java/com/jg/project/tool/gen/util/GenUtils.java similarity index 96% rename from src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java rename to src/main/java/com/jg/project/tool/gen/util/GenUtils.java index e107a9b..d107bfa 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java +++ b/src/main/java/com/jg/project/tool/gen/util/GenUtils.java @@ -1,17 +1,17 @@ -package com.ruoyi.project.tool.gen.util; +package com.jg.project.tool.gen.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.jg.common.constant.GenConstants; +import com.jg.common.utils.StringUtils; +import com.jg.framework.config.GenConfig; +import com.jg.project.tool.gen.domain.GenTable; +import com.jg.project.tool.gen.domain.GenTableColumn; /** * 代码生成器 工具类 * - * @author ruoyi + * @author jg */ public class GenUtils { diff --git a/src/main/java/com/ruoyi/project/tool/gen/util/VelocityInitializer.java b/src/main/java/com/jg/project/tool/gen/util/VelocityInitializer.java similarity index 88% rename from src/main/java/com/ruoyi/project/tool/gen/util/VelocityInitializer.java rename to src/main/java/com/jg/project/tool/gen/util/VelocityInitializer.java index 578b4fa..ac29260 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/util/VelocityInitializer.java +++ b/src/main/java/com/jg/project/tool/gen/util/VelocityInitializer.java @@ -1,13 +1,13 @@ -package com.ruoyi.project.tool.gen.util; +package com.jg.project.tool.gen.util; import java.util.Properties; import org.apache.velocity.app.Velocity; -import com.ruoyi.common.constant.Constants; +import com.jg.common.constant.Constants; /** * VelocityEngine工厂 * - * @author ruoyi + * @author jg */ public class VelocityInitializer { diff --git a/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java b/src/main/java/com/jg/project/tool/gen/util/VelocityUtils.java similarity index 97% rename from src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java rename to src/main/java/com/jg/project/tool/gen/util/VelocityUtils.java index 9a632d7..045a475 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java +++ b/src/main/java/com/jg/project/tool/gen/util/VelocityUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.tool.gen.util; +package com.jg.project.tool.gen.util; import java.util.ArrayList; import java.util.HashSet; @@ -7,16 +7,16 @@ import java.util.Set; import org.apache.velocity.VelocityContext; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -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.jg.common.constant.GenConstants; +import com.jg.common.utils.DateUtils; +import com.jg.common.utils.StringUtils; +import com.jg.project.tool.gen.domain.GenTable; +import com.jg.project.tool.gen.domain.GenTableColumn; /** * 模板处理工具类 * - * @author ruoyi + * @author jg */ public class VelocityUtils { diff --git a/src/main/java/com/ruoyi/project/tool/swagger/TestController.java b/src/main/java/com/jg/project/tool/swagger/TestController.java similarity index 96% rename from src/main/java/com/ruoyi/project/tool/swagger/TestController.java rename to src/main/java/com/jg/project/tool/swagger/TestController.java index 3bd01cf..c27d5c4 100644 --- a/src/main/java/com/ruoyi/project/tool/swagger/TestController.java +++ b/src/main/java/com/jg/project/tool/swagger/TestController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.tool.swagger; +package com.jg.project.tool.swagger; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.R; +import com.jg.common.utils.StringUtils; +import com.jg.framework.web.controller.BaseController; +import com.jg.framework.web.domain.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -25,7 +25,7 @@ import io.swagger.annotations.ApiOperation; /** * swagger 用户测试方法 * - * @author ruoyi + * @author jg */ @Api("用户信息管理") @RestController diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e8d3f91..a4fccc9 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,12 +1,12 @@ # 项目相关配置 -ruoyi: +jg: # 名称 - name: RuoYi + name: JG # 版本 version: 3.8.7 # 版权年份 copyrightYear: 2024 - # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） + # 文件路径 示例（ Windows配置D:/jg/uploadPath，Linux配置 /home/jg/uploadPath） profile: D:/JG/uploadPath # 获取ip地址开关 addressEnabled: false @@ -34,7 +34,7 @@ server: # 日志配置 logging: level: - com.ruoyi: debug + com.jg: debug org.springframework: warn # 用户配置 @@ -100,14 +100,14 @@ token: ## MyBatis配置 #mybatis: # # 搜索指定包别名 -# typeAliasesPackage: com.ruoyi.project.**.domain +# typeAliasesPackage: com.jg.project.**.domain # # 配置mapper的扫描，找到所有的mapper.xml映射文件 # mapperLocations: classpath*:mybatis/**/*Mapper.xml # # 加载全局的配置文件 # configLocation: classpath:mybatis/mybatis-config.xml mybatis-plus: mapper-locations: classpath*:mybatis/**/*Mapper.xml - type-aliases-package: com.ruoyi.**.domain + type-aliases-package: com.jg.**.domain global-config: db-config: id-type: auto @@ -142,9 +142,9 @@ xss: # 代码生成 gen: # 作者 - author: ruoyi + author: jg # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.project.system + packageName: com.jg.project.system # 自动去除表前缀，默认是true autoRemovePre: false # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt index d6ca197..6262042 100644 --- a/src/main/resources/banner.txt +++ b/src/main/resources/banner.txt @@ -1,4 +1,4 @@ -Application Version: ${ruoyi.version} +Application Version: ${jg.version} Spring Boot Version: ${spring-boot.version} # # # # # ########## #### ## ## ## ## ## ## diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index a360583..035100c 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -72,7 +72,7 @@ - + diff --git a/src/main/resources/mybatis/PartThree/AboutPartThreeMapper.xml b/src/main/resources/mybatis/PartThree/AboutPartThreeMapper.xml index 8535583..fbe99a5 100644 --- a/src/main/resources/mybatis/PartThree/AboutPartThreeMapper.xml +++ b/src/main/resources/mybatis/PartThree/AboutPartThreeMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/src/main/resources/mybatis/monitor/SysLogininforMapper.xml b/src/main/resources/mybatis/monitor/SysLogininforMapper.xml index 9e92f59..e74d584 100644 --- a/src/main/resources/mybatis/monitor/SysLogininforMapper.xml +++ b/src/main/resources/mybatis/monitor/SysLogininforMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/monitor/SysOperLogMapper.xml b/src/main/resources/mybatis/monitor/SysOperLogMapper.xml index dd5a44a..a4a7647 100644 --- a/src/main/resources/mybatis/monitor/SysOperLogMapper.xml +++ b/src/main/resources/mybatis/monitor/SysOperLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysConfigMapper.xml b/src/main/resources/mybatis/system/SysConfigMapper.xml index c586e2e..75853ba 100644 --- a/src/main/resources/mybatis/system/SysConfigMapper.xml +++ b/src/main/resources/mybatis/system/SysConfigMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysDeptMapper.xml b/src/main/resources/mybatis/system/SysDeptMapper.xml index d361cdc..2f2152e 100644 --- a/src/main/resources/mybatis/system/SysDeptMapper.xml +++ b/src/main/resources/mybatis/system/SysDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysDictDataMapper.xml b/src/main/resources/mybatis/system/SysDictDataMapper.xml index 8221d6e..90d58c4 100644 --- a/src/main/resources/mybatis/system/SysDictDataMapper.xml +++ b/src/main/resources/mybatis/system/SysDictDataMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysDictTypeMapper.xml b/src/main/resources/mybatis/system/SysDictTypeMapper.xml index 06498a9..f3ef37a 100644 --- a/src/main/resources/mybatis/system/SysDictTypeMapper.xml +++ b/src/main/resources/mybatis/system/SysDictTypeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysJobLogMapper.xml b/src/main/resources/mybatis/system/SysJobLogMapper.xml index db17d91..ccea00b 100644 --- a/src/main/resources/mybatis/system/SysJobLogMapper.xml +++ b/src/main/resources/mybatis/system/SysJobLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysJobMapper.xml b/src/main/resources/mybatis/system/SysJobMapper.xml index 47f61c9..df90e43 100644 --- a/src/main/resources/mybatis/system/SysJobMapper.xml +++ b/src/main/resources/mybatis/system/SysJobMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysMenuMapper.xml b/src/main/resources/mybatis/system/SysMenuMapper.xml index a07f65f..50eb803 100644 --- a/src/main/resources/mybatis/system/SysMenuMapper.xml +++ b/src/main/resources/mybatis/system/SysMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysNoticeMapper.xml b/src/main/resources/mybatis/system/SysNoticeMapper.xml index 33c37a7..2859d63 100644 --- a/src/main/resources/mybatis/system/SysNoticeMapper.xml +++ b/src/main/resources/mybatis/system/SysNoticeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysPostMapper.xml b/src/main/resources/mybatis/system/SysPostMapper.xml index 23e7c14..dc2291a 100644 --- a/src/main/resources/mybatis/system/SysPostMapper.xml +++ b/src/main/resources/mybatis/system/SysPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysRoleDeptMapper.xml b/src/main/resources/mybatis/system/SysRoleDeptMapper.xml index 23d2cb5..f3eae7f 100644 --- a/src/main/resources/mybatis/system/SysRoleDeptMapper.xml +++ b/src/main/resources/mybatis/system/SysRoleDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysRoleMapper.xml b/src/main/resources/mybatis/system/SysRoleMapper.xml index adfa374..24c6563 100644 --- a/src/main/resources/mybatis/system/SysRoleMapper.xml +++ b/src/main/resources/mybatis/system/SysRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysRoleMenuMapper.xml b/src/main/resources/mybatis/system/SysRoleMenuMapper.xml index bf32088..775c0c9 100644 --- a/src/main/resources/mybatis/system/SysRoleMenuMapper.xml +++ b/src/main/resources/mybatis/system/SysRoleMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysUserMapper.xml b/src/main/resources/mybatis/system/SysUserMapper.xml index f02de1b..1bf2c84 100644 --- a/src/main/resources/mybatis/system/SysUserMapper.xml +++ b/src/main/resources/mybatis/system/SysUserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysUserPostMapper.xml b/src/main/resources/mybatis/system/SysUserPostMapper.xml index d048078..89d29fe 100644 --- a/src/main/resources/mybatis/system/SysUserPostMapper.xml +++ b/src/main/resources/mybatis/system/SysUserPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysUserRoleMapper.xml b/src/main/resources/mybatis/system/SysUserRoleMapper.xml index d7324eb..20c345b 100644 --- a/src/main/resources/mybatis/system/SysUserRoleMapper.xml +++ b/src/main/resources/mybatis/system/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/tool/GenTableColumnMapper.xml b/src/main/resources/mybatis/tool/GenTableColumnMapper.xml index 450f89c..2ceb51e 100644 --- a/src/main/resources/mybatis/tool/GenTableColumnMapper.xml +++ b/src/main/resources/mybatis/tool/GenTableColumnMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/tool/GenTableMapper.xml b/src/main/resources/mybatis/tool/GenTableMapper.xml index f26cc99..02d229b 100644 --- a/src/main/resources/mybatis/tool/GenTableMapper.xml +++ b/src/main/resources/mybatis/tool/GenTableMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/vm/java/controller.java.vm b/src/main/resources/vm/java/controller.java.vm index a10bbb2..77dd67e 100644 --- a/src/main/resources/vm/java/controller.java.vm +++ b/src/main/resources/vm/java/controller.java.vm @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; import com.jg.framework.web.controller.BaseController; import ${packageName}.domain.${ClassName}; import ${packageName}.service.I${ClassName}Service; -import com.ruoyi.framework.web.domain.R; +import com.jg.framework.web.domain.R; #if($table.crud || $table.sub) #elseif($table.tree) #end diff --git a/target/classes/application.yml b/target/classes/application.yml index e8d3f91..a4fccc9 100644 --- a/target/classes/application.yml +++ b/target/classes/application.yml @@ -1,12 +1,12 @@ # 项目相关配置 -ruoyi: +jg: # 名称 - name: RuoYi + name: JG # 版本 version: 3.8.7 # 版权年份 copyrightYear: 2024 - # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） + # 文件路径 示例（ Windows配置D:/jg/uploadPath，Linux配置 /home/jg/uploadPath） profile: D:/JG/uploadPath # 获取ip地址开关 addressEnabled: false @@ -34,7 +34,7 @@ server: # 日志配置 logging: level: - com.ruoyi: debug + com.jg: debug org.springframework: warn # 用户配置 @@ -100,14 +100,14 @@ token: ## MyBatis配置 #mybatis: # # 搜索指定包别名 -# typeAliasesPackage: com.ruoyi.project.**.domain +# typeAliasesPackage: com.jg.project.**.domain # # 配置mapper的扫描，找到所有的mapper.xml映射文件 # mapperLocations: classpath*:mybatis/**/*Mapper.xml # # 加载全局的配置文件 # configLocation: classpath:mybatis/mybatis-config.xml mybatis-plus: mapper-locations: classpath*:mybatis/**/*Mapper.xml - type-aliases-package: com.ruoyi.**.domain + type-aliases-package: com.jg.**.domain global-config: db-config: id-type: auto @@ -142,9 +142,9 @@ xss: # 代码生成 gen: # 作者 - author: ruoyi + author: jg # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.project.system + packageName: com.jg.project.system # 自动去除表前缀，默认是true autoRemovePre: false # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） diff --git a/target/classes/banner.txt b/target/classes/banner.txt index d6ca197..6262042 100644 --- a/target/classes/banner.txt +++ b/target/classes/banner.txt @@ -1,4 +1,4 @@ -Application Version: ${ruoyi.version} +Application Version: ${jg.version} Spring Boot Version: ${spring-boot.version} # # # # # ########## #### ## ## ## ## ## ## diff --git a/target/classes/com/ruoyi/RuoYiApplication.class b/target/classes/com/ruoyi/RuoYiApplication.class deleted file mode 100644 index a5f7552..0000000 Binary files a/target/classes/com/ruoyi/RuoYiApplication.class and /dev/null differ diff --git a/target/classes/com/ruoyi/RuoYiServletInitializer.class b/target/classes/com/ruoyi/RuoYiServletInitializer.class deleted file mode 100644 index efdae1b..0000000 Binary files a/target/classes/com/ruoyi/RuoYiServletInitializer.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/constant/CacheConstants.class b/target/classes/com/ruoyi/common/constant/CacheConstants.class deleted file mode 100644 index c1e8c94..0000000 Binary files a/target/classes/com/ruoyi/common/constant/CacheConstants.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/constant/Constants.class b/target/classes/com/ruoyi/common/constant/Constants.class deleted file mode 100644 index b633253..0000000 Binary files a/target/classes/com/ruoyi/common/constant/Constants.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/constant/GenConstants.class b/target/classes/com/ruoyi/common/constant/GenConstants.class deleted file mode 100644 index 82a4183..0000000 Binary files a/target/classes/com/ruoyi/common/constant/GenConstants.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/constant/HttpStatus.class b/target/classes/com/ruoyi/common/constant/HttpStatus.class deleted file mode 100644 index 3e48329..0000000 Binary files a/target/classes/com/ruoyi/common/constant/HttpStatus.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/constant/ScheduleConstants$Status.class b/target/classes/com/ruoyi/common/constant/ScheduleConstants$Status.class deleted file mode 100644 index fdb1cc2..0000000 Binary files a/target/classes/com/ruoyi/common/constant/ScheduleConstants$Status.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/constant/ScheduleConstants.class b/target/classes/com/ruoyi/common/constant/ScheduleConstants.class deleted file mode 100644 index 8ea01aa..0000000 Binary files a/target/classes/com/ruoyi/common/constant/ScheduleConstants.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/constant/UserConstants.class b/target/classes/com/ruoyi/common/constant/UserConstants.class deleted file mode 100644 index 0eaa572..0000000 Binary files a/target/classes/com/ruoyi/common/constant/UserConstants.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/core/text/CharsetKit.class b/target/classes/com/ruoyi/common/core/text/CharsetKit.class deleted file mode 100644 index fa3c231..0000000 Binary files a/target/classes/com/ruoyi/common/core/text/CharsetKit.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/core/text/Convert.class b/target/classes/com/ruoyi/common/core/text/Convert.class deleted file mode 100644 index 8745b18..0000000 Binary files a/target/classes/com/ruoyi/common/core/text/Convert.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/core/text/StrFormatter.class b/target/classes/com/ruoyi/common/core/text/StrFormatter.class deleted file mode 100644 index cc730c7..0000000 Binary files a/target/classes/com/ruoyi/common/core/text/StrFormatter.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/enums/HttpMethod.class b/target/classes/com/ruoyi/common/enums/HttpMethod.class deleted file mode 100644 index db9aade..0000000 Binary files a/target/classes/com/ruoyi/common/enums/HttpMethod.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/enums/UserStatus.class b/target/classes/com/ruoyi/common/enums/UserStatus.class deleted file mode 100644 index 926c7c0..0000000 Binary files a/target/classes/com/ruoyi/common/enums/UserStatus.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/DemoModeException.class b/target/classes/com/ruoyi/common/exception/DemoModeException.class deleted file mode 100644 index c2c7f3e..0000000 Binary files a/target/classes/com/ruoyi/common/exception/DemoModeException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/GlobalException.class b/target/classes/com/ruoyi/common/exception/GlobalException.class deleted file mode 100644 index dcf0f6b..0000000 Binary files a/target/classes/com/ruoyi/common/exception/GlobalException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/ServiceException.class b/target/classes/com/ruoyi/common/exception/ServiceException.class deleted file mode 100644 index a5986d6..0000000 Binary files a/target/classes/com/ruoyi/common/exception/ServiceException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/UtilException.class b/target/classes/com/ruoyi/common/exception/UtilException.class deleted file mode 100644 index e40f9dc..0000000 Binary files a/target/classes/com/ruoyi/common/exception/UtilException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/base/BaseException.class b/target/classes/com/ruoyi/common/exception/base/BaseException.class deleted file mode 100644 index 0da7597..0000000 Binary files a/target/classes/com/ruoyi/common/exception/base/BaseException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/file/FileException.class b/target/classes/com/ruoyi/common/exception/file/FileException.class deleted file mode 100644 index 81850c9..0000000 Binary files a/target/classes/com/ruoyi/common/exception/file/FileException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.class b/target/classes/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.class deleted file mode 100644 index facf41c..0000000 Binary files a/target/classes/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/file/FileSizeLimitExceededException.class b/target/classes/com/ruoyi/common/exception/file/FileSizeLimitExceededException.class deleted file mode 100644 index 0efee01..0000000 Binary files a/target/classes/com/ruoyi/common/exception/file/FileSizeLimitExceededException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/file/FileUploadException.class b/target/classes/com/ruoyi/common/exception/file/FileUploadException.class deleted file mode 100644 index 02b8e97..0000000 Binary files a/target/classes/com/ruoyi/common/exception/file/FileUploadException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/file/InvalidExtensionException$InvalidFlashExtensionException.class b/target/classes/com/ruoyi/common/exception/file/InvalidExtensionException$InvalidFlashExtensionException.class deleted file mode 100644 index 8e0c42b..0000000 Binary files a/target/classes/com/ruoyi/common/exception/file/InvalidExtensionException$InvalidFlashExtensionException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/file/InvalidExtensionException$InvalidImageExtensionException.class b/target/classes/com/ruoyi/common/exception/file/InvalidExtensionException$InvalidImageExtensionException.class deleted file mode 100644 index 806d7a3..0000000 Binary files a/target/classes/com/ruoyi/common/exception/file/InvalidExtensionException$InvalidImageExtensionException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/file/InvalidExtensionException$InvalidMediaExtensionException.class b/target/classes/com/ruoyi/common/exception/file/InvalidExtensionException$InvalidMediaExtensionException.class deleted file mode 100644 index d215ea8..0000000 Binary files a/target/classes/com/ruoyi/common/exception/file/InvalidExtensionException$InvalidMediaExtensionException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/file/InvalidExtensionException$InvalidVideoExtensionException.class b/target/classes/com/ruoyi/common/exception/file/InvalidExtensionException$InvalidVideoExtensionException.class deleted file mode 100644 index 99df9db..0000000 Binary files a/target/classes/com/ruoyi/common/exception/file/InvalidExtensionException$InvalidVideoExtensionException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/file/InvalidExtensionException.class b/target/classes/com/ruoyi/common/exception/file/InvalidExtensionException.class deleted file mode 100644 index a34d368..0000000 Binary files a/target/classes/com/ruoyi/common/exception/file/InvalidExtensionException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/job/TaskException$Code.class b/target/classes/com/ruoyi/common/exception/job/TaskException$Code.class deleted file mode 100644 index 5879372..0000000 Binary files a/target/classes/com/ruoyi/common/exception/job/TaskException$Code.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/job/TaskException.class b/target/classes/com/ruoyi/common/exception/job/TaskException.class deleted file mode 100644 index 5d32aab..0000000 Binary files a/target/classes/com/ruoyi/common/exception/job/TaskException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/user/BlackListException.class b/target/classes/com/ruoyi/common/exception/user/BlackListException.class deleted file mode 100644 index 48f2b2b..0000000 Binary files a/target/classes/com/ruoyi/common/exception/user/BlackListException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/user/CaptchaException.class b/target/classes/com/ruoyi/common/exception/user/CaptchaException.class deleted file mode 100644 index 4efae4d..0000000 Binary files a/target/classes/com/ruoyi/common/exception/user/CaptchaException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/user/CaptchaExpireException.class b/target/classes/com/ruoyi/common/exception/user/CaptchaExpireException.class deleted file mode 100644 index d025814..0000000 Binary files a/target/classes/com/ruoyi/common/exception/user/CaptchaExpireException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/user/UserException.class b/target/classes/com/ruoyi/common/exception/user/UserException.class deleted file mode 100644 index e664a7c..0000000 Binary files a/target/classes/com/ruoyi/common/exception/user/UserException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/user/UserNotExistsException.class b/target/classes/com/ruoyi/common/exception/user/UserNotExistsException.class deleted file mode 100644 index 488ae1e..0000000 Binary files a/target/classes/com/ruoyi/common/exception/user/UserNotExistsException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/user/UserPasswordNotMatchException.class b/target/classes/com/ruoyi/common/exception/user/UserPasswordNotMatchException.class deleted file mode 100644 index cd4e9b1..0000000 Binary files a/target/classes/com/ruoyi/common/exception/user/UserPasswordNotMatchException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.class b/target/classes/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.class deleted file mode 100644 index 3ebd819..0000000 Binary files a/target/classes/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/filter/PropertyPreExcludeFilter.class b/target/classes/com/ruoyi/common/filter/PropertyPreExcludeFilter.class deleted file mode 100644 index 8a82752..0000000 Binary files a/target/classes/com/ruoyi/common/filter/PropertyPreExcludeFilter.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/filter/RepeatableFilter.class b/target/classes/com/ruoyi/common/filter/RepeatableFilter.class deleted file mode 100644 index 23cd33f..0000000 Binary files a/target/classes/com/ruoyi/common/filter/RepeatableFilter.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/filter/RepeatedlyRequestWrapper$1.class b/target/classes/com/ruoyi/common/filter/RepeatedlyRequestWrapper$1.class deleted file mode 100644 index 1a548e6..0000000 Binary files a/target/classes/com/ruoyi/common/filter/RepeatedlyRequestWrapper$1.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/filter/RepeatedlyRequestWrapper.class b/target/classes/com/ruoyi/common/filter/RepeatedlyRequestWrapper.class deleted file mode 100644 index 0ca282d..0000000 Binary files a/target/classes/com/ruoyi/common/filter/RepeatedlyRequestWrapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/filter/XssFilter.class b/target/classes/com/ruoyi/common/filter/XssFilter.class deleted file mode 100644 index bc375b7..0000000 Binary files a/target/classes/com/ruoyi/common/filter/XssFilter.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/filter/XssHttpServletRequestWrapper$1.class b/target/classes/com/ruoyi/common/filter/XssHttpServletRequestWrapper$1.class deleted file mode 100644 index 3256f12..0000000 Binary files a/target/classes/com/ruoyi/common/filter/XssHttpServletRequestWrapper$1.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/filter/XssHttpServletRequestWrapper.class b/target/classes/com/ruoyi/common/filter/XssHttpServletRequestWrapper.class deleted file mode 100644 index 0e80ae2..0000000 Binary files a/target/classes/com/ruoyi/common/filter/XssHttpServletRequestWrapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/Arith.class b/target/classes/com/ruoyi/common/utils/Arith.class deleted file mode 100644 index e785a25..0000000 Binary files a/target/classes/com/ruoyi/common/utils/Arith.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/DateUtils.class b/target/classes/com/ruoyi/common/utils/DateUtils.class deleted file mode 100644 index c61f996..0000000 Binary files a/target/classes/com/ruoyi/common/utils/DateUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/DictUtils.class b/target/classes/com/ruoyi/common/utils/DictUtils.class deleted file mode 100644 index 45b68fd..0000000 Binary files a/target/classes/com/ruoyi/common/utils/DictUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/ExceptionUtil.class b/target/classes/com/ruoyi/common/utils/ExceptionUtil.class deleted file mode 100644 index 6387539..0000000 Binary files a/target/classes/com/ruoyi/common/utils/ExceptionUtil.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/LogUtils.class b/target/classes/com/ruoyi/common/utils/LogUtils.class deleted file mode 100644 index 4f6c708..0000000 Binary files a/target/classes/com/ruoyi/common/utils/LogUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/MessageUtils.class b/target/classes/com/ruoyi/common/utils/MessageUtils.class deleted file mode 100644 index 16c9216..0000000 Binary files a/target/classes/com/ruoyi/common/utils/MessageUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/PageUtils.class b/target/classes/com/ruoyi/common/utils/PageUtils.class deleted file mode 100644 index 38048f0..0000000 Binary files a/target/classes/com/ruoyi/common/utils/PageUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/SecurityUtils.class b/target/classes/com/ruoyi/common/utils/SecurityUtils.class deleted file mode 100644 index 33855c4..0000000 Binary files a/target/classes/com/ruoyi/common/utils/SecurityUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/ServletUtils.class b/target/classes/com/ruoyi/common/utils/ServletUtils.class deleted file mode 100644 index 09a4d67..0000000 Binary files a/target/classes/com/ruoyi/common/utils/ServletUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/StringUtils.class b/target/classes/com/ruoyi/common/utils/StringUtils.class deleted file mode 100644 index 91ca084..0000000 Binary files a/target/classes/com/ruoyi/common/utils/StringUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/Threads.class b/target/classes/com/ruoyi/common/utils/Threads.class deleted file mode 100644 index 4d4eaf3..0000000 Binary files a/target/classes/com/ruoyi/common/utils/Threads.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/bean/BeanUtils.class b/target/classes/com/ruoyi/common/utils/bean/BeanUtils.class deleted file mode 100644 index a29fe81..0000000 Binary files a/target/classes/com/ruoyi/common/utils/bean/BeanUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/bean/BeanValidators.class b/target/classes/com/ruoyi/common/utils/bean/BeanValidators.class deleted file mode 100644 index e9043a5..0000000 Binary files a/target/classes/com/ruoyi/common/utils/bean/BeanValidators.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/file/FileTypeUtils.class b/target/classes/com/ruoyi/common/utils/file/FileTypeUtils.class deleted file mode 100644 index 587de44..0000000 Binary files a/target/classes/com/ruoyi/common/utils/file/FileTypeUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/file/FileUploadUtils.class b/target/classes/com/ruoyi/common/utils/file/FileUploadUtils.class deleted file mode 100644 index 010382f..0000000 Binary files a/target/classes/com/ruoyi/common/utils/file/FileUploadUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/file/FileUtils.class b/target/classes/com/ruoyi/common/utils/file/FileUtils.class deleted file mode 100644 index 223b45b..0000000 Binary files a/target/classes/com/ruoyi/common/utils/file/FileUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/file/ImageUtils.class b/target/classes/com/ruoyi/common/utils/file/ImageUtils.class deleted file mode 100644 index 56e6929..0000000 Binary files a/target/classes/com/ruoyi/common/utils/file/ImageUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/file/MimeTypeUtils.class b/target/classes/com/ruoyi/common/utils/file/MimeTypeUtils.class deleted file mode 100644 index f103ee4..0000000 Binary files a/target/classes/com/ruoyi/common/utils/file/MimeTypeUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/html/EscapeUtil.class b/target/classes/com/ruoyi/common/utils/html/EscapeUtil.class deleted file mode 100644 index 40fa6ae..0000000 Binary files a/target/classes/com/ruoyi/common/utils/html/EscapeUtil.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/html/HTMLFilter.class b/target/classes/com/ruoyi/common/utils/html/HTMLFilter.class deleted file mode 100644 index 1bd1f6a..0000000 Binary files a/target/classes/com/ruoyi/common/utils/html/HTMLFilter.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/http/HttpHelper.class b/target/classes/com/ruoyi/common/utils/http/HttpHelper.class deleted file mode 100644 index 40c2e0d..0000000 Binary files a/target/classes/com/ruoyi/common/utils/http/HttpHelper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/http/HttpUtils$1.class b/target/classes/com/ruoyi/common/utils/http/HttpUtils$1.class deleted file mode 100644 index 3df88e3..0000000 Binary files a/target/classes/com/ruoyi/common/utils/http/HttpUtils$1.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/http/HttpUtils$TrustAnyHostnameVerifier.class b/target/classes/com/ruoyi/common/utils/http/HttpUtils$TrustAnyHostnameVerifier.class deleted file mode 100644 index 84d4a4e..0000000 Binary files a/target/classes/com/ruoyi/common/utils/http/HttpUtils$TrustAnyHostnameVerifier.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/http/HttpUtils$TrustAnyTrustManager.class b/target/classes/com/ruoyi/common/utils/http/HttpUtils$TrustAnyTrustManager.class deleted file mode 100644 index 0270cad..0000000 Binary files a/target/classes/com/ruoyi/common/utils/http/HttpUtils$TrustAnyTrustManager.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/http/HttpUtils.class b/target/classes/com/ruoyi/common/utils/http/HttpUtils.class deleted file mode 100644 index 31d38a1..0000000 Binary files a/target/classes/com/ruoyi/common/utils/http/HttpUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/ip/AddressUtils.class b/target/classes/com/ruoyi/common/utils/ip/AddressUtils.class deleted file mode 100644 index 627cee5..0000000 Binary files a/target/classes/com/ruoyi/common/utils/ip/AddressUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/ip/IpUtils.class b/target/classes/com/ruoyi/common/utils/ip/IpUtils.class deleted file mode 100644 index 7ffbe68..0000000 Binary files a/target/classes/com/ruoyi/common/utils/ip/IpUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/job/AbstractQuartzJob.class b/target/classes/com/ruoyi/common/utils/job/AbstractQuartzJob.class deleted file mode 100644 index 22670fb..0000000 Binary files a/target/classes/com/ruoyi/common/utils/job/AbstractQuartzJob.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/job/CronUtils.class b/target/classes/com/ruoyi/common/utils/job/CronUtils.class deleted file mode 100644 index ff2bacd..0000000 Binary files a/target/classes/com/ruoyi/common/utils/job/CronUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/job/JobInvokeUtil.class b/target/classes/com/ruoyi/common/utils/job/JobInvokeUtil.class deleted file mode 100644 index 47c447d..0000000 Binary files a/target/classes/com/ruoyi/common/utils/job/JobInvokeUtil.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/job/QuartzDisallowConcurrentExecution.class b/target/classes/com/ruoyi/common/utils/job/QuartzDisallowConcurrentExecution.class deleted file mode 100644 index 9b9a268..0000000 Binary files a/target/classes/com/ruoyi/common/utils/job/QuartzDisallowConcurrentExecution.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/job/QuartzJobExecution.class b/target/classes/com/ruoyi/common/utils/job/QuartzJobExecution.class deleted file mode 100644 index 9a54a45..0000000 Binary files a/target/classes/com/ruoyi/common/utils/job/QuartzJobExecution.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/job/ScheduleUtils.class b/target/classes/com/ruoyi/common/utils/job/ScheduleUtils.class deleted file mode 100644 index 493cbe7..0000000 Binary files a/target/classes/com/ruoyi/common/utils/job/ScheduleUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.class b/target/classes/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.class deleted file mode 100644 index 4c64947..0000000 Binary files a/target/classes/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/poi/ExcelUtil.class b/target/classes/com/ruoyi/common/utils/poi/ExcelUtil.class deleted file mode 100644 index cf7249c..0000000 Binary files a/target/classes/com/ruoyi/common/utils/poi/ExcelUtil.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/reflect/ReflectUtils.class b/target/classes/com/ruoyi/common/utils/reflect/ReflectUtils.class deleted file mode 100644 index 727d872..0000000 Binary files a/target/classes/com/ruoyi/common/utils/reflect/ReflectUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/sign/Base64.class b/target/classes/com/ruoyi/common/utils/sign/Base64.class deleted file mode 100644 index b2bcd2b..0000000 Binary files a/target/classes/com/ruoyi/common/utils/sign/Base64.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/sign/Md5Utils.class b/target/classes/com/ruoyi/common/utils/sign/Md5Utils.class deleted file mode 100644 index f0c39e6..0000000 Binary files a/target/classes/com/ruoyi/common/utils/sign/Md5Utils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/spring/SpringUtils.class b/target/classes/com/ruoyi/common/utils/spring/SpringUtils.class deleted file mode 100644 index 75d620b..0000000 Binary files a/target/classes/com/ruoyi/common/utils/spring/SpringUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/sql/SqlUtil.class b/target/classes/com/ruoyi/common/utils/sql/SqlUtil.class deleted file mode 100644 index a640f8e..0000000 Binary files a/target/classes/com/ruoyi/common/utils/sql/SqlUtil.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/uuid/IdUtils.class b/target/classes/com/ruoyi/common/utils/uuid/IdUtils.class deleted file mode 100644 index 60ed5df..0000000 Binary files a/target/classes/com/ruoyi/common/utils/uuid/IdUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/uuid/Seq.class b/target/classes/com/ruoyi/common/utils/uuid/Seq.class deleted file mode 100644 index 670e2e5..0000000 Binary files a/target/classes/com/ruoyi/common/utils/uuid/Seq.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/uuid/UUID$Holder.class b/target/classes/com/ruoyi/common/utils/uuid/UUID$Holder.class deleted file mode 100644 index b9ef6fa..0000000 Binary files a/target/classes/com/ruoyi/common/utils/uuid/UUID$Holder.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/utils/uuid/UUID.class b/target/classes/com/ruoyi/common/utils/uuid/UUID.class deleted file mode 100644 index 9135b02..0000000 Binary files a/target/classes/com/ruoyi/common/utils/uuid/UUID.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/xss/Xss.class b/target/classes/com/ruoyi/common/xss/Xss.class deleted file mode 100644 index 404ec7a..0000000 Binary files a/target/classes/com/ruoyi/common/xss/Xss.class and /dev/null differ diff --git a/target/classes/com/ruoyi/common/xss/XssValidator.class b/target/classes/com/ruoyi/common/xss/XssValidator.class deleted file mode 100644 index 5fb0fa5..0000000 Binary files a/target/classes/com/ruoyi/common/xss/XssValidator.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/aspectj/DataScopeAspect.class b/target/classes/com/ruoyi/framework/aspectj/DataScopeAspect.class deleted file mode 100644 index a52298e..0000000 Binary files a/target/classes/com/ruoyi/framework/aspectj/DataScopeAspect.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/aspectj/DataSourceAspect.class b/target/classes/com/ruoyi/framework/aspectj/DataSourceAspect.class deleted file mode 100644 index c05f237..0000000 Binary files a/target/classes/com/ruoyi/framework/aspectj/DataSourceAspect.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/aspectj/LogAspect.class b/target/classes/com/ruoyi/framework/aspectj/LogAspect.class deleted file mode 100644 index 2745bd0..0000000 Binary files a/target/classes/com/ruoyi/framework/aspectj/LogAspect.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/aspectj/RateLimiterAspect.class b/target/classes/com/ruoyi/framework/aspectj/RateLimiterAspect.class deleted file mode 100644 index b005400..0000000 Binary files a/target/classes/com/ruoyi/framework/aspectj/RateLimiterAspect.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/aspectj/lang/annotation/Anonymous.class b/target/classes/com/ruoyi/framework/aspectj/lang/annotation/Anonymous.class deleted file mode 100644 index b1dda2b..0000000 Binary files a/target/classes/com/ruoyi/framework/aspectj/lang/annotation/Anonymous.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/aspectj/lang/annotation/DataScope.class b/target/classes/com/ruoyi/framework/aspectj/lang/annotation/DataScope.class deleted file mode 100644 index 3e6dd41..0000000 Binary files a/target/classes/com/ruoyi/framework/aspectj/lang/annotation/DataScope.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/aspectj/lang/annotation/DataSource.class b/target/classes/com/ruoyi/framework/aspectj/lang/annotation/DataSource.class deleted file mode 100644 index 927e46a..0000000 Binary files a/target/classes/com/ruoyi/framework/aspectj/lang/annotation/DataSource.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/aspectj/lang/annotation/Excel$ColumnType.class b/target/classes/com/ruoyi/framework/aspectj/lang/annotation/Excel$ColumnType.class deleted file mode 100644 index 37d54bb..0000000 Binary files a/target/classes/com/ruoyi/framework/aspectj/lang/annotation/Excel$ColumnType.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/aspectj/lang/annotation/Excel$Type.class b/target/classes/com/ruoyi/framework/aspectj/lang/annotation/Excel$Type.class deleted file mode 100644 index 285243e..0000000 Binary files a/target/classes/com/ruoyi/framework/aspectj/lang/annotation/Excel$Type.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/aspectj/lang/annotation/Excel.class b/target/classes/com/ruoyi/framework/aspectj/lang/annotation/Excel.class deleted file mode 100644 index 0db4453..0000000 Binary files a/target/classes/com/ruoyi/framework/aspectj/lang/annotation/Excel.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/aspectj/lang/annotation/Excels.class b/target/classes/com/ruoyi/framework/aspectj/lang/annotation/Excels.class deleted file mode 100644 index 33a115e..0000000 Binary files a/target/classes/com/ruoyi/framework/aspectj/lang/annotation/Excels.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/aspectj/lang/annotation/Log.class b/target/classes/com/ruoyi/framework/aspectj/lang/annotation/Log.class deleted file mode 100644 index f0f606e..0000000 Binary files a/target/classes/com/ruoyi/framework/aspectj/lang/annotation/Log.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/aspectj/lang/annotation/RateLimiter.class b/target/classes/com/ruoyi/framework/aspectj/lang/annotation/RateLimiter.class deleted file mode 100644 index 6328244..0000000 Binary files a/target/classes/com/ruoyi/framework/aspectj/lang/annotation/RateLimiter.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/aspectj/lang/enums/BusinessStatus.class b/target/classes/com/ruoyi/framework/aspectj/lang/enums/BusinessStatus.class deleted file mode 100644 index de66c89..0000000 Binary files a/target/classes/com/ruoyi/framework/aspectj/lang/enums/BusinessStatus.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/aspectj/lang/enums/BusinessType.class b/target/classes/com/ruoyi/framework/aspectj/lang/enums/BusinessType.class deleted file mode 100644 index 194905b..0000000 Binary files a/target/classes/com/ruoyi/framework/aspectj/lang/enums/BusinessType.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/aspectj/lang/enums/DataSourceType.class b/target/classes/com/ruoyi/framework/aspectj/lang/enums/DataSourceType.class deleted file mode 100644 index 6cecd25..0000000 Binary files a/target/classes/com/ruoyi/framework/aspectj/lang/enums/DataSourceType.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/aspectj/lang/enums/LimitType.class b/target/classes/com/ruoyi/framework/aspectj/lang/enums/LimitType.class deleted file mode 100644 index 06eae3b..0000000 Binary files a/target/classes/com/ruoyi/framework/aspectj/lang/enums/LimitType.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/aspectj/lang/enums/OperatorType.class b/target/classes/com/ruoyi/framework/aspectj/lang/enums/OperatorType.class deleted file mode 100644 index 49ec280..0000000 Binary files a/target/classes/com/ruoyi/framework/aspectj/lang/enums/OperatorType.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/config/ApplicationConfig.class b/target/classes/com/ruoyi/framework/config/ApplicationConfig.class deleted file mode 100644 index 76ab7ae..0000000 Binary files a/target/classes/com/ruoyi/framework/config/ApplicationConfig.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/config/CaptchaConfig.class b/target/classes/com/ruoyi/framework/config/CaptchaConfig.class deleted file mode 100644 index eb4e93e..0000000 Binary files a/target/classes/com/ruoyi/framework/config/CaptchaConfig.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/config/DruidConfig$1.class b/target/classes/com/ruoyi/framework/config/DruidConfig$1.class deleted file mode 100644 index d3bca66..0000000 Binary files a/target/classes/com/ruoyi/framework/config/DruidConfig$1.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/config/DruidConfig.class b/target/classes/com/ruoyi/framework/config/DruidConfig.class deleted file mode 100644 index f31b68c..0000000 Binary files a/target/classes/com/ruoyi/framework/config/DruidConfig.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.class b/target/classes/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.class deleted file mode 100644 index 4be41ee..0000000 Binary files a/target/classes/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/config/FilterConfig.class b/target/classes/com/ruoyi/framework/config/FilterConfig.class deleted file mode 100644 index bf96d47..0000000 Binary files a/target/classes/com/ruoyi/framework/config/FilterConfig.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/config/GenConfig.class b/target/classes/com/ruoyi/framework/config/GenConfig.class deleted file mode 100644 index f039e31..0000000 Binary files a/target/classes/com/ruoyi/framework/config/GenConfig.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/config/I18nConfig.class b/target/classes/com/ruoyi/framework/config/I18nConfig.class deleted file mode 100644 index f76ad70..0000000 Binary files a/target/classes/com/ruoyi/framework/config/I18nConfig.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/config/KaptchaTextCreator.class b/target/classes/com/ruoyi/framework/config/KaptchaTextCreator.class deleted file mode 100644 index 9ff554a..0000000 Binary files a/target/classes/com/ruoyi/framework/config/KaptchaTextCreator.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/config/MybatisPlusConfig.class b/target/classes/com/ruoyi/framework/config/MybatisPlusConfig.class deleted file mode 100644 index f9aa923..0000000 Binary files a/target/classes/com/ruoyi/framework/config/MybatisPlusConfig.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/config/RedisConfig.class b/target/classes/com/ruoyi/framework/config/RedisConfig.class deleted file mode 100644 index f2b7358..0000000 Binary files a/target/classes/com/ruoyi/framework/config/RedisConfig.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/config/ResourcesConfig.class b/target/classes/com/ruoyi/framework/config/ResourcesConfig.class deleted file mode 100644 index 922e751..0000000 Binary files a/target/classes/com/ruoyi/framework/config/ResourcesConfig.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/config/RuoYiConfig.class b/target/classes/com/ruoyi/framework/config/RuoYiConfig.class deleted file mode 100644 index 5d887ed..0000000 Binary files a/target/classes/com/ruoyi/framework/config/RuoYiConfig.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/config/SecurityConfig.class b/target/classes/com/ruoyi/framework/config/SecurityConfig.class deleted file mode 100644 index abe1e46..0000000 Binary files a/target/classes/com/ruoyi/framework/config/SecurityConfig.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/config/ServerConfig.class b/target/classes/com/ruoyi/framework/config/ServerConfig.class deleted file mode 100644 index b4c7979..0000000 Binary files a/target/classes/com/ruoyi/framework/config/ServerConfig.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/config/SwaggerConfig.class b/target/classes/com/ruoyi/framework/config/SwaggerConfig.class deleted file mode 100644 index 810477b..0000000 Binary files a/target/classes/com/ruoyi/framework/config/SwaggerConfig.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/config/ThreadPoolConfig$1.class b/target/classes/com/ruoyi/framework/config/ThreadPoolConfig$1.class deleted file mode 100644 index 82e0728..0000000 Binary files a/target/classes/com/ruoyi/framework/config/ThreadPoolConfig$1.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/config/ThreadPoolConfig.class b/target/classes/com/ruoyi/framework/config/ThreadPoolConfig.class deleted file mode 100644 index d474975..0000000 Binary files a/target/classes/com/ruoyi/framework/config/ThreadPoolConfig.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/config/properties/DruidProperties.class b/target/classes/com/ruoyi/framework/config/properties/DruidProperties.class deleted file mode 100644 index 87aca49..0000000 Binary files a/target/classes/com/ruoyi/framework/config/properties/DruidProperties.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/config/properties/PermitAllUrlProperties.class b/target/classes/com/ruoyi/framework/config/properties/PermitAllUrlProperties.class deleted file mode 100644 index 9c666e0..0000000 Binary files a/target/classes/com/ruoyi/framework/config/properties/PermitAllUrlProperties.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/datasource/DynamicDataSource.class b/target/classes/com/ruoyi/framework/datasource/DynamicDataSource.class deleted file mode 100644 index 26cc712..0000000 Binary files a/target/classes/com/ruoyi/framework/datasource/DynamicDataSource.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.class b/target/classes/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.class deleted file mode 100644 index a73ee58..0000000 Binary files a/target/classes/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.class b/target/classes/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.class deleted file mode 100644 index f2e6f77..0000000 Binary files a/target/classes/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.class b/target/classes/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.class deleted file mode 100644 index 30b8623..0000000 Binary files a/target/classes/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.class b/target/classes/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.class deleted file mode 100644 index 0299a5b..0000000 Binary files a/target/classes/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/manager/AsyncManager.class b/target/classes/com/ruoyi/framework/manager/AsyncManager.class deleted file mode 100644 index 7506020..0000000 Binary files a/target/classes/com/ruoyi/framework/manager/AsyncManager.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/manager/ShutdownManager.class b/target/classes/com/ruoyi/framework/manager/ShutdownManager.class deleted file mode 100644 index ae952e5..0000000 Binary files a/target/classes/com/ruoyi/framework/manager/ShutdownManager.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/manager/factory/AsyncFactory$1.class b/target/classes/com/ruoyi/framework/manager/factory/AsyncFactory$1.class deleted file mode 100644 index cf18176..0000000 Binary files a/target/classes/com/ruoyi/framework/manager/factory/AsyncFactory$1.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/manager/factory/AsyncFactory$2.class b/target/classes/com/ruoyi/framework/manager/factory/AsyncFactory$2.class deleted file mode 100644 index 3ddf7e0..0000000 Binary files a/target/classes/com/ruoyi/framework/manager/factory/AsyncFactory$2.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/manager/factory/AsyncFactory.class b/target/classes/com/ruoyi/framework/manager/factory/AsyncFactory.class deleted file mode 100644 index 3016b00..0000000 Binary files a/target/classes/com/ruoyi/framework/manager/factory/AsyncFactory.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/redis/RedisCache.class b/target/classes/com/ruoyi/framework/redis/RedisCache.class deleted file mode 100644 index e945aae..0000000 Binary files a/target/classes/com/ruoyi/framework/redis/RedisCache.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/security/LoginBody.class b/target/classes/com/ruoyi/framework/security/LoginBody.class deleted file mode 100644 index 622ec71..0000000 Binary files a/target/classes/com/ruoyi/framework/security/LoginBody.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/security/LoginUser.class b/target/classes/com/ruoyi/framework/security/LoginUser.class deleted file mode 100644 index bcd951b..0000000 Binary files a/target/classes/com/ruoyi/framework/security/LoginUser.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/security/RegisterBody.class b/target/classes/com/ruoyi/framework/security/RegisterBody.class deleted file mode 100644 index ef4beb0..0000000 Binary files a/target/classes/com/ruoyi/framework/security/RegisterBody.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/security/context/AuthenticationContextHolder.class b/target/classes/com/ruoyi/framework/security/context/AuthenticationContextHolder.class deleted file mode 100644 index f01d593..0000000 Binary files a/target/classes/com/ruoyi/framework/security/context/AuthenticationContextHolder.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/security/context/PermissionContextHolder.class b/target/classes/com/ruoyi/framework/security/context/PermissionContextHolder.class deleted file mode 100644 index b1c31ad..0000000 Binary files a/target/classes/com/ruoyi/framework/security/context/PermissionContextHolder.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.class b/target/classes/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.class deleted file mode 100644 index b82352e..0000000 Binary files a/target/classes/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.class b/target/classes/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.class deleted file mode 100644 index 5b9c1a3..0000000 Binary files a/target/classes/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.class b/target/classes/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.class deleted file mode 100644 index e6c6e34..0000000 Binary files a/target/classes/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/security/service/PermissionService.class b/target/classes/com/ruoyi/framework/security/service/PermissionService.class deleted file mode 100644 index 215b701..0000000 Binary files a/target/classes/com/ruoyi/framework/security/service/PermissionService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/security/service/SysLoginService.class b/target/classes/com/ruoyi/framework/security/service/SysLoginService.class deleted file mode 100644 index a762385..0000000 Binary files a/target/classes/com/ruoyi/framework/security/service/SysLoginService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/security/service/SysPasswordService.class b/target/classes/com/ruoyi/framework/security/service/SysPasswordService.class deleted file mode 100644 index d4ccb46..0000000 Binary files a/target/classes/com/ruoyi/framework/security/service/SysPasswordService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/security/service/SysPermissionService.class b/target/classes/com/ruoyi/framework/security/service/SysPermissionService.class deleted file mode 100644 index 329a43e..0000000 Binary files a/target/classes/com/ruoyi/framework/security/service/SysPermissionService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/security/service/SysRegisterService.class b/target/classes/com/ruoyi/framework/security/service/SysRegisterService.class deleted file mode 100644 index 00596e8..0000000 Binary files a/target/classes/com/ruoyi/framework/security/service/SysRegisterService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/security/service/TokenService.class b/target/classes/com/ruoyi/framework/security/service/TokenService.class deleted file mode 100644 index f4d2e42..0000000 Binary files a/target/classes/com/ruoyi/framework/security/service/TokenService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/security/service/UserDetailsServiceImpl.class b/target/classes/com/ruoyi/framework/security/service/UserDetailsServiceImpl.class deleted file mode 100644 index 70044f8..0000000 Binary files a/target/classes/com/ruoyi/framework/security/service/UserDetailsServiceImpl.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/task/RyTask.class b/target/classes/com/ruoyi/framework/task/RyTask.class deleted file mode 100644 index fc02082..0000000 Binary files a/target/classes/com/ruoyi/framework/task/RyTask.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/web/controller/BaseController$1.class b/target/classes/com/ruoyi/framework/web/controller/BaseController$1.class deleted file mode 100644 index 9be3861..0000000 Binary files a/target/classes/com/ruoyi/framework/web/controller/BaseController$1.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/web/controller/BaseController.class b/target/classes/com/ruoyi/framework/web/controller/BaseController.class deleted file mode 100644 index dae1f09..0000000 Binary files a/target/classes/com/ruoyi/framework/web/controller/BaseController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/web/domain/AjaxResult.class b/target/classes/com/ruoyi/framework/web/domain/AjaxResult.class deleted file mode 100644 index 603bc06..0000000 Binary files a/target/classes/com/ruoyi/framework/web/domain/AjaxResult.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/web/domain/BaseEntity.class b/target/classes/com/ruoyi/framework/web/domain/BaseEntity.class deleted file mode 100644 index f918617..0000000 Binary files a/target/classes/com/ruoyi/framework/web/domain/BaseEntity.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/web/domain/R.class b/target/classes/com/ruoyi/framework/web/domain/R.class deleted file mode 100644 index 89a153a..0000000 Binary files a/target/classes/com/ruoyi/framework/web/domain/R.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/web/domain/Server.class b/target/classes/com/ruoyi/framework/web/domain/Server.class deleted file mode 100644 index 6cf946e..0000000 Binary files a/target/classes/com/ruoyi/framework/web/domain/Server.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/web/domain/TreeEntity.class b/target/classes/com/ruoyi/framework/web/domain/TreeEntity.class deleted file mode 100644 index ffea00a..0000000 Binary files a/target/classes/com/ruoyi/framework/web/domain/TreeEntity.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/web/domain/TreeSelect.class b/target/classes/com/ruoyi/framework/web/domain/TreeSelect.class deleted file mode 100644 index bfa17ad..0000000 Binary files a/target/classes/com/ruoyi/framework/web/domain/TreeSelect.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/web/domain/server/Cpu.class b/target/classes/com/ruoyi/framework/web/domain/server/Cpu.class deleted file mode 100644 index 3e5c0bb..0000000 Binary files a/target/classes/com/ruoyi/framework/web/domain/server/Cpu.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/web/domain/server/Jvm.class b/target/classes/com/ruoyi/framework/web/domain/server/Jvm.class deleted file mode 100644 index 44bc9c1..0000000 Binary files a/target/classes/com/ruoyi/framework/web/domain/server/Jvm.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/web/domain/server/Mem.class b/target/classes/com/ruoyi/framework/web/domain/server/Mem.class deleted file mode 100644 index 71a5b9e..0000000 Binary files a/target/classes/com/ruoyi/framework/web/domain/server/Mem.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/web/domain/server/Sys.class b/target/classes/com/ruoyi/framework/web/domain/server/Sys.class deleted file mode 100644 index 50838fd..0000000 Binary files a/target/classes/com/ruoyi/framework/web/domain/server/Sys.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/web/domain/server/SysFile.class b/target/classes/com/ruoyi/framework/web/domain/server/SysFile.class deleted file mode 100644 index a70581f..0000000 Binary files a/target/classes/com/ruoyi/framework/web/domain/server/SysFile.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/web/exception/GlobalExceptionHandler.class b/target/classes/com/ruoyi/framework/web/exception/GlobalExceptionHandler.class deleted file mode 100644 index 5dcc1c9..0000000 Binary files a/target/classes/com/ruoyi/framework/web/exception/GlobalExceptionHandler.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/web/page/PageDomain.class b/target/classes/com/ruoyi/framework/web/page/PageDomain.class deleted file mode 100644 index e00c530..0000000 Binary files a/target/classes/com/ruoyi/framework/web/page/PageDomain.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/web/page/TableDataInfo.class b/target/classes/com/ruoyi/framework/web/page/TableDataInfo.class deleted file mode 100644 index fdc4ca4..0000000 Binary files a/target/classes/com/ruoyi/framework/web/page/TableDataInfo.class and /dev/null differ diff --git a/target/classes/com/ruoyi/framework/web/page/TableSupport.class b/target/classes/com/ruoyi/framework/web/page/TableSupport.class deleted file mode 100644 index 80516ab..0000000 Binary files a/target/classes/com/ruoyi/framework/web/page/TableSupport.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/about/controller/AboutPartThreeController.class b/target/classes/com/ruoyi/project/about/controller/AboutPartThreeController.class deleted file mode 100644 index 1d07c96..0000000 Binary files a/target/classes/com/ruoyi/project/about/controller/AboutPartThreeController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/about/domain/AboutPartThree$AboutPartThreeBuilder.class b/target/classes/com/ruoyi/project/about/domain/AboutPartThree$AboutPartThreeBuilder.class deleted file mode 100644 index 398208f..0000000 Binary files a/target/classes/com/ruoyi/project/about/domain/AboutPartThree$AboutPartThreeBuilder.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/about/domain/AboutPartThree.class b/target/classes/com/ruoyi/project/about/domain/AboutPartThree.class deleted file mode 100644 index 5c6442a..0000000 Binary files a/target/classes/com/ruoyi/project/about/domain/AboutPartThree.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/about/mapper/AboutPartThreeMapper.class b/target/classes/com/ruoyi/project/about/mapper/AboutPartThreeMapper.class deleted file mode 100644 index 4adb278..0000000 Binary files a/target/classes/com/ruoyi/project/about/mapper/AboutPartThreeMapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/about/service/IAboutPartThreeService.class b/target/classes/com/ruoyi/project/about/service/IAboutPartThreeService.class deleted file mode 100644 index 32f54da..0000000 Binary files a/target/classes/com/ruoyi/project/about/service/IAboutPartThreeService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/about/service/impl/AboutPartThreeServiceImpl.class b/target/classes/com/ruoyi/project/about/service/impl/AboutPartThreeServiceImpl.class deleted file mode 100644 index 0c5541a..0000000 Binary files a/target/classes/com/ruoyi/project/about/service/impl/AboutPartThreeServiceImpl.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/common/CaptchaController.class b/target/classes/com/ruoyi/project/common/CaptchaController.class deleted file mode 100644 index 452c9ab..0000000 Binary files a/target/classes/com/ruoyi/project/common/CaptchaController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/common/CommonController.class b/target/classes/com/ruoyi/project/common/CommonController.class deleted file mode 100644 index a750e35..0000000 Binary files a/target/classes/com/ruoyi/project/common/CommonController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/controller/CacheController.class b/target/classes/com/ruoyi/project/monitor/controller/CacheController.class deleted file mode 100644 index d1074ea..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/controller/CacheController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/controller/ServerController.class b/target/classes/com/ruoyi/project/monitor/controller/ServerController.class deleted file mode 100644 index 6322423..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/controller/ServerController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/controller/SysJobController.class b/target/classes/com/ruoyi/project/monitor/controller/SysJobController.class deleted file mode 100644 index 889a3f7..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/controller/SysJobController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/controller/SysJobLogController.class b/target/classes/com/ruoyi/project/monitor/controller/SysJobLogController.class deleted file mode 100644 index db614c6..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/controller/SysJobLogController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/controller/SysLogininforController.class b/target/classes/com/ruoyi/project/monitor/controller/SysLogininforController.class deleted file mode 100644 index e584df0..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/controller/SysLogininforController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/controller/SysOperlogController.class b/target/classes/com/ruoyi/project/monitor/controller/SysOperlogController.class deleted file mode 100644 index dd65da4..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/controller/SysOperlogController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/controller/SysUserOnlineController.class b/target/classes/com/ruoyi/project/monitor/controller/SysUserOnlineController.class deleted file mode 100644 index f36e356..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/controller/SysUserOnlineController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/domain/SysCache.class b/target/classes/com/ruoyi/project/monitor/domain/SysCache.class deleted file mode 100644 index b195ea9..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/domain/SysCache.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/domain/SysJob.class b/target/classes/com/ruoyi/project/monitor/domain/SysJob.class deleted file mode 100644 index 5e8b898..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/domain/SysJob.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/domain/SysJobLog.class b/target/classes/com/ruoyi/project/monitor/domain/SysJobLog.class deleted file mode 100644 index 61a51f3..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/domain/SysJobLog.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/domain/SysLogininfor.class b/target/classes/com/ruoyi/project/monitor/domain/SysLogininfor.class deleted file mode 100644 index 0a8d931..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/domain/SysLogininfor.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/domain/SysOperLog.class b/target/classes/com/ruoyi/project/monitor/domain/SysOperLog.class deleted file mode 100644 index 665bdea..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/domain/SysOperLog.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/domain/SysUserOnline.class b/target/classes/com/ruoyi/project/monitor/domain/SysUserOnline.class deleted file mode 100644 index eb72982..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/domain/SysUserOnline.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/mapper/SysJobLogMapper.class b/target/classes/com/ruoyi/project/monitor/mapper/SysJobLogMapper.class deleted file mode 100644 index b310e72..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/mapper/SysJobLogMapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/mapper/SysJobMapper.class b/target/classes/com/ruoyi/project/monitor/mapper/SysJobMapper.class deleted file mode 100644 index d8b642d..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/mapper/SysJobMapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/mapper/SysLogininforMapper.class b/target/classes/com/ruoyi/project/monitor/mapper/SysLogininforMapper.class deleted file mode 100644 index 3e51de0..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/mapper/SysLogininforMapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/mapper/SysOperLogMapper.class b/target/classes/com/ruoyi/project/monitor/mapper/SysOperLogMapper.class deleted file mode 100644 index 905df9d..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/mapper/SysOperLogMapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/service/ISysJobLogService.class b/target/classes/com/ruoyi/project/monitor/service/ISysJobLogService.class deleted file mode 100644 index d84e7bb..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/service/ISysJobLogService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/service/ISysJobService.class b/target/classes/com/ruoyi/project/monitor/service/ISysJobService.class deleted file mode 100644 index 676cdad..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/service/ISysJobService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/service/ISysLogininforService.class b/target/classes/com/ruoyi/project/monitor/service/ISysLogininforService.class deleted file mode 100644 index dd67b93..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/service/ISysLogininforService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/service/ISysOperLogService.class b/target/classes/com/ruoyi/project/monitor/service/ISysOperLogService.class deleted file mode 100644 index 4ad2561..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/service/ISysOperLogService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.class b/target/classes/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.class deleted file mode 100644 index c95b8df..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.class b/target/classes/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.class deleted file mode 100644 index de06b8e..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.class b/target/classes/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.class deleted file mode 100644 index 5b9dbdc..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.class b/target/classes/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.class deleted file mode 100644 index 0fc1516..0000000 Binary files a/target/classes/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/controller/SysConfigController.class b/target/classes/com/ruoyi/project/system/controller/SysConfigController.class deleted file mode 100644 index a384bf4..0000000 Binary files a/target/classes/com/ruoyi/project/system/controller/SysConfigController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/controller/SysDeptController.class b/target/classes/com/ruoyi/project/system/controller/SysDeptController.class deleted file mode 100644 index 652e807..0000000 Binary files a/target/classes/com/ruoyi/project/system/controller/SysDeptController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/controller/SysDictDataController.class b/target/classes/com/ruoyi/project/system/controller/SysDictDataController.class deleted file mode 100644 index 4ced745..0000000 Binary files a/target/classes/com/ruoyi/project/system/controller/SysDictDataController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/controller/SysDictTypeController.class b/target/classes/com/ruoyi/project/system/controller/SysDictTypeController.class deleted file mode 100644 index 2f49e9f..0000000 Binary files a/target/classes/com/ruoyi/project/system/controller/SysDictTypeController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/controller/SysIndexController.class b/target/classes/com/ruoyi/project/system/controller/SysIndexController.class deleted file mode 100644 index 3fb9277..0000000 Binary files a/target/classes/com/ruoyi/project/system/controller/SysIndexController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/controller/SysLoginController.class b/target/classes/com/ruoyi/project/system/controller/SysLoginController.class deleted file mode 100644 index f4b2f7c..0000000 Binary files a/target/classes/com/ruoyi/project/system/controller/SysLoginController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/controller/SysMenuController.class b/target/classes/com/ruoyi/project/system/controller/SysMenuController.class deleted file mode 100644 index 819e6e4..0000000 Binary files a/target/classes/com/ruoyi/project/system/controller/SysMenuController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/controller/SysNoticeController.class b/target/classes/com/ruoyi/project/system/controller/SysNoticeController.class deleted file mode 100644 index 8621828..0000000 Binary files a/target/classes/com/ruoyi/project/system/controller/SysNoticeController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/controller/SysPostController.class b/target/classes/com/ruoyi/project/system/controller/SysPostController.class deleted file mode 100644 index a4f943f..0000000 Binary files a/target/classes/com/ruoyi/project/system/controller/SysPostController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/controller/SysProfileController.class b/target/classes/com/ruoyi/project/system/controller/SysProfileController.class deleted file mode 100644 index ed0a20b..0000000 Binary files a/target/classes/com/ruoyi/project/system/controller/SysProfileController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/controller/SysRegisterController.class b/target/classes/com/ruoyi/project/system/controller/SysRegisterController.class deleted file mode 100644 index 8e4bbb7..0000000 Binary files a/target/classes/com/ruoyi/project/system/controller/SysRegisterController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/controller/SysRoleController.class b/target/classes/com/ruoyi/project/system/controller/SysRoleController.class deleted file mode 100644 index 16ce385..0000000 Binary files a/target/classes/com/ruoyi/project/system/controller/SysRoleController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/controller/SysUserController.class b/target/classes/com/ruoyi/project/system/controller/SysUserController.class deleted file mode 100644 index cda28a0..0000000 Binary files a/target/classes/com/ruoyi/project/system/controller/SysUserController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/domain/SysConfig.class b/target/classes/com/ruoyi/project/system/domain/SysConfig.class deleted file mode 100644 index 8a89bc0..0000000 Binary files a/target/classes/com/ruoyi/project/system/domain/SysConfig.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/domain/SysDept.class b/target/classes/com/ruoyi/project/system/domain/SysDept.class deleted file mode 100644 index e406b37..0000000 Binary files a/target/classes/com/ruoyi/project/system/domain/SysDept.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/domain/SysDictData.class b/target/classes/com/ruoyi/project/system/domain/SysDictData.class deleted file mode 100644 index 1b96d58..0000000 Binary files a/target/classes/com/ruoyi/project/system/domain/SysDictData.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/domain/SysDictType.class b/target/classes/com/ruoyi/project/system/domain/SysDictType.class deleted file mode 100644 index a26b60a..0000000 Binary files a/target/classes/com/ruoyi/project/system/domain/SysDictType.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/domain/SysMenu.class b/target/classes/com/ruoyi/project/system/domain/SysMenu.class deleted file mode 100644 index 76af12b..0000000 Binary files a/target/classes/com/ruoyi/project/system/domain/SysMenu.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/domain/SysNotice.class b/target/classes/com/ruoyi/project/system/domain/SysNotice.class deleted file mode 100644 index 81d27a9..0000000 Binary files a/target/classes/com/ruoyi/project/system/domain/SysNotice.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/domain/SysPost.class b/target/classes/com/ruoyi/project/system/domain/SysPost.class deleted file mode 100644 index d4c85eb..0000000 Binary files a/target/classes/com/ruoyi/project/system/domain/SysPost.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/domain/SysRole.class b/target/classes/com/ruoyi/project/system/domain/SysRole.class deleted file mode 100644 index 4e299cd..0000000 Binary files a/target/classes/com/ruoyi/project/system/domain/SysRole.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/domain/SysRoleDept.class b/target/classes/com/ruoyi/project/system/domain/SysRoleDept.class deleted file mode 100644 index f096636..0000000 Binary files a/target/classes/com/ruoyi/project/system/domain/SysRoleDept.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/domain/SysRoleMenu.class b/target/classes/com/ruoyi/project/system/domain/SysRoleMenu.class deleted file mode 100644 index ed5f6d0..0000000 Binary files a/target/classes/com/ruoyi/project/system/domain/SysRoleMenu.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/domain/SysUser.class b/target/classes/com/ruoyi/project/system/domain/SysUser.class deleted file mode 100644 index cd53e58..0000000 Binary files a/target/classes/com/ruoyi/project/system/domain/SysUser.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/domain/SysUserPost.class b/target/classes/com/ruoyi/project/system/domain/SysUserPost.class deleted file mode 100644 index 978b319..0000000 Binary files a/target/classes/com/ruoyi/project/system/domain/SysUserPost.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/domain/SysUserRole.class b/target/classes/com/ruoyi/project/system/domain/SysUserRole.class deleted file mode 100644 index 38882fe..0000000 Binary files a/target/classes/com/ruoyi/project/system/domain/SysUserRole.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/domain/vo/MetaVo.class b/target/classes/com/ruoyi/project/system/domain/vo/MetaVo.class deleted file mode 100644 index 2137a69..0000000 Binary files a/target/classes/com/ruoyi/project/system/domain/vo/MetaVo.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/domain/vo/RouterVo.class b/target/classes/com/ruoyi/project/system/domain/vo/RouterVo.class deleted file mode 100644 index db4406f..0000000 Binary files a/target/classes/com/ruoyi/project/system/domain/vo/RouterVo.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/mapper/SysConfigMapper.class b/target/classes/com/ruoyi/project/system/mapper/SysConfigMapper.class deleted file mode 100644 index ca4ca31..0000000 Binary files a/target/classes/com/ruoyi/project/system/mapper/SysConfigMapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/mapper/SysDeptMapper.class b/target/classes/com/ruoyi/project/system/mapper/SysDeptMapper.class deleted file mode 100644 index a53a9dd..0000000 Binary files a/target/classes/com/ruoyi/project/system/mapper/SysDeptMapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/mapper/SysDictDataMapper.class b/target/classes/com/ruoyi/project/system/mapper/SysDictDataMapper.class deleted file mode 100644 index 9e63a72..0000000 Binary files a/target/classes/com/ruoyi/project/system/mapper/SysDictDataMapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/mapper/SysDictTypeMapper.class b/target/classes/com/ruoyi/project/system/mapper/SysDictTypeMapper.class deleted file mode 100644 index 1be7270..0000000 Binary files a/target/classes/com/ruoyi/project/system/mapper/SysDictTypeMapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/mapper/SysMenuMapper.class b/target/classes/com/ruoyi/project/system/mapper/SysMenuMapper.class deleted file mode 100644 index 8794764..0000000 Binary files a/target/classes/com/ruoyi/project/system/mapper/SysMenuMapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/mapper/SysNoticeMapper.class b/target/classes/com/ruoyi/project/system/mapper/SysNoticeMapper.class deleted file mode 100644 index 945f3b3..0000000 Binary files a/target/classes/com/ruoyi/project/system/mapper/SysNoticeMapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/mapper/SysPostMapper.class b/target/classes/com/ruoyi/project/system/mapper/SysPostMapper.class deleted file mode 100644 index b3847fd..0000000 Binary files a/target/classes/com/ruoyi/project/system/mapper/SysPostMapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/mapper/SysRoleDeptMapper.class b/target/classes/com/ruoyi/project/system/mapper/SysRoleDeptMapper.class deleted file mode 100644 index 4831040..0000000 Binary files a/target/classes/com/ruoyi/project/system/mapper/SysRoleDeptMapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/mapper/SysRoleMapper.class b/target/classes/com/ruoyi/project/system/mapper/SysRoleMapper.class deleted file mode 100644 index 3992642..0000000 Binary files a/target/classes/com/ruoyi/project/system/mapper/SysRoleMapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/mapper/SysRoleMenuMapper.class b/target/classes/com/ruoyi/project/system/mapper/SysRoleMenuMapper.class deleted file mode 100644 index 4bb06cb..0000000 Binary files a/target/classes/com/ruoyi/project/system/mapper/SysRoleMenuMapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/mapper/SysUserMapper.class b/target/classes/com/ruoyi/project/system/mapper/SysUserMapper.class deleted file mode 100644 index 2f47abf..0000000 Binary files a/target/classes/com/ruoyi/project/system/mapper/SysUserMapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/mapper/SysUserPostMapper.class b/target/classes/com/ruoyi/project/system/mapper/SysUserPostMapper.class deleted file mode 100644 index a50b288..0000000 Binary files a/target/classes/com/ruoyi/project/system/mapper/SysUserPostMapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/mapper/SysUserRoleMapper.class b/target/classes/com/ruoyi/project/system/mapper/SysUserRoleMapper.class deleted file mode 100644 index af5e112..0000000 Binary files a/target/classes/com/ruoyi/project/system/mapper/SysUserRoleMapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/service/ISysConfigService.class b/target/classes/com/ruoyi/project/system/service/ISysConfigService.class deleted file mode 100644 index b6d4169..0000000 Binary files a/target/classes/com/ruoyi/project/system/service/ISysConfigService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/service/ISysDeptService.class b/target/classes/com/ruoyi/project/system/service/ISysDeptService.class deleted file mode 100644 index 2883eb2..0000000 Binary files a/target/classes/com/ruoyi/project/system/service/ISysDeptService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/service/ISysDictDataService.class b/target/classes/com/ruoyi/project/system/service/ISysDictDataService.class deleted file mode 100644 index db251d1..0000000 Binary files a/target/classes/com/ruoyi/project/system/service/ISysDictDataService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/service/ISysDictTypeService.class b/target/classes/com/ruoyi/project/system/service/ISysDictTypeService.class deleted file mode 100644 index a13024e..0000000 Binary files a/target/classes/com/ruoyi/project/system/service/ISysDictTypeService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/service/ISysMenuService.class b/target/classes/com/ruoyi/project/system/service/ISysMenuService.class deleted file mode 100644 index 0d0e121..0000000 Binary files a/target/classes/com/ruoyi/project/system/service/ISysMenuService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/service/ISysNoticeService.class b/target/classes/com/ruoyi/project/system/service/ISysNoticeService.class deleted file mode 100644 index 087dcf3..0000000 Binary files a/target/classes/com/ruoyi/project/system/service/ISysNoticeService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/service/ISysPostService.class b/target/classes/com/ruoyi/project/system/service/ISysPostService.class deleted file mode 100644 index fd8daae..0000000 Binary files a/target/classes/com/ruoyi/project/system/service/ISysPostService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/service/ISysRoleService.class b/target/classes/com/ruoyi/project/system/service/ISysRoleService.class deleted file mode 100644 index 91c5170..0000000 Binary files a/target/classes/com/ruoyi/project/system/service/ISysRoleService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/service/ISysUserOnlineService.class b/target/classes/com/ruoyi/project/system/service/ISysUserOnlineService.class deleted file mode 100644 index e3ed3a0..0000000 Binary files a/target/classes/com/ruoyi/project/system/service/ISysUserOnlineService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/service/ISysUserService.class b/target/classes/com/ruoyi/project/system/service/ISysUserService.class deleted file mode 100644 index 5789e94..0000000 Binary files a/target/classes/com/ruoyi/project/system/service/ISysUserService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.class b/target/classes/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.class deleted file mode 100644 index 1c8821a..0000000 Binary files a/target/classes/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.class b/target/classes/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.class deleted file mode 100644 index 65d4854..0000000 Binary files a/target/classes/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.class b/target/classes/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.class deleted file mode 100644 index cb26e62..0000000 Binary files a/target/classes/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.class b/target/classes/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.class deleted file mode 100644 index 874501f..0000000 Binary files a/target/classes/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.class b/target/classes/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.class deleted file mode 100644 index db76cb9..0000000 Binary files a/target/classes/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.class b/target/classes/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.class deleted file mode 100644 index 48df474..0000000 Binary files a/target/classes/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/service/impl/SysPostServiceImpl.class b/target/classes/com/ruoyi/project/system/service/impl/SysPostServiceImpl.class deleted file mode 100644 index a7a5e45..0000000 Binary files a/target/classes/com/ruoyi/project/system/service/impl/SysPostServiceImpl.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.class b/target/classes/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.class deleted file mode 100644 index bf1c589..0000000 Binary files a/target/classes/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.class b/target/classes/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.class deleted file mode 100644 index 67d103d..0000000 Binary files a/target/classes/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/system/service/impl/SysUserServiceImpl.class b/target/classes/com/ruoyi/project/system/service/impl/SysUserServiceImpl.class deleted file mode 100644 index e0d8cfb..0000000 Binary files a/target/classes/com/ruoyi/project/system/service/impl/SysUserServiceImpl.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/tool/gen/controller/GenController.class b/target/classes/com/ruoyi/project/tool/gen/controller/GenController.class deleted file mode 100644 index 129ee1c..0000000 Binary files a/target/classes/com/ruoyi/project/tool/gen/controller/GenController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/tool/gen/domain/GenTable.class b/target/classes/com/ruoyi/project/tool/gen/domain/GenTable.class deleted file mode 100644 index 0b65bd0..0000000 Binary files a/target/classes/com/ruoyi/project/tool/gen/domain/GenTable.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/tool/gen/domain/GenTableColumn.class b/target/classes/com/ruoyi/project/tool/gen/domain/GenTableColumn.class deleted file mode 100644 index 00de515..0000000 Binary files a/target/classes/com/ruoyi/project/tool/gen/domain/GenTableColumn.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/tool/gen/mapper/GenTableColumnMapper.class b/target/classes/com/ruoyi/project/tool/gen/mapper/GenTableColumnMapper.class deleted file mode 100644 index 940fa66..0000000 Binary files a/target/classes/com/ruoyi/project/tool/gen/mapper/GenTableColumnMapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/tool/gen/mapper/GenTableMapper.class b/target/classes/com/ruoyi/project/tool/gen/mapper/GenTableMapper.class deleted file mode 100644 index 2214838..0000000 Binary files a/target/classes/com/ruoyi/project/tool/gen/mapper/GenTableMapper.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.class b/target/classes/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.class deleted file mode 100644 index 38690e7..0000000 Binary files a/target/classes/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.class b/target/classes/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.class deleted file mode 100644 index 96cdfaf..0000000 Binary files a/target/classes/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/tool/gen/service/IGenTableColumnService.class b/target/classes/com/ruoyi/project/tool/gen/service/IGenTableColumnService.class deleted file mode 100644 index bbfe901..0000000 Binary files a/target/classes/com/ruoyi/project/tool/gen/service/IGenTableColumnService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/tool/gen/service/IGenTableService.class b/target/classes/com/ruoyi/project/tool/gen/service/IGenTableService.class deleted file mode 100644 index 0d6c62c..0000000 Binary files a/target/classes/com/ruoyi/project/tool/gen/service/IGenTableService.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/tool/gen/util/GenUtils.class b/target/classes/com/ruoyi/project/tool/gen/util/GenUtils.class deleted file mode 100644 index a398736..0000000 Binary files a/target/classes/com/ruoyi/project/tool/gen/util/GenUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/tool/gen/util/VelocityInitializer.class b/target/classes/com/ruoyi/project/tool/gen/util/VelocityInitializer.class deleted file mode 100644 index a710871..0000000 Binary files a/target/classes/com/ruoyi/project/tool/gen/util/VelocityInitializer.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/tool/gen/util/VelocityUtils.class b/target/classes/com/ruoyi/project/tool/gen/util/VelocityUtils.class deleted file mode 100644 index 37772ea..0000000 Binary files a/target/classes/com/ruoyi/project/tool/gen/util/VelocityUtils.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/tool/swagger/TestController.class b/target/classes/com/ruoyi/project/tool/swagger/TestController.class deleted file mode 100644 index 9ec2e3a..0000000 Binary files a/target/classes/com/ruoyi/project/tool/swagger/TestController.class and /dev/null differ diff --git a/target/classes/com/ruoyi/project/tool/swagger/UserEntity.class b/target/classes/com/ruoyi/project/tool/swagger/UserEntity.class deleted file mode 100644 index 4ef10ed..0000000 Binary files a/target/classes/com/ruoyi/project/tool/swagger/UserEntity.class and /dev/null differ diff --git a/target/classes/logback.xml b/target/classes/logback.xml index a360583..035100c 100644 --- a/target/classes/logback.xml +++ b/target/classes/logback.xml @@ -1,7 +1,7 @@ - + @@ -72,7 +72,7 @@ - + diff --git a/target/classes/mybatis/PartThree/AboutPartThreeMapper.xml b/target/classes/mybatis/PartThree/AboutPartThreeMapper.xml index 8535583..fbe99a5 100644 --- a/target/classes/mybatis/PartThree/AboutPartThreeMapper.xml +++ b/target/classes/mybatis/PartThree/AboutPartThreeMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/target/classes/mybatis/monitor/SysLogininforMapper.xml b/target/classes/mybatis/monitor/SysLogininforMapper.xml index 9e92f59..e74d584 100644 --- a/target/classes/mybatis/monitor/SysLogininforMapper.xml +++ b/target/classes/mybatis/monitor/SysLogininforMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/target/classes/mybatis/monitor/SysOperLogMapper.xml b/target/classes/mybatis/monitor/SysOperLogMapper.xml index dd5a44a..a4a7647 100644 --- a/target/classes/mybatis/monitor/SysOperLogMapper.xml +++ b/target/classes/mybatis/monitor/SysOperLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/target/classes/mybatis/system/SysConfigMapper.xml b/target/classes/mybatis/system/SysConfigMapper.xml index c586e2e..75853ba 100644 --- a/target/classes/mybatis/system/SysConfigMapper.xml +++ b/target/classes/mybatis/system/SysConfigMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/target/classes/mybatis/system/SysDeptMapper.xml b/target/classes/mybatis/system/SysDeptMapper.xml index d361cdc..2f2152e 100644 --- a/target/classes/mybatis/system/SysDeptMapper.xml +++ b/target/classes/mybatis/system/SysDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/target/classes/mybatis/system/SysDictDataMapper.xml b/target/classes/mybatis/system/SysDictDataMapper.xml index 8221d6e..90d58c4 100644 --- a/target/classes/mybatis/system/SysDictDataMapper.xml +++ b/target/classes/mybatis/system/SysDictDataMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/target/classes/mybatis/system/SysDictTypeMapper.xml b/target/classes/mybatis/system/SysDictTypeMapper.xml index 06498a9..f3ef37a 100644 --- a/target/classes/mybatis/system/SysDictTypeMapper.xml +++ b/target/classes/mybatis/system/SysDictTypeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/target/classes/mybatis/system/SysJobLogMapper.xml b/target/classes/mybatis/system/SysJobLogMapper.xml index db17d91..ccea00b 100644 --- a/target/classes/mybatis/system/SysJobLogMapper.xml +++ b/target/classes/mybatis/system/SysJobLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/target/classes/mybatis/system/SysJobMapper.xml b/target/classes/mybatis/system/SysJobMapper.xml index 47f61c9..df90e43 100644 --- a/target/classes/mybatis/system/SysJobMapper.xml +++ b/target/classes/mybatis/system/SysJobMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/target/classes/mybatis/system/SysMenuMapper.xml b/target/classes/mybatis/system/SysMenuMapper.xml index a07f65f..50eb803 100644 --- a/target/classes/mybatis/system/SysMenuMapper.xml +++ b/target/classes/mybatis/system/SysMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/target/classes/mybatis/system/SysNoticeMapper.xml b/target/classes/mybatis/system/SysNoticeMapper.xml index 33c37a7..2859d63 100644 --- a/target/classes/mybatis/system/SysNoticeMapper.xml +++ b/target/classes/mybatis/system/SysNoticeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/target/classes/mybatis/system/SysPostMapper.xml b/target/classes/mybatis/system/SysPostMapper.xml index 23e7c14..dc2291a 100644 --- a/target/classes/mybatis/system/SysPostMapper.xml +++ b/target/classes/mybatis/system/SysPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/target/classes/mybatis/system/SysRoleDeptMapper.xml b/target/classes/mybatis/system/SysRoleDeptMapper.xml index 23d2cb5..f3eae7f 100644 --- a/target/classes/mybatis/system/SysRoleDeptMapper.xml +++ b/target/classes/mybatis/system/SysRoleDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/target/classes/mybatis/system/SysRoleMapper.xml b/target/classes/mybatis/system/SysRoleMapper.xml index adfa374..24c6563 100644 --- a/target/classes/mybatis/system/SysRoleMapper.xml +++ b/target/classes/mybatis/system/SysRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/target/classes/mybatis/system/SysRoleMenuMapper.xml b/target/classes/mybatis/system/SysRoleMenuMapper.xml index bf32088..775c0c9 100644 --- a/target/classes/mybatis/system/SysRoleMenuMapper.xml +++ b/target/classes/mybatis/system/SysRoleMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/target/classes/mybatis/system/SysUserMapper.xml b/target/classes/mybatis/system/SysUserMapper.xml index f02de1b..1bf2c84 100644 --- a/target/classes/mybatis/system/SysUserMapper.xml +++ b/target/classes/mybatis/system/SysUserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/target/classes/mybatis/system/SysUserPostMapper.xml b/target/classes/mybatis/system/SysUserPostMapper.xml index d048078..89d29fe 100644 --- a/target/classes/mybatis/system/SysUserPostMapper.xml +++ b/target/classes/mybatis/system/SysUserPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/target/classes/mybatis/system/SysUserRoleMapper.xml b/target/classes/mybatis/system/SysUserRoleMapper.xml index d7324eb..20c345b 100644 --- a/target/classes/mybatis/system/SysUserRoleMapper.xml +++ b/target/classes/mybatis/system/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/target/classes/mybatis/tool/GenTableColumnMapper.xml b/target/classes/mybatis/tool/GenTableColumnMapper.xml index 450f89c..2ceb51e 100644 --- a/target/classes/mybatis/tool/GenTableColumnMapper.xml +++ b/target/classes/mybatis/tool/GenTableColumnMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/target/classes/mybatis/tool/GenTableMapper.xml b/target/classes/mybatis/tool/GenTableMapper.xml index f26cc99..02d229b 100644 --- a/target/classes/mybatis/tool/GenTableMapper.xml +++ b/target/classes/mybatis/tool/GenTableMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/target/classes/vm/java/controller.java.vm b/target/classes/vm/java/controller.java.vm index a10bbb2..77dd67e 100644 --- a/target/classes/vm/java/controller.java.vm +++ b/target/classes/vm/java/controller.java.vm @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; import com.jg.framework.web.controller.BaseController; import ${packageName}.domain.${ClassName}; import ${packageName}.service.I${ClassName}Service; -import com.ruoyi.framework.web.domain.R; +import com.jg.framework.web.domain.R; #if($table.crud || $table.sub) #elseif($table.tree) #end diff --git a/target/classes/vm/java/mapper.java.vm b/target/classes/vm/java/mapper.java.vm index e861409..4ecac61 100644 --- a/target/classes/vm/java/mapper.java.vm +++ b/target/classes/vm/java/mapper.java.vm @@ -10,5 +10,11 @@ import ${packageName}.domain.${ClassName}; * @date ${datetime} */ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> { - + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName}集合 + */ + public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); } diff --git a/target/classes/vm/java/service.java.vm b/target/classes/vm/java/service.java.vm index e06f8e4..3b40beb 100644 --- a/target/classes/vm/java/service.java.vm +++ b/target/classes/vm/java/service.java.vm @@ -11,5 +11,11 @@ import com.baomidou.mybatisplus.extension.service.IService; * @date ${datetime} */ public interface I${ClassName}Service extends IService<${ClassName}> { - + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName}集合 + */ + public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); } diff --git a/target/classes/vm/java/serviceImpl.java.vm b/target/classes/vm/java/serviceImpl.java.vm index e13a05b..8568b56 100644 --- a/target/classes/vm/java/serviceImpl.java.vm +++ b/target/classes/vm/java/serviceImpl.java.vm @@ -5,6 +5,9 @@ import ${packageName}.mapper.${ClassName}Mapper; import ${packageName}.domain.${ClassName}; import ${packageName}.service.I${ClassName}Service; import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + /** * ${functionName}Service业务层处理 * @@ -14,4 +17,18 @@ import org.springframework.stereotype.Service; @Service public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service { + @Resource + private ${ClassName}Mapper ${className}Mapper; + + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} + */ + @Override + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) + { + return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); + } } diff --git a/target/classes/vm/xml/mapper.xml.vm b/target/classes/vm/xml/mapper.xml.vm index 4916767..d7b2468 100644 --- a/target/classes/vm/xml/mapper.xml.vm +++ b/target/classes/vm/xml/mapper.xml.vm @@ -2,5 +2,25 @@ + + #foreach ($column in $columns) + + #end + + #if($table.sub) + + + + + + #foreach ($column in $subTable.columns) + + #end + + #end + + + select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName} + \ No newline at end of file