Merge branch 'master' into dev

blade-auth/pom.xml

@@ -13,7 +13,7 @@
 
     <artifactId>blade-auth</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.2.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>2.8.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-system-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

blade-common/pom.xml

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

blade-gateway/pom.xml

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

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>2.8.2.RELEASE</version>
     <packaging>jar</packaging>
 
 

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>2.8.2.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

blade-ops/blade-admin/pom.xml

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

blade-ops/blade-develop/pom.xml

@@ -13,7 +13,7 @@
 
     <artifactId>blade-develop</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.2.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>2.8.2.RELEASE</version>
         </dependency>
     </dependencies>
 

blade-ops/blade-flow-design/pom.xml

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

blade-ops/blade-flow/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-flow</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.2.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>2.8.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-scope-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.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>2.8.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-flow-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
         </dependency>
         <!-- 工作流 -->
         <dependency>

blade-ops/blade-log/pom.xml

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

blade-ops/blade-report/pom.xml

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

blade-ops/blade-resource/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-resource</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.2.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>2.8.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-dict-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
         </dependency>
     </dependencies>
 

blade-ops/blade-swagger/pom.xml

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

blade-ops/blade-turbine/pom.xml

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

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>2.8.2.RELEASE</version>
     <packaging>jar</packaging>
 
 

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>2.8.2.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

blade-service-api/blade-client-api/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-client-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.2.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springblade</groupId>
@@ -20,13 +20,13 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-resource-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-system-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

blade-service-api/blade-deliver-goods-api/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-deliver-goods-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.2.RELEASE</version>
 
 
 </project>

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>2.8.2.RELEASE</version>
     <packaging>jar</packaging>
 
 </project>

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>2.8.2.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

blade-service-api/blade-mocha-item-api/pom.xml

@@ -12,7 +12,7 @@
     <artifactId>blade-mocha-item-api</artifactId>
 
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.2.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springblade</groupId>
@@ -21,13 +21,13 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-resource-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-system-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

blade-service-api/blade-purchase-sales-api/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-purchase-sales-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.2.RELEASE</version>
 
 
 </project>

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>2.8.2.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

blade-service-api/blade-stock-api/pom.xml

@@ -11,6 +11,6 @@
 
     <artifactId>blade-stock-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.2.RELEASE</version>
 
 </project>

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>2.8.2.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

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>2.8.2.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

blade-service-api/pom.xml

@@ -24,7 +24,6 @@
         <module>blade-client-api</module>
         <module>blade-purchase-sales-api</module>
         <module>blade-deliver-goods-api</module>
-        <module>blade-deliver-goods-api</module>
         <module>blade-stock-api</module>
         <module>blade-mocha-item-api</module>
     </modules>

blade-service/blade-client/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-client</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.2.RELEASE</version>
     <dependencies>
     <dependency>
         <groupId>org.springblade</groupId>
@@ -24,18 +24,18 @@
     <dependency>
         <groupId>org.springblade</groupId>
         <artifactId>blade-client-api</artifactId>
-        <version>${bladex.project.version}</version>
+        <version>2.8.2.RELEASE</version>
     </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-user-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-resource-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-resource</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

blade-service/blade-deliver-goods/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-deliver-goods</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.2.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springblade</groupId>
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-deliver-goods-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
         </dependency>
     </dependencies>
 

blade-service/blade-desk/pom.xml

@@ -13,7 +13,7 @@
 
     <artifactId>blade-desk</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.2.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>2.8.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-user-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-flow-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
         </dependency>
         <!--Oss-->
         <dependency>

blade-service/blade-mocha-item/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-mocha-item</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.2.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springblade</groupId>
@@ -24,18 +24,18 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-purchase-sales-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-mocha-item-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-user-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

blade-service/blade-purchase-sales/pom.xml

@@ -12,7 +12,7 @@
 
     <artifactId>blade-purchase-sales</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.2.RELEASE</version>
     <dependencies>
     <dependency>
         <groupId>org.springblade</groupId>
@@ -25,18 +25,18 @@
     <dependency>
         <groupId>org.springblade</groupId>
         <artifactId>blade-purchase-sales-api</artifactId>
-        <version>${bladex.project.version}</version>
+        <version>2.8.2.RELEASE</version>
     </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-client-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-user-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

blade-service/blade-stock/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-stock</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.2.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springblade</groupId>
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-stock-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
         </dependency>
     </dependencies>
 

blade-service/blade-system/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>blade-system</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.2.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>2.8.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-user-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
         </dependency>
     </dependencies>
 

blade-service/blade-user/pom.xml

@@ -12,7 +12,7 @@
 
     <artifactId>blade-user</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.2.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>2.8.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-system-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.2.RELEASE</version>
         </dependency>
     </dependencies>
 

blade-service/pom.xml

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

pom.xml

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