🎉 2.6.0.RELEASE

5 years ago · cb56f32289
33 changed files with 62 additions and 36 deletions
--- a/blade-auth/pom.xml
+++ b/blade-auth/pom.xml
@ -8,7 +8,7 @@
    <parent>
        <artifactId>BladeX</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
    </parent>

    <artifactId>blade-auth</artifactId>
--- a/blade-common/pom.xml
+++ b/blade-common/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>BladeX</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-gateway/pom.xml
+++ b/blade-gateway/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>BladeX</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops-api/blade-flow-api/pom.xml
+++ b/blade-ops-api/blade-flow-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops-api/blade-resource-api/pom.xml
+++ b/blade-ops-api/blade-resource-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops-api</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops-api/pom.xml
+++ b/blade-ops-api/pom.xml
@ -5,13 +5,13 @@
    <parent>
        <artifactId>BladeX</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-ops-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>

--- a/blade-ops/blade-admin/pom.xml
+++ b/blade-ops/blade-admin/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops/blade-develop/pom.xml
+++ b/blade-ops/blade-develop/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>org.springblade</groupId>
        <artifactId>blade-ops</artifactId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/blade-ops/blade-flow-design/pom.xml
+++ b/blade-ops/blade-flow-design/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops/blade-flow/pom.xml
+++ b/blade-ops/blade-flow/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops/blade-log/pom.xml
+++ b/blade-ops/blade-log/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops/blade-report/pom.xml
+++ b/blade-ops/blade-report/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops/blade-resource/pom.xml
+++ b/blade-ops/blade-resource/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops/blade-turbine/pom.xml
+++ b/blade-ops/blade-turbine/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops/blade-xxljob-admin/pom.xml
+++ b/blade-ops/blade-xxljob-admin/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/blade-ops/blade-xxljob/pom.xml
+++ b/blade-ops/blade-xxljob/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</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-xxljob</artifactId>
--- a/blade-ops/blade-zipkin/pom.xml
+++ b/blade-ops/blade-zipkin/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-ops</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-ops/pom.xml
+++ b/blade-ops/pom.xml
@ -5,13 +5,13 @@
    <parent>
        <artifactId>BladeX</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-ops</artifactId>
    <name>${project.artifactId}</name>
-    <version>2.5.2.SNAPSHOT</version>
+    <version>2.6.0.RELEASE</version>
    <packaging>pom</packaging>

    <modules>
--- a/blade-service-api/blade-desk-api/pom.xml
+++ b/blade-service-api/blade-desk-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>

--- a/blade-service-api/blade-dict-api/pom.xml
+++ b/blade-service-api/blade-dict-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>

--- a/blade-service-api/blade-scope-api/pom.xml
+++ b/blade-service-api/blade-scope-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>

--- a/blade-service-api/blade-system-api/pom.xml
+++ b/blade-service-api/blade-system-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>

--- a/blade-service-api/blade-user-api/pom.xml
+++ b/blade-service-api/blade-user-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>

--- a/blade-service-api/pom.xml
+++ b/blade-service-api/pom.xml
@ -5,13 +5,13 @@
    <parent>
        <artifactId>BladeX</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>

--- a/blade-service/blade-desk/pom.xml
+++ b/blade-service/blade-desk/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>
--- a/blade-service/blade-system/pom.xml
+++ b/blade-service/blade-system/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/blade-service/blade-user/pom.xml
+++ b/blade-service/blade-user/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>blade-service</artifactId>
        <groupId>org.springblade</groupId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/blade-service/pom.xml
+++ b/blade-service/pom.xml
@ -6,14 +6,14 @@
    <parent>
        <groupId>org.springblade</groupId>
        <artifactId>BladeX</artifactId>
-        <version>2.5.2.SNAPSHOT</version>
+        <version>2.6.0.RELEASE</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>

    <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>

--- a/pom.xml
+++ b/pom.xml
@ -5,11 +5,11 @@

    <groupId>org.springblade</groupId>
    <artifactId>BladeX</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>
--- a/script/docker/app/.env
+++ b/script/docker/app/.env
@ -1,2 +1,2 @@
 REGISTER=192.168.0.157/blade
-TAG=2.5.2.SNAPSHOT
+TAG=2.6.0.RELEASE
--- a/script/docker/app/deploy.sh
+++ b/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
 }

 #关闭所有模块
--- a/script/docker/app/docker-compose.yml
+++ b/script/docker/app/docker-compose.yml
@ -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:
--- a/script/docker/app/nginx/api/nginx.conf
+++ b/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;
+      }
+    }
+
 }