yaoyi преди 1 месец
родител
ревизия
3737072305
променени са 100 файла, в които са добавени 324 реда и са изтрити 297 реда
  1. 40 17
      .idea/compiler.xml
  2. 42 42
      .idea/encodings.xml
  3. 1 1
      .idea/misc.xml
  4. 1 0
      .idea/vcs.xml
  5. 6 6
      hr-api/hr-api-system/pom.xml
  6. 5 5
      hr-api/hr-api-system/src/main/java/com/hr/system/api/RemoteFileService.java
  7. 7 7
      hr-api/hr-api-system/src/main/java/com/hr/system/api/RemoteLogService.java
  8. 7 7
      hr-api/hr-api-system/src/main/java/com/hr/system/api/RemoteUserService.java
  9. 2 2
      hr-api/hr-api-system/src/main/java/com/hr/system/api/domain/SysDept.java
  10. 5 5
      hr-api/hr-api-system/src/main/java/com/hr/system/api/domain/SysDictData.java
  11. 4 4
      hr-api/hr-api-system/src/main/java/com/hr/system/api/domain/SysDictType.java
  12. 1 1
      hr-api/hr-api-system/src/main/java/com/hr/system/api/domain/SysFile.java
  13. 4 4
      hr-api/hr-api-system/src/main/java/com/hr/system/api/domain/SysLogininfor.java
  14. 4 4
      hr-api/hr-api-system/src/main/java/com/hr/system/api/domain/SysOperLog.java
  15. 4 4
      hr-api/hr-api-system/src/main/java/com/hr/system/api/domain/SysRole.java
  16. 8 8
      hr-api/hr-api-system/src/main/java/com/hr/system/api/domain/SysUser.java
  17. 4 4
      hr-api/hr-api-system/src/main/java/com/hr/system/api/factory/RemoteFileFallbackFactory.java
  18. 5 5
      hr-api/hr-api-system/src/main/java/com/hr/system/api/factory/RemoteLogFallbackFactory.java
  19. 5 5
      hr-api/hr-api-system/src/main/java/com/hr/system/api/factory/RemoteUserFallbackFactory.java
  20. 2 2
      hr-api/hr-api-system/src/main/java/com/hr/system/api/model/LoginUser.java
  21. 1 1
      hr-api/hr-api-system/src/main/java/com/hr/system/api/model/SysDeptDto.java
  22. 3 0
      hr-api/hr-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
  23. 5 5
      hr-api/pom.xml
  24. 6 6
      hr-auth/pom.xml
  25. 0 0
      hr-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java
  26. 4 4
      hr-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
  27. 0 0
      hr-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java
  28. 0 0
      hr-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java
  29. 2 2
      hr-auth/src/main/java/com/ruoyi/auth/service/Miyao.java
  30. 14 14
      hr-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
  31. 4 4
      hr-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java
  32. 6 6
      hr-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java
  33. 0 0
      hr-auth/src/main/resources/banner.txt
  34. 0 0
      hr-auth/src/main/resources/bootstrap - 副本.yml
  35. 0 0
      hr-auth/src/main/resources/bootstrap.yml
  36. 0 0
      hr-auth/src/main/resources/logback.xml
  37. 4 4
      hr-common/hr-common-core/pom.xml
  38. 2 2
      hr-common/hr-common-core/src/main/java/com/hr/common/core/annotation/Excel.java
  39. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/annotation/Excels.java
  40. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/constant/CacheConstants.java
  41. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/constant/Constants.java
  42. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/constant/GenConstants.java
  43. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/constant/HttpStatus.java
  44. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/constant/ScheduleConstants.java
  45. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/constant/SecurityConstants.java
  46. 4 4
      hr-common/hr-common-core/src/main/java/com/hr/common/core/constant/ServiceNameConstants.java
  47. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/constant/TokenConstants.java
  48. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/constant/UserConstants.java
  49. 4 4
      hr-common/hr-common-core/src/main/java/com/hr/common/core/context/SecurityContextHolder.java
  50. 2 2
      hr-common/hr-common-core/src/main/java/com/hr/common/core/domain/R.java
  51. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/enums/UserStatus.java
  52. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/CaptchaException.java
  53. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/CheckedException.java
  54. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/DemoModeException.java
  55. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/GlobalException.java
  56. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/InnerAuthException.java
  57. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/PreAuthorizeException.java
  58. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/ServiceException.java
  59. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/UtilException.java
  60. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/auth/NotLoginException.java
  61. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/auth/NotPermissionException.java
  62. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/auth/NotRoleException.java
  63. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/base/BaseException.java
  64. 2 2
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/file/FileException.java
  65. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/file/FileNameLengthLimitExceededException.java
  66. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/file/FileSizeLimitExceededException.java
  67. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/file/FileUploadException.java
  68. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/file/InvalidExtensionException.java
  69. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/job/TaskException.java
  70. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/user/CaptchaExpireException.java
  71. 2 2
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/user/UserException.java
  72. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/user/UserPasswordNotMatchException.java
  73. 2 2
      hr-common/hr-common-core/src/main/java/com/hr/common/core/text/CharsetKit.java
  74. 2 2
      hr-common/hr-common-core/src/main/java/com/hr/common/core/text/Convert.java
  75. 2 2
      hr-common/hr-common-core/src/main/java/com/hr/common/core/text/StrFormatter.java
  76. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/DateUtils.java
  77. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/ExceptionUtil.java
  78. 4 4
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/JwtUtils.java
  79. 4 4
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/PageUtils.java
  80. 4 4
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/ServletUtils.java
  81. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/SpringUtils.java
  82. 3 3
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/StringUtils.java
  83. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/bean/BeanUtils.java
  84. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/bean/BeanValidators.java
  85. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/file/FileTypeUtils.java
  86. 2 2
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/file/FileUtils.java
  87. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/file/ImageUtils.java
  88. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/file/MimeTypeUtils.java
  89. 2 2
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/html/EscapeUtil.java
  90. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/html/HTMLFilter.java
  91. 3 3
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/ip/IpUtils.java
  92. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/poi/ExcelHandlerAdapter.java
  93. 12 12
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/poi/ExcelUtil.java
  94. 3 3
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/reflect/ReflectUtils.java
  95. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/sign/Base64.java
  96. 3 3
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/sql/SqlUtil.java
  97. 1 1
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/uuid/IdUtils.java
  98. 3 3
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/uuid/Seq.java
  99. 2 2
      hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/uuid/UUID.java
  100. 10 10
      hr-common/hr-common-core/src/main/java/com/hr/common/core/web/controller/BaseController.java

+ 40 - 17
.idea/compiler.xml

@@ -7,25 +7,48 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="ruoyi-common-datascope" />
-        <module name="ruoyi-modules-job" />
-        <module name="ruoyi-modules-system" />
-        <module name="ruoyi-common-redis" />
-        <module name="ruoyi-api-system" />
-        <module name="ruoyi-common-swagger" />
-        <module name="ruoyi-common-core" />
-        <module name="ruoyi-common-security" />
-        <module name="ruoyi-common-sensitive" />
-        <module name="ruoyi-common-datasource" />
-        <module name="ruoyi-gateway" />
-        <module name="ruoyi-modules-gen" />
-        <module name="ruoyi-visual-monitor" />
-        <module name="ruoyi-common-seata" />
-        <module name="ruoyi-auth" />
-        <module name="ruoyi-common-log" />
-        <module name="ruoyi-modules-file" />
+        <module name="hr-common-datascope" />
+        <module name="hr-modules-gen" />
+        <module name="hr-modules-file" />
+        <module name="hr-common-seata" />
+        <module name="hr-common-security" />
+        <module name="hr-modules-system" />
+        <module name="hr-common-swagger" />
+        <module name="hr-auth" />
+        <module name="hr-common-core" />
+        <module name="hr-common-log" />
+        <module name="hr-common-sensitive" />
+        <module name="hr-modules-job" />
+        <module name="hr-api-system" />
+        <module name="hr-visual-monitor" />
+        <module name="hr-common-datasource" />
+        <module name="hr-gateway" />
+        <module name="hr-common-redis" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="ruoyi-api" target="1.8" />
+      <module name="ruoyi-api-system" target="1.8" />
+      <module name="ruoyi-auth" target="1.8" />
+      <module name="ruoyi-common" target="1.8" />
+      <module name="ruoyi-common-core" target="1.8" />
+      <module name="ruoyi-common-datascope" target="1.8" />
+      <module name="ruoyi-common-datasource" target="1.8" />
+      <module name="ruoyi-common-log" target="1.8" />
+      <module name="ruoyi-common-redis" target="1.8" />
+      <module name="ruoyi-common-seata" target="1.8" />
+      <module name="ruoyi-common-security" target="1.8" />
+      <module name="ruoyi-common-sensitive" target="1.8" />
+      <module name="ruoyi-common-swagger" target="1.8" />
+      <module name="ruoyi-gateway" target="1.8" />
+      <module name="ruoyi-modules" target="1.8" />
+      <module name="ruoyi-modules-file" target="1.8" />
+      <module name="ruoyi-modules-gen" target="1.8" />
+      <module name="ruoyi-modules-job" target="1.8" />
+      <module name="ruoyi-modules-system" target="1.8" />
+      <module name="ruoyi-visual" target="1.8" />
+      <module name="ruoyi-visual-monitor" target="1.8" />
+    </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">

+ 42 - 42
.idea/encodings.xml

@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/ruoyi-api/ruoyi-api-system/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-api/ruoyi-api-system/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-api/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-api/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-auth/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-auth/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-common/ruoyi-common-core/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-common/ruoyi-common-core/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-common/ruoyi-common-datascope/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-common/ruoyi-common-datascope/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-common/ruoyi-common-datasource/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-common/ruoyi-common-datasource/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-common/ruoyi-common-log/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-common/ruoyi-common-log/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-common/ruoyi-common-redis/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-common/ruoyi-common-redis/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-common/ruoyi-common-seata/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-common/ruoyi-common-seata/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-common/ruoyi-common-security/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-common/ruoyi-common-security/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-common/ruoyi-common-sensitive/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-common/ruoyi-common-sensitive/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-common/ruoyi-common-swagger/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-common/ruoyi-common-swagger/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-common/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-common/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-gateway/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-gateway/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-modules/ruoyi-file/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-modules/ruoyi-file/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-modules/ruoyi-gen/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-modules/ruoyi-gen/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-modules/ruoyi-job/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-modules/ruoyi-job/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-modules/ruoyi-system/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-modules/ruoyi-system/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-modules/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-modules/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-visual/ruoyi-monitor/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-visual/ruoyi-monitor/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-visual/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ruoyi-visual/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-api/hr-api-system/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-api/hr-api-system/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-api/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-api/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-auth/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-auth/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-common/hr-common-core/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-common/hr-common-core/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-common/hr-common-datascope/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-common/hr-common-datascope/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-common/hr-common-datasource/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-common/hr-common-datasource/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-common/hr-common-log/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-common/hr-common-log/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-common/hr-common-redis/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-common/hr-common-redis/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-common/hr-common-seata/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-common/hr-common-seata/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-common/hr-common-security/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-common/hr-common-security/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-common/hr-common-sensitive/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-common/hr-common-sensitive/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-common/hr-common-swagger/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-common/hr-common-swagger/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-common/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-common/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-gateway/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-gateway/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-modules/hr-file/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-modules/hr-file/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-modules/hr-gen/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-modules/hr-gen/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-modules/hr-job/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-modules/hr-job/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-modules/hr-system/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-modules/hr-system/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-modules/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-modules/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-visual/hr-monitor/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-visual/hr-monitor/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-visual/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hr-visual/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>

+ 1 - 1
.idea/misc.xml

@@ -8,5 +8,5 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="zulu-1.8" project-jdk-type="JavaSDK" />
 </project>

+ 1 - 0
.idea/vcs.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

+ 6 - 6
ruoyi-api/ruoyi-api-system/pom.xml → hr-api/hr-api-system/pom.xml

@@ -3,24 +3,24 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>ruoyi-api</artifactId>
+        <groupId>com.hr</groupId>
+        <artifactId>hr-api</artifactId>
         <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
-    <artifactId>ruoyi-api-system</artifactId>
+    <artifactId>hr-api-system</artifactId>
 
     <description>
-        ruoyi-api-system系统接口模块
+        hr-api-system系统接口模块
     </description>
 
     <dependencies>
 		
         <!-- RuoYi Common Core-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-core</artifactId>
+            <groupId>com.hr</groupId>
+            <artifactId>hr-common-core</artifactId>
         </dependency>
         
     </dependencies>

+ 5 - 5
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java → hr-api/hr-api-system/src/main/java/com/hr/system/api/RemoteFileService.java

@@ -1,14 +1,14 @@
-package com.ruoyi.system.api;
+package com.hr.system.api;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.SysFile;
-import com.ruoyi.system.api.factory.RemoteFileFallbackFactory;
+import com.hr.common.core.constant.ServiceNameConstants;
+import com.hr.common.core.domain.R;
+import com.hr.system.api.domain.SysFile;
+import com.hr.system.api.factory.RemoteFileFallbackFactory;
 
 /**
  * 文件服务

+ 7 - 7
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java → hr-api/hr-api-system/src/main/java/com/hr/system/api/RemoteLogService.java

@@ -1,15 +1,15 @@
-package com.ruoyi.system.api;
+package com.hr.system.api;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.SysLogininfor;
-import com.ruoyi.system.api.domain.SysOperLog;
-import com.ruoyi.system.api.factory.RemoteLogFallbackFactory;
+import com.hr.common.core.constant.SecurityConstants;
+import com.hr.common.core.constant.ServiceNameConstants;
+import com.hr.common.core.domain.R;
+import com.hr.system.api.domain.SysLogininfor;
+import com.hr.system.api.domain.SysOperLog;
+import com.hr.system.api.factory.RemoteLogFallbackFactory;
 
 /**
  * 日志服务

+ 7 - 7
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java → hr-api/hr-api-system/src/main/java/com/hr/system/api/RemoteUserService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.system.api;
+package com.hr.system.api;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -7,12 +7,12 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.factory.RemoteUserFallbackFactory;
-import com.ruoyi.system.api.model.LoginUser;
+import com.hr.common.core.constant.SecurityConstants;
+import com.hr.common.core.constant.ServiceNameConstants;
+import com.hr.common.core.domain.R;
+import com.hr.system.api.domain.SysUser;
+import com.hr.system.api.factory.RemoteUserFallbackFactory;
+import com.hr.system.api.model.LoginUser;
 
 /**
  * 用户服务

+ 2 - 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java → hr-api/hr-api-system/src/main/java/com/hr/system/api/domain/SysDept.java

@@ -1,4 +1,4 @@
-package com.ruoyi.system.api.domain;
+package com.hr.system.api.domain;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,7 +8,7 @@ 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.web.domain.BaseEntity;
+import com.hr.common.core.web.domain.BaseEntity;
 
 /**
  * 部门表 sys_dept

+ 5 - 5
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java → hr-api/hr-api-system/src/main/java/com/hr/system/api/domain/SysDictData.java

@@ -1,13 +1,13 @@
-package com.ruoyi.system.api.domain;
+package com.hr.system.api.domain;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.hr.common.core.annotation.Excel;
+import com.hr.common.core.annotation.Excel.ColumnType;
+import com.hr.common.core.constant.UserConstants;
+import com.hr.common.core.web.domain.BaseEntity;
 
 /**
  * 字典数据表 sys_dict_data

+ 4 - 4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java → hr-api/hr-api-system/src/main/java/com/hr/system/api/domain/SysDictType.java

@@ -1,13 +1,13 @@
-package com.ruoyi.system.api.domain;
+package com.hr.system.api.domain;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.hr.common.core.annotation.Excel;
+import com.hr.common.core.annotation.Excel.ColumnType;
+import com.hr.common.core.web.domain.BaseEntity;
 
 /**
  * 字典类型表 sys_dict_type

+ 1 - 1
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java → hr-api/hr-api-system/src/main/java/com/hr/system/api/domain/SysFile.java

@@ -1,4 +1,4 @@
-package com.ruoyi.system.api.domain;
+package com.hr.system.api.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

+ 4 - 4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java → hr-api/hr-api-system/src/main/java/com/hr/system/api/domain/SysLogininfor.java

@@ -1,10 +1,10 @@
-package com.ruoyi.system.api.domain;
+package com.hr.system.api.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.hr.common.core.annotation.Excel;
+import com.hr.common.core.annotation.Excel.ColumnType;
+import com.hr.common.core.web.domain.BaseEntity;
 
 /**
  * 系统访问记录表 sys_logininfor

+ 4 - 4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java → hr-api/hr-api-system/src/main/java/com/hr/system/api/domain/SysOperLog.java

@@ -1,10 +1,10 @@
-package com.ruoyi.system.api.domain;
+package com.hr.system.api.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.hr.common.core.annotation.Excel;
+import com.hr.common.core.annotation.Excel.ColumnType;
+import com.hr.common.core.web.domain.BaseEntity;
 
 /**
  * 操作日志记录表 oper_log

+ 4 - 4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java → hr-api/hr-api-system/src/main/java/com/hr/system/api/domain/SysRole.java

@@ -1,4 +1,4 @@
-package com.ruoyi.system.api.domain;
+package com.hr.system.api.domain;
 
 import java.util.Set;
 import javax.validation.constraints.NotBlank;
@@ -6,9 +6,9 @@ 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.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.hr.common.core.annotation.Excel;
+import com.hr.common.core.annotation.Excel.ColumnType;
+import com.hr.common.core.web.domain.BaseEntity;
 
 /**
  * 角色表 sys_role

+ 8 - 8
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java → hr-api/hr-api-system/src/main/java/com/hr/system/api/domain/SysUser.java

@@ -1,17 +1,17 @@
-package com.ruoyi.system.api.domain;
+package com.hr.system.api.domain;
 
 import java.util.Date;
 import java.util.List;
 import javax.validation.constraints.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.annotation.Excel.Type;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.annotation.Excels;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.common.core.xss.Xss;
+import com.hr.common.core.annotation.Excel;
+import com.hr.common.core.annotation.Excel.ColumnType;
+import com.hr.common.core.annotation.Excel.Type;
+import com.hr.common.core.constant.UserConstants;
+import com.hr.common.core.annotation.Excels;
+import com.hr.common.core.web.domain.BaseEntity;
+import com.hr.common.core.xss.Xss;
 
 /**
  * 用户对象 sys_user

+ 4 - 4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java → hr-api/hr-api-system/src/main/java/com/hr/system/api/factory/RemoteFileFallbackFactory.java

@@ -1,13 +1,13 @@
-package com.ruoyi.system.api.factory;
+package com.hr.system.api.factory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteFileService;
-import com.ruoyi.system.api.domain.SysFile;
+import com.hr.common.core.domain.R;
+import com.hr.system.api.RemoteFileService;
+import com.hr.system.api.domain.SysFile;
 
 /**
  * 文件服务降级处理

+ 5 - 5
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java → hr-api/hr-api-system/src/main/java/com/hr/system/api/factory/RemoteLogFallbackFactory.java

@@ -1,13 +1,13 @@
-package com.ruoyi.system.api.factory;
+package com.hr.system.api.factory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteLogService;
-import com.ruoyi.system.api.domain.SysLogininfor;
-import com.ruoyi.system.api.domain.SysOperLog;
+import com.hr.common.core.domain.R;
+import com.hr.system.api.RemoteLogService;
+import com.hr.system.api.domain.SysLogininfor;
+import com.hr.system.api.domain.SysOperLog;
 
 /**
  * 日志服务降级处理

+ 5 - 5
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java → hr-api/hr-api-system/src/main/java/com/hr/system/api/factory/RemoteUserFallbackFactory.java

@@ -1,13 +1,13 @@
-package com.ruoyi.system.api.factory;
+package com.hr.system.api.factory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.RemoteUserService;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.model.LoginUser;
+import com.hr.common.core.domain.R;
+import com.hr.system.api.RemoteUserService;
+import com.hr.system.api.domain.SysUser;
+import com.hr.system.api.model.LoginUser;
 
 /**
  * 用户服务降级处理

+ 2 - 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java → hr-api/hr-api-system/src/main/java/com/hr/system/api/model/LoginUser.java

@@ -1,11 +1,11 @@
-package com.ruoyi.system.api.model;
+package com.hr.system.api.model;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.Set;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.system.api.domain.SysUser;
+import com.hr.system.api.domain.SysUser;
 
 /**
  * 用户信息

+ 1 - 1
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/SysDeptDto.java → hr-api/hr-api-system/src/main/java/com/hr/system/api/model/SysDeptDto.java

@@ -1,4 +1,4 @@
-package com.ruoyi.system.api.model;
+package com.hr.system.api.model;
 
 public class SysDeptDto {
 

+ 3 - 0
hr-api/hr-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,3 @@
+com.hr.system.api.factory.RemoteUserFallbackFactory
+com.hr.system.api.factory.RemoteLogFallbackFactory
+com.hr.system.api.factory.RemoteFileFallbackFactory

+ 5 - 5
ruoyi-api/pom.xml → hr-api/pom.xml

@@ -2,21 +2,21 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>ruoyi</artifactId>
+        <groupId>com.hr</groupId>
+        <artifactId>baseauth</artifactId>
         <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <modules>
-        <module>ruoyi-api-system</module>
+        <module>hr-api-system</module>
     </modules>
 
-    <artifactId>ruoyi-api</artifactId>
+    <artifactId>hr-api</artifactId>
     <packaging>pom</packaging>
 
     <description>
-        ruoyi-api系统接口
+        hr-api系统接口
     </description>
 
 </project>

+ 6 - 6
ruoyi-auth/pom.xml → hr-auth/pom.xml

@@ -2,16 +2,16 @@
          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>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>ruoyi</artifactId>
+        <groupId>com.hr</groupId>
+        <artifactId>baseauth</artifactId>
         <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
-    <artifactId>ruoyi-auth</artifactId>
+    <artifactId>hr-auth</artifactId>
 	
     <description>
-        ruoyi-auth认证授权中心
+        hr-auth认证授权中心
     </description>
     
     <dependencies>
@@ -48,8 +48,8 @@
 		
         <!-- RuoYi Common Security-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-security</artifactId>
+            <groupId>com.hr</groupId>
+            <artifactId>hr-common-security</artifactId>
         </dependency>
         
     </dependencies>

+ 0 - 0
ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java → hr-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java


+ 4 - 4
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java → hr-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -9,13 +9,13 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.auth.form.LoginBody;
 import com.ruoyi.auth.form.RegisterBody;
 import com.ruoyi.auth.service.SysLoginService;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.JwtUtils;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.hr.common.core.domain.R;
+import com.hr.common.core.utils.JwtUtils;
+import com.hr.common.core.utils.StringUtils;
 import com.ruoyi.common.security.auth.AuthUtil;
 import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.model.LoginUser;
+import com.hr.system.api.model.LoginUser;
 
 /**
  * token 控制

+ 0 - 0
ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java → hr-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java


+ 0 - 0
ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java → hr-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java


+ 2 - 2
ruoyi-auth/src/main/java/com/ruoyi/auth/service/Miyao.java → hr-auth/src/main/java/com/ruoyi/auth/service/Miyao.java

@@ -1,7 +1,7 @@
 package com.ruoyi.auth.service;
 
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.utils.JwtUtils;
+import com.hr.common.core.constant.SecurityConstants;
+import com.hr.common.core.utils.JwtUtils;
 
 import java.util.HashMap;
 import java.util.Map;

+ 14 - 14
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java → hr-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -2,22 +2,22 @@ package com.ruoyi.auth.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.enums.UserStatus;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.ip.IpUtils;
+import com.hr.common.core.constant.CacheConstants;
+import com.hr.common.core.constant.Constants;
+import com.hr.common.core.constant.SecurityConstants;
+import com.hr.common.core.constant.UserConstants;
+import com.hr.common.core.domain.R;
+import com.hr.common.core.enums.UserStatus;
+import com.hr.common.core.exception.ServiceException;
+import com.hr.common.core.text.Convert;
+import com.hr.common.core.utils.DateUtils;
+import com.hr.common.core.utils.StringUtils;
+import com.hr.common.core.utils.ip.IpUtils;
 import com.ruoyi.common.redis.service.RedisService;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.RemoteUserService;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.model.LoginUser;
+import com.hr.system.api.RemoteUserService;
+import com.hr.system.api.domain.SysUser;
+import com.hr.system.api.model.LoginUser;
 
 /**
  * 登录校验方法

+ 4 - 4
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java → hr-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java

@@ -3,12 +3,12 @@ package com.ruoyi.auth.service;
 import java.util.concurrent.TimeUnit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.exception.ServiceException;
+import com.hr.common.core.constant.CacheConstants;
+import com.hr.common.core.constant.Constants;
+import com.hr.common.core.exception.ServiceException;
 import com.ruoyi.common.redis.service.RedisService;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysUser;
+import com.hr.system.api.domain.SysUser;
 
 /**
  * 登录密码方法

+ 6 - 6
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java → hr-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java

@@ -2,12 +2,12 @@ package com.ruoyi.auth.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.ip.IpUtils;
-import com.ruoyi.system.api.RemoteLogService;
-import com.ruoyi.system.api.domain.SysLogininfor;
+import com.hr.common.core.constant.Constants;
+import com.hr.common.core.constant.SecurityConstants;
+import com.hr.common.core.utils.StringUtils;
+import com.hr.common.core.utils.ip.IpUtils;
+import com.hr.system.api.RemoteLogService;
+import com.hr.system.api.domain.SysLogininfor;
 
 /**
  * 记录日志方法

+ 0 - 0
ruoyi-auth/src/main/resources/banner.txt → hr-auth/src/main/resources/banner.txt


+ 0 - 0
ruoyi-auth/src/main/resources/bootstrap - 副本.yml → hr-auth/src/main/resources/bootstrap - 副本.yml


+ 0 - 0
ruoyi-auth/src/main/resources/bootstrap.yml → hr-auth/src/main/resources/bootstrap.yml


+ 0 - 0
ruoyi-auth/src/main/resources/logback.xml → hr-auth/src/main/resources/logback.xml


+ 4 - 4
ruoyi-common/ruoyi-common-core/pom.xml → hr-common/hr-common-core/pom.xml

@@ -3,16 +3,16 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>ruoyi-common</artifactId>
+        <groupId>com.hr</groupId>
+        <artifactId>hr-common</artifactId>
         <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ruoyi-common-core</artifactId>
+    <artifactId>hr-common-core</artifactId>
     
     <description>
-        ruoyi-common-core核心模块
+        hr-common-core核心模块
     </description>
 
     <dependencies>

+ 2 - 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/annotation/Excel.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.annotation;
+package com.hr.common.core.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -7,7 +7,7 @@ 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.core.utils.poi.ExcelHandlerAdapter;
+import com.hr.common.core.utils.poi.ExcelHandlerAdapter;
 
 /**
  * 自定义导出Excel数据注解

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/annotation/Excels.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.annotation;
+package com.hr.common.core.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/constant/CacheConstants.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.constant;
+package com.hr.common.core.constant;
 
 /**
  * 缓存常量信息

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/constant/Constants.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.constant;
+package com.hr.common.core.constant;
 
 /**
  * 通用常量信息

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/constant/GenConstants.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.constant;
+package com.hr.common.core.constant;
 
 /**
  * 代码生成通用常量

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/constant/HttpStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.constant;
+package com.hr.common.core.constant;
 
 /**
  * 返回状态码

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/constant/ScheduleConstants.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.constant;
+package com.hr.common.core.constant;
 
 /**
  * 任务调度通用常量

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/constant/SecurityConstants.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.constant;
+package com.hr.common.core.constant;
 
 /**
  * 权限相关通用常量

+ 4 - 4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/constant/ServiceNameConstants.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.constant;
+package com.hr.common.core.constant;
 
 /**
  * 服务名称
@@ -10,15 +10,15 @@ public class ServiceNameConstants
     /**
      * 认证服务的serviceid
      */
-    public static final String AUTH_SERVICE = "ruoyi-auth";
+    public static final String AUTH_SERVICE = "hr-auth";
 
     /**
      * 系统模块的serviceid
      */
-    public static final String SYSTEM_SERVICE = "ruoyi-system";
+    public static final String SYSTEM_SERVICE = "hr-system";
 
     /**
      * 文件服务的serviceid
      */
-    public static final String FILE_SERVICE = "ruoyi-file";
+    public static final String FILE_SERVICE = "hr-file";
 }

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/constant/TokenConstants.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.constant;
+package com.hr.common.core.constant;
 
 /**
  * Token的Key常量

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/constant/UserConstants.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.constant;
+package com.hr.common.core.constant;
 
 /**
  * 用户常量信息

+ 4 - 4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/context/SecurityContextHolder.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.core.context;
+package com.hr.common.core.context;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import com.alibaba.ttl.TransmittableThreadLocal;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.hr.common.core.constant.SecurityConstants;
+import com.hr.common.core.text.Convert;
+import com.hr.common.core.utils.StringUtils;
 
 /**
  * 获取当前线程变量中的 用户id、用户名称、Token等信息 

+ 2 - 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/domain/R.java

@@ -1,7 +1,7 @@
-package com.ruoyi.common.core.domain;
+package com.hr.common.core.domain;
 
 import java.io.Serializable;
-import com.ruoyi.common.core.constant.Constants;
+import com.hr.common.core.constant.Constants;
 
 /**
  * 响应信息主体

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/enums/UserStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.enums;
+package com.hr.common.core.enums;
 
 /**
  * 用户状态

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/CaptchaException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception;
+package com.hr.common.core.exception;
 
 /**
  * 验证码错误异常类

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/CheckedException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception;
+package com.hr.common.core.exception;
 
 /**
  * 检查异常

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/DemoModeException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception;
+package com.hr.common.core.exception;
 
 /**
  * 演示模式异常

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/GlobalException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception;
+package com.hr.common.core.exception;
 
 /**
  * 全局异常

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/InnerAuthException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception;
+package com.hr.common.core.exception;
 
 /**
  * 内部认证异常

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/PreAuthorizeException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception;
+package com.hr.common.core.exception;
 
 /**
  * 权限异常

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/ServiceException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception;
+package com.hr.common.core.exception;
 
 /**
  * 业务异常

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/UtilException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception;
+package com.hr.common.core.exception;
 
 /**
  * 工具类异常

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/auth/NotLoginException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception.auth;
+package com.hr.common.core.exception.auth;
 
 /**
  * 未能通过的登录认证异常

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/auth/NotPermissionException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception.auth;
+package com.hr.common.core.exception.auth;
 
 import org.apache.commons.lang3.StringUtils;
 

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/auth/NotRoleException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception.auth;
+package com.hr.common.core.exception.auth;
 
 import org.apache.commons.lang3.StringUtils;
 

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/base/BaseException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception.base;
+package com.hr.common.core.exception.base;
 
 /**
  * 基础异常

+ 2 - 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/file/FileException.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.core.exception.file;
+package com.hr.common.core.exception.file;
 
-import com.ruoyi.common.core.exception.base.BaseException;
+import com.hr.common.core.exception.base.BaseException;
 
 /**
  * 文件信息异常类

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/file/FileNameLengthLimitExceededException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception.file;
+package com.hr.common.core.exception.file;
 
 /**
  * 文件名称超长限制异常类

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/file/FileSizeLimitExceededException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception.file;
+package com.hr.common.core.exception.file;
 
 /**
  * 文件名大小限制异常类

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileUploadException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/file/FileUploadException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception.file;
+package com.hr.common.core.exception.file;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/file/InvalidExtensionException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception.file;
+package com.hr.common.core.exception.file;
 
 import java.util.Arrays;
 

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/job/TaskException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception.job;
+package com.hr.common.core.exception.job;
 
 /**
  * 计划策略异常

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/user/CaptchaExpireException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception.user;
+package com.hr.common.core.exception.user;
 
 /**
  * 验证码失效异常类

+ 2 - 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/user/UserException.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.core.exception.user;
+package com.hr.common.core.exception.user;
 
-import com.ruoyi.common.core.exception.base.BaseException;
+import com.hr.common.core.exception.base.BaseException;
 
 /**
  * 用户信息异常类

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/exception/user/UserPasswordNotMatchException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception.user;
+package com.hr.common.core.exception.user;
 
 /**
  * 用户密码不正确或不符合规范异常类

+ 2 - 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/text/CharsetKit.java

@@ -1,8 +1,8 @@
-package com.ruoyi.common.core.text;
+package com.hr.common.core.text;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.hr.common.core.utils.StringUtils;
 
 /**
  * 字符集工具类

+ 2 - 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/text/Convert.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.text;
+package com.hr.common.core.text;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -7,7 +7,7 @@ import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.text.NumberFormat;
 import java.util.Set;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.hr.common.core.utils.StringUtils;
 
 /**
  * 类型转换器

+ 2 - 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/text/StrFormatter.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.core.text;
+package com.hr.common.core.text;
 
-import com.ruoyi.common.core.utils.StringUtils;
+import com.hr.common.core.utils.StringUtils;
 
 /**
  * 字符串格式化

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/DateUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils;
+package com.hr.common.core.utils;
 
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/ExceptionUtil.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils;
+package com.hr.common.core.utils;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

+ 4 - 4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/JwtUtils.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.core.utils;
+package com.hr.common.core.utils;
 
 import java.util.Map;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.common.core.constant.TokenConstants;
-import com.ruoyi.common.core.text.Convert;
+import com.hr.common.core.constant.SecurityConstants;
+import com.hr.common.core.constant.TokenConstants;
+import com.hr.common.core.text.Convert;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;

+ 4 - 4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/PageUtils.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.core.utils;
+package com.hr.common.core.utils;
 
 import com.github.pagehelper.PageHelper;
-import com.ruoyi.common.core.utils.sql.SqlUtil;
-import com.ruoyi.common.core.web.page.PageDomain;
-import com.ruoyi.common.core.web.page.TableSupport;
+import com.hr.common.core.utils.sql.SqlUtil;
+import com.hr.common.core.web.page.PageDomain;
+import com.hr.common.core.web.page.TableSupport;
 
 /**
  * 分页工具类

+ 4 - 4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/ServletUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils;
+package com.hr.common.core.utils;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -22,9 +22,9 @@ import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import com.alibaba.fastjson2.JSON;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.text.Convert;
+import com.hr.common.core.constant.Constants;
+import com.hr.common.core.domain.R;
+import com.hr.common.core.text.Convert;
 import reactor.core.publisher.Mono;
 
 /**

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/SpringUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils;
+package com.hr.common.core.utils;
 
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeansException;

+ 3 - 3
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/StringUtils.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.core.utils;
+package com.hr.common.core.utils;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import org.springframework.util.AntPathMatcher;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.text.StrFormatter;
+import com.hr.common.core.constant.Constants;
+import com.hr.common.core.text.StrFormatter;
 
 /**
  * 字符串工具类

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/bean/BeanUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.bean;
+package com.hr.common.core.utils.bean;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/bean/BeanValidators.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.bean;
+package com.hr.common.core.utils.bean;
 
 import java.util.Set;
 import javax.validation.ConstraintViolation;

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/file/FileTypeUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.file;
+package com.hr.common.core.utils.file;
 
 import java.io.File;
 import java.util.Objects;

+ 2 - 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/file/FileUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.file;
+package com.hr.common.core.utils.file;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -11,7 +11,7 @@ import java.nio.charset.StandardCharsets;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.ArrayUtils;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.hr.common.core.utils.StringUtils;
 
 /**
  * 文件处理工具类

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/file/ImageUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.file;
+package com.hr.common.core.utils.file;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/file/MimeTypeUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.file;
+package com.hr.common.core.utils.file;
 
 /**
  * 媒体类型工具类

+ 2 - 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/html/EscapeUtil.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.core.utils.html;
+package com.hr.common.core.utils.html;
 
-import com.ruoyi.common.core.utils.StringUtils;
+import com.hr.common.core.utils.StringUtils;
 
 /**
  * 转义和反转义工具类

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/html/HTMLFilter.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.html;
+package com.hr.common.core.utils.html;
 
 import java.util.ArrayList;
 import java.util.Collections;

+ 3 - 3
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/ip/IpUtils.java

@@ -1,10 +1,10 @@
-package com.ruoyi.common.core.utils.ip;
+package com.hr.common.core.utils.ip;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import javax.servlet.http.HttpServletRequest;
-import com.ruoyi.common.core.utils.ServletUtils;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.hr.common.core.utils.ServletUtils;
+import com.hr.common.core.utils.StringUtils;
 
 /**
  * 获取IP方法

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/poi/ExcelHandlerAdapter.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.poi;
+package com.hr.common.core.utils.poi;
 
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Workbook;

+ 12 - 12
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/poi/ExcelUtil.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.poi;
+package com.hr.common.core.utils.poi;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -52,17 +52,17 @@ import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
 import org.apache.poi.xssf.usermodel.XSSFDataValidation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.annotation.Excel.Type;
-import com.ruoyi.common.core.annotation.Excels;
-import com.ruoyi.common.core.exception.UtilException;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.file.FileTypeUtils;
-import com.ruoyi.common.core.utils.file.ImageUtils;
-import com.ruoyi.common.core.utils.reflect.ReflectUtils;
+import com.hr.common.core.annotation.Excel;
+import com.hr.common.core.annotation.Excel.ColumnType;
+import com.hr.common.core.annotation.Excel.Type;
+import com.hr.common.core.annotation.Excels;
+import com.hr.common.core.exception.UtilException;
+import com.hr.common.core.text.Convert;
+import com.hr.common.core.utils.DateUtils;
+import com.hr.common.core.utils.StringUtils;
+import com.hr.common.core.utils.file.FileTypeUtils;
+import com.hr.common.core.utils.file.ImageUtils;
+import com.hr.common.core.utils.reflect.ReflectUtils;
 
 /**
  * Excel相关处理

+ 3 - 3
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/reflect/ReflectUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.reflect;
+package com.hr.common.core.utils.reflect;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -12,8 +12,8 @@ import org.apache.commons.lang3.Validate;
 import org.apache.poi.ss.usermodel.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.core.utils.DateUtils;
+import com.hr.common.core.text.Convert;
+import com.hr.common.core.utils.DateUtils;
 
 /**
  * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/sign/Base64.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.sign;
+package com.hr.common.core.utils.sign;
 
 /**
  * Base64工具类

+ 3 - 3
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/sql/SqlUtil.java

@@ -1,7 +1,7 @@
-package com.ruoyi.common.core.utils.sql;
+package com.hr.common.core.utils.sql;
 
-import com.ruoyi.common.core.exception.UtilException;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.hr.common.core.exception.UtilException;
+import com.hr.common.core.utils.StringUtils;
 
 /**
  * sql操作工具类

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/uuid/IdUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.uuid;
+package com.hr.common.core.utils.uuid;
 
 /**
  * ID生成器工具类

+ 3 - 3
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/uuid/Seq.java

@@ -1,8 +1,8 @@
-package com.ruoyi.common.core.utils.uuid;
+package com.hr.common.core.utils.uuid;
 
 import java.util.concurrent.atomic.AtomicInteger;
-import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.hr.common.core.utils.DateUtils;
+import com.hr.common.core.utils.StringUtils;
 
 /**
  * @author ruoyi 序列生成类

+ 2 - 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/utils/uuid/UUID.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.core.utils.uuid;
+package com.hr.common.core.utils.uuid;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
-import com.ruoyi.common.core.exception.UtilException;
+import com.hr.common.core.exception.UtilException;
 
 /**
  * 提供通用唯一识别码(universally unique identifier)(UUID)实现

+ 10 - 10
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java → hr-common/hr-common-core/src/main/java/com/hr/common/core/web/controller/BaseController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.web.controller;
+package com.hr.common.core.web.controller;
 
 import java.beans.PropertyEditorSupport;
 import java.util.Date;
@@ -9,15 +9,15 @@ 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.core.constant.HttpStatus;
-import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.PageUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.sql.SqlUtil;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.PageDomain;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.core.web.page.TableSupport;
+import com.hr.common.core.constant.HttpStatus;
+import com.hr.common.core.utils.DateUtils;
+import com.hr.common.core.utils.PageUtils;
+import com.hr.common.core.utils.StringUtils;
+import com.hr.common.core.utils.sql.SqlUtil;
+import com.hr.common.core.web.domain.AjaxResult;
+import com.hr.common.core.web.page.PageDomain;
+import com.hr.common.core.web.page.TableDataInfo;
+import com.hr.common.core.web.page.TableSupport;
 
 /**
  * web层通用数据处理

Някои файлове не бяха показани, защото твърде много файлове са промени