Bläddra i källkod

refactor:调整项目模块目录

韩帛霖 1 år sedan
förälder
incheckning
e69d32d399
100 ändrade filer med 550 tillägg och 644 borttagningar
  1. 1 1
      LICENSE
  2. 10 10
      README.md
  3. 3 3
      bin/run.bat
  4. 26 26
      pom.xml
  5. 0 1
      ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt
  6. 12 12
      ry.bat
  7. 1 1
      ry.sh
  8. 2 15
      sql/ry-vue-2023-6-16.sql
  9. 13 13
      sql/ry-vue.sql
  10. 2 15
      sql/ry-vue2023-6-19-3.sql
  11. 2 15
      sql/ry-vue2023-6-25.sql
  12. 2 15
      sql/ry-vue2023-6-27.sql
  13. 2 15
      sql/ry-vue2023-6-30.sql
  14. 2 15
      sql/ry-vue_2023-06-19-2.sql
  15. 9 9
      zkqy-admin/pom.xml
  16. 7 9
      zkqy-admin/src/main/java/com/zkqy/ZkqyApplication.java
  17. 4 4
      zkqy-admin/src/main/java/com/zkqy/ZkqyServletInitializer.java
  18. 11 11
      zkqy-admin/src/main/java/com/zkqy/web/controller/common/CaptchaController.java
  19. 13 13
      zkqy-admin/src/main/java/com/zkqy/web/controller/common/CommonController.java
  20. 6 6
      zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/CacheController.java
  21. 4 4
      zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/ServerController.java
  22. 10 10
      zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/SysActivationLogController.java
  23. 11 11
      zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/SysLogininforController.java
  24. 10 10
      zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/SysOperlogController.java
  25. 13 13
      zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/SysUserOnlineController.java
  26. 5 7
      zkqy-admin/src/main/java/com/zkqy/web/controller/system/DataSourceController.java
  27. 10 13
      zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysBpmNodeScriptController.java
  28. 10 10
      zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysConfigController.java
  29. 10 10
      zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysDeptController.java
  30. 13 13
      zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysDictDataController.java
  31. 10 10
      zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysDictTypeController.java
  32. 10 10
      zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysDragTableStyleController.java
  33. 6 6
      zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysIndexController.java
  34. 15 15
      zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysLoginController.java
  35. 10 11
      zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysMenuController.java
  36. 9 9
      zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysNoticeController.java
  37. 10 10
      zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysPostController.java
  38. 16 16
      zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysProfileController.java
  39. 8 8
      zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysRegisterController.java
  40. 19 21
      zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysRoleController.java
  41. 11 11
      zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysTenantController.java
  42. 19 19
      zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysUserController.java
  43. 3 3
      zkqy-admin/src/main/java/com/zkqy/web/controller/system/TemplateBaseController.java
  44. 5 5
      zkqy-admin/src/main/java/com/zkqy/web/controller/tool/TestController.java
  45. 7 7
      zkqy-admin/src/main/java/com/zkqy/web/core/config/SwaggerConfig.java
  46. 0 0
      zkqy-admin/src/main/resources/META-INF/spring-devtools.properties
  47. 1 1
      zkqy-admin/src/main/resources/application-druid.yml
  48. 11 11
      zkqy-admin/src/main/resources/application.yml
  49. 1 1
      zkqy-admin/src/main/resources/banner.txt
  50. 0 0
      zkqy-admin/src/main/resources/i18n/messages.properties
  51. 1 1
      zkqy-admin/src/main/resources/logback.xml
  52. 0 0
      zkqy-admin/src/main/resources/mybatis/mybatis-config.xml
  53. 3 3
      zkqy-common/pom.xml
  54. 2 2
      zkqy-common/src/main/java/com/zkqy/common/annotation/Anonymous.java
  55. 2 2
      zkqy-common/src/main/java/com/zkqy/common/annotation/DataScope.java
  56. 3 3
      zkqy-common/src/main/java/com/zkqy/common/annotation/DataSource.java
  57. 3 3
      zkqy-common/src/main/java/com/zkqy/common/annotation/Excel.java
  58. 2 2
      zkqy-common/src/main/java/com/zkqy/common/annotation/Excels.java
  59. 4 4
      zkqy-common/src/main/java/com/zkqy/common/annotation/Log.java
  60. 4 4
      zkqy-common/src/main/java/com/zkqy/common/annotation/RateLimiter.java
  61. 2 2
      zkqy-common/src/main/java/com/zkqy/common/annotation/RepeatSubmit.java
  62. 7 7
      zkqy-common/src/main/java/com/zkqy/common/config/ZkqyConfig.java
  63. 2 2
      zkqy-common/src/main/java/com/zkqy/common/constant/CacheConstants.java
  64. 4 4
      zkqy-common/src/main/java/com/zkqy/common/constant/Constants.java
  65. 2 2
      zkqy-common/src/main/java/com/zkqy/common/constant/GenConstants.java
  66. 2 2
      zkqy-common/src/main/java/com/zkqy/common/constant/HttpStatus.java
  67. 2 2
      zkqy-common/src/main/java/com/zkqy/common/constant/ScheduleConstants.java
  68. 2 2
      zkqy-common/src/main/java/com/zkqy/common/constant/UserConstants.java
  69. 13 13
      zkqy-common/src/main/java/com/zkqy/common/core/controller/BaseController.java
  70. 4 4
      zkqy-common/src/main/java/com/zkqy/common/core/domain/AjaxResult.java
  71. 2 2
      zkqy-common/src/main/java/com/zkqy/common/core/domain/BaseEntity.java
  72. 3 3
      zkqy-common/src/main/java/com/zkqy/common/core/domain/R.java
  73. 2 2
      zkqy-common/src/main/java/com/zkqy/common/core/domain/TreeEntity.java
  74. 4 4
      zkqy-common/src/main/java/com/zkqy/common/core/domain/TreeSelect.java
  75. 1 1
      zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/DataSource.java
  76. 3 3
      zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysDept.java
  77. 6 6
      zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysDictData.java
  78. 5 5
      zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysDictType.java
  79. 3 3
      zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysMenu.java
  80. 6 7
      zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysRole.java
  81. 4 6
      zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysTenant.java
  82. 9 10
      zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysUser.java
  83. 2 2
      zkqy-common/src/main/java/com/zkqy/common/core/domain/model/LoginBody.java
  84. 3 3
      zkqy-common/src/main/java/com/zkqy/common/core/domain/model/LoginUser.java
  85. 2 2
      zkqy-common/src/main/java/com/zkqy/common/core/domain/model/RegisterBody.java
  86. 3 3
      zkqy-common/src/main/java/com/zkqy/common/core/page/PageDomain.java
  87. 2 2
      zkqy-common/src/main/java/com/zkqy/common/core/page/TableDataInfo.java
  88. 4 5
      zkqy-common/src/main/java/com/zkqy/common/core/page/TableSupport.java
  89. 2 2
      zkqy-common/src/main/java/com/zkqy/common/core/redis/RedisCache.java
  90. 3 3
      zkqy-common/src/main/java/com/zkqy/common/core/text/CharsetKit.java
  91. 3 3
      zkqy-common/src/main/java/com/zkqy/common/core/text/Convert.java
  92. 3 3
      zkqy-common/src/main/java/com/zkqy/common/core/text/StrFormatter.java
  93. 2 2
      zkqy-common/src/main/java/com/zkqy/common/enums/BusinessStatus.java
  94. 2 2
      zkqy-common/src/main/java/com/zkqy/common/enums/BusinessType.java
  95. 2 2
      zkqy-common/src/main/java/com/zkqy/common/enums/DataSourceType.java
  96. 2 2
      zkqy-common/src/main/java/com/zkqy/common/enums/HttpMethod.java
  97. 2 2
      zkqy-common/src/main/java/com/zkqy/common/enums/LimitType.java
  98. 2 2
      zkqy-common/src/main/java/com/zkqy/common/enums/OperatorType.java
  99. 2 2
      zkqy-common/src/main/java/com/zkqy/common/enums/UserStatus.java
  100. 2 2
      zkqy-common/src/main/java/com/zkqy/common/exception/DemoModeException.java

+ 1 - 1
LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 RuoYi
+Copyright (c) 2018 zkqy
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

+ 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
 
 ## 演示图
 

+ 3 - 3
bin/run.bat

@@ -1,14 +1,14 @@
 @echo off
 echo.
-echo [信息] 使用Jar命令运行Web工程。
+echo [锟斤拷息] 使锟斤拷Jar锟斤拷锟斤拷锟斤拷锟斤拷Web锟斤拷锟教★拷
 echo.
 
 cd %~dp0
-cd ../ruoyi-admin/target
+cd ../zkqy-admin/target
 
 set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
 
-java -jar %JAVA_OPTS% ruoyi-admin.jar
+java -jar %JAVA_OPTS% zkqy-admin.jar
 
 cd bin
 pause

+ 26 - 26
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>
-    <artifactId>ruoyi</artifactId>
+    <groupId>com.zkqy</groupId>
+    <artifactId>zkqy</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>
@@ -137,37 +137,37 @@
 
             <!-- 定时任务-->
             <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-quartz</artifactId>
-                <version>${ruoyi.version}</version>
+                <groupId>com.zkqy</groupId>
+                <artifactId>zkqy-quartz</artifactId>
+                <version>${zkqy.version}</version>
             </dependency>
 
             <!-- 代码生成-->
             <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-generator</artifactId>
-                <version>${ruoyi.version}</version>
+                <groupId>com.zkqy</groupId>
+                <artifactId>zkqy-generator</artifactId>
+                <version>${zkqy.version}</version>
             </dependency>
 
             <!-- 核心模块-->
             <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>
 
             <!-- mybatis-plus -->
@@ -187,12 +187,12 @@
     </dependencyManagement>
 
     <modules>
-        <module>ruoyi-admin</module>
-        <module>ruoyi-framework</module>
-        <module>ruoyi-system</module>
-        <module>ruoyi-quartz</module>
-        <module>ruoyi-generator</module>
-        <module>ruoyi-common</module>
+        <module>zkqy-admin</module>
+        <module>zkqy-framework</module>
+        <module>zkqy-system</module>
+        <module>zkqy-quartz</module>
+        <module>zkqy-generator</module>
+        <module>zkqy-common</module>
     </modules>
     <packaging>pom</packaging>
 

+ 0 - 1
ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt

@@ -1 +0,0 @@
-如果使用的是RuoYi-Vue3前端,那么需要覆盖一下此目录的模板index.vue.vm、index-tree.vue.vm文件到上级vue目录。

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

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 2 - 15
sql/ry-vue-2023-6-16.sql


+ 13 - 13
sql/ry-vue.sql

@@ -557,7 +557,7 @@ CREATE TABLE `sys_menu` (
 INSERT INTO `sys_menu` VALUES ('1', '系统管理', '0', '1', 'system', null, '', '1', '0', 'M', '0', '0', '', 'system', 'admin', '2023-05-25 16:54:10', '', null, '系统管理目录');
 INSERT INTO `sys_menu` VALUES ('2', '系统监控', '0', '2', 'monitor', null, '', '1', '0', 'M', '0', '0', '', 'monitor', 'admin', '2023-05-25 16:54:10', '', null, '系统监控目录');
 INSERT INTO `sys_menu` VALUES ('3', '系统工具', '0', '3', 'tool', null, '', '1', '0', 'M', '0', '0', '', 'tool', 'admin', '2023-05-25 16:54:10', '', null, '系统工具目录');
-INSERT INTO `sys_menu` VALUES ('4', '若依官网', '0', '4', 'http://ruoyi.vip', null, '', '0', '0', 'M', '0', '0', '', 'guide', 'admin', '2023-05-25 16:54:10', '', null, '若依官网地址');
+INSERT INTO `sys_menu` VALUES ('4', '若依官网', '0', '4', 'http://zkqy.vip', null, '', '0', '0', 'M', '0', '0', '', 'guide', 'admin', '2023-05-25 16:54:10', '', null, '若依官网地址');
 INSERT INTO `sys_menu` VALUES ('100', '用户管理', '1', '1', 'user', 'system/user/index', '', '1', '0', 'C', '0', '0', 'system:user:list', 'user', 'admin', '2023-05-25 16:54:10', '', null, '用户管理菜单');
 INSERT INTO `sys_menu` VALUES ('101', '角色管理', '1', '2', 'role', 'system/role/index', '', '1', '0', 'C', '0', '0', 'system:role:list', 'peoples', 'admin', '2023-05-25 16:54:10', '', null, '角色管理菜单');
 INSERT INTO `sys_menu` VALUES ('102', '菜单管理', '1', '3', 'menu', 'system/menu/index', '', '1', '0', 'C', '0', '0', 'system:menu:list', 'tree-table', 'admin', '2023-05-25 16:54:10', '', null, '菜单管理菜单');
@@ -695,18 +695,18 @@ CREATE TABLE `sys_oper_log` (
 -- ----------------------------
 -- Records of sys_oper_log
 -- ----------------------------
-INSERT INTO `sys_oper_log` VALUES ('100', '用户管理', '3', 'com.ruoyi.web.controller.system.SysUserController.remove()', 'DELETE', '1', 'admin', null, '/system/user/2', '127.0.0.1', '内网IP', '{}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:11:13', '30');
-INSERT INTO `sys_oper_log` VALUES ('101', '部门管理', '3', 'com.ruoyi.web.controller.system.SysDeptController.remove()', 'DELETE', '1', 'admin', null, '/system/dept/109', '127.0.0.1', '内网IP', '{}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:13:13', '13');
-INSERT INTO `sys_oper_log` VALUES ('102', '部门管理', '3', 'com.ruoyi.web.controller.system.SysDeptController.remove()', 'DELETE', '1', 'admin', null, '/system/dept/108', '127.0.0.1', '内网IP', '{}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:13:14', '13');
-INSERT INTO `sys_oper_log` VALUES ('103', '部门管理', '3', 'com.ruoyi.web.controller.system.SysDeptController.remove()', 'DELETE', '1', 'admin', null, '/system/dept/102', '127.0.0.1', '内网IP', '{}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:13:15', '14');
-INSERT INTO `sys_oper_log` VALUES ('104', '部门管理', '3', 'com.ruoyi.web.controller.system.SysDeptController.remove()', 'DELETE', '1', 'admin', null, '/system/dept/107', '127.0.0.1', '内网IP', '{}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:13:17', '12');
-INSERT INTO `sys_oper_log` VALUES ('105', '部门管理', '3', 'com.ruoyi.web.controller.system.SysDeptController.remove()', 'DELETE', '1', 'admin', null, '/system/dept/106', '127.0.0.1', '内网IP', '{}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:13:18', '14');
-INSERT INTO `sys_oper_log` VALUES ('106', '部门管理', '3', 'com.ruoyi.web.controller.system.SysDeptController.remove()', 'DELETE', '1', 'admin', null, '/system/dept/105', '127.0.0.1', '内网IP', '{}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:13:20', '13');
-INSERT INTO `sys_oper_log` VALUES ('107', '部门管理', '3', 'com.ruoyi.web.controller.system.SysDeptController.remove()', 'DELETE', '1', 'admin', null, '/system/dept/104', '127.0.0.1', '内网IP', '{}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:13:22', '15');
-INSERT INTO `sys_oper_log` VALUES ('108', '部门管理', '2', 'com.ruoyi.web.controller.system.SysDeptController.edit()', 'PUT', '1', 'admin', null, '/system/dept', '127.0.0.1', '内网IP', '{\"ancestors\":\"0,100\",\"children\":[],\"deptId\":101,\"deptName\":\"北京公司\",\"email\":\"ry@qq.com\",\"leader\":\"若依\",\"orderNum\":1,\"params\":{},\"parentId\":100,\"parentName\":\"若依科技\",\"phone\":\"15888888888\",\"status\":\"0\",\"updateBy\":\"admin\"}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:13:41', '23');
-INSERT INTO `sys_oper_log` VALUES ('109', '部门管理', '2', 'com.ruoyi.web.controller.system.SysDeptController.edit()', 'PUT', '1', 'admin', null, '/system/dept', '127.0.0.1', '内网IP', '{\"ancestors\":\"0\",\"children\":[],\"deptId\":100,\"deptName\":\"科技集团\",\"email\":\"ry@qq.com\",\"leader\":\"若依\",\"orderNum\":0,\"params\":{},\"parentId\":0,\"phone\":\"15888888888\",\"status\":\"0\",\"updateBy\":\"admin\"}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:13:59', '16');
-INSERT INTO `sys_oper_log` VALUES ('110', '参数管理', '2', 'com.ruoyi.web.controller.system.SysConfigController.edit()', 'PUT', '1', 'admin', null, '/system/config', '127.0.0.1', '内网IP', '{\"configId\":4,\"configKey\":\"sys.account.captchaEnabled\",\"configName\":\"账号自助-验证码开关\",\"configType\":\"N\",\"configValue\":\"true\",\"createBy\":\"admin\",\"createTime\":\"2023-05-25 16:54:11\",\"params\":{},\"remark\":\"是否开启验证码功能(true开启,false关闭)\",\"updateBy\":\"admin\"}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:14:25', '20');
-INSERT INTO `sys_oper_log` VALUES ('111', '参数管理', '2', 'com.ruoyi.web.controller.system.SysConfigController.edit()', 'PUT', '1', 'admin', null, '/system/config', '127.0.0.1', '内网IP', '{\"configId\":4,\"configKey\":\"sys.account.captchaEnabled\",\"configName\":\"账号自助-验证码开关\",\"configType\":\"Y\",\"configValue\":\"false\",\"createBy\":\"admin\",\"createTime\":\"2023-05-25 16:54:11\",\"params\":{},\"remark\":\"是否开启验证码功能(true开启,false关闭)\",\"updateBy\":\"admin\",\"updateTime\":\"2023-05-25 18:14:25\"}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:14:44', '23');
+INSERT INTO `sys_oper_log` VALUES ('100', '用户管理', '3', 'com.zkqy.web.controller.system.SysUserController.remove()', 'DELETE', '1', 'admin', null, '/system/user/2', '127.0.0.1', '内网IP', '{}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:11:13', '30');
+INSERT INTO `sys_oper_log` VALUES ('101', '部门管理', '3', 'com.zkqy.web.controller.system.SysDeptController.remove()', 'DELETE', '1', 'admin', null, '/system/dept/109', '127.0.0.1', '内网IP', '{}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:13:13', '13');
+INSERT INTO `sys_oper_log` VALUES ('102', '部门管理', '3', 'com.zkqy.web.controller.system.SysDeptController.remove()', 'DELETE', '1', 'admin', null, '/system/dept/108', '127.0.0.1', '内网IP', '{}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:13:14', '13');
+INSERT INTO `sys_oper_log` VALUES ('103', '部门管理', '3', 'com.zkqy.web.controller.system.SysDeptController.remove()', 'DELETE', '1', 'admin', null, '/system/dept/102', '127.0.0.1', '内网IP', '{}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:13:15', '14');
+INSERT INTO `sys_oper_log` VALUES ('104', '部门管理', '3', 'com.zkqy.web.controller.system.SysDeptController.remove()', 'DELETE', '1', 'admin', null, '/system/dept/107', '127.0.0.1', '内网IP', '{}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:13:17', '12');
+INSERT INTO `sys_oper_log` VALUES ('105', '部门管理', '3', 'com.zkqy.web.controller.system.SysDeptController.remove()', 'DELETE', '1', 'admin', null, '/system/dept/106', '127.0.0.1', '内网IP', '{}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:13:18', '14');
+INSERT INTO `sys_oper_log` VALUES ('106', '部门管理', '3', 'com.zkqy.web.controller.system.SysDeptController.remove()', 'DELETE', '1', 'admin', null, '/system/dept/105', '127.0.0.1', '内网IP', '{}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:13:20', '13');
+INSERT INTO `sys_oper_log` VALUES ('107', '部门管理', '3', 'com.zkqy.web.controller.system.SysDeptController.remove()', 'DELETE', '1', 'admin', null, '/system/dept/104', '127.0.0.1', '内网IP', '{}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:13:22', '15');
+INSERT INTO `sys_oper_log` VALUES ('108', '部门管理', '2', 'com.zkqy.web.controller.system.SysDeptController.edit()', 'PUT', '1', 'admin', null, '/system/dept', '127.0.0.1', '内网IP', '{\"ancestors\":\"0,100\",\"children\":[],\"deptId\":101,\"deptName\":\"北京公司\",\"email\":\"ry@qq.com\",\"leader\":\"若依\",\"orderNum\":1,\"params\":{},\"parentId\":100,\"parentName\":\"若依科技\",\"phone\":\"15888888888\",\"status\":\"0\",\"updateBy\":\"admin\"}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:13:41', '23');
+INSERT INTO `sys_oper_log` VALUES ('109', '部门管理', '2', 'com.zkqy.web.controller.system.SysDeptController.edit()', 'PUT', '1', 'admin', null, '/system/dept', '127.0.0.1', '内网IP', '{\"ancestors\":\"0\",\"children\":[],\"deptId\":100,\"deptName\":\"科技集团\",\"email\":\"ry@qq.com\",\"leader\":\"若依\",\"orderNum\":0,\"params\":{},\"parentId\":0,\"phone\":\"15888888888\",\"status\":\"0\",\"updateBy\":\"admin\"}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:13:59', '16');
+INSERT INTO `sys_oper_log` VALUES ('110', '参数管理', '2', 'com.zkqy.web.controller.system.SysConfigController.edit()', 'PUT', '1', 'admin', null, '/system/config', '127.0.0.1', '内网IP', '{\"configId\":4,\"configKey\":\"sys.account.captchaEnabled\",\"configName\":\"账号自助-验证码开关\",\"configType\":\"N\",\"configValue\":\"true\",\"createBy\":\"admin\",\"createTime\":\"2023-05-25 16:54:11\",\"params\":{},\"remark\":\"是否开启验证码功能(true开启,false关闭)\",\"updateBy\":\"admin\"}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:14:25', '20');
+INSERT INTO `sys_oper_log` VALUES ('111', '参数管理', '2', 'com.zkqy.web.controller.system.SysConfigController.edit()', 'PUT', '1', 'admin', null, '/system/config', '127.0.0.1', '内网IP', '{\"configId\":4,\"configKey\":\"sys.account.captchaEnabled\",\"configName\":\"账号自助-验证码开关\",\"configType\":\"Y\",\"configValue\":\"false\",\"createBy\":\"admin\",\"createTime\":\"2023-05-25 16:54:11\",\"params\":{},\"remark\":\"是否开启验证码功能(true开启,false关闭)\",\"updateBy\":\"admin\",\"updateTime\":\"2023-05-25 18:14:25\"}', '{\"msg\":\"操作成功\",\"code\":200}', '0', null, '2023-05-25 18:14:44', '23');
 
 -- ----------------------------
 -- Table structure for sys_post

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 2 - 15
sql/ry-vue2023-6-19-3.sql


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 2 - 15
sql/ry-vue2023-6-25.sql


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 2 - 15
sql/ry-vue2023-6-27.sql


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 2 - 15
sql/ry-vue2023-6-30.sql


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 2 - 15
sql/ry-vue_2023-06-19-2.sql


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

@@ -3,13 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>ruoyi</artifactId>
-        <groupId>com.ruoyi</groupId>
+        <artifactId>zkqy</artifactId>
+        <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服务入口
@@ -45,20 +45,20 @@
 
         <!-- 核心模块-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-framework</artifactId>
+            <groupId>com.zkqy</groupId>
+            <artifactId>zkqy-framework</artifactId>
         </dependency>
 
         <!-- 定时任务-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-quartz</artifactId>
+            <groupId>com.zkqy</groupId>
+            <artifactId>zkqy-quartz</artifactId>
         </dependency>
 
         <!-- 代码生成-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-generator</artifactId>
+            <groupId>com.zkqy</groupId>
+            <artifactId>zkqy-generator</artifactId>
         </dependency>
 
     </dependencies>

+ 7 - 9
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;
@@ -6,16 +6,14 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 
 /**
  * 启动程序
- * 
- * @author ruoyi
+ *
+ * @author zkqy
  */
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-public class RuoYiApplication
-{
-    public static void main(String[] args)
-    {
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+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" +
                 " .-------.       ____     __        \n" +
                 " |  _ _   \\      \\   \\   /  /    \n" +

+ 4 - 4
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;
@@ -6,13 +6,13 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 /**
  * web容器中进行部署
  * 
- * @author ruoyi
+ * @author zkqy
  */
-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);
     }
 }

+ 11 - 11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/common/CaptchaController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.common;
+package com.zkqy.web.controller.common;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -11,19 +11,19 @@ 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.config.RuoYiConfig;
-import com.ruoyi.common.constant.CacheConstants;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.utils.sign.Base64;
-import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.system.service.ISysConfigService;
+import com.zkqy.common.config.ZkqyConfig;
+import com.zkqy.common.constant.CacheConstants;
+import com.zkqy.common.constant.Constants;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.redis.RedisCache;
+import com.zkqy.common.utils.sign.Base64;
+import com.zkqy.common.utils.uuid.IdUtils;
+import com.zkqy.system.service.ISysConfigService;
 
 /**
  * 验证码操作处理
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 public class CaptchaController
@@ -61,7 +61,7 @@ public class CaptchaController
         BufferedImage image = null;
 
         // 生成验证码
-        String captchaType = RuoYiConfig.getCaptchaType();
+        String captchaType = ZkqyConfig.getCaptchaType();
         if ("math".equals(captchaType))
         {
             String capText = captchaProducerMath.createText();

+ 13 - 13
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/common/CommonController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.common;
+package com.zkqy.web.controller.common;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,18 +13,18 @@ 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.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;
 
 /**
  * 通用请求处理
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 @RequestMapping("/common")
@@ -53,7 +53,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 = ZkqyConfig.getDownloadPath() + fileName;
 
             response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
             FileUtils.setAttachmentResponseHeader(response, realFileName);
@@ -78,7 +78,7 @@ public class CommonController
         try
         {
             // 上传文件路径
-            String filePath = RuoYiConfig.getUploadPath();
+            String filePath = ZkqyConfig.getUploadPath();
             // 上传并返回新文件名称
             String fileName = FileUploadUtils.upload(filePath, file);
             String url = serverConfig.getUrl() + fileName;
@@ -104,7 +104,7 @@ public class CommonController
         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>();
@@ -146,7 +146,7 @@ public class CommonController
                 throw new Exception(StringUtils.format("资源文件({})非法,不允许下载。 ", resource));
             }
             // 本地资源路径
-            String localPath = RuoYiConfig.getProfile();
+            String localPath = ZkqyConfig.getProfile();
             // 数据库资源地址
             String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX);
             // 下载名称

+ 6 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/CacheController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.monitor;
+package com.zkqy.web.controller.monitor;
 
 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.core.domain.AjaxResult;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.domain.SysCache;
+import com.zkqy.common.constant.CacheConstants;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.utils.StringUtils;
+import com.zkqy.system.domain.SysCache;
 
 /**
  * 缓存监控
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 @RequestMapping("/monitor/cache")

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/ServerController.java

@@ -1,16 +1,16 @@
-package com.ruoyi.web.controller.monitor;
+package com.zkqy.web.controller.monitor;
 
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.framework.web.domain.Server;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.framework.web.domain.Server;
 
 /**
  * 服务器监控
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 @RequestMapping("/monitor/server")

+ 10 - 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysActivationLogController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/SysActivationLogController.java

@@ -1,13 +1,13 @@
-package com.ruoyi.web.controller.monitor;
+package com.zkqy.web.controller.monitor;
 
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.SysActivationCodeLog;
-import com.ruoyi.system.service.ISysActivationCodeLogService;
+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.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.system.domain.SysActivationCodeLog;
+import com.zkqy.system.service.ISysActivationCodeLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -18,7 +18,7 @@ import java.util.List;
 /**
  * 操作日志记录
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 @RequestMapping("/monitor/activationlog")

+ 11 - 11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/SysLogininforController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.monitor;
+package com.zkqy.web.controller.monitor;
 
 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.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.service.SysPasswordService;
-import com.ruoyi.system.domain.SysLogininfor;
-import com.ruoyi.system.service.ISysLogininforService;
+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.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.framework.web.service.SysPasswordService;
+import com.zkqy.system.domain.SysLogininfor;
+import com.zkqy.system.service.ISysLogininforService;
 
 /**
  * 系统访问记录
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 @RequestMapping("/monitor/logininfor")

+ 10 - 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/SysOperlogController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.monitor;
+package com.zkqy.web.controller.monitor;
 
 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.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.SysOperLog;
-import com.ruoyi.system.service.ISysOperLogService;
+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.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.system.domain.SysOperLog;
+import com.zkqy.system.service.ISysOperLogService;
 
 /**
  * 操作日志记录
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 @RequestMapping("/monitor/operlog")

+ 13 - 13
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/SysUserOnlineController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.monitor;
+package com.zkqy.web.controller.monitor;
 
 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.annotation.Log;
-import com.ruoyi.common.constant.CacheConstants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.domain.SysUserOnline;
-import com.ruoyi.system.service.ISysUserOnlineService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.constant.CacheConstants;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.model.LoginUser;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.core.redis.RedisCache;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.StringUtils;
+import com.zkqy.system.domain.SysUserOnline;
+import com.zkqy.system.service.ISysUserOnlineService;
 
 /**
  * 在线用户监控
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 @RequestMapping("/monitor/online")

+ 5 - 7
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,12 +1,10 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.DataSource;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.system.service.IDataSourceService;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.entity.DataSource;
+import com.zkqy.system.service.IDataSourceService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;

+ 10 - 13
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysBpmNodeScriptController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysBpmNodeScriptController.java

@@ -1,13 +1,10 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
-import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.common.annotation.Anonymous;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,19 +14,19 @@ 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.domain.SysBpmNodeScript;
-import com.ruoyi.system.service.ISysBpmNodeScriptService;
-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.domain.SysBpmNodeScript;
+import com.zkqy.system.service.ISysBpmNodeScriptService;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.common.core.page.TableDataInfo;
 
 /**
  * 流程节点脚本Controller
  *
- * @author ruoyi
+ * @author zkqy
  * @date 2023-10-26
  */
 @RestController

+ 10 - 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysConfigController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 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.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.SysConfig;
-import com.ruoyi.system.service.ISysConfigService;
+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.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.system.domain.SysConfig;
+import com.zkqy.system.service.ISysConfigService;
 
 /**
  * 参数配置 信息操作处理
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 @RequestMapping("/system/config")

+ 10 - 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysDeptController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 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.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.service.ISysDeptService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.constant.UserConstants;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.entity.SysDept;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.StringUtils;
+import com.zkqy.system.service.ISysDeptService;
 
 /**
  * 部门信息
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 @RequestMapping("/system/dept")

+ 13 - 13
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysDictDataController.java

@@ -1,10 +1,10 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.common.annotation.Anonymous;
+import com.zkqy.common.annotation.Anonymous;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -16,21 +16,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.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 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;
 
 /**
  * 数据字典信息
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 @RequestMapping("/system/dict/data")

+ 10 - 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysDictTypeController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 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.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;
 
 /**
  * 数据字典信息
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 @RequestMapping("/system/dict/type")

+ 10 - 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDragTableStyleController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysDragTableStyleController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -12,19 +12,19 @@ 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.domain.SysDragTableStyle;
-import com.ruoyi.system.service.ISysDragTableStyleService;
-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.domain.SysDragTableStyle;
+import com.zkqy.system.service.ISysDragTableStyleService;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.common.core.page.TableDataInfo;
 
 /**
  * 动态格样式模板Controller
  * 
- * @author ruoyi
+ * @author zkqy
  * @date 2023-11-07
  */
 @RestController

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

@@ -1,22 +1,22 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 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.config.RuoYiConfig;
-import com.ruoyi.common.utils.StringUtils;
+import com.zkqy.common.config.ZkqyConfig;
+import com.zkqy.common.utils.StringUtils;
 
 /**
  * 首页
  *
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 public class SysIndexController
 {
     /** 系统基础配置 */
     @Autowired
-    private RuoYiConfig ruoyiConfig;
+    private ZkqyConfig zkqyConfig;
 
     /**
      * 访问首页,提示语
@@ -24,6 +24,6 @@ public class SysIndexController
     @RequestMapping("/")
     public String index()
     {
-        return StringUtils.format("欢迎使用{}后台管理框架,当前版本:v{},请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion());
+        return StringUtils.format("欢迎使用{}后台管理框架,当前版本:v{},请通过前端地址访问。", zkqyConfig.getName(), zkqyConfig.getVersion());
     }
 }

+ 15 - 15
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysLoginController.java

@@ -1,12 +1,12 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import java.util.List;
 import java.util.Set;
 
-import com.ruoyi.common.core.domain.entity.DataSource;
-import com.ruoyi.common.core.domain.entity.SysTenant;
-import com.ruoyi.system.service.IDataSourceService;
-import com.ruoyi.system.service.impl.SysTenantServiceImpl;
+import com.zkqy.common.core.domain.entity.DataSource;
+import com.zkqy.common.core.domain.entity.SysTenant;
+import com.zkqy.system.service.IDataSourceService;
+import com.zkqy.system.service.impl.SysTenantServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.BindingResult;
@@ -14,15 +14,15 @@ 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.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysMenu;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginBody;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.framework.web.service.SysLoginService;
-import com.ruoyi.framework.web.service.SysPermissionService;
-import com.ruoyi.system.service.ISysMenuService;
+import com.zkqy.common.constant.Constants;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.entity.SysMenu;
+import com.zkqy.common.core.domain.entity.SysUser;
+import com.zkqy.common.core.domain.model.LoginBody;
+import com.zkqy.common.utils.SecurityUtils;
+import com.zkqy.framework.web.service.SysLoginService;
+import com.zkqy.framework.web.service.SysPermissionService;
+import com.zkqy.system.service.ISysMenuService;
 import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
@@ -31,7 +31,7 @@ import javax.validation.Valid;
 /**
  * 登录验证
  *
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 public class SysLoginController {

+ 10 - 11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysMenuController.java

@@ -1,25 +1,24 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import java.util.List;
 
-import com.ruoyi.common.annotation.Anonymous;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysMenu;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.service.ISysMenuService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.constant.UserConstants;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.entity.SysMenu;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.StringUtils;
+import com.zkqy.system.service.ISysMenuService;
 
 /**
  * 菜单信息
  *
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 @RequestMapping("/system/menu")

+ 9 - 9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysNoticeController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 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.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.domain.SysNotice;
-import com.ruoyi.system.service.ISysNoticeService;
+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.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.system.domain.SysNotice;
+import com.zkqy.system.service.ISysNoticeService;
 
 /**
  * 公告 信息操作处理
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 @RequestMapping("/system/notice")

+ 10 - 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysPostController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 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.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.SysPost;
-import com.ruoyi.system.service.ISysPostService;
+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.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.system.domain.SysPost;
+import com.zkqy.system.service.ISysPostService;
 
 /**
  * 岗位信息操作处理
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 @RequestMapping("/system/post")

+ 16 - 16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysProfileController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -9,24 +9,24 @@ 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.annotation.Log;
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.common.utils.file.MimeTypeUtils;
-import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.service.ISysUserService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.config.ZkqyConfig;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.entity.SysUser;
+import com.zkqy.common.core.domain.model.LoginUser;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.SecurityUtils;
+import com.zkqy.common.utils.StringUtils;
+import com.zkqy.common.utils.file.FileUploadUtils;
+import com.zkqy.common.utils.file.MimeTypeUtils;
+import com.zkqy.framework.web.service.TokenService;
+import com.zkqy.system.service.ISysUserService;
 
 /**
  * 个人信息 业务处理
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 @RequestMapping("/system/user/profile")
@@ -125,7 +125,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(ZkqyConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION);
             if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
             {
                 AjaxResult ajax = AjaxResult.success();

+ 8 - 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysRegisterController.java

@@ -1,20 +1,20 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 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.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.model.RegisterBody;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.service.SysRegisterService;
-import com.ruoyi.system.service.ISysConfigService;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.model.RegisterBody;
+import com.zkqy.common.utils.StringUtils;
+import com.zkqy.framework.web.service.SysRegisterService;
+import com.zkqy.system.service.ISysConfigService;
 
 /**
  * 注册验证
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 public class SysRegisterController extends BaseController

+ 19 - 21
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysRoleController.java

@@ -1,12 +1,10 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
-import com.alibaba.fastjson2.JSON;
-import com.ruoyi.common.annotation.Anonymous;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -18,28 +16,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.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.service.SysPermissionService;
-import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.domain.SysUserRole;
-import com.ruoyi.system.service.ISysDeptService;
-import com.ruoyi.system.service.ISysRoleService;
-import com.ruoyi.system.service.ISysUserService;
+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.SysDept;
+import com.zkqy.common.core.domain.entity.SysRole;
+import com.zkqy.common.core.domain.entity.SysUser;
+import com.zkqy.common.core.domain.model.LoginUser;
+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.framework.web.service.SysPermissionService;
+import com.zkqy.framework.web.service.TokenService;
+import com.zkqy.system.domain.SysUserRole;
+import com.zkqy.system.service.ISysDeptService;
+import com.zkqy.system.service.ISysRoleService;
+import com.zkqy.system.service.ISysUserService;
 
 /**
  * 角色信息
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 @RequestMapping("/system/role")

+ 11 - 11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysTenantController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysTenantController.java

@@ -1,9 +1,9 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.common.annotation.Anonymous;
+import com.zkqy.common.annotation.Anonymous;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,19 +14,19 @@ 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.common.core.domain.entity.SysTenant;
-import com.ruoyi.system.service.ISysTenantService;
-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.common.core.domain.entity.SysTenant;
+import com.zkqy.system.service.ISysTenantService;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.common.core.page.TableDataInfo;
 
 /**
  * 租户信息Controller
  * 
- * @author ruoyi
+ * @author zkqy
  * @date 2023-06-03
  */
 @RestController

+ 19 - 19
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysUserController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import java.util.Arrays;
 import java.util.List;
@@ -6,34 +6,34 @@ import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson2.JSON;
-import com.ruoyi.common.annotation.Anonymous;
-import com.ruoyi.system.domain.SysPost;
+import com.zkqy.common.annotation.Anonymous;
+import com.zkqy.system.domain.SysPost;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-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.SysDept;
-import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.service.ISysDeptService;
-import com.ruoyi.system.service.ISysPostService;
-import com.ruoyi.system.service.ISysRoleService;
-import com.ruoyi.system.service.ISysUserService;
+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.SysDept;
+import com.zkqy.common.core.domain.entity.SysRole;
+import com.zkqy.common.core.domain.entity.SysUser;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.SecurityUtils;
+import com.zkqy.common.utils.StringUtils;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.system.service.ISysDeptService;
+import com.zkqy.system.service.ISysPostService;
+import com.zkqy.system.service.ISysRoleService;
+import com.zkqy.system.service.ISysUserService;
 
 /**
  * 用户信息
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @RestController
 @RequestMapping("/system/user")

+ 3 - 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TemplateBaseController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/TemplateBaseController.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.system.service.TemplateBaseService;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.system.service.TemplateBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

+ 5 - 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/tool/TestController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.tool;
+package com.zkqy.web.controller.tool;
 
 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.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.utils.StringUtils;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.R;
+import com.zkqy.common.utils.StringUtils;
 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 zkqy
  */
 @Api("用户信息管理")
 @RestController

+ 7 - 7
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,4 +1,4 @@
-package com.ruoyi.web.core.config;
+package com.zkqy.web.core.config;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import com.ruoyi.common.config.RuoYiConfig;
+import com.zkqy.common.config.ZkqyConfig;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
 import springfox.documentation.builders.ApiInfoBuilder;
@@ -25,14 +25,14 @@ import springfox.documentation.spring.web.plugins.Docket;
 /**
  * Swagger2的接口配置
  * 
- * @author ruoyi
+ * @author zkqy
  */
 @Configuration
 public class SwaggerConfig
 {
     /** 系统基础配置 */
     @Autowired
-    private RuoYiConfig ruoyiConfig;
+    private ZkqyConfig zkqyConfig;
 
     /** 是否开启swagger */
     @Value("${swagger.enabled}")
@@ -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()
@@ -117,9 +117,9 @@ public class SwaggerConfig
                 // 描述
                 .description("描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
                 // 作者信息
-                .contact(new Contact(ruoyiConfig.getName(), null, null))
+                .contact(new Contact(zkqyConfig.getName(), null, null))
                 // 版本
-                .version("版本号:" + ruoyiConfig.getVersion())
+                .version("版本号:" + zkqyConfig.getVersion())
                 .build();
     }
 }

+ 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

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

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

@@ -1,15 +1,15 @@
 # 项目相关配置
-ruoyi:
+zkqy:
   # 名称
-  name: RuoYi
+  name: zkqy
   # 版本
   version: 3.8.5
   # 版权年份
   copyrightYear: 2023
   # 实例演示开关
   demoEnabled: true
-  # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
-  profile: D:/ruoyi/uploadPath
+  # 文件路径 示例( Windows配置D:/zkqy/uploadPath,Linux配置 /home/zkqy/uploadPath)
+  profile: D:/zkqy/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -36,7 +36,7 @@ server:
 # 日志配置
 logging:
   level:
-    com.ruoyi: debug
+    com.zkqy: debug
     org.springframework: warn
 
 # 用户配置
@@ -97,12 +97,12 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期(默认30分钟)
-  expireTime: 300000
+  expireTime: 30
 
 # MyBatis配置
 mybatis:
   # 搜索指定包别名
-  typeAliasesPackage: com.ruoyi.**.domain
+  typeAliasesPackage: com.zkqy.**.domain
   # 配置mapper的扫描,找到所有的mapper.xml映射文件
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 加载全局的配置文件
@@ -134,10 +134,10 @@ xss:
 parameter:
   ip:
     # 数据引擎切换数据源接口地址
-    DATA_ENGINE_IP: http://localhost:8099/dataSource/changeDataSource
+    DATA_ENGINE_IP: http://192.168.110.59:8099/dataSource/changeDataSource
     # 动态表单切换数据源接口地址
-    DRAG_FORM_IP: http://localhost:8088/dataSource/changeDataSource
+    DRAG_FORM_IP: http://192.168.110.59:8088/dataSource/changeDataSource
     # 流程引擎切换数据源接口地址
-    PROCESS_ENGINE_IP: http://localhost:8055/dataSource/changeDataSource
+    PROCESS_ENGINE_IP: http://192.168.110.59:8055/dataSource/changeDataSource
     #数据引擎初始化数据库表接口地址
-    DATA_ENGINE_INITDATABASE_IP: http://localhost:8099/tableInfo/initDatabase
+    DATA_ENGINE_INITDATABASE_IP: http://192.168.110.59:8099/tableInfo/initDatabase

+ 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


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

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


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

@@ -3,13 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>ruoyi</artifactId>
-        <groupId>com.ruoyi</groupId>
+        <artifactId>zkqy</artifactId>
+        <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
 {
     /** 项目名称 */
     private String name;
@@ -80,7 +80,7 @@ public class RuoYiConfig
 
     public void setProfile(String profile)
     {
-        RuoYiConfig.profile = profile;
+        ZkqyConfig.profile = profile;
     }
 
     public static boolean isAddressEnabled()
@@ -90,7 +90,7 @@ public class RuoYiConfig
 
     public void setAddressEnabled(boolean addressEnabled)
     {
-        RuoYiConfig.addressEnabled = addressEnabled;
+        ZkqyConfig.addressEnabled = addressEnabled;
     }
 
     public static String getCaptchaType() {
@@ -98,7 +98,7 @@ public class RuoYiConfig
     }
 
     public void setCaptchaType(String captchaType) {
-        RuoYiConfig.captchaType = captchaType;
+        ZkqyConfig.captchaType = captchaType;
     }
 
     /**

+ 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>
 {

+ 2 - 2
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.util.Date;
@@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 /**
  * 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 lombok.Data;
 import lombok.experimental.Accessors;

+ 3 - 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,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_dept
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class SysDept extends BaseEntity
 {

+ 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
 {

+ 6 - 7
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,19 +1,18 @@
-package com.ruoyi.common.core.domain.entity;
+package com.zkqy.common.core.domain.entity;
 
 import java.util.Set;
 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.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_role
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class SysRole extends BaseEntity
 {

+ 4 - 6
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,9 +1,7 @@
-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 org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zkqy.common.annotation.Excel;
+import com.zkqy.common.core.domain.BaseEntity;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
@@ -11,7 +9,7 @@ import javax.validation.constraints.Size;
 /**
  * 部门表 sys_tenant
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class SysTenant extends BaseEntity
 {

+ 9 - 10
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,21 +1,20 @@
-package com.ruoyi.common.core.domain.entity;
+package com.zkqy.common.core.domain.entity;
 
 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.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.core.domain.BaseEntity;
+import com.zkqy.common.xss.Xss;
 
 /**
  * 用户对象 sys_user
  * 
- * @author ruoyi
+ * @author zkqy
  */
 public class SysUser extends BaseEntity
 {

+ 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,4 +1,4 @@
-package com.ruoyi.common.core.domain.model;
+package com.zkqy.common.core.domain.model;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -6,7 +6,7 @@ import javax.validation.constraints.NotNull;
 /**
  * 用户登录对象
  * 
- * @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
 {

Vissa filer visades inte eftersom för många filer har ändrats