smallchill преди 6 години
родител
ревизия
8c9e4db53e

+ 1 - 1
blade-auth/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>BladeX</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
 
     <artifactId>blade-auth</artifactId>

+ 1 - 1
blade-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BladeX</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
blade-gateway/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BladeX</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 2 - 2
blade-ops-api/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>BladeX</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-ops-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.2.2.RELEASE</version>
+    <version>2.3.0.RELEASE</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务API集合</description>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
blade-ops/blade-develop/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>blade-ops</artifactId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
blade-ops/blade-turbine/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>blade-xxljob</artifactId>

+ 1 - 1
blade-ops/blade-zipkin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 2 - 2
blade-ops/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>BladeX</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-ops</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.2.2.RELEASE</version>
+    <version>2.3.0.RELEASE</version>
     <packaging>pom</packaging>
 
     <modules>

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>BladeX</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-service-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.2.2.RELEASE</version>
+    <version>2.3.0.RELEASE</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务API集合</description>
 

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

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>blade-service</artifactId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

+ 2 - 2
blade-service/pom.xml

@@ -6,14 +6,14 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>BladeX</artifactId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.3.0.RELEASE</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-service</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.2.2.RELEASE</version>
+    <version>2.3.0.RELEASE</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务集合</description>
 

+ 4 - 0
doc/nacos/blade-dev.yaml

@@ -24,6 +24,10 @@ spring:
 
 #项目模块集中配置
 blade:
+  #分布式锁配置
+  lock:
+     enabled: false
+     address: redis://127.0.0.1:6379
   #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖)
   datasource:
     dev:

+ 5 - 1
doc/nacos/blade-prod.yaml

@@ -20,9 +20,13 @@ spring:
       validation-query: select 1
       # Oracle校验
       #validation-query: select 1 from dual
-      
+
 #项目模块集中配置
 blade:
+  #分布式锁配置
+  lock:
+    enabled: false
+    address: redis://192.168.0.157:3379
   #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖)
   datasource:
     prod:

+ 5 - 1
doc/nacos/blade-test.yaml

@@ -20,9 +20,13 @@ spring:
       validation-query: select 1
       # Oracle校验
       #validation-query: select 1 from dual
-      
+
 #项目模块集中配置
 blade:
+  #分布式锁配置
+  lock:
+    enabled: false
+    address: redis://192.168.0.157:3379
   #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖)
   datasource:
     test:

+ 7 - 7
pom.xml

@@ -5,11 +5,11 @@
 
     <groupId>org.springblade</groupId>
     <artifactId>BladeX</artifactId>
-    <version>2.2.2.RELEASE</version>
+    <version>2.3.0.RELEASE</version>
     <packaging>pom</packaging>
 
     <properties>
-        <bladex.project.version>2.2.2.RELEASE</bladex.project.version>
+        <bladex.project.version>2.3.0.RELEASE</bladex.project.version>
 
         <java.version>1.8</java.version>
         <maven.plugin.version>3.8.1</maven.plugin.version>
@@ -138,11 +138,6 @@
     </build>
 
     <repositories>
-        <repository>
-            <id>blade-release</id>
-            <name>Release Repository</name>
-            <url>http://nexus.bladex.vip/repository/maven-releases/</url>
-        </repository>
         <repository>
             <id>aliyun-repos</id>
             <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
@@ -150,6 +145,11 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <id>blade-release</id>
+            <name>Release Repository</name>
+            <url>http://nexus.bladex.vip/repository/maven-releases/</url>
+        </repository>
     </repositories>
 
     <pluginRepositories>

+ 1 - 1
script/docker/app/.env

@@ -1,2 +1,2 @@
 REGISTER=192.168.0.157/blade
-TAG=2.2.2.RELEASE
+TAG=2.3.0.RELEASE