home пре 2 година
родитељ
комит
765de3ba60
67 измењених фајлова са 87 додато и 97 уклоњено
  1. 2 2
      bladex-tool/blade-bom/pom.xml
  2. 1 1
      bladex-tool/blade-core-auto/pom.xml
  3. 1 1
      bladex-tool/blade-core-boot/pom.xml
  4. 1 1
      bladex-tool/blade-core-cloud/pom.xml
  5. 1 1
      bladex-tool/blade-core-context/pom.xml
  6. 1 1
      bladex-tool/blade-core-db/pom.xml
  7. 1 1
      bladex-tool/blade-core-launch/pom.xml
  8. 1 1
      bladex-tool/blade-core-log4j2/pom.xml
  9. 1 1
      bladex-tool/blade-core-secure/pom.xml
  10. 1 1
      bladex-tool/blade-core-test/pom.xml
  11. 1 1
      bladex-tool/blade-core-tool/pom.xml
  12. 1 1
      bladex-tool/blade-starter-actuate/pom.xml
  13. 1 1
      bladex-tool/blade-starter-api-crypto/pom.xml
  14. 1 1
      bladex-tool/blade-starter-auth/pom.xml
  15. 1 1
      bladex-tool/blade-starter-cache/pom.xml
  16. 1 1
      bladex-tool/blade-starter-datascope/pom.xml
  17. 1 1
      bladex-tool/blade-starter-develop/pom.xml
  18. 1 1
      bladex-tool/blade-starter-ehcache/pom.xml
  19. 1 1
      bladex-tool/blade-starter-excel/pom.xml
  20. 1 1
      bladex-tool/blade-starter-flowable/pom.xml
  21. 1 1
      bladex-tool/blade-starter-http/pom.xml
  22. 1 1
      bladex-tool/blade-starter-jwt/pom.xml
  23. 1 1
      bladex-tool/blade-starter-loadbalancer/pom.xml
  24. 1 1
      bladex-tool/blade-starter-log/pom.xml
  25. 1 1
      bladex-tool/blade-starter-metrics/pom.xml
  26. 1 1
      bladex-tool/blade-starter-mongo/pom.xml
  27. 1 1
      bladex-tool/blade-starter-mybatis/pom.xml
  28. 1 1
      bladex-tool/blade-starter-oss/pom.xml
  29. 1 1
      bladex-tool/blade-starter-prometheus/pom.xml
  30. 1 1
      bladex-tool/blade-starter-redis/pom.xml
  31. 1 1
      bladex-tool/blade-starter-report/pom.xml
  32. 1 1
      bladex-tool/blade-starter-sms/pom.xml
  33. 1 1
      bladex-tool/blade-starter-social/pom.xml
  34. 1 1
      bladex-tool/blade-starter-swagger/pom.xml
  35. 1 1
      bladex-tool/blade-starter-tenant/pom.xml
  36. 1 1
      bladex-tool/blade-starter-trace/pom.xml
  37. 1 1
      bladex-tool/blade-starter-transaction/pom.xml
  38. 3 3
      bladex/blade-auth/pom.xml
  39. 1 1
      bladex/blade-common/pom.xml
  40. 1 1
      bladex/blade-gateway/pom.xml
  41. 1 1
      bladex/blade-ops-api/blade-flow-api/pom.xml
  42. 1 1
      bladex/blade-ops-api/blade-resource-api/pom.xml
  43. 1 1
      bladex/blade-ops/blade-admin/pom.xml
  44. 2 2
      bladex/blade-ops/blade-develop/pom.xml
  45. 5 5
      bladex/blade-ops/blade-flow/pom.xml
  46. 1 1
      bladex/blade-ops/blade-log/pom.xml
  47. 1 1
      bladex/blade-ops/blade-report/pom.xml
  48. 3 3
      bladex/blade-ops/blade-resource/pom.xml
  49. 1 1
      bladex/blade-ops/blade-swagger/pom.xml
  50. 1 1
      bladex/blade-ops/blade-xxljob-admin/pom.xml
  51. 1 1
      bladex/blade-ops/blade-xxljob/pom.xml
  52. 1 1
      bladex/blade-service-api/blade-desk-api/pom.xml
  53. 1 1
      bladex/blade-service-api/blade-dict-api/pom.xml
  54. 1 1
      bladex/blade-service-api/blade-scope-api/pom.xml
  55. 1 1
      bladex/blade-service-api/blade-system-api/pom.xml
  56. 1 1
      bladex/blade-service-api/blade-user-api/pom.xml
  57. 4 4
      bladex/blade-service/blade-desk/pom.xml
  58. 3 3
      bladex/blade-service/blade-system/pom.xml
  59. 3 3
      bladex/blade-service/blade-user/pom.xml
  60. 2 2
      bladex/blade-service/pom.xml
  61. 2 2
      bladex/pom.xml
  62. 1 0
      hx-common/code-generator/pom.xml
  63. 1 1
      hx-common/common-client-util/src/main/java/com/fjhx/utils/UserClientUtil.java
  64. 4 4
      hx-common/common-tool/pom.xml
  65. 1 1
      hx-common/common-tool/src/main/java/com/fjhx/base/BaseService.java
  66. 0 6
      hx-common/pom.xml
  67. 0 5
      hx-service/storage-restructure/pom.xml

+ 2 - 2
bladex-tool/blade-bom/pom.xml

@@ -15,7 +15,7 @@
     <groupId>org.springblade.platform</groupId>
     <artifactId>blade-bom</artifactId>
     <packaging>pom</packaging>
-    <version>${bladex.tool.version}</version>
+    <version>3.0.1.RELEASE</version>
     <description>bladex统一版本配置</description>
 
     <properties>
@@ -94,7 +94,7 @@
                 <version>${bladex.tool.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.springblade</groupId>l
+                <groupId>org.springblade</groupId>
                 <artifactId>blade-core-test</artifactId>
                 <version>${bladex.tool.version}</version>
             </dependency>

+ 1 - 1
bladex-tool/blade-core-auto/pom.xml

@@ -13,7 +13,7 @@
 
     <artifactId>blade-core-auto</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <build>

+ 1 - 1
bladex-tool/blade-core-boot/pom.xml

@@ -12,7 +12,7 @@
 
     <artifactId>blade-core-boot</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-core-cloud/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-core-cloud</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
 

+ 1 - 1
bladex-tool/blade-core-context/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-core-context</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-core-db/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-core-db</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-core-launch/pom.xml

@@ -12,7 +12,7 @@
 
     <artifactId>blade-core-launch</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-core-log4j2/pom.xml

@@ -13,7 +13,7 @@
 
     <artifactId>blade-core-log4j2</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-core-secure/pom.xml

@@ -12,7 +12,7 @@
 
     <artifactId>blade-core-secure</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-core-test/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-core-test</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-core-tool/pom.xml

@@ -13,7 +13,7 @@
 
     <artifactId>blade-core-tool</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-actuate/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-actuate</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-api-crypto/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-api-crypto</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-auth/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-auth</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-cache/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-cache</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-datascope/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-datascope</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-develop/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-develop</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-ehcache/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-ehcache</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-excel/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-excel</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-flowable/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-flowable</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <properties>

+ 1 - 1
bladex-tool/blade-starter-http/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-http</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-jwt/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-jwt</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-loadbalancer/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-loadbalancer</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-log/pom.xml

@@ -12,7 +12,7 @@
 
     <artifactId>blade-starter-log</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-metrics/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-metrics</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-mongo/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-mongo</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-mybatis/pom.xml

@@ -12,7 +12,7 @@
 
     <artifactId>blade-starter-mybatis</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-oss/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-oss</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-prometheus/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-prometheus</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-redis/pom.xml

@@ -12,7 +12,7 @@
 
     <artifactId>blade-starter-redis</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-report/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-report</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-sms/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-sms</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-social/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-social</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-swagger/pom.xml

@@ -12,7 +12,7 @@
 
     <artifactId>blade-starter-swagger</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-tenant/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-tenant</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-trace/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-trace</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex-tool/blade-starter-transaction/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-starter-transaction</artifactId>
     <name>${project.artifactId}</name>
-    <version>${project.parent.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 3 - 3
bladex/blade-auth/pom.xml

@@ -13,7 +13,7 @@
 
     <artifactId>blade-auth</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -55,12 +55,12 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-user-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>3.0.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-system-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>3.0.1.RELEASE</version>
         </dependency>
         <!--安全模块-->
         <dependency>

+ 1 - 1
bladex/blade-common/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-common</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex/blade-gateway/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-gateway</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex/blade-ops-api/blade-flow-api/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-flow-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
 

+ 1 - 1
bladex/blade-ops-api/blade-resource-api/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-resource-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex/blade-ops/blade-admin/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-admin</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 2 - 2
bladex/blade-ops/blade-develop/pom.xml

@@ -13,7 +13,7 @@
 
     <artifactId>blade-develop</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-dict-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>3.0.1.RELEASE</version>
         </dependency>
     </dependencies>
 

+ 5 - 5
bladex/blade-ops/blade-flow/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-flow</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -35,12 +35,12 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-dict-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>3.0.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-scope-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>3.0.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
@@ -50,12 +50,12 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-user-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>3.0.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-flow-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>3.0.1.RELEASE</version>
         </dependency>
         <!-- 工作流 -->
         <dependency>

+ 1 - 1
bladex/blade-ops/blade-log/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-log</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex/blade-ops/blade-report/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-report</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 3 - 3
bladex/blade-ops/blade-resource/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-resource</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -75,12 +75,12 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-resource-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>3.0.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-dict-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>3.0.1.RELEASE</version>
         </dependency>
     </dependencies>
 

+ 1 - 1
bladex/blade-ops/blade-swagger/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-swagger</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex/blade-ops/blade-xxljob-admin/pom.xml

@@ -10,7 +10,7 @@
 
     <artifactId>blade-xxljob-admin</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
 

+ 1 - 1
bladex/blade-ops/blade-xxljob/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>blade-xxljob</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex/blade-service-api/blade-desk-api/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-desk-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
 </project>

+ 1 - 1
bladex/blade-service-api/blade-dict-api/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-dict-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex/blade-service-api/blade-scope-api/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-scope-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

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

@@ -11,7 +11,7 @@
 
     <artifactId>blade-system-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 1 - 1
bladex/blade-service-api/blade-user-api/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-user-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

+ 4 - 4
bladex/blade-service/blade-desk/pom.xml

@@ -13,7 +13,7 @@
 
     <artifactId>blade-desk</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -28,17 +28,17 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-desk-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>3.0.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-user-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>3.0.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-flow-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>3.0.1.RELEASE</version>
         </dependency>
         <!--Oss-->
         <dependency>

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

@@ -11,7 +11,7 @@
 
     <artifactId>blade-system</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -30,12 +30,12 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-system-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>3.0.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-user-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>3.0.1.RELEASE</version>
         </dependency>
     </dependencies>
 

+ 3 - 3
bladex/blade-service/blade-user/pom.xml

@@ -12,7 +12,7 @@
 
     <artifactId>blade-user</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>3.0.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -31,12 +31,12 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-user-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>3.0.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-system-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>3.0.1.RELEASE</version>
         </dependency>
     </dependencies>
 

+ 2 - 2
bladex/blade-service/pom.xml

@@ -43,12 +43,12 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-dict-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>3.0.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-scope-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>3.0.1.RELEASE</version>
         </dependency>
     </dependencies>
 

+ 2 - 2
bladex/pom.xml

@@ -52,14 +52,14 @@
             <dependency>
                 <groupId>org.springblade.platform</groupId>
                 <artifactId>blade-bom</artifactId>
-                <version>${bladex.project.version}</version>
+                <version>3.0.1.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.springblade</groupId>
                 <artifactId>blade-common</artifactId>
-                <version>${bladex.project.version}</version>
+                <version>3.0.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>

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

@@ -22,6 +22,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.4.0</version>
         </dependency>
 
         <!-- myBatis-plus代码自动生成模板引擎 -->

+ 1 - 1
hx-common/common-client-util/src/main/java/com/fjhx/utils/UserClientUtil.java

@@ -1,8 +1,8 @@
 package com.fjhx.utils;
 
+import cn.hutool.extra.spring.SpringUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.api.ResultCode;
-import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.system.user.feign.IUserSearchClient;
 
 import java.util.*;

+ 4 - 4
hx-common/common-tool/pom.xml

@@ -23,10 +23,10 @@
             <artifactId>blade-core-boot</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>org.projectlombok</groupId>-->
-<!--            <artifactId>lombok</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.springblade</groupId>

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

@@ -85,7 +85,7 @@ public interface BaseService<T> extends IService<T> {
     /**
      * 条件查询
      */
-    default Integer count(SFunction<T, ?> column, Object val) {
+    default Long count(SFunction<T, ?> column, Object val) {
         return lambdaQuery().eq(column, val).count();
     }
 

+ 0 - 6
hx-common/pom.xml

@@ -109,12 +109,6 @@
                 <version>${hx.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>service-flow-api</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
-
         </dependencies>
     </dependencyManagement>
 

+ 0 - 5
hx-service/storage-restructure/pom.xml

@@ -24,11 +24,6 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>common-flow-api</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>com.aliyun.oss</groupId>
             <artifactId>aliyun-sdk-oss</artifactId>
         </dependency>