Browse Source

后端框架修正

lv.wenbin 1 year ago
parent
commit
530f9462c7
100 changed files with 25 additions and 25 deletions
  1. 0 0
      ems-application/README.md
  2. 0 0
      ems-application/doc/若依环境使用手册.docx
  3. 4 4
      ems-application/ems-server/pom.xml
  4. 13 13
      ems-application/pom.xml
  5. 5 5
      ems-application/ruoyi-admin/pom.xml
  6. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
  7. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java
  8. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
  9. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
  10. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
  11. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
  12. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
  13. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
  14. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
  15. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
  16. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
  17. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
  18. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
  19. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
  20. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
  21. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
  22. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
  23. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
  24. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
  25. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
  26. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
  27. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
  28. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
  29. 0 0
      ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
  30. 0 0
      ems-application/ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties
  31. 1 1
      ems-application/ruoyi-admin/src/main/resources/application-druid.yml
  32. 0 0
      ems-application/ruoyi-admin/src/main/resources/application.yml
  33. 0 0
      ems-application/ruoyi-admin/src/main/resources/banner.txt
  34. 0 0
      ems-application/ruoyi-admin/src/main/resources/i18n/messages.properties
  35. 0 0
      ems-application/ruoyi-admin/src/main/resources/logback.xml
  36. 0 0
      ems-application/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
  37. 2 2
      ems-application/ruoyi-common/pom.xml
  38. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java
  39. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java
  40. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java
  41. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
  42. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java
  43. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java
  44. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java
  45. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
  46. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java
  47. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
  48. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/config/serializer/SensitiveJsonSerializer.java
  49. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java
  50. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
  51. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
  52. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java
  53. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
  54. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
  55. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
  56. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
  57. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
  58. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
  59. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
  60. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java
  61. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
  62. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
  63. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
  64. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
  65. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
  66. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
  67. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
  68. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
  69. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
  70. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
  71. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
  72. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
  73. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
  74. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
  75. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
  76. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java
  77. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java
  78. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java
  79. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java
  80. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/enums/DesensitizedType.java
  81. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java
  82. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java
  83. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java
  84. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java
  85. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java
  86. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java
  87. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java
  88. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java
  89. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
  90. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java
  91. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java
  92. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java
  93. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java
  94. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
  95. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java
  96. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/BlackListException.java
  97. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java
  98. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java
  99. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java
  100. 0 0
      ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java

+ 0 - 0
nrg-admin/README.md → ems-application/README.md


+ 0 - 0
nrg-admin/doc/若依环境使用手册.docx → ems-application/doc/若依环境使用手册.docx


+ 4 - 4
nrg-admin/nrg-server/pom.xml → ems-application/ems-server/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>ems-application</artifactId>
+        <groupId>com.huashe</groupId>
         <version>3.8.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>nrg-server</artifactId>
+    <artifactId>ems-server</artifactId>
 
     <description>
         能源管理模块
@@ -19,7 +19,7 @@
 
         <!-- 通用工具-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>com.huashe</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
 

+ 13 - 13
nrg-admin/pom.xml → ems-application/pom.xml

@@ -4,13 +4,13 @@
          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.huashe</groupId>
+    <artifactId>ems-application</artifactId>
     <version>3.8.7</version>
 
-    <name>ruoyi</name>
-    <url>http://www.ruoyi.vip</url>
-    <description>若依管理系统</description>
+    <name>ems-application</name>
+
+    <description>能源管理系统-应用版</description>
     
     <properties>
         <ruoyi.version>3.8.7</ruoyi.version>
@@ -139,42 +139,42 @@
 
             <!-- 定时任务-->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>com.huashe</groupId>
                 <artifactId>ruoyi-quartz</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
 
             <!-- 代码生成-->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>com.huashe</groupId>
                 <artifactId>ruoyi-generator</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
 
             <!-- 核心模块-->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>com.huashe</groupId>
                 <artifactId>ruoyi-framework</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
 
             <!-- 系统模块-->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>com.huashe</groupId>
                 <artifactId>ruoyi-system</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
 
             <!-- 系统模块-->
             <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>nrg-server</artifactId>
+                <groupId>com.huashe</groupId>
+                <artifactId>ems-server</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
 
             <!-- 通用工具-->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>com.huashe</groupId>
                 <artifactId>ruoyi-common</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
@@ -186,7 +186,7 @@
         <module>ruoyi-admin</module>
         <module>ruoyi-framework</module>
         <module>ruoyi-system</module>
-        <module>nrg-server</module>
+        <module>ems-server</module>
         <module>ruoyi-quartz</module>
         <module>ruoyi-generator</module>
         <module>ruoyi-common</module>

+ 5 - 5
nrg-admin/ruoyi-admin/pom.xml → ems-application/ruoyi-admin/pom.xml

@@ -3,8 +3,8 @@
          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>ems-application</artifactId>
+        <groupId>com.huashe</groupId>
         <version>3.8.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -45,19 +45,19 @@
 
         <!-- 核心模块-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>com.huashe</groupId>
             <artifactId>ruoyi-framework</artifactId>
         </dependency>
 
         <!-- 定时任务-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>com.huashe</groupId>
             <artifactId>ruoyi-quartz</artifactId>
         </dependency>
 
         <!-- 代码生成-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>com.huashe</groupId>
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
 

+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java → ems-application/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java


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


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

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://172.192.10.105:30002/nrg_mgr?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://172.192.10.105:30002/ems_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: root
             # 从库数据源

+ 0 - 0
nrg-admin/ruoyi-admin/src/main/resources/application.yml → ems-application/ruoyi-admin/src/main/resources/application.yml


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/resources/banner.txt → ems-application/ruoyi-admin/src/main/resources/banner.txt


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/resources/i18n/messages.properties → ems-application/ruoyi-admin/src/main/resources/i18n/messages.properties


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/resources/logback.xml → ems-application/ruoyi-admin/src/main/resources/logback.xml


+ 0 - 0
nrg-admin/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml → ems-application/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml


+ 2 - 2
nrg-admin/ruoyi-common/pom.xml → ems-application/ruoyi-common/pom.xml

@@ -3,8 +3,8 @@
          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>ems-application</artifactId>
+        <groupId>com.huashe</groupId>
         <version>3.8.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/config/serializer/SensitiveJsonSerializer.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/config/serializer/SensitiveJsonSerializer.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/enums/DesensitizedType.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/enums/DesensitizedType.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/BlackListException.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/BlackListException.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java


+ 0 - 0
nrg-admin/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java → ems-application/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java


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