From d6f9c61948b2e993fd842006ab8177833c2d5010 Mon Sep 17 00:00:00 2001 From: smallchill Date: Sat, 8 Aug 2020 14:10:03 +0800 Subject: [PATCH] :tada: 2.6.0.RELEASE --- blade-biz-common/pom.xml | 2 +- .../blade-dubbo-provider-api/pom.xml | 2 +- blade-example-api/blade-stream-api/pom.xml | 2 +- blade-example-api/pom.xml | 4 ++-- blade-example/blade-dubbo-consumer/pom.xml | 2 +- blade-example/blade-dubbo-provider/pom.xml | 2 +- blade-example/blade-easypoi/pom.xml | 2 +- blade-example/blade-mq-kafka/pom.xml | 2 +- blade-example/blade-mq-rabbit/pom.xml | 2 +- blade-example/blade-seata-order/pom.xml | 2 +- blade-example/blade-seata-storage/pom.xml | 2 +- blade-example/blade-stream-consumer/pom.xml | 2 +- blade-example/blade-stream-provider/pom.xml | 2 +- blade-example/blade-websocket/pom.xml | 2 +- blade-example/pom.xml | 4 ++-- blade-gateway/pom.xml | 2 +- blade-service-api/blade-demo-api/pom.xml | 2 +- blade-service-api/pom.xml | 4 ++-- blade-service/blade-demo/pom.xml | 4 ++-- blade-service/pom.xml | 4 ++-- pom.xml | 4 ++-- script/docker/app/.env | 2 +- script/docker/app/deploy.sh | 2 +- script/docker/app/docker-compose.yml | 12 +++++++++++- script/docker/app/nginx/api/nginx.conf | 16 ++++++++++++++++ 25 files changed, 56 insertions(+), 30 deletions(-) diff --git a/blade-biz-common/pom.xml b/blade-biz-common/pom.xml index b8c784187..07cab9a4a 100644 --- a/blade-biz-common/pom.xml +++ b/blade-biz-common/pom.xml @@ -5,7 +5,7 @@ BladeX-Biz org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-example-api/blade-dubbo-provider-api/pom.xml b/blade-example-api/blade-dubbo-provider-api/pom.xml index 023d9d886..9d3562814 100644 --- a/blade-example-api/blade-dubbo-provider-api/pom.xml +++ b/blade-example-api/blade-dubbo-provider-api/pom.xml @@ -5,7 +5,7 @@ blade-example-api org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-example-api/blade-stream-api/pom.xml b/blade-example-api/blade-stream-api/pom.xml index 14fdddc57..d662afcb7 100644 --- a/blade-example-api/blade-stream-api/pom.xml +++ b/blade-example-api/blade-stream-api/pom.xml @@ -5,7 +5,7 @@ blade-example-api org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-example-api/pom.xml b/blade-example-api/pom.xml index f13077d21..b74388c63 100644 --- a/blade-example-api/pom.xml +++ b/blade-example-api/pom.xml @@ -5,13 +5,13 @@ BladeX-Biz org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 blade-example-api ${project.artifactId} - 2.5.2.SNAPSHOT + 2.6.0.RELEASE pom BladeX 微服务范例API集合 diff --git a/blade-example/blade-dubbo-consumer/pom.xml b/blade-example/blade-dubbo-consumer/pom.xml index a8238ff46..987519380 100644 --- a/blade-example/blade-dubbo-consumer/pom.xml +++ b/blade-example/blade-dubbo-consumer/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-example/blade-dubbo-provider/pom.xml b/blade-example/blade-dubbo-provider/pom.xml index bfb8e0814..c8606bd52 100644 --- a/blade-example/blade-dubbo-provider/pom.xml +++ b/blade-example/blade-dubbo-provider/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-example/blade-easypoi/pom.xml b/blade-example/blade-easypoi/pom.xml index 2b1d14ffc..b60982aeb 100644 --- a/blade-example/blade-easypoi/pom.xml +++ b/blade-example/blade-easypoi/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-example/blade-mq-kafka/pom.xml b/blade-example/blade-mq-kafka/pom.xml index c5e713635..06eb396fb 100644 --- a/blade-example/blade-mq-kafka/pom.xml +++ b/blade-example/blade-mq-kafka/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-example/blade-mq-rabbit/pom.xml b/blade-example/blade-mq-rabbit/pom.xml index 8475848b1..d63c56a0d 100644 --- a/blade-example/blade-mq-rabbit/pom.xml +++ b/blade-example/blade-mq-rabbit/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-example/blade-seata-order/pom.xml b/blade-example/blade-seata-order/pom.xml index 4f529438b..f4112c1e1 100644 --- a/blade-example/blade-seata-order/pom.xml +++ b/blade-example/blade-seata-order/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-example/blade-seata-storage/pom.xml b/blade-example/blade-seata-storage/pom.xml index 8bc515583..8b6efcdd9 100644 --- a/blade-example/blade-seata-storage/pom.xml +++ b/blade-example/blade-seata-storage/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-example/blade-stream-consumer/pom.xml b/blade-example/blade-stream-consumer/pom.xml index 6f948ee92..00e797da5 100644 --- a/blade-example/blade-stream-consumer/pom.xml +++ b/blade-example/blade-stream-consumer/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-example/blade-stream-provider/pom.xml b/blade-example/blade-stream-provider/pom.xml index dc5172491..35e020fb2 100644 --- a/blade-example/blade-stream-provider/pom.xml +++ b/blade-example/blade-stream-provider/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-example/blade-websocket/pom.xml b/blade-example/blade-websocket/pom.xml index b06df6f5e..0775be947 100644 --- a/blade-example/blade-websocket/pom.xml +++ b/blade-example/blade-websocket/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-example/pom.xml b/blade-example/pom.xml index 1005a99d5..15c6394d1 100644 --- a/blade-example/pom.xml +++ b/blade-example/pom.xml @@ -5,13 +5,13 @@ BladeX-Biz org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 blade-example ${project.artifactId} - 2.5.2.SNAPSHOT + 2.6.0.RELEASE pom BladeX 微服务范例集合 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index da454cba5..7fc204e17 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ BladeX-Biz org.springblade - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 diff --git a/blade-service-api/blade-demo-api/pom.xml b/blade-service-api/blade-demo-api/pom.xml index 311a4f7a9..eae55e525 100644 --- a/blade-service-api/blade-demo-api/pom.xml +++ b/blade-service-api/blade-demo-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 458844c10..bedad8fb1 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,14 +5,14 @@ BladeX-Biz 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-demo/pom.xml b/blade-service/blade-demo/pom.xml index fc9541ba7..af1e95bbf 100644 --- a/blade-service/blade-demo/pom.xml +++ b/blade-service/blade-demo/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 2.5.2.SNAPSHOT + 2.6.0.RELEASE 4.0.0 @@ -37,7 +37,7 @@ com.baomidou dynamic-datasource-spring-boot-starter - 2.5.6 + 3.2.0 org.springblade diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 39a4bbd32..242ead260 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -7,12 +7,12 @@ org.springblade BladeX-Biz - 2.5.2.SNAPSHOT + 2.6.0.RELEASE blade-service ${project.artifactId} - 2.5.2.SNAPSHOT + 2.6.0.RELEASE pom BladeX 微服务集合 diff --git a/pom.xml b/pom.xml index cc111396c..9ace2330f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ org.springblade BladeX-Biz - 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 078a84223..8eb99c245 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 9a49605ff..1654d47eb 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 17a1d0ee0..812b56b9e 100644 --- a/script/docker/app/docker-compose.yml +++ b/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: diff --git a/script/docker/app/nginx/api/nginx.conf b/script/docker/app/nginx/api/nginx.conf index 4c6680434..1d9df90a8 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; + } + } + }