java_project
/
logisticsplatform
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

🎉 2.6.0.RELEASE

test
smallchill 5 years ago
parent
a438d86f33
commit
cb56f32289
33 changed files with 62 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      blade-auth/pom.xml
  2. 2
      blade-common/pom.xml
  3. 2
      blade-gateway/pom.xml
  4. 2
      blade-ops-api/blade-flow-api/pom.xml
  5. 2
      blade-ops-api/blade-resource-api/pom.xml
  6. 4
      blade-ops-api/pom.xml
  7. 2
      blade-ops/blade-admin/pom.xml
  8. 2
      blade-ops/blade-develop/pom.xml
  9. 2
      blade-ops/blade-flow-design/pom.xml
  10. 2
      blade-ops/blade-flow/pom.xml
  11. 2
      blade-ops/blade-log/pom.xml
  12. 2
      blade-ops/blade-report/pom.xml
  13. 2
      blade-ops/blade-resource/pom.xml
  14. 2
      blade-ops/blade-turbine/pom.xml
  15. 2
      blade-ops/blade-xxljob-admin/pom.xml
  16. 2
      blade-ops/blade-xxljob/pom.xml
  17. 2
      blade-ops/blade-zipkin/pom.xml
  18. 4
      blade-ops/pom.xml
  19. 2
      blade-service-api/blade-desk-api/pom.xml
  20. 2
      blade-service-api/blade-dict-api/pom.xml
  21. 2
      blade-service-api/blade-scope-api/pom.xml
  22. 2
      blade-service-api/blade-system-api/pom.xml
  23. 2
      blade-service-api/blade-user-api/pom.xml
  24. 4
      blade-service-api/pom.xml
  25. 2
      blade-service/blade-desk/pom.xml
  26. 2
      blade-service/blade-system/pom.xml
  27. 2
      blade-service/blade-user/pom.xml
  28. 4
      blade-service/pom.xml
  29. 4
      pom.xml
  30. 2
      script/docker/app/.env
  31. 2
      script/docker/app/deploy.sh
  32. 10
      script/docker/app/docker-compose.yml
  33. 16
      script/docker/app/nginx/api/nginx.conf

2
blade-auth/pom.xml
Unescape View File

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

2
blade-common/pom.xml
Unescape View File

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

2
blade-gateway/pom.xml
Unescape View File

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

2
blade-ops-api/blade-flow-api/pom.xml
Unescape View File

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

2
blade-ops-api/blade-resource-api/pom.xml
Unescape View File

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

4
blade-ops-api/pom.xml
Unescape View File

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

2
blade-ops/blade-admin/pom.xml
Unescape View File

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

2
blade-ops/blade-develop/pom.xml
Unescape View File

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

2
blade-ops/blade-flow-design/pom.xml
Unescape View File

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

2
blade-ops/blade-flow/pom.xml
Unescape View File

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

2
blade-ops/blade-log/pom.xml
Unescape View File

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

2
blade-ops/blade-report/pom.xml
Unescape View File

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

2
blade-ops/blade-resource/pom.xml
Unescape View File

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

2
blade-ops/blade-turbine/pom.xml
Unescape View File

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

2
blade-ops/blade-xxljob-admin/pom.xml
Unescape View File

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

2
blade-ops/blade-xxljob/pom.xml
Unescape View File

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

2
blade-ops/blade-zipkin/pom.xml
Unescape View File

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

4
blade-ops/pom.xml
Unescape View File

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

2
blade-service-api/blade-desk-api/pom.xml
Unescape View File

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

2
blade-service-api/blade-dict-api/pom.xml
Unescape View File

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

2
blade-service-api/blade-scope-api/pom.xml
Unescape View File

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

2
blade-service-api/blade-system-api/pom.xml
Unescape View File

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

2
blade-service-api/blade-user-api/pom.xml
Unescape View File

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

4
blade-service-api/pom.xml
Unescape View File

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

2
blade-service/blade-desk/pom.xml
Unescape View File

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

2
blade-service/blade-system/pom.xml
Unescape View File

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

2
blade-service/blade-user/pom.xml
Unescape View File

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

4
blade-service/pom.xml
Unescape View File

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

4
pom.xml
Unescape View File

@ -5,11 +5,11 @@
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<version>2.5.2.SNAPSHOT</version> <version>2.6.0.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <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> <java.version>1.8</java.version>
<maven.plugin.version>3.8.1</maven.plugin.version> <maven.plugin.version>3.8.1</maven.plugin.version>

2
script/docker/app/.env
Unescape View File

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

2
script/docker/app/deploy.sh
Unescape View File

@ -49,7 +49,7 @@ monitor(){
#启动程序模块 #启动程序模块
modules(){ 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
} }
#关闭所有模块 #关闭所有模块

10
script/docker/app/docker-compose.yml
Unescape View File

@ -157,6 +157,16 @@ services:
blade_net: blade_net:
ipv4_address: 172.30.0.92 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: blade-log:
image: "${REGISTER}/blade/blade-log:${TAG}" image: "${REGISTER}/blade/blade-log:${TAG}"
environment: environment:

16
script/docker/app/nginx/api/nginx.conf
Unescape View File

@ -40,6 +40,10 @@ http {
server 172.30.0.92:8100; server 172.30.0.92:8100;
} }
upstream report {
server 172.30.0.98:8018;
}
server { server {
listen 88; listen 88;
server_name gateway; 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;
}
}
} }

Write Preview
Loading…
Cancel
Save