diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index 4e57a68f..76fc46ae 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -8,7 +8,7 @@ BladeX org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE blade-auth diff --git a/blade-common/pom.xml b/blade-common/pom.xml index 050d0101..ccf287c2 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ BladeX org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index de731782..1a4bd35b 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ BladeX org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-ops-api/blade-flow-api/pom.xml b/blade-ops-api/blade-flow-api/pom.xml index d403db52..2a462ead 100644 --- a/blade-ops-api/blade-flow-api/pom.xml +++ b/blade-ops-api/blade-flow-api/pom.xml @@ -5,7 +5,7 @@ blade-ops-api org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-ops-api/blade-resource-api/pom.xml b/blade-ops-api/blade-resource-api/pom.xml index 97373569..6f3f1ee4 100644 --- a/blade-ops-api/blade-resource-api/pom.xml +++ b/blade-ops-api/blade-resource-api/pom.xml @@ -5,7 +5,7 @@ blade-ops-api org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-ops-api/pom.xml b/blade-ops-api/pom.xml index 43373036..6fe3f8a6 100644 --- a/blade-ops-api/pom.xml +++ b/blade-ops-api/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 blade-ops-api ${project.artifactId} - 2.5.2.SNAPSHOT + 2.6.0.RELEASE pom BladeX 微服务API集合 diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index 44c67c61..b4338cd1 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index a1bc1ba0..b2b12b10 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-ops - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-flow-design/pom.xml b/blade-ops/blade-flow-design/pom.xml index a00c22aa..15c127ab 100644 --- a/blade-ops/blade-flow-design/pom.xml +++ b/blade-ops/blade-flow-design/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-flow/pom.xml b/blade-ops/blade-flow/pom.xml index 90186154..614e7824 100644 --- a/blade-ops/blade-flow/pom.xml +++ b/blade-ops/blade-flow/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-log/pom.xml b/blade-ops/blade-log/pom.xml index a4c5977d..898b45c9 100644 --- a/blade-ops/blade-log/pom.xml +++ b/blade-ops/blade-log/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-report/pom.xml b/blade-ops/blade-report/pom.xml index b5f7b880..48f05b65 100644 --- a/blade-ops/blade-report/pom.xml +++ b/blade-ops/blade-report/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index 3a20a977..a50b32b2 100644 --- a/blade-ops/blade-resource/pom.xml +++ b/blade-ops/blade-resource/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-turbine/pom.xml b/blade-ops/blade-turbine/pom.xml index b6029424..cb8cb912 100644 --- a/blade-ops/blade-turbine/pom.xml +++ b/blade-ops/blade-turbine/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-xxljob-admin/pom.xml b/blade-ops/blade-xxljob-admin/pom.xml index c908e81e..8c38786e 100644 --- a/blade-ops/blade-xxljob-admin/pom.xml +++ b/blade-ops/blade-xxljob-admin/pom.xml @@ -3,7 +3,7 @@ blade-ops org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-xxljob/pom.xml b/blade-ops/blade-xxljob/pom.xml index 9b8d7771..1f77f3c1 100644 --- a/blade-ops/blade-xxljob/pom.xml +++ b/blade-ops/blade-xxljob/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 blade-xxljob diff --git a/blade-ops/blade-zipkin/pom.xml b/blade-ops/blade-zipkin/pom.xml index 153862c8..3684c832 100644 --- a/blade-ops/blade-zipkin/pom.xml +++ b/blade-ops/blade-zipkin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index 2a9ca8bd..1dc48d20 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 blade-ops ${project.artifactId} - 2.5.2.SNAPSHOT + 2.6.0.RELEASE pom diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index d326f616..e4dd3e65 100644 --- a/blade-service-api/blade-desk-api/pom.xml +++ b/blade-service-api/blade-desk-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml index 2c500e28..c4fe82af 100644 --- a/blade-service-api/blade-dict-api/pom.xml +++ b/blade-service-api/blade-dict-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-service-api/blade-scope-api/pom.xml b/blade-service-api/blade-scope-api/pom.xml index 38028855..1a706b85 100644 --- a/blade-service-api/blade-scope-api/pom.xml +++ b/blade-service-api/blade-scope-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml index b7a07b09..d5615de3 100644 --- a/blade-service-api/blade-system-api/pom.xml +++ b/blade-service-api/blade-system-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml index 1c91ca3b..6ab507eb 100644 --- a/blade-service-api/blade-user-api/pom.xml +++ b/blade-service-api/blade-user-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 1002b807..089b1d28 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 blade-service-api ${project.artifactId} - 2.5.2.SNAPSHOT + 2.6.0.RELEASE pom BladeX 微服务API集合 diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index c19b7a8f..6bcbf360 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index fa8b9799..5644bfb1 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml index bd4c88d7..55a0d963 100644 --- a/blade-service/blade-user/pom.xml +++ b/blade-service/blade-user/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-service/pom.xml b/blade-service/pom.xml index ee65ba51..96c0750b 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -6,14 +6,14 @@ org.springblade BladeX - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 blade-service ${project.artifactId} - 2.5.2.SNAPSHOT + 2.6.0.RELEASE pom BladeX 微服务集合 diff --git a/pom.xml b/pom.xml index bd4ec8f7..ff999257 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ org.springblade BladeX - 2.5.2.SNAPSHOT + 2.6.0.RELEASE pom - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 1.8 3.8.1 diff --git a/script/docker/app/.env b/script/docker/app/.env index 078a8422..8eb99c24 100644 --- 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 diff --git a/script/docker/app/deploy.sh b/script/docker/app/deploy.sh index 9a49605f..1654d47e 100644 --- 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 } #关闭所有模块 diff --git a/script/docker/app/docker-compose.yml b/script/docker/app/docker-compose.yml index aa50efb1..812b56b9 100644 --- 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: diff --git a/script/docker/app/nginx/api/nginx.conf b/script/docker/app/nginx/api/nginx.conf index 4c668043..1d9df90a 100644 --- 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; + } + } + }