home 2 éve
szülő
commit
845f31183a
100 módosított fájl, 24 hozzáadás és 23 törlés
  1. 1 1
      bladex/blade-service/blade-system/pom.xml
  2. 1 1
      hx-common/code-generator/pom.xml
  3. 2 2
      hx-common/common-file/pom.xml
  4. 0 0
      hx-common/common-file/src/main/java/com/fjhx/ServiceFileServeApplication.java
  5. 0 0
      hx-common/common-file/src/main/java/com/fjhx/controller/FileInfoController.java
  6. 0 0
      hx-common/common-file/src/main/java/com/fjhx/entity/FileInfo.java
  7. 0 0
      hx-common/common-file/src/main/java/com/fjhx/feign/FileClient.java
  8. 0 0
      hx-common/common-file/src/main/java/com/fjhx/mapper/FileInfoMapper.java
  9. 0 0
      hx-common/common-file/src/main/java/com/fjhx/mapper/FileInfoMapper.xml
  10. 0 0
      hx-common/common-file/src/main/java/com/fjhx/service/FileInfoService.java
  11. 0 0
      hx-common/common-file/src/main/java/com/fjhx/service/impl/FileInfoServiceImpl.java
  12. 0 0
      hx-common/common-file/src/main/resources/application-dev.yml
  13. 0 0
      hx-common/common-file/src/main/resources/application-prod.yml
  14. 0 0
      hx-common/common-file/src/main/resources/application-test.yml
  15. 2 2
      hx-common/common-flow/pom.xml
  16. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/HxFlowApplication.java
  17. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/controller/FlowApplycheckController.java
  18. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/controller/FlowController.java
  19. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/controller/FlowNodeController.java
  20. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/controller/FlowNodelineController.java
  21. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/feign/FlowApi.java
  22. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowApplycheckMapper.java
  23. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowApplycheckMapper.xml
  24. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowMapper.java
  25. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowMapper.xml
  26. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowNodeMapper.java
  27. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowNodeMapper.xml
  28. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowNodelineMapper.java
  29. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowNodelineMapper.xml
  30. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/service/IFlowApplycheckService.java
  31. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/service/IFlowEngineService.java
  32. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/service/IFlowNodeService.java
  33. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/service/IFlowNodelineService.java
  34. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/service/IFlowService.java
  35. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/service/impl/FlowApplycheckServiceImpl.java
  36. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/service/impl/FlowEngineServiceImpl.java
  37. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/service/impl/FlowNodeServiceImpl.java
  38. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/service/impl/FlowNodelineServiceImpl.java
  39. 0 0
      hx-common/common-flow/src/main/java/com/fjhx/flow/service/impl/FlowServiceImpl.java
  40. 0 0
      hx-common/common-flow/src/main/resources/application-dev.yml
  41. 0 0
      hx-common/common-flow/src/main/resources/application-prod.yml
  42. 0 0
      hx-common/common-flow/src/main/resources/application-test.yml
  43. 2 2
      hx-common/common-rocketmq/pom.xml
  44. 0 0
      hx-common/common-rocketmq/src/main/java/com/fjhx/HxRocketMqApplication.java
  45. 0 0
      hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/consumer/ConsumerService.java
  46. 0 0
      hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/feign/RocketmqApi.java
  47. 0 0
      hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/message/controller/StockMessageController.java
  48. 0 0
      hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/message/mapper/StockMessageMapper.java
  49. 0 0
      hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/message/mapper/StockMessageMapper.xml
  50. 0 0
      hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/message/service/StockMessageService.java
  51. 0 0
      hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/message/service/impl/StockMessageServiceImpl.java
  52. 0 0
      hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/producer/ProducerController.java
  53. 0 0
      hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/service/Impl/RocketMqServiceImpl.java
  54. 0 0
      hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/service/RocketMqService.java
  55. 0 0
      hx-common/common-rocketmq/src/main/resources/application-dev.yml
  56. 0 0
      hx-common/common-rocketmq/src/main/resources/application-prod.yml
  57. 0 0
      hx-common/common-rocketmq/src/main/resources/application-test.yml
  58. 3 3
      hx-common/common-socket/pom.xml
  59. 0 0
      hx-common/common-socket/src/main/java/com/fjhx/SocketApplication.java
  60. 0 0
      hx-common/common-socket/src/main/java/com/fjhx/consumer/ConsumerService.java
  61. 0 0
      hx-common/common-socket/src/main/java/com/fjhx/entity/MessageNotice.java
  62. 0 0
      hx-common/common-socket/src/main/java/com/fjhx/enums/MessageNoticeEnum.java
  63. 0 0
      hx-common/common-socket/src/main/java/com/fjhx/enums/MsgSourceEnum.java
  64. 0 0
      hx-common/common-socket/src/main/java/com/fjhx/notice/service/ISendNoticeService.java
  65. 0 0
      hx-common/common-socket/src/main/java/com/fjhx/notice/service/impl/SendNoticeServiceImpl.java
  66. 0 0
      hx-common/common-socket/src/main/java/com/fjhx/websocket/config/WebSocketConfig.java
  67. 0 0
      hx-common/common-socket/src/main/java/com/fjhx/websocket/endpoint/NoticeServerEndpoint.java
  68. 0 0
      hx-common/common-socket/src/main/java/com/fjhx/websocket/service/IWebSocketService.java
  69. 0 0
      hx-common/common-socket/src/main/java/com/fjhx/websocket/service/impl/WebSocketServiceImpl.java
  70. 0 0
      hx-common/common-socket/src/main/resources/application-dev.yml
  71. 0 0
      hx-common/common-socket/src/main/resources/application-prod.yml
  72. 0 0
      hx-common/common-socket/src/main/resources/application-test.yml
  73. 1 1
      hx-common/common-tool/pom.xml
  74. 0 0
      hx-common/common-tool/src/main/java/com/fjhx/base/BaseEntity.java
  75. 0 0
      hx-common/common-tool/src/main/java/com/fjhx/base/BaseService.java
  76. 0 0
      hx-common/common-tool/src/main/java/com/fjhx/base/BasicEntity.java
  77. 0 0
      hx-common/common-tool/src/main/java/com/fjhx/base/ListPageMap.java
  78. 0 0
      hx-common/common-tool/src/main/java/com/fjhx/base/Pager.java
  79. 0 0
      hx-common/common-tool/src/main/java/com/fjhx/constants/ClientConstant.java
  80. 0 0
      hx-common/common-tool/src/main/java/com/fjhx/constants/ErrorMsgConstant.java
  81. 0 0
      hx-common/common-tool/src/main/java/com/fjhx/constants/StatusConstant.java
  82. 0 0
      hx-common/common-tool/src/main/java/com/fjhx/utils/Assert.java
  83. 0 0
      hx-common/common-tool/src/main/java/com/fjhx/utils/CodeUtil.java
  84. 0 0
      hx-common/common-tool/src/main/java/com/fjhx/utils/DateUtil.java
  85. 0 0
      hx-common/common-tool/src/main/java/com/fjhx/utils/HmacUtil.java
  86. 0 0
      hx-common/common-tool/src/main/java/com/fjhx/utils/HxBeanUtil.java
  87. 0 0
      hx-common/common-tool/src/main/java/com/fjhx/utils/HxUtils.java
  88. 0 0
      hx-common/common-tool/src/main/java/com/fjhx/utils/ListUtil.java
  89. 0 0
      hx-common/common-tool/src/main/java/com/fjhx/utils/TreeUtil.java
  90. 0 0
      hx-common/common-tool/src/main/java/com/fjhx/utils/WrapperUtil.java
  91. 9 8
      hx-common/pom.xml
  92. 1 1
      hx-common/product-library/pom.xml
  93. 1 1
      hx-service-api/common-file-api/pom.xml
  94. 0 0
      hx-service-api/common-file-api/src/main/java/com/fjhx/feign/IFileClient.java
  95. 0 0
      hx-service-api/common-file-api/src/main/java/com/fjhx/params/FileInfoParam.java
  96. 1 1
      hx-service-api/common-flow-api/pom.xml
  97. 0 0
      hx-service-api/common-flow-api/src/main/java/com/fjhx/myapp/application/entity/Flow.java
  98. 0 0
      hx-service-api/common-flow-api/src/main/java/com/fjhx/myapp/application/entity/FlowApplycheck.java
  99. 0 0
      hx-service-api/common-flow-api/src/main/java/com/fjhx/myapp/application/entity/FlowNode.java
  100. 0 0
      hx-service-api/common-flow-api/src/main/java/com/fjhx/myapp/application/entity/FlowNodeline.java

+ 1 - 1
bladex/blade-service/blade-system/pom.xml

@@ -39,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>hx-tool</artifactId>
+            <artifactId>common-tool</artifactId>
             <version>3.2.0</version>
         </dependency>
     </dependencies>

+ 1 - 1
hx-common/code-generator/pom.xml

@@ -39,7 +39,7 @@
         <!-- 工具模块 -->
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>hx-tool</artifactId>
+            <artifactId>common-tool</artifactId>
         </dependency>
 
     </dependencies>

+ 2 - 2
hx-service/service-file/pom.xml → hx-common/common-file/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>hx-service</artifactId>
+        <artifactId>hx-common</artifactId>
         <groupId>com.fjhx</groupId>
         <version>3.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>service-file</artifactId>
+    <artifactId>common-file</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

+ 0 - 0
hx-service/service-file/src/main/java/com/fjhx/ServiceFileServeApplication.java → hx-common/common-file/src/main/java/com/fjhx/ServiceFileServeApplication.java


+ 0 - 0
hx-service/service-file/src/main/java/com/fjhx/controller/FileInfoController.java → hx-common/common-file/src/main/java/com/fjhx/controller/FileInfoController.java


+ 0 - 0
hx-service/service-file/src/main/java/com/fjhx/entity/FileInfo.java → hx-common/common-file/src/main/java/com/fjhx/entity/FileInfo.java


+ 0 - 0
hx-service/service-file/src/main/java/com/fjhx/feign/FileClient.java → hx-common/common-file/src/main/java/com/fjhx/feign/FileClient.java


+ 0 - 0
hx-service/service-file/src/main/java/com/fjhx/mapper/FileInfoMapper.java → hx-common/common-file/src/main/java/com/fjhx/mapper/FileInfoMapper.java


+ 0 - 0
hx-service/service-file/src/main/java/com/fjhx/mapper/FileInfoMapper.xml → hx-common/common-file/src/main/java/com/fjhx/mapper/FileInfoMapper.xml


+ 0 - 0
hx-service/service-file/src/main/java/com/fjhx/service/FileInfoService.java → hx-common/common-file/src/main/java/com/fjhx/service/FileInfoService.java


+ 0 - 0
hx-service/service-file/src/main/java/com/fjhx/service/impl/FileInfoServiceImpl.java → hx-common/common-file/src/main/java/com/fjhx/service/impl/FileInfoServiceImpl.java


+ 0 - 0
hx-service/service-file/src/main/resources/application-dev.yml → hx-common/common-file/src/main/resources/application-dev.yml


+ 0 - 0
hx-service/service-file/src/main/resources/application-prod.yml → hx-common/common-file/src/main/resources/application-prod.yml


+ 0 - 0
hx-service/service-file/src/main/resources/application-test.yml → hx-common/common-file/src/main/resources/application-test.yml


+ 2 - 2
hx-common/hx-flow/pom.xml → hx-common/common-flow/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hx-flow</artifactId>
+    <artifactId>common-flow</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -25,7 +25,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>hx-flow-api</artifactId>
+            <artifactId>common-flow-api</artifactId>
         </dependency>
 
     </dependencies>

+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/HxFlowApplication.java → hx-common/common-flow/src/main/java/com/fjhx/HxFlowApplication.java


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/controller/FlowApplycheckController.java → hx-common/common-flow/src/main/java/com/fjhx/flow/controller/FlowApplycheckController.java


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/controller/FlowController.java → hx-common/common-flow/src/main/java/com/fjhx/flow/controller/FlowController.java


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/controller/FlowNodeController.java → hx-common/common-flow/src/main/java/com/fjhx/flow/controller/FlowNodeController.java


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/controller/FlowNodelineController.java → hx-common/common-flow/src/main/java/com/fjhx/flow/controller/FlowNodelineController.java


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/feign/FlowApi.java → hx-common/common-flow/src/main/java/com/fjhx/flow/feign/FlowApi.java


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/mapper/FlowApplycheckMapper.java → hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowApplycheckMapper.java


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/mapper/FlowApplycheckMapper.xml → hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowApplycheckMapper.xml


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/mapper/FlowMapper.java → hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowMapper.java


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/mapper/FlowMapper.xml → hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowMapper.xml


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/mapper/FlowNodeMapper.java → hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowNodeMapper.java


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/mapper/FlowNodeMapper.xml → hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowNodeMapper.xml


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/mapper/FlowNodelineMapper.java → hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowNodelineMapper.java


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/mapper/FlowNodelineMapper.xml → hx-common/common-flow/src/main/java/com/fjhx/flow/mapper/FlowNodelineMapper.xml


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/service/IFlowApplycheckService.java → hx-common/common-flow/src/main/java/com/fjhx/flow/service/IFlowApplycheckService.java


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/service/IFlowEngineService.java → hx-common/common-flow/src/main/java/com/fjhx/flow/service/IFlowEngineService.java


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/service/IFlowNodeService.java → hx-common/common-flow/src/main/java/com/fjhx/flow/service/IFlowNodeService.java


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/service/IFlowNodelineService.java → hx-common/common-flow/src/main/java/com/fjhx/flow/service/IFlowNodelineService.java


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/service/IFlowService.java → hx-common/common-flow/src/main/java/com/fjhx/flow/service/IFlowService.java


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/service/impl/FlowApplycheckServiceImpl.java → hx-common/common-flow/src/main/java/com/fjhx/flow/service/impl/FlowApplycheckServiceImpl.java


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/service/impl/FlowEngineServiceImpl.java → hx-common/common-flow/src/main/java/com/fjhx/flow/service/impl/FlowEngineServiceImpl.java


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/service/impl/FlowNodeServiceImpl.java → hx-common/common-flow/src/main/java/com/fjhx/flow/service/impl/FlowNodeServiceImpl.java


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/service/impl/FlowNodelineServiceImpl.java → hx-common/common-flow/src/main/java/com/fjhx/flow/service/impl/FlowNodelineServiceImpl.java


+ 0 - 0
hx-common/hx-flow/src/main/java/com/fjhx/flow/service/impl/FlowServiceImpl.java → hx-common/common-flow/src/main/java/com/fjhx/flow/service/impl/FlowServiceImpl.java


+ 0 - 0
hx-common/hx-flow/src/main/resources/application-dev.yml → hx-common/common-flow/src/main/resources/application-dev.yml


+ 0 - 0
hx-common/hx-flow/src/main/resources/application-prod.yml → hx-common/common-flow/src/main/resources/application-prod.yml


+ 0 - 0
hx-common/hx-flow/src/main/resources/application-test.yml → hx-common/common-flow/src/main/resources/application-test.yml


+ 2 - 2
hx-common/hx-rocketmq/pom.xml → hx-common/common-rocketmq/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hx-rocketmq</artifactId>
+    <artifactId>common-rocketmq</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -24,7 +24,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>hx-rocketmq-api</artifactId>
+            <artifactId>common-rocketmq-api</artifactId>
         </dependency>
 
     </dependencies>

+ 0 - 0
hx-common/hx-rocketmq/src/main/java/com/fjhx/HxRocketMqApplication.java → hx-common/common-rocketmq/src/main/java/com/fjhx/HxRocketMqApplication.java


+ 0 - 0
hx-common/hx-rocketmq/src/main/java/com/fjhx/rocketmq/consumer/ConsumerService.java → hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/consumer/ConsumerService.java


+ 0 - 0
hx-common/hx-rocketmq/src/main/java/com/fjhx/rocketmq/feign/RocketmqApi.java → hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/feign/RocketmqApi.java


+ 0 - 0
hx-common/hx-rocketmq/src/main/java/com/fjhx/rocketmq/message/controller/StockMessageController.java → hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/message/controller/StockMessageController.java


+ 0 - 0
hx-common/hx-rocketmq/src/main/java/com/fjhx/rocketmq/message/mapper/StockMessageMapper.java → hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/message/mapper/StockMessageMapper.java


+ 0 - 0
hx-common/hx-rocketmq/src/main/java/com/fjhx/rocketmq/message/mapper/StockMessageMapper.xml → hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/message/mapper/StockMessageMapper.xml


+ 0 - 0
hx-common/hx-rocketmq/src/main/java/com/fjhx/rocketmq/message/service/StockMessageService.java → hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/message/service/StockMessageService.java


+ 0 - 0
hx-common/hx-rocketmq/src/main/java/com/fjhx/rocketmq/message/service/impl/StockMessageServiceImpl.java → hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/message/service/impl/StockMessageServiceImpl.java


+ 0 - 0
hx-common/hx-rocketmq/src/main/java/com/fjhx/rocketmq/producer/ProducerController.java → hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/producer/ProducerController.java


+ 0 - 0
hx-common/hx-rocketmq/src/main/java/com/fjhx/rocketmq/service/Impl/RocketMqServiceImpl.java → hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/service/Impl/RocketMqServiceImpl.java


+ 0 - 0
hx-common/hx-rocketmq/src/main/java/com/fjhx/rocketmq/service/RocketMqService.java → hx-common/common-rocketmq/src/main/java/com/fjhx/rocketmq/service/RocketMqService.java


+ 0 - 0
hx-common/hx-rocketmq/src/main/resources/application-dev.yml → hx-common/common-rocketmq/src/main/resources/application-dev.yml


+ 0 - 0
hx-common/hx-rocketmq/src/main/resources/application-prod.yml → hx-common/common-rocketmq/src/main/resources/application-prod.yml


+ 0 - 0
hx-common/hx-rocketmq/src/main/resources/application-test.yml → hx-common/common-rocketmq/src/main/resources/application-test.yml


+ 3 - 3
hx-common/hx-socket/pom.xml → hx-common/common-socket/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hx-socket</artifactId>
+    <artifactId>common-socket</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -30,7 +30,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>hx-rocketmq-api</artifactId>
+            <artifactId>common-rocketmq-api</artifactId>
         </dependency>
 
         <dependency>
@@ -40,7 +40,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>hx-rocketmq</artifactId>
+            <artifactId>common-rocketmq</artifactId>
         </dependency>
 
         <!-- websocket -->

+ 0 - 0
hx-common/hx-socket/src/main/java/com/fjhx/SocketApplication.java → hx-common/common-socket/src/main/java/com/fjhx/SocketApplication.java


+ 0 - 0
hx-common/hx-socket/src/main/java/com/fjhx/consumer/ConsumerService.java → hx-common/common-socket/src/main/java/com/fjhx/consumer/ConsumerService.java


+ 0 - 0
hx-common/hx-socket/src/main/java/com/fjhx/entity/MessageNotice.java → hx-common/common-socket/src/main/java/com/fjhx/entity/MessageNotice.java


+ 0 - 0
hx-common/hx-socket/src/main/java/com/fjhx/enums/MessageNoticeEnum.java → hx-common/common-socket/src/main/java/com/fjhx/enums/MessageNoticeEnum.java


+ 0 - 0
hx-common/hx-socket/src/main/java/com/fjhx/enums/MsgSourceEnum.java → hx-common/common-socket/src/main/java/com/fjhx/enums/MsgSourceEnum.java


+ 0 - 0
hx-common/hx-socket/src/main/java/com/fjhx/notice/service/ISendNoticeService.java → hx-common/common-socket/src/main/java/com/fjhx/notice/service/ISendNoticeService.java


+ 0 - 0
hx-common/hx-socket/src/main/java/com/fjhx/notice/service/impl/SendNoticeServiceImpl.java → hx-common/common-socket/src/main/java/com/fjhx/notice/service/impl/SendNoticeServiceImpl.java


+ 0 - 0
hx-common/hx-socket/src/main/java/com/fjhx/websocket/config/WebSocketConfig.java → hx-common/common-socket/src/main/java/com/fjhx/websocket/config/WebSocketConfig.java


+ 0 - 0
hx-common/hx-socket/src/main/java/com/fjhx/websocket/endpoint/NoticeServerEndpoint.java → hx-common/common-socket/src/main/java/com/fjhx/websocket/endpoint/NoticeServerEndpoint.java


+ 0 - 0
hx-common/hx-socket/src/main/java/com/fjhx/websocket/service/IWebSocketService.java → hx-common/common-socket/src/main/java/com/fjhx/websocket/service/IWebSocketService.java


+ 0 - 0
hx-common/hx-socket/src/main/java/com/fjhx/websocket/service/impl/WebSocketServiceImpl.java → hx-common/common-socket/src/main/java/com/fjhx/websocket/service/impl/WebSocketServiceImpl.java


+ 0 - 0
hx-common/hx-socket/src/main/resources/application-dev.yml → hx-common/common-socket/src/main/resources/application-dev.yml


+ 0 - 0
hx-common/hx-socket/src/main/resources/application-prod.yml → hx-common/common-socket/src/main/resources/application-prod.yml


+ 0 - 0
hx-common/hx-socket/src/main/resources/application-test.yml → hx-common/common-socket/src/main/resources/application-test.yml


+ 1 - 1
hx-common/hx-tool/pom.xml → hx-common/common-tool/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hx-tool</artifactId>
+    <artifactId>common-tool</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

+ 0 - 0
hx-common/hx-tool/src/main/java/com/fjhx/base/BaseEntity.java → hx-common/common-tool/src/main/java/com/fjhx/base/BaseEntity.java


+ 0 - 0
hx-common/hx-tool/src/main/java/com/fjhx/base/BaseService.java → hx-common/common-tool/src/main/java/com/fjhx/base/BaseService.java


+ 0 - 0
hx-common/hx-tool/src/main/java/com/fjhx/base/BasicEntity.java → hx-common/common-tool/src/main/java/com/fjhx/base/BasicEntity.java


+ 0 - 0
hx-common/hx-tool/src/main/java/com/fjhx/base/ListPageMap.java → hx-common/common-tool/src/main/java/com/fjhx/base/ListPageMap.java


+ 0 - 0
hx-common/hx-tool/src/main/java/com/fjhx/base/Pager.java → hx-common/common-tool/src/main/java/com/fjhx/base/Pager.java


+ 0 - 0
hx-common/hx-tool/src/main/java/com/fjhx/constants/ClientConstant.java → hx-common/common-tool/src/main/java/com/fjhx/constants/ClientConstant.java


+ 0 - 0
hx-common/hx-tool/src/main/java/com/fjhx/constants/ErrorMsgConstant.java → hx-common/common-tool/src/main/java/com/fjhx/constants/ErrorMsgConstant.java


+ 0 - 0
hx-common/hx-tool/src/main/java/com/fjhx/constants/StatusConstant.java → hx-common/common-tool/src/main/java/com/fjhx/constants/StatusConstant.java


+ 0 - 0
hx-common/hx-tool/src/main/java/com/fjhx/utils/Assert.java → hx-common/common-tool/src/main/java/com/fjhx/utils/Assert.java


+ 0 - 0
hx-common/hx-tool/src/main/java/com/fjhx/utils/CodeUtil.java → hx-common/common-tool/src/main/java/com/fjhx/utils/CodeUtil.java


+ 0 - 0
hx-common/hx-tool/src/main/java/com/fjhx/utils/DateUtil.java → hx-common/common-tool/src/main/java/com/fjhx/utils/DateUtil.java


+ 0 - 0
hx-common/hx-tool/src/main/java/com/fjhx/utils/HmacUtil.java → hx-common/common-tool/src/main/java/com/fjhx/utils/HmacUtil.java


+ 0 - 0
hx-common/hx-tool/src/main/java/com/fjhx/utils/HxBeanUtil.java → hx-common/common-tool/src/main/java/com/fjhx/utils/HxBeanUtil.java


+ 0 - 0
hx-common/hx-tool/src/main/java/com/fjhx/utils/HxUtils.java → hx-common/common-tool/src/main/java/com/fjhx/utils/HxUtils.java


+ 0 - 0
hx-common/hx-tool/src/main/java/com/fjhx/utils/ListUtil.java → hx-common/common-tool/src/main/java/com/fjhx/utils/ListUtil.java


+ 0 - 0
hx-common/hx-tool/src/main/java/com/fjhx/utils/TreeUtil.java → hx-common/common-tool/src/main/java/com/fjhx/utils/TreeUtil.java


+ 0 - 0
hx-common/hx-tool/src/main/java/com/fjhx/utils/WrapperUtil.java → hx-common/common-tool/src/main/java/com/fjhx/utils/WrapperUtil.java


+ 9 - 8
hx-common/pom.xml

@@ -14,10 +14,11 @@
 
     <modules>
         <module>code-generator</module>
-        <module>hx-flow</module>
-        <module>hx-rocketmq</module>
-        <module>hx-socket</module>
-        <module>hx-tool</module>
+        <module>common-file</module>
+        <module>common-flow</module>
+        <module>common-rocketmq</module>
+        <module>common-socket</module>
+        <module>common-tool</module>
         <module>client-util</module>
         <module>product-library</module>
     </modules>
@@ -51,7 +52,7 @@
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>hx-tool</artifactId>
+                <artifactId>common-tool</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 
@@ -83,19 +84,19 @@
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>hx-flow-api</artifactId>
+                <artifactId>common-flow-api</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>hx-rocketmq</artifactId>
+                <artifactId>common-rocketmq</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>hx-rocketmq-api</artifactId>
+                <artifactId>common-rocketmq-api</artifactId>
                 <version>${hx.version}</version>
             </dependency>
 

+ 1 - 1
hx-common/product-library/pom.xml

@@ -21,7 +21,7 @@
         <!-- 工具模块 -->
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>hx-tool</artifactId>
+            <artifactId>common-tool</artifactId>
         </dependency>
 
     </dependencies>

+ 1 - 1
hx-service-api/service-file-api/pom.xml → hx-service-api/common-file-api/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>service-file-api</artifactId>
+    <artifactId>common-file-api</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

+ 0 - 0
hx-service-api/service-file-api/src/main/java/com/fjhx/feign/IFileClient.java → hx-service-api/common-file-api/src/main/java/com/fjhx/feign/IFileClient.java


+ 0 - 0
hx-service-api/service-file-api/src/main/java/com/fjhx/params/FileInfoParam.java → hx-service-api/common-file-api/src/main/java/com/fjhx/params/FileInfoParam.java


+ 1 - 1
hx-service-api/hx-flow-api/pom.xml → hx-service-api/common-flow-api/pom.xml

@@ -9,6 +9,6 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hx-flow-api</artifactId>
+    <artifactId>common-flow-api</artifactId>
 
 </project>

+ 0 - 0
hx-service-api/hx-flow-api/src/main/java/com/fjhx/myapp/application/entity/Flow.java → hx-service-api/common-flow-api/src/main/java/com/fjhx/myapp/application/entity/Flow.java


+ 0 - 0
hx-service-api/hx-flow-api/src/main/java/com/fjhx/myapp/application/entity/FlowApplycheck.java → hx-service-api/common-flow-api/src/main/java/com/fjhx/myapp/application/entity/FlowApplycheck.java


+ 0 - 0
hx-service-api/hx-flow-api/src/main/java/com/fjhx/myapp/application/entity/FlowNode.java → hx-service-api/common-flow-api/src/main/java/com/fjhx/myapp/application/entity/FlowNode.java


+ 0 - 0
hx-service-api/hx-flow-api/src/main/java/com/fjhx/myapp/application/entity/FlowNodeline.java → hx-service-api/common-flow-api/src/main/java/com/fjhx/myapp/application/entity/FlowNodeline.java


Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott