Browse Source

refactor:调整项目模块目录

韩帛霖 1 year ago
parent
commit
f6ae0eb480
100 changed files with 423 additions and 435 deletions
  1. 10 10
      README.md
  2. 18 19
      pom.xml
  3. 0 37
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/bpm/TestController.java
  4. 0 46
      ruoyi-admin/src/main/java/com/ruoyi/web/ljj.java
  5. 12 12
      ry.bat
  6. 1 1
      ry.sh
  7. 6 6
      zkqy-admin/pom.xml
  8. 3 3
      zkqy-admin/src/main/java/com/zkqy/ZkqyApplication.java
  9. 3 3
      zkqy-admin/src/main/java/com/zkqy/ZkqyServletInitializer.java
  10. 9 11
      zkqy-admin/src/main/java/com/zkqy/web/controller/bpm/BpmNodeHandleUserController.java
  11. 9 9
      zkqy-admin/src/main/java/com/zkqy/web/controller/bpm/BpmNodeScriptRelevanceController.java
  12. 11 12
      zkqy-admin/src/main/java/com/zkqy/web/controller/bpm/BpmProcessConfigurationController.java
  13. 9 9
      zkqy-admin/src/main/java/com/zkqy/web/controller/bpm/BpmProcessController.java
  14. 13 13
      zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/CommonFileController.java
  15. 11 12
      zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/SysDictDataController.java
  16. 9 9
      zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/SysDictTypeController.java
  17. 6 6
      zkqy-admin/src/main/java/com/zkqy/web/controller/system/DataSourceController.java
  18. 68 0
      zkqy-admin/src/main/java/com/zkqy/web/controller/test/TestController.java
  19. 6 6
      zkqy-admin/src/main/java/com/zkqy/web/core/config/SwaggerConfig.java
  20. 13 0
      zkqy-admin/src/main/java/com/zkqy/web/ljj.java
  21. 0 0
      zkqy-admin/src/main/resources/META-INF/spring-devtools.properties
  22. 1 1
      zkqy-admin/src/main/resources/application-druid.yml
  23. 7 7
      zkqy-admin/src/main/resources/application.yml
  24. 1 1
      zkqy-admin/src/main/resources/banner.txt
  25. 0 0
      zkqy-admin/src/main/resources/i18n/messages.properties
  26. 0 0
      zkqy-admin/src/main/resources/lib/DmJdbcDriver18.jar
  27. 1 1
      zkqy-admin/src/main/resources/logback.xml
  28. 3 3
      zkqy-admin/src/main/resources/mybatis/mybatis-config.xml
  29. 2 2
      zkqy-common/pom.xml
  30. 2 2
      zkqy-common/src/main/java/com/zkqy/common/annotation/Anonymous.java
  31. 2 2
      zkqy-common/src/main/java/com/zkqy/common/annotation/DataScope.java
  32. 3 3
      zkqy-common/src/main/java/com/zkqy/common/annotation/DataSource.java
  33. 3 3
      zkqy-common/src/main/java/com/zkqy/common/annotation/Excel.java
  34. 2 2
      zkqy-common/src/main/java/com/zkqy/common/annotation/Excels.java
  35. 4 4
      zkqy-common/src/main/java/com/zkqy/common/annotation/Log.java
  36. 4 4
      zkqy-common/src/main/java/com/zkqy/common/annotation/RateLimiter.java
  37. 2 2
      zkqy-common/src/main/java/com/zkqy/common/annotation/RepeatSubmit.java
  38. 7 7
      zkqy-common/src/main/java/com/zkqy/common/config/ZkqyConfig.java
  39. 1 1
      zkqy-common/src/main/java/com/zkqy/common/config/bpm/BpmProperties.java
  40. 2 2
      zkqy-common/src/main/java/com/zkqy/common/config/datasource/DynamicDataSource.java
  41. 2 2
      zkqy-common/src/main/java/com/zkqy/common/config/datasource/DynamicDataSourceContextHolder.java
  42. 1 1
      zkqy-common/src/main/java/com/zkqy/common/config/datasource/config/CrosConfig.java
  43. 1 1
      zkqy-common/src/main/java/com/zkqy/common/config/datasource/config/DataSourceConfig.java
  44. 4 4
      zkqy-common/src/main/java/com/zkqy/common/config/datasource/config/DynamicDataSource.java
  45. 1 1
      zkqy-common/src/main/java/com/zkqy/common/config/datasource/config/GenConfig.java
  46. 1 1
      zkqy-common/src/main/java/com/zkqy/common/config/datasource/config/SpringContextUtils.java
  47. 1 1
      zkqy-common/src/main/java/com/zkqy/common/config/datasource/constant/DataSourceType.java
  48. 2 2
      zkqy-common/src/main/java/com/zkqy/common/config/datasource/constant/HttpStatus.java
  49. 1 1
      zkqy-common/src/main/java/com/zkqy/common/config/datasource/constant/UrlSuffix.java
  50. 3 3
      zkqy-common/src/main/java/com/zkqy/common/config/datasource/utils/AjaxResult.java
  51. 1 1
      zkqy-common/src/main/java/com/zkqy/common/config/datasource/utils/DataSourceUtils.java
  52. 1 1
      zkqy-common/src/main/java/com/zkqy/common/config/datasource/utils/PageUtil.java
  53. 1 1
      zkqy-common/src/main/java/com/zkqy/common/constant/BpmNodeTypeConstants.java
  54. 2 2
      zkqy-common/src/main/java/com/zkqy/common/constant/CacheConstants.java
  55. 4 4
      zkqy-common/src/main/java/com/zkqy/common/constant/Constants.java
  56. 2 2
      zkqy-common/src/main/java/com/zkqy/common/constant/GenConstants.java
  57. 2 2
      zkqy-common/src/main/java/com/zkqy/common/constant/HttpStatus.java
  58. 2 2
      zkqy-common/src/main/java/com/zkqy/common/constant/ScheduleConstants.java
  59. 2 2
      zkqy-common/src/main/java/com/zkqy/common/constant/UserConstants.java
  60. 13 13
      zkqy-common/src/main/java/com/zkqy/common/core/controller/BaseController.java
  61. 4 4
      zkqy-common/src/main/java/com/zkqy/common/core/domain/AjaxResult.java
  62. 4 4
      zkqy-common/src/main/java/com/zkqy/common/core/domain/BaseEntity.java
  63. 3 3
      zkqy-common/src/main/java/com/zkqy/common/core/domain/R.java
  64. 2 2
      zkqy-common/src/main/java/com/zkqy/common/core/domain/TreeEntity.java
  65. 4 4
      zkqy-common/src/main/java/com/zkqy/common/core/domain/TreeSelect.java
  66. 1 1
      zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/DataSource.java
  67. 2 3
      zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysDept.java
  68. 6 6
      zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysDictData.java
  69. 5 5
      zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysDictType.java
  70. 3 3
      zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysMenu.java
  71. 4 5
      zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysRole.java
  72. 3 4
      zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysTenant.java
  73. 7 8
      zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysUser.java
  74. 2 2
      zkqy-common/src/main/java/com/zkqy/common/core/domain/model/LoginBody.java
  75. 3 3
      zkqy-common/src/main/java/com/zkqy/common/core/domain/model/LoginUser.java
  76. 2 2
      zkqy-common/src/main/java/com/zkqy/common/core/domain/model/RegisterBody.java
  77. 3 3
      zkqy-common/src/main/java/com/zkqy/common/core/page/PageDomain.java
  78. 2 2
      zkqy-common/src/main/java/com/zkqy/common/core/page/TableDataInfo.java
  79. 4 5
      zkqy-common/src/main/java/com/zkqy/common/core/page/TableSupport.java
  80. 2 2
      zkqy-common/src/main/java/com/zkqy/common/core/redis/RedisCache.java
  81. 3 3
      zkqy-common/src/main/java/com/zkqy/common/core/text/CharsetKit.java
  82. 3 3
      zkqy-common/src/main/java/com/zkqy/common/core/text/Convert.java
  83. 3 3
      zkqy-common/src/main/java/com/zkqy/common/core/text/StrFormatter.java
  84. 2 2
      zkqy-common/src/main/java/com/zkqy/common/enums/BusinessStatus.java
  85. 2 2
      zkqy-common/src/main/java/com/zkqy/common/enums/BusinessType.java
  86. 2 2
      zkqy-common/src/main/java/com/zkqy/common/enums/DataSourceType.java
  87. 2 2
      zkqy-common/src/main/java/com/zkqy/common/enums/HttpMethod.java
  88. 2 2
      zkqy-common/src/main/java/com/zkqy/common/enums/LimitType.java
  89. 2 2
      zkqy-common/src/main/java/com/zkqy/common/enums/OperatorType.java
  90. 2 2
      zkqy-common/src/main/java/com/zkqy/common/enums/UserStatus.java
  91. 2 2
      zkqy-common/src/main/java/com/zkqy/common/exception/DemoModeException.java
  92. 2 2
      zkqy-common/src/main/java/com/zkqy/common/exception/GlobalException.java
  93. 2 2
      zkqy-common/src/main/java/com/zkqy/common/exception/ServiceException.java
  94. 2 2
      zkqy-common/src/main/java/com/zkqy/common/exception/UtilException.java
  95. 4 4
      zkqy-common/src/main/java/com/zkqy/common/exception/base/BaseException.java
  96. 3 3
      zkqy-common/src/main/java/com/zkqy/common/exception/file/FileException.java
  97. 2 2
      zkqy-common/src/main/java/com/zkqy/common/exception/file/FileNameLengthLimitExceededException.java
  98. 2 2
      zkqy-common/src/main/java/com/zkqy/common/exception/file/FileSizeLimitExceededException.java
  99. 2 2
      zkqy-common/src/main/java/com/zkqy/common/exception/file/InvalidExtensionException.java
  100. 2 2
      zkqy-common/src/main/java/com/zkqy/common/exception/job/TaskException.java

+ 10 - 10
README.md

@@ -1,12 +1,12 @@
 <p align="center">
 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.8.5</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">zkqy v3.8.5</h1>
 <h4 align="center">基于SpringBoot+Vue前后端分离的Java快速开发框架</h4>
 <p align="center">
-	<a href="https://gitee.com/y_project/RuoYi-Vue/stargazers"><img src="https://gitee.com/y_project/RuoYi-Vue/badge/star.svg?theme=dark"></a>
-	<a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.8.5-brightgreen.svg"></a>
-	<a href="https://gitee.com/y_project/RuoYi-Vue/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
+	<a href="https://gitee.com/y_project/zkqy-Vue/stargazers"><img src="https://gitee.com/y_project/zkqy-Vue/badge/star.svg?theme=dark"></a>
+	<a href="https://gitee.com/y_project/zkqy-Vue"><img src="https://img.shields.io/badge/zkqy-v3.8.5-brightgreen.svg"></a>
+	<a href="https://gitee.com/y_project/zkqy-Vue/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
 </p>
 
 ## 平台简介
@@ -18,11 +18,11 @@
 * 权限认证使用Jwt,支持多终端认证系统。
 * 支持加载动态权限菜单,多方式轻松权限控制。
 * 高效率开发,使用代码生成器可以一键生成前后端代码。
-* 提供了技术栈([Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev))版本[RuoYi-Vue3](https://github.com/yangzongzhuan/RuoYi-Vue3),保持同步更新。
-* 提供了单应用版本[RuoYi-Vue-fast](https://github.com/yangzongzhuan/RuoYi-Vue-fast),Oracle版本[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle),保持同步更新。
-* 不分离版本,请移步[RuoYi](https://gitee.com/y_project/RuoYi),微服务版本,请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
+* 提供了技术栈([Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev))版本[zkqy-Vue3](https://github.com/yangzongzhuan/zkqy-Vue3),保持同步更新。
+* 提供了单应用版本[zkqy-Vue-fast](https://github.com/yangzongzhuan/zkqy-Vue-fast),Oracle版本[zkqy-Vue-Oracle](https://github.com/yangzongzhuan/zkqy-Vue-Oracle),保持同步更新。
+* 不分离版本,请移步[zkqy](https://gitee.com/y_project/zkqy),微服务版本,请移步[zkqy-Cloud](https://gitee.com/y_project/zkqy-Cloud)
 * 特别鸣谢:[element](https://github.com/ElemeFE/element),[vue-element-admin](https://github.com/PanJiaChen/vue-element-admin),[eladmin-web](https://github.com/elunez/eladmin-web)。
-* 阿里云折扣场:[点我进入](http://aly.ruoyi.vip),腾讯云秒杀场:[点我进入](http://txy.ruoyi.vip)&nbsp;&nbsp;
+* 阿里云折扣场:[点我进入](http://aly.zkqy.vip),腾讯云秒杀场:[点我进入](http://txy.zkqy.vip)&nbsp;&nbsp;
 * 阿里云优惠券:[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link),腾讯云优惠券:[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)&nbsp;&nbsp;
 
 ## 内置功能
@@ -51,8 +51,8 @@
 - admin/admin123  
 - 陆陆续续收到一些打赏,为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。
 
-演示地址:http://vue.ruoyi.vip  
-文档地址:http://doc.ruoyi.vip
+演示地址:http://vue.zkqy.vip  
+文档地址:http://doc.zkqy.vip
 
 ## 演示图
 

+ 18 - 19
pom.xml

@@ -4,16 +4,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	
-    <groupId>com.ruoyi</groupId>
+    <groupId>com.zkqy</groupId>
     <artifactId>mec_process</artifactId>
     <version>3.8.5</version>
 
-    <name>ruoyi</name>
-    <url>http://www.ruoyi.vip</url>
+    <name>zkqy</name>
+    <url>http://www.zkqy.vip</url>
     <description>若依管理系统</description>
     
     <properties>
-        <ruoyi.version>3.8.5</ruoyi.version>
+        <zkqy.version>3.8.5</zkqy.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
@@ -147,23 +147,23 @@
 
             <!-- 核心模块-->
             <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-framework</artifactId>
-                <version>${ruoyi.version}</version>
+                <groupId>com.zkqy</groupId>
+                <artifactId>zkqy-framework</artifactId>
+                <version>${zkqy.version}</version>
             </dependency>
 
             <!-- 系统模块-->
             <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-system</artifactId>
-                <version>${ruoyi.version}</version>
+                <groupId>com.zkqy</groupId>
+                <artifactId>zkqy-system</artifactId>
+                <version>${zkqy.version}</version>
             </dependency>
 
             <!-- 通用工具-->
             <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-common</artifactId>
-                <version>${ruoyi.version}</version>
+                <groupId>com.zkqy</groupId>
+                <artifactId>zkqy-common</artifactId>
+                <version>${zkqy.version}</version>
             </dependency>
 
             <!-- oracle 驱动 -->
@@ -180,12 +180,11 @@
     </dependencyManagement>
 
     <modules>
-        <module>ruoyi-admin</module>
-        <module>ruoyi-framework</module>
-        <module>ruoyi-system</module>
-
-        <module>ruoyi-common</module>
-        <module>ruoyi-process-execution</module>
+        <module>zkqy-admin</module>
+        <module>zkqy-framework</module>
+        <module>zkqy-system</module>
+        <module>zkqy-common</module>
+        <module>zkqy-process-execution</module>
     </modules>
     <packaging>pom</packaging>
 

+ 0 - 37
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bpm/TestController.java

@@ -1,37 +0,0 @@
-package com.ruoyi.web.controller.bpm;
-
-
-import com.ruoyi.execution.produce.dispersed.entity.runbpm.BpmRunNodeFormFilterConditionsVo;
-import com.ruoyi.execution.produce.dispersed.entity.runbpm.BpmRunNodeFromVo;
-import com.ruoyi.execution.produce.utils.EchoNodeFormData;
-import com.ruoyi.system.entity.CommonEntity;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/test")
-public class TestController {
-
-    @Autowired
-    EchoNodeFormData echoNodeFormData;
-
-    @GetMapping("/api")
-    public CommonEntity common(){
-        Map<String, Object> map = new HashMap<>();
-        map.put("del_flag", 0);
-        map.put("type", 2);
-        map.put("id", 7);
-        BpmRunNodeFromVo a=new BpmRunNodeFromVo();
-        a.setTaskProcessKey("557ae1f460ca44b4bf59ee64eb7bdb7c");
-        a.setTaskNodeKey("Event_2920d486-d344-4d10-bd37-13d3b785974b");
-        a.getFormDataVoList()
-                .add(new BpmRunNodeFormFilterConditionsVo("goods",map,false));
-        a.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("bpm_process", map,"list"));
-        return echoNodeFormData.getEchoNodeFormData(a);
-    }
-}

+ 0 - 46
ruoyi-admin/src/main/java/com/ruoyi/web/ljj.java

@@ -1,46 +0,0 @@
-package com.ruoyi.web;
-
-import com.ruoyi.common.config.bpm.BpmProperties;
-import com.ruoyi.system.entity.BpmProcess;
-
-import javax.tools.SimpleJavaFileObject;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author hanzihang
- * @date 2023/11/3 2:52 PM
- */
-public class ljj {
-    public static void main(String[] args) {
-
-
-
-//        String yourClassPath = System.getProperty("java.class.path");
-//        System.out.println(yourClassPath);
-//        List<String> asd = new ArrayList<>();
-//        asd.add("123");
-//        asd.add("456");
-//        asd.add("789");
-//        BpmProcess process = new BpmProcess();
-//        List<BpmProcess> list = new ArrayList<>();
-//        process.setProcessId(1L);
-//        process.setProcessXmlContent("流程开始");
-//        list.add(process);
-//        process.setProcessId(2L);
-//        process.setProcessXmlContent("流程执行");
-//        list.add(process);
-//        process.setProcessId(3L);
-//        process.setProcessXmlContent("流程结束");
-//        List<BpmProcess> k = list.stream().filter(item -> item.getProcessId() == 2L).collect(Collectors.toList());
-//        System.out.println(process);
-
-//        asd.stream()
-//                .filter(entity -> entity.getId() == targetId)
-        //(item-> item.equals("456"));
-
-        //System.out.println(asd.toString().replaceAll("\\[", "").replaceAll("\\]", ""));
-    }
-}

+ 12 - 12
ry.bat

@@ -1,21 +1,21 @@
 @echo off
 
-rem jar平目录
-set AppName=ruoyi-admin.jar
+rem jar平锟斤拷目录
+set AppName=zkqy-admin.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通过jps命令查找pid并结束进程
+rem 锟斤拷锟斤拷stop通锟斤拷jps锟斤拷锟斤拷锟斤拷锟絧id锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷
 :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 根据进程ID,kill进程
+		rem 锟斤拷锟捷斤拷锟斤拷ID锟斤拷kill锟斤拷锟斤拷
 		taskkill /f /pid %pid%
 	)
 goto:eof

+ 1 - 1
ry.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 # ./ry.sh start 启动 stop 停止 restart 重启 status 状态
-AppName=ruoyi-admin.jar
+AppName=zkqy-admin.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"

+ 6 - 6
ruoyi-admin/pom.xml → zkqy-admin/pom.xml

@@ -4,12 +4,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>mec_process</artifactId>
-        <groupId>com.ruoyi</groupId>
+        <groupId>com.zkqy</groupId>
         <version>3.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>ruoyi-admin</artifactId>
+    <artifactId>zkqy-admin</artifactId>
 
     <description>
         web服务入口
@@ -51,8 +51,8 @@
 
         <!-- 核心模块-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-framework</artifactId>
+            <groupId>com.zkqy</groupId>
+            <artifactId>zkqy-framework</artifactId>
         </dependency>
 
         <dependency>
@@ -76,8 +76,8 @@
             <systemPath>${project.basedir}/src/main/resources/lib/DmJdbcDriver18.jar</systemPath>
         </dependency>
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-process-execution</artifactId>
+            <groupId>com.zkqy</groupId>
+            <artifactId>zkqy-process-execution</artifactId>
             <version>3.8.5</version>
             <scope>compile</scope>
         </dependency>

+ 3 - 3
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java → zkqy-admin/src/main/java/com/zkqy/ZkqyApplication.java

@@ -1,4 +1,4 @@
-package com.ruoyi;
+package com.zkqy;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -10,10 +10,10 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  * @author hzh
  */
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-public class RuoYiApplication {
+public class ZkqyApplication {
     public static void main(String[] args) {
         // System.setProperty("spring.devtools.restart.enabled", "false");
-        SpringApplication.run(RuoYiApplication.class, args);
+        SpringApplication.run(ZkqyApplication.class, args);
         System.out.println("(♥◠‿◠)ノ゙  流程引擎启动成功!   ლ(´ڡ`ლ)゙  " + "\n" +
                 "BBBBBBBBBBBBBBBBB   PPPPPPPPPPPPPPPPP   MMMMMMMM               MMMMMMMM\n" +
                 "B::::::::::::::::B  P::::::::::::::::P  M:::::::M             M:::::::M\n" +

+ 3 - 3
ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java → zkqy-admin/src/main/java/com/zkqy/ZkqyServletInitializer.java

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

+ 9 - 11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bpm/BpmNodeHandleUserController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/bpm/BpmNodeHandleUserController.java

@@ -1,10 +1,8 @@
-package com.ruoyi.web.controller.bpm;
+package com.zkqy.web.controller.bpm;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.common.config.bpm.BpmProperties;
-import com.ruoyi.common.utils.bpm.BpmUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -17,14 +15,14 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.entity.BpmNodeHandleUser;
-import com.ruoyi.system.service.IBpmNodeHandleUserService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.system.entity.BpmNodeHandleUser;
+import com.zkqy.system.service.IBpmNodeHandleUserService;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.common.core.page.TableDataInfo;
 
 /**
  * 节点处理用户Controller

+ 9 - 9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bpm/BpmNodeScriptRelevanceController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/bpm/BpmNodeScriptRelevanceController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.bpm;
+package com.zkqy.web.controller.bpm;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -14,14 +14,14 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.entity.BpmNodeScriptRelevance;
-import com.ruoyi.system.service.IBpmNodeScriptRelevanceService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.system.entity.BpmNodeScriptRelevance;
+import com.zkqy.system.service.IBpmNodeScriptRelevanceService;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.common.core.page.TableDataInfo;
 
 /**
  * 流程节点脚本关联Controller

+ 11 - 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bpm/BpmProcessConfigurationController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/bpm/BpmProcessConfigurationController.java

@@ -1,11 +1,10 @@
-package com.ruoyi.web.controller.bpm;
+package com.zkqy.web.controller.bpm;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.common.annotation.Anonymous;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.system.entity.vo.NodeVo;
+import com.zkqy.common.annotation.Anonymous;
+import com.zkqy.system.entity.vo.NodeVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,14 +17,14 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.entity.BpmProcessConfiguration;
-import com.ruoyi.system.service.IBpmProcessConfigurationService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.system.entity.BpmProcessConfiguration;
+import com.zkqy.system.service.IBpmProcessConfigurationService;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.common.core.page.TableDataInfo;
 
 /**
  * 流程配置Controller

+ 9 - 9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bpm/BpmProcessController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/bpm/BpmProcessController.java

@@ -1,23 +1,23 @@
-package com.ruoyi.web.controller.bpm;
+package com.zkqy.web.controller.bpm;
 
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.system.entity.BpmProcess;
+import com.zkqy.system.entity.BpmProcess;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.service.IBpmProcessService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.system.service.IBpmProcessService;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.common.core.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
 /**

+ 13 - 13
ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/CommonFileController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/CommonFileController.java

@@ -1,12 +1,12 @@
-package com.ruoyi.web.controller.dragForm;
+package com.zkqy.web.controller.dragForm;
 
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.common.utils.file.FileUtils;
-import com.ruoyi.framework.config.ServerConfig;
+import com.zkqy.common.config.ZkqyConfig;
+import com.zkqy.common.constant.Constants;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.utils.StringUtils;
+import com.zkqy.common.utils.file.FileUploadUtils;
+import com.zkqy.common.utils.file.FileUtils;
+import com.zkqy.framework.config.ServerConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.ruoyi.common.core.domain.AjaxResult.success;
+import static com.zkqy.common.core.domain.AjaxResult.success;
 
 /**
  * 通用请求处理
@@ -51,7 +51,7 @@ public class CommonFileController {
                 throw new Exception(StringUtils.format("文件名称({})非法,不允许下载。 ", fileName));
             }
             String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
-            String filePath = RuoYiConfig.getDownloadPath() + fileName;
+            String filePath = ZkqyConfig.getDownloadPath() + fileName;
 
             response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
             FileUtils.setAttachmentResponseHeader(response, realFileName);
@@ -71,7 +71,7 @@ public class CommonFileController {
     public AjaxResult uploadFile(MultipartFile file) throws Exception {
         try {
             // 上传文件路径
-            String filePath = RuoYiConfig.getUploadPath();
+            String filePath = ZkqyConfig.getUploadPath();
             // 上传并返回新文件名称
             String fileName = FileUploadUtils.upload(filePath, file);
             String url = serverConfig.getUrl() + fileName;
@@ -93,7 +93,7 @@ public class CommonFileController {
     public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception {
         try {
             // 上传文件路径
-            String filePath = RuoYiConfig.getUploadPath();
+            String filePath = ZkqyConfig.getUploadPath();
             List<String> urls = new ArrayList<String>();
             List<String> fileNames = new ArrayList<String>();
             List<String> newFileNames = new ArrayList<String>();
@@ -129,7 +129,7 @@ public class CommonFileController {
                 throw new Exception(StringUtils.format("资源文件({})非法,不允许下载。 ", resource));
             }
             // 本地资源路径
-            String localPath = RuoYiConfig.getProfile();
+            String localPath = ZkqyConfig.getProfile();
             // 数据库资源地址
             String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX);
             // 下载名称

+ 11 - 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/SysDictDataController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/SysDictDataController.java

@@ -1,16 +1,15 @@
-package com.ruoyi.web.controller.dragForm;
+package com.zkqy.web.controller.dragForm;
 
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysDictData;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.service.ISysDictDataService;
-import com.ruoyi.system.service.ISysDictTypeService;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.entity.SysDictData;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.StringUtils;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.system.service.ISysDictDataService;
+import com.zkqy.system.service.ISysDictTypeService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

+ 9 - 9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/SysDictTypeController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/SysDictTypeController.java

@@ -1,13 +1,13 @@
-package com.ruoyi.web.controller.dragForm;
+package com.zkqy.web.controller.dragForm;
 
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysDictType;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.service.ISysDictTypeService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.entity.SysDictType;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;

+ 6 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/DataSourceController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/DataSourceController.java

@@ -1,10 +1,10 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.DataSource;
-import com.ruoyi.system.entity.TableInfo;
-import com.ruoyi.system.service.IDataSourceService;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.entity.DataSource;
+import com.zkqy.system.entity.TableInfo;
+import com.zkqy.system.service.IDataSourceService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.List;
@@ -33,7 +33,7 @@ public class DataSourceController {
      * 得到当前数据源的所有表
      */
     @PostMapping("/getAllTable")
-    public com.ruoyi.common.config.datasource.utils.AjaxResult queryAll(@RequestBody Map<String, Object> query) {
+    public com.zkqy.common.config.datasource.utils.AjaxResult queryAll(@RequestBody Map<String, Object> query) {
         return dataSourceService.tableInfoList(query);
     }
 

+ 68 - 0
zkqy-admin/src/main/java/com/zkqy/web/controller/test/TestController.java

@@ -0,0 +1,68 @@
+package com.zkqy.web.controller.test;
+
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFormFilterConditionsVo;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFromVo;
+import com.zkqy.execution.produce.dispersed.service.IBpmExecuteNodeFormService;
+import com.zkqy.execution.produce.utils.EchoNodeFormData;
+import com.zkqy.system.entity.CommonEntity;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author hanzihang
+ * @date 2023/12/8 5:15 PM
+ */
+@RestController
+@RequestMapping("/system/test")
+public class TestController {
+    @Autowired
+    private IBpmExecuteNodeFormService iBpmExecuteNodeFormService;
+    @Autowired
+    private ApplicationContext applicationContext;
+
+    @Autowired
+    EchoNodeFormData echoNodeFormData;
+
+
+    @GetMapping("/testController")
+    public AjaxResult testcontr(String processKey) {
+        Object bean1 = applicationContext.getBean("11f4951b-682f-4185-acb7-f4b8db9d5940");
+        try {
+            applicationContext.getBean("qwe");
+
+        } catch (NoSuchBeanDefinitionException e) {
+            return AjaxResult.error();
+
+        }
+
+
+        System.err.println(bean1);
+        Object sd = iBpmExecuteNodeFormService.selectNodeFromInfos(processKey);
+        return AjaxResult.success(sd);
+    }
+
+
+    @GetMapping("/api")
+    public CommonEntity common() {
+        Map<String, Object> map = new HashMap<>();
+        map.put("del_flag", 0);
+        map.put("type", 2);
+        map.put("id", 7);
+        BpmRunNodeFromVo a = new BpmRunNodeFromVo();
+        a.setTaskProcessKey("557ae1f460ca44b4bf59ee64eb7bdb7c");
+        a.setTaskNodeKey("Event_2920d486-d344-4d10-bd37-13d3b785974b");
+        a.getFormDataVoList()
+                .add(new BpmRunNodeFormFilterConditionsVo("goods", map));
+        a.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("bpm_process", map, "list"));
+        return echoNodeFormData.getEchoNodeFormData(a);
+    }
+
+}

+ 6 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java → zkqy-admin/src/main/java/com/zkqy/web/core/config/SwaggerConfig.java

@@ -1,6 +1,6 @@
-package com.ruoyi.web.core.config;
+package com.zkqy.web.core.config;
 
-import com.ruoyi.common.config.RuoYiConfig;
+import com.zkqy.common.config.ZkqyConfig;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +29,7 @@ public class SwaggerConfig {
      * 系统基础配置
      */
     @Autowired
-    private RuoYiConfig ruoyiConfig;
+    private ZkqyConfig zkqyConfig;
 
     /**
      * 是否开启swagger
@@ -58,7 +58,7 @@ public class SwaggerConfig {
                 // 扫描所有有注解的api,用这种方式更灵活
                 .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
                 // 扫描指定包中的swagger注解
-                // .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger"))
+                // .apis(RequestHandlerSelectors.basePackage("com.zkqy.project.tool.swagger"))
                 // 扫描所有 .apis(RequestHandlerSelectors.any())
                 .paths(PathSelectors.any())
                 .build()
@@ -113,9 +113,9 @@ public class SwaggerConfig {
                 // 描述
                 .description("描述:用于MES低代码平台的流程拖拽")
                 // 作者信息
-                .contact(new Contact(ruoyiConfig.getName(), null, null))
+                .contact(new Contact(zkqyConfig.getName(), null, null))
                 // 版本
-                .version("版本号:" + ruoyiConfig.getVersion())
+                .version("版本号:" + zkqyConfig.getVersion())
                 .build();
     }
 }

File diff suppressed because it is too large
+ 13 - 0
zkqy-admin/src/main/java/com/zkqy/web/ljj.java


+ 0 - 0
ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties → zkqy-admin/src/main/resources/META-INF/spring-devtools.properties


+ 1 - 1
ruoyi-admin/src/main/resources/application-druid.yml → zkqy-admin/src/main/resources/application-druid.yml

@@ -37,7 +37,7 @@ spring:
         allow:
         url-pattern:
         # 控制台管理用户名和密码
-        login-username: ruoyi
+        login-username: zkqy
         login-password: 123456
       filter:
         stat:

+ 7 - 7
ruoyi-admin/src/main/resources/application.yml → zkqy-admin/src/main/resources/application.yml

@@ -1,14 +1,14 @@
 # 项目相关配置
-ruoyi:
+zkqy:
   # 名称
-  name: RuoYi
+  name: zkqy
   # 版本
   version: 3.8.5
   # 版权年份
   copyrightYear: 2023
   # 实例演示开关
   demoEnabled: true
-  # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
+  # 文件路径 示例( Windows配置D:/zkqy/uploadPath,Linux配置 /home/zkqy/uploadPath)
   profile: D:/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
@@ -39,7 +39,7 @@ server:
 # 日志配置
 logging:
   level:
-    com.ruoyi: debug
+    com.zkqy: debug
     org.springframework: warn
 
 # 用户配置
@@ -87,13 +87,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: localhost
+    host: 192.168.110.15
     # 端口,默认为6379
     port: 6379
     # 数据库索引
     database: 0
     # 密码
-    password: 123456
+    password:
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -119,7 +119,7 @@ token:
 # MyBatis配置
 mybatis:
   # 搜索指定包别名
-  typeAliasesPackage: com.ruoyi.**.entity
+  typeAliasesPackage: com.zkqy.**.entity
   # 配置mapper的扫描,找到所有的mapper.xml映射文件
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 加载全局的配置文件

+ 1 - 1
ruoyi-admin/src/main/resources/banner.txt → zkqy-admin/src/main/resources/banner.txt

@@ -1,4 +1,4 @@
-Application Version: ${ruoyi.version}
+Application Version: ${zkqy.version}
 Spring Boot Version: ${spring-boot.version}
 ////////////////////////////////////////////////////////////////////
 //                          _ooOoo_                               //

+ 0 - 0
ruoyi-admin/src/main/resources/i18n/messages.properties → zkqy-admin/src/main/resources/i18n/messages.properties


+ 0 - 0
ruoyi-admin/src/main/resources/lib/DmJdbcDriver18.jar → zkqy-admin/src/main/resources/lib/DmJdbcDriver18.jar


+ 1 - 1
ruoyi-admin/src/main/resources/logback.xml → zkqy-admin/src/main/resources/logback.xml

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

+ 3 - 3
ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml → zkqy-admin/src/main/resources/mybatis/mybatis-config.xml

@@ -22,12 +22,12 @@
 
     </settings>
     <typeHandlers>
-        <typeHandler handler="com.ruoyi.system.entity.BlobTypeHandler"/>
+        <typeHandler handler="com.zkqy.system.entity.BlobTypeHandler"/>
     </typeHandlers>
     <!--  重写驼峰转换工具类  -->
-    <objectWrapperFactory type="com.ruoyi.common.utils.MapWrapperFactory"/>
+    <objectWrapperFactory type="com.zkqy.common.utils.MapWrapperFactory"/>
     <plugins>
-        <plugin interceptor="com.ruoyi.framework.aspectj.SqlInterceptor"/>
+        <plugin interceptor="com.zkqy.framework.aspectj.SqlInterceptor"/>
     </plugins>
 
 

+ 2 - 2
ruoyi-common/pom.xml → zkqy-common/pom.xml

@@ -4,12 +4,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>mec_process</artifactId>
-        <groupId>com.ruoyi</groupId>
+        <groupId>com.zkqy</groupId>
         <version>3.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ruoyi-common</artifactId>
+    <artifactId>zkqy-common</artifactId>
 
     <description>
         common通用工具

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java → zkqy-common/src/main/java/com/zkqy/common/annotation/Anonymous.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.annotation;
+package com.zkqy.common.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -9,7 +9,7 @@ import java.lang.annotation.Target;
 /**
  * 匿名访问不鉴权注解
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @Target({ ElementType.METHOD, ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java → zkqy-common/src/main/java/com/zkqy/common/annotation/DataScope.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.annotation;
+package com.zkqy.common.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -9,7 +9,7 @@ import java.lang.annotation.Target;
 /**
  * 数据权限过滤注解
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)

+ 3 - 3
ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java → zkqy-common/src/main/java/com/zkqy/common/annotation/DataSource.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.annotation;
+package com.zkqy.common.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.common.enums.DataSourceType;
+import com.zkqy.common.enums.DataSourceType;
 
 /**
  * 自定义多数据源切换注解
  *
  * 优先级:先方法,后类,如果方法覆盖了类上的数据源类型,以方法的为准,否则以类上的为准
  *
- * @author ruoyi
+ * @author zkqy
  */
 @Target({ ElementType.METHOD, ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)

+ 3 - 3
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java → zkqy-common/src/main/java/com/zkqy/common/annotation/Excel.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.annotation;
+package com.zkqy.common.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.zkqy.common.utils.poi.ExcelHandlerAdapter;
 
 /**
  * 自定义导出Excel数据注解
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java → zkqy-common/src/main/java/com/zkqy/common/annotation/Excels.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.annotation;
+package com.zkqy.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 /**
  * Excel注解集
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)

+ 4 - 4
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java → zkqy-common/src/main/java/com/zkqy/common/annotation/Log.java

@@ -1,17 +1,17 @@
-package com.ruoyi.common.annotation;
+package com.zkqy.common.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.enums.OperatorType;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.enums.OperatorType;
 
 /**
  * 自定义操作日志记录注解
  * 
- * @author ruoyi
+ * @author zkqy
  *
  */
 @Target({ ElementType.PARAMETER, ElementType.METHOD })

+ 4 - 4
ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java → zkqy-common/src/main/java/com/zkqy/common/annotation/RateLimiter.java

@@ -1,17 +1,17 @@
-package com.ruoyi.common.annotation;
+package com.zkqy.common.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import com.ruoyi.common.constant.CacheConstants;
-import com.ruoyi.common.enums.LimitType;
+import com.zkqy.common.constant.CacheConstants;
+import com.zkqy.common.enums.LimitType;
 
 /**
  * 限流注解
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java → zkqy-common/src/main/java/com/zkqy/common/annotation/RepeatSubmit.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.annotation;
+package com.zkqy.common.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -10,7 +10,7 @@ import java.lang.annotation.Target;
 /**
  * 自定义注解防止表单重复提交
  * 
- * @author ruoyi
+ * @author zkqy
  *
  */
 @Inherited

+ 7 - 7
ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java → zkqy-common/src/main/java/com/zkqy/common/config/ZkqyConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.config;
+package com.zkqy.common.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 zkqy
  */
 @Component
-@ConfigurationProperties(prefix = "ruoyi")
-public class RuoYiConfig {
+@ConfigurationProperties(prefix = "zkqy")
+public class ZkqyConfig {
     /**
      * 项目名称
      */
@@ -83,7 +83,7 @@ public class RuoYiConfig {
     }
 
     public void setProfile(String profile) {
-        RuoYiConfig.profile = profile;
+        ZkqyConfig.profile = profile;
     }
 
     public static boolean isAddressEnabled() {
@@ -91,7 +91,7 @@ public class RuoYiConfig {
     }
 
     public void setAddressEnabled(boolean addressEnabled) {
-        RuoYiConfig.addressEnabled = addressEnabled;
+        ZkqyConfig.addressEnabled = addressEnabled;
     }
 
     public static String getCaptchaType() {
@@ -99,7 +99,7 @@ public class RuoYiConfig {
     }
 
     public void setCaptchaType(String captchaType) {
-        RuoYiConfig.captchaType = captchaType;
+        ZkqyConfig.captchaType = captchaType;
     }
 
     /**

+ 1 - 1
ruoyi-common/src/main/java/com/ruoyi/common/config/bpm/BpmProperties.java → zkqy-common/src/main/java/com/zkqy/common/config/bpm/BpmProperties.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.config.bpm;
+package com.zkqy.common.config.bpm;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/config/datasource/DynamicDataSource.java → zkqy-common/src/main/java/com/zkqy/common/config/datasource/DynamicDataSource.java

@@ -1,4 +1,4 @@
-//package com.ruoyi.framework.datasource;
+//package com.zkqy.framework.datasource;
 //
 //import java.util.Map;
 //import javax.sql.DataSource;
@@ -7,7 +7,7 @@
 ///**
 // * 动态数据源
 // *
-// * @author ruoyi
+// * @author zkqy
 // */
 //public class DynamicDataSource extends AbstractRoutingDataSource
 //{

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/config/datasource/DynamicDataSourceContextHolder.java → zkqy-common/src/main/java/com/zkqy/common/config/datasource/DynamicDataSourceContextHolder.java

@@ -1,4 +1,4 @@
-//package com.ruoyi.framework.datasource;
+//package com.zkqy.framework.datasource;
 //
 //import org.slf4j.Logger;
 //import org.slf4j.LoggerFactory;
@@ -6,7 +6,7 @@
 ///**
 // * 数据源切换处理
 // *
-// * @author ruoyi
+// * @author zkqy
 // */
 //public class DynamicDataSourceContextHolder
 //{

+ 1 - 1
ruoyi-common/src/main/java/com/ruoyi/common/config/datasource/config/CrosConfig.java → zkqy-common/src/main/java/com/zkqy/common/config/datasource/config/CrosConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.config.datasource.config;
+package com.zkqy.common.config.datasource.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;

+ 1 - 1
ruoyi-common/src/main/java/com/ruoyi/common/config/datasource/config/DataSourceConfig.java → zkqy-common/src/main/java/com/zkqy/common/config/datasource/config/DataSourceConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.config.datasource.config;
+package com.zkqy.common.config.datasource.config;
 
 
 import com.alibaba.druid.pool.DruidDataSource;

+ 4 - 4
ruoyi-common/src/main/java/com/ruoyi/common/config/datasource/config/DynamicDataSource.java → zkqy-common/src/main/java/com/zkqy/common/config/datasource/config/DynamicDataSource.java

@@ -1,12 +1,12 @@
-package com.ruoyi.common.config.datasource.config;
+package com.zkqy.common.config.datasource.config;
 
 
 
 
 import com.alibaba.druid.pool.DruidDataSource;
-import com.ruoyi.common.config.datasource.constant.DataSourceType;
-import com.ruoyi.common.config.datasource.constant.UrlSuffix;
-import com.ruoyi.common.utils.StringUtils;
+import com.zkqy.common.config.datasource.constant.DataSourceType;
+import com.zkqy.common.config.datasource.constant.UrlSuffix;
+import com.zkqy.common.utils.StringUtils;
 import org.apache.ibatis.mapping.Environment;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.SqlSessionFactory;

+ 1 - 1
ruoyi-common/src/main/java/com/ruoyi/common/config/datasource/config/GenConfig.java → zkqy-common/src/main/java/com/zkqy/common/config/datasource/config/GenConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.config.datasource.config;
+package com.zkqy.common.config.datasource.config;
 
 
 public class GenConfig {

+ 1 - 1
ruoyi-common/src/main/java/com/ruoyi/common/config/datasource/config/SpringContextUtils.java → zkqy-common/src/main/java/com/zkqy/common/config/datasource/config/SpringContextUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.config.datasource.config;
+package com.zkqy.common.config.datasource.config;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;

+ 1 - 1
ruoyi-common/src/main/java/com/ruoyi/common/config/datasource/constant/DataSourceType.java → zkqy-common/src/main/java/com/zkqy/common/config/datasource/constant/DataSourceType.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.config.datasource.constant;
+package com.zkqy.common.config.datasource.constant;
 
 public enum DataSourceType {
 

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/config/datasource/constant/HttpStatus.java → zkqy-common/src/main/java/com/zkqy/common/config/datasource/constant/HttpStatus.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.config.datasource.constant;
+package com.zkqy.common.config.datasource.constant;
 
 /**
  * 返回状态码
  *
- * @author ruoyi
+ * @author zkqy
  */
 public class HttpStatus {
 

+ 1 - 1
ruoyi-common/src/main/java/com/ruoyi/common/config/datasource/constant/UrlSuffix.java → zkqy-common/src/main/java/com/zkqy/common/config/datasource/constant/UrlSuffix.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.config.datasource.constant;
+package com.zkqy.common.config.datasource.constant;
 
 public class UrlSuffix {
 

+ 3 - 3
ruoyi-common/src/main/java/com/ruoyi/common/config/datasource/utils/AjaxResult.java → zkqy-common/src/main/java/com/zkqy/common/config/datasource/utils/AjaxResult.java

@@ -1,8 +1,8 @@
-package com.ruoyi.common.config.datasource.utils;
+package com.zkqy.common.config.datasource.utils;
 
 
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.utils.StringUtils;
+import com.zkqy.common.constant.HttpStatus;
+import com.zkqy.common.utils.StringUtils;
 
 import java.util.HashMap;
 

+ 1 - 1
ruoyi-common/src/main/java/com/ruoyi/common/config/datasource/utils/DataSourceUtils.java → zkqy-common/src/main/java/com/zkqy/common/config/datasource/utils/DataSourceUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.config.datasource.utils;
+package com.zkqy.common.config.datasource.utils;
 
 
 public class DataSourceUtils {

+ 1 - 1
ruoyi-common/src/main/java/com/ruoyi/common/config/datasource/utils/PageUtil.java → zkqy-common/src/main/java/com/zkqy/common/config/datasource/utils/PageUtil.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.config.datasource.utils;
+package com.zkqy.common.config.datasource.utils;
 
 import org.apache.ibatis.session.RowBounds;
 

+ 1 - 1
ruoyi-common/src/main/java/com/ruoyi/common/constant/BpmNodeTypeConstants.java → zkqy-common/src/main/java/com/zkqy/common/constant/BpmNodeTypeConstants.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.constant;
+package com.zkqy.common.constant;
 
 /**
  * 流程节点类型常量信息

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java → zkqy-common/src/main/java/com/zkqy/common/constant/CacheConstants.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.constant;
+package com.zkqy.common.constant;
 
 /**
  * 缓存的key 常量
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class CacheConstants
 {

+ 4 - 4
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java → zkqy-common/src/main/java/com/zkqy/common/constant/Constants.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.constant;
+package com.zkqy.common.constant;
 
 import io.jsonwebtoken.Claims;
 
 /**
  * 通用常量信息
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class Constants
 {
@@ -132,11 +132,11 @@ public class Constants
     /**
      * 定时任务白名单配置(仅允许访问的包名,如其他需要可以自行添加)
      */
-    public static final String[] JOB_WHITELIST_STR = { "com.ruoyi" };
+    public static final String[] JOB_WHITELIST_STR = { "com.zkqy" };
 
     /**
      * 定时任务违规的字符
      */
     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.common.config" };
+            "org.springframework", "org.apache", "com.zkqy.common.utils.file", "com.zkqy.common.config" };
 }

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java → zkqy-common/src/main/java/com/zkqy/common/constant/GenConstants.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.constant;
+package com.zkqy.common.constant;
 
 /**
  * 代码生成通用常量
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class GenConstants
 {

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java → zkqy-common/src/main/java/com/zkqy/common/constant/HttpStatus.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.constant;
+package com.zkqy.common.constant;
 
 /**
  * 返回状态码
  *
- * @author ruoyi
+ * @author zkqy
  */
 public class HttpStatus {
     /**

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java → zkqy-common/src/main/java/com/zkqy/common/constant/ScheduleConstants.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.constant;
+package com.zkqy.common.constant;
 
 /**
  * 任务调度通用常量
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class ScheduleConstants
 {

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java → zkqy-common/src/main/java/com/zkqy/common/constant/UserConstants.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.constant;
+package com.zkqy.common.constant;
 
 /**
  * 用户常量信息
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class UserConstants
 {

+ 13 - 13
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java → zkqy-common/src/main/java/com/zkqy/common/core/controller/BaseController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.controller;
+package com.zkqy.common.core.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.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.page.PageDomain;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.page.TableSupport;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.sql.SqlUtil;
+import com.zkqy.common.constant.HttpStatus;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.model.LoginUser;
+import com.zkqy.common.core.page.PageDomain;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.core.page.TableSupport;
+import com.zkqy.common.utils.DateUtils;
+import com.zkqy.common.utils.PageUtils;
+import com.zkqy.common.utils.SecurityUtils;
+import com.zkqy.common.utils.StringUtils;
+import com.zkqy.common.utils.sql.SqlUtil;
 
 /**
  * web层通用数据处理
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class BaseController
 {

+ 4 - 4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java → zkqy-common/src/main/java/com/zkqy/common/core/domain/AjaxResult.java

@@ -1,13 +1,13 @@
-package com.ruoyi.common.core.domain;
+package com.zkqy.common.core.domain;
 
 import java.util.HashMap;
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.utils.StringUtils;
+import com.zkqy.common.constant.HttpStatus;
+import com.zkqy.common.utils.StringUtils;
 
 /**
  * 操作消息提醒
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class AjaxResult extends HashMap<String, Object>
 {

+ 4 - 4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java → zkqy-common/src/main/java/com/zkqy/common/core/domain/BaseEntity.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.domain;
+package com.zkqy.common.core.domain;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
@@ -8,13 +8,13 @@ import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.zkqy.common.utils.DateUtils;
+import com.zkqy.common.utils.SecurityUtils;
 
 /**
  * Entity基类
  *
- * @author ruoyi
+ * @author zkqy
  */
 public class BaseEntity implements Serializable {
 

+ 3 - 3
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java → zkqy-common/src/main/java/com/zkqy/common/core/domain/R.java

@@ -1,12 +1,12 @@
-package com.ruoyi.common.core.domain;
+package com.zkqy.common.core.domain;
 
 import java.io.Serializable;
-import com.ruoyi.common.constant.HttpStatus;
+import com.zkqy.common.constant.HttpStatus;
 
 /**
  * 响应信息主体
  *
- * @author ruoyi
+ * @author zkqy
  */
 public class R<T> implements Serializable
 {

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java → zkqy-common/src/main/java/com/zkqy/common/core/domain/TreeEntity.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.domain;
+package com.zkqy.common.core.domain;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,7 +6,7 @@ import java.util.List;
 /**
  * Tree基类
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class TreeEntity extends BaseEntity
 {

+ 4 - 4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java → zkqy-common/src/main/java/com/zkqy/common/core/domain/TreeSelect.java

@@ -1,16 +1,16 @@
-package com.ruoyi.common.core.domain;
+package com.zkqy.common.core.domain;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.stream.Collectors;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.zkqy.common.core.domain.entity.SysDept;
+import com.zkqy.common.core.domain.entity.SysMenu;
 
 /**
  * Treeselect树结构实体类
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class TreeSelect implements Serializable
 {

+ 1 - 1
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/DataSource.java → zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/DataSource.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.domain.entity;
+package com.zkqy.common.core.domain.entity;
 
 import java.io.Serializable;
 

+ 2 - 3
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java → zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysDept.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.domain.entity;
+package com.zkqy.common.core.domain.entity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,12 +8,11 @@ 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.common.core.domain.BaseEntity;
 
 /**
  * 部门表 sys_dept
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class SysDept
 {

+ 6 - 6
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java → zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysDictData.java

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

+ 5 - 5
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java → zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysDictType.java

@@ -1,18 +1,18 @@
-package com.ruoyi.common.core.domain.entity;
+package com.zkqy.common.core.domain.entity;
 
 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.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.zkqy.common.annotation.Excel;
+import com.zkqy.common.annotation.Excel.ColumnType;
+import com.zkqy.common.core.domain.BaseEntity;
 
 /**
  * 字典类型表 sys_dict_type
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class SysDictType extends BaseEntity
 {

+ 3 - 3
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java → zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysMenu.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.domain.entity;
+package com.zkqy.common.core.domain.entity;
 
 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.common.core.domain.BaseEntity;
+import com.zkqy.common.core.domain.BaseEntity;
 
 /**
  * 菜单权限表 sys_menu
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class SysMenu extends BaseEntity
 {

+ 4 - 5
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java → zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysRole.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.domain.entity;
+package com.zkqy.common.core.domain.entity;
 
 import java.util.Set;
 import javax.validation.constraints.NotBlank;
@@ -6,14 +6,13 @@ 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.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.zkqy.common.annotation.Excel;
+import com.zkqy.common.annotation.Excel.ColumnType;
 
 /**
  * 角色表 sys_role
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class SysRole
 {

+ 3 - 4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysTenant.java → zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysTenant.java

@@ -1,7 +1,6 @@
-package com.ruoyi.common.core.domain.entity;
+package com.zkqy.common.core.domain.entity;
 
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.zkqy.common.annotation.Excel;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -12,7 +11,7 @@ import javax.validation.constraints.Size;
 /**
  * 部门表 sys_tenant
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class SysTenant
 {

+ 7 - 8
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java → zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysUser.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.domain.entity;
+package com.zkqy.common.core.domain.entity;
 
 import java.util.Date;
 import java.util.List;
@@ -6,17 +6,16 @@ import javax.validation.constraints.*;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-import com.ruoyi.common.annotation.Excel.Type;
-import com.ruoyi.common.annotation.Excels;
-import com.ruoyi.common.core.domain.BaseEntity;
-import com.ruoyi.common.xss.Xss;
+import com.zkqy.common.annotation.Excel;
+import com.zkqy.common.annotation.Excel.ColumnType;
+import com.zkqy.common.annotation.Excel.Type;
+import com.zkqy.common.annotation.Excels;
+import com.zkqy.common.xss.Xss;
 
 /**
  * 用户对象 sys_user
  *
- * @author ruoyi
+ * @author zkqy
  */
 public class SysUser {
     private static final long serialVersionUID = 1L;

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java → zkqy-common/src/main/java/com/zkqy/common/core/domain/model/LoginBody.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.core.domain.model;
+package com.zkqy.common.core.domain.model;
 
 /**
  * 用户登录对象
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class LoginBody
 {

+ 3 - 3
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java → zkqy-common/src/main/java/com/zkqy/common/core/domain/model/LoginUser.java

@@ -1,16 +1,16 @@
-package com.ruoyi.common.core.domain.model;
+package com.zkqy.common.core.domain.model;
 
 import java.util.Collection;
 import java.util.Set;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import com.alibaba.fastjson2.annotation.JSONField;
-import com.ruoyi.common.core.domain.entity.SysUser;
+import com.zkqy.common.core.domain.entity.SysUser;
 
 /**
  * 登录用户身份权限
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class LoginUser implements UserDetails
 {

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java → zkqy-common/src/main/java/com/zkqy/common/core/domain/model/RegisterBody.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.core.domain.model;
+package com.zkqy.common.core.domain.model;
 
 /**
  * 用户注册对象
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class RegisterBody extends LoginBody
 {

+ 3 - 3
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java → zkqy-common/src/main/java/com/zkqy/common/core/page/PageDomain.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.core.page;
+package com.zkqy.common.core.page;
 
-import com.ruoyi.common.utils.StringUtils;
+import com.zkqy.common.utils.StringUtils;
 
 /**
  * 分页数据
  *
- * @author ruoyi
+ * @author zkqy
  */
 public class PageDomain {
     /**

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java → zkqy-common/src/main/java/com/zkqy/common/core/page/TableDataInfo.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.page;
+package com.zkqy.common.core.page;
 
 import java.io.Serializable;
 import java.util.List;
@@ -6,7 +6,7 @@ import java.util.List;
 /**
  * 表格分页数据对象
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class TableDataInfo implements Serializable
 {

+ 4 - 5
ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java → zkqy-common/src/main/java/com/zkqy/common/core/page/TableSupport.java

@@ -1,13 +1,12 @@
-package com.ruoyi.common.core.page;
+package com.zkqy.common.core.page;
 
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.ServletUtils;
+import com.zkqy.common.core.text.Convert;
+import com.zkqy.common.utils.ServletUtils;
 
 /**
  * 表格数据处理
  *
- * @author ruoyi
+ * @author zkqy
  */
 public class TableSupport {
     /**

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java → zkqy-common/src/main/java/com/zkqy/common/core/redis/RedisCache.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.redis;
+package com.zkqy.common.core.redis;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
 /**
  * spring redis 工具类
  *
- * @author ruoyi
+ * @author zkqy
  **/
 @SuppressWarnings(value = { "unchecked", "rawtypes" })
 @Component

+ 3 - 3
ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java → zkqy-common/src/main/java/com/zkqy/common/core/text/CharsetKit.java

@@ -1,13 +1,13 @@
-package com.ruoyi.common.core.text;
+package com.zkqy.common.core.text;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import com.ruoyi.common.utils.StringUtils;
+import com.zkqy.common.utils.StringUtils;
 
 /**
  * 字符集工具类
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class CharsetKit
 {

+ 3 - 3
ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java → zkqy-common/src/main/java/com/zkqy/common/core/text/Convert.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.text;
+package com.zkqy.common.core.text;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -6,13 +6,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.zkqy.common.utils.StringUtils;
 import org.apache.commons.lang3.ArrayUtils;
 
 /**
  * 类型转换器
  *
- * @author ruoyi
+ * @author zkqy
  */
 public class Convert
 {

+ 3 - 3
ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java → zkqy-common/src/main/java/com/zkqy/common/core/text/StrFormatter.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.core.text;
+package com.zkqy.common.core.text;
 
-import com.ruoyi.common.utils.StringUtils;
+import com.zkqy.common.utils.StringUtils;
 
 /**
  * 字符串格式化
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class StrFormatter
 {

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java → zkqy-common/src/main/java/com/zkqy/common/enums/BusinessStatus.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.enums;
+package com.zkqy.common.enums;
 
 /**
  * 操作状态
  * 
- * @author ruoyi
+ * @author zkqy
  *
  */
 public enum BusinessStatus

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java → zkqy-common/src/main/java/com/zkqy/common/enums/BusinessType.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.enums;
+package com.zkqy.common.enums;
 
 /**
  * 业务操作类型
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public enum BusinessType
 {

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java → zkqy-common/src/main/java/com/zkqy/common/enums/DataSourceType.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.enums;
+package com.zkqy.common.enums;
 
 /**
  * 数据源
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public enum DataSourceType
 {

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java → zkqy-common/src/main/java/com/zkqy/common/enums/HttpMethod.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.enums;
+package com.zkqy.common.enums;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -7,7 +7,7 @@ import org.springframework.lang.Nullable;
 /**
  * 请求方式
  *
- * @author ruoyi
+ * @author zkqy
  */
 public enum HttpMethod
 {

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java → zkqy-common/src/main/java/com/zkqy/common/enums/LimitType.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.enums;
+package com.zkqy.common.enums;
 
 /**
  * 限流类型
  *
- * @author ruoyi
+ * @author zkqy
  */
 
 public enum LimitType

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java → zkqy-common/src/main/java/com/zkqy/common/enums/OperatorType.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.enums;
+package com.zkqy.common.enums;
 
 /**
  * 操作人类别
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public enum OperatorType
 {

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java → zkqy-common/src/main/java/com/zkqy/common/enums/UserStatus.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.enums;
+package com.zkqy.common.enums;
 
 /**
  * 用户状态
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public enum UserStatus
 {

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java → zkqy-common/src/main/java/com/zkqy/common/exception/DemoModeException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception;
+package com.zkqy.common.exception;
 
 /**
  * 演示模式异常
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class DemoModeException extends RuntimeException
 {

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java → zkqy-common/src/main/java/com/zkqy/common/exception/GlobalException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception;
+package com.zkqy.common.exception;
 
 /**
  * 全局异常
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class GlobalException extends RuntimeException
 {

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java → zkqy-common/src/main/java/com/zkqy/common/exception/ServiceException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception;
+package com.zkqy.common.exception;
 
 /**
  * 业务异常
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public final class ServiceException extends RuntimeException
 {

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java → zkqy-common/src/main/java/com/zkqy/common/exception/UtilException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception;
+package com.zkqy.common.exception;
 
 /**
  * 工具类异常
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class UtilException extends RuntimeException
 {

+ 4 - 4
ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java → zkqy-common/src/main/java/com/zkqy/common/exception/base/BaseException.java

@@ -1,12 +1,12 @@
-package com.ruoyi.common.exception.base;
+package com.zkqy.common.exception.base;
 
-import com.ruoyi.common.utils.MessageUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.zkqy.common.utils.MessageUtils;
+import com.zkqy.common.utils.StringUtils;
 
 /**
  * 基础异常
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class BaseException extends RuntimeException
 {

+ 3 - 3
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java → zkqy-common/src/main/java/com/zkqy/common/exception/file/FileException.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.exception.file;
+package com.zkqy.common.exception.file;
 
-import com.ruoyi.common.exception.base.BaseException;
+import com.zkqy.common.exception.base.BaseException;
 
 /**
  * 文件信息异常类
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class FileException extends BaseException
 {

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java → zkqy-common/src/main/java/com/zkqy/common/exception/file/FileNameLengthLimitExceededException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception.file;
+package com.zkqy.common.exception.file;
 
 /**
  * 文件名称超长限制异常类
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class FileNameLengthLimitExceededException extends FileException
 {

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java → zkqy-common/src/main/java/com/zkqy/common/exception/file/FileSizeLimitExceededException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception.file;
+package com.zkqy.common.exception.file;
 
 /**
  * 文件名大小限制异常类
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class FileSizeLimitExceededException extends FileException
 {

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java → zkqy-common/src/main/java/com/zkqy/common/exception/file/InvalidExtensionException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.exception.file;
+package com.zkqy.common.exception.file;
 
 import java.util.Arrays;
 import org.apache.commons.fileupload.FileUploadException;
@@ -6,7 +6,7 @@ import org.apache.commons.fileupload.FileUploadException;
 /**
  * 文件上传 误异常类
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class InvalidExtensionException extends FileUploadException
 {

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java → zkqy-common/src/main/java/com/zkqy/common/exception/job/TaskException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception.job;
+package com.zkqy.common.exception.job;
 
 /**
  * 计划策略异常
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class TaskException extends Exception
 {

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