:tada: 2.6.0.RELEASE

blade-biz-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-example-api/blade-dubbo-provider-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-example-api/blade-stream-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-example-api/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-example-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.5.2.SNAPSHOT</version>
+    <version>2.6.0.RELEASE</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务范例API集合</description>
 

blade-example/blade-dubbo-consumer/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-example/blade-dubbo-provider/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-example/blade-easypoi/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-example/blade-mq-kafka/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-example/blade-mq-rabbit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-example/blade-seata-order/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-example/blade-seata-storage/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-example/blade-stream-consumer/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-example/blade-stream-provider/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-example/blade-websocket/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-example/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-example</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.5.2.SNAPSHOT</version>
+    <version>2.6.0.RELEASE</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务范例集合</description>
 

blade-gateway/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

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

blade-service-api/pom.xml

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

blade-service/blade-demo/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>blade-service</artifactId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>2.5.6</version>
+            <version>3.2.0</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>

blade-service/pom.xml

@@ -7,12 +7,12 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>BladeX-Biz</artifactId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
     </parent>
 
     <artifactId>blade-service</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.5.2.SNAPSHOT</version>
+    <version>2.6.0.RELEASE</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务集合</description>
 

pom.xml

@@ -5,11 +5,11 @@
 
     <groupId>org.springblade</groupId>
     <artifactId>BladeX-Biz</artifactId>
-    <version>2.5.2.SNAPSHOT</version>
+    <version>2.6.0.RELEASE</version>
     <packaging>pom</packaging>
 
     <properties>
-        <bladex.project.version>2.5.2.SNAPSHOT</bladex.project.version>
+        <bladex.project.version>2.6.0.RELEASE</bladex.project.version>
 
         <java.version>1.8</java.version>
         <maven.plugin.version>3.8.1</maven.plugin.version>

script/docker/app/.env

@@ -1,2 +1,2 @@
 REGISTER=192.168.0.157/blade
-TAG=2.5.2.SNAPSHOT
+TAG=2.6.0.RELEASE

script/docker/app/deploy.sh

@@ -49,7 +49,7 @@ monitor(){
 
 #启动程序模块
 modules(){
-	docker-compose up -d blade-gateway1 blade-gateway2 blade-auth1 blade-auth2 blade-user blade-desk blade-system blade-log blade-flow blade-flow-design blade-resource
+	docker-compose up -d blade-gateway1 blade-gateway2 blade-auth1 blade-auth2 blade-report blade-user blade-desk blade-system blade-log blade-flow blade-flow-design blade-resource
 }
 
 #关闭所有模块

script/docker/app/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   nacos:
-    image: nacos/nacos-server:1.3.1
+    image: nacos/nacos-server:1.3.2
     hostname: "nacos-standalone"
     environment:
       - MODE=standalone
@@ -157,6 +157,16 @@ services:
       blade_net:
         ipv4_address: 172.30.0.92
 
+  blade-report:
+    image: "${REGISTER}/blade/blade-report:${TAG}"
+    environment:
+      - TZ=Asia/Shanghai
+    privileged: true
+    restart: always
+    networks:
+      blade_net:
+        ipv4_address: 172.30.0.98
+
   blade-log:
     image: "${REGISTER}/blade/blade-log:${TAG}"
     environment:

script/docker/app/nginx/api/nginx.conf

@@ -40,6 +40,10 @@ http {
                  server 172.30.0.92:8100;
              }
 
+    upstream report {
+                 server 172.30.0.98:8018;
+             }
+
     server {
       listen       88;
       server_name  gateway;
@@ -64,4 +68,16 @@ http {
       }
     }
 
+    server {
+      listen       8108;
+      server_name  auth;
+      location / {
+           proxy_set_header Host $host;
+           proxy_set_header X-Real-IP $remote_addr;
+           proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+           proxy_buffering off;
+           proxy_pass http://report;
+      }
+    }
+
 }