Browse Source

🎉 3.1.0.RELEASE

test
smallchill 2 years ago
parent
commit
f4eb963aac
  1. 2
      blade-biz-common/pom.xml
  2. 2
      blade-example-api/blade-dubbo-provider-api/pom.xml
  3. 2
      blade-example-api/blade-stream-api/pom.xml
  4. 4
      blade-example-api/pom.xml
  5. 2
      blade-example/blade-dubbo-consumer/pom.xml
  6. 2
      blade-example/blade-dubbo-provider/pom.xml
  7. 2
      blade-example/blade-easypoi/pom.xml
  8. 2
      blade-example/blade-mq-kafka/pom.xml
  9. 2
      blade-example/blade-mq-rabbit/pom.xml
  10. 2
      blade-example/blade-seata-order/pom.xml
  11. 2
      blade-example/blade-seata-storage/pom.xml
  12. 4
      blade-example/blade-sharding-jdbc/pom.xml
  13. 2
      blade-example/blade-stream-consumer/pom.xml
  14. 2
      blade-example/blade-stream-provider/pom.xml
  15. 2
      blade-example/blade-websocket/pom.xml
  16. 4
      blade-example/pom.xml
  17. 2
      blade-gateway/pom.xml
  18. 2
      blade-ops/blade-xxljob-admin/pom.xml
  19. 2
      blade-ops/blade-xxljob/pom.xml
  20. 4
      blade-ops/pom.xml
  21. 2
      blade-service-api/blade-demo-api/pom.xml
  22. 4
      blade-service-api/pom.xml
  23. 2
      blade-service/blade-demo/pom.xml
  24. 4
      blade-service/pom.xml
  25. 2
      doc/nacos/blade.yaml
  26. 4
      pom.xml
  27. 2
      script/docker/app/.env
  28. 11
      script/docker/app/deploy.sh
  29. 41
      script/docker/app/docker-compose.yml
  30. 46
      script/docker/app/nacos/conf/application.properties
  31. 19
      script/docker/app/nacos/init.d/custom.properties

2
blade-biz-common/pom.xml

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

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

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

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

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

4
blade-example-api/pom.xml

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

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

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

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

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

2
blade-example/blade-easypoi/pom.xml

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

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

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

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

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

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

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

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

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

4
blade-example/blade-sharding-jdbc/pom.xml

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-example</artifactId>
<groupId>org.springblade</groupId>
<version>3.0.1.RELEASE</version>
<version>3.1.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -17,7 +17,6 @@
<properties>
<shardingsphere.version>5.2.1</shardingsphere.version>
<snakeyaml.version>1.33</snakeyaml.version>
</properties>
<dependencies>
@ -50,7 +49,6 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml.version}</version>
</dependency>
</dependencies>

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

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

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

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

2
blade-example/blade-websocket/pom.xml

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

4
blade-example/pom.xml

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

2
blade-gateway/pom.xml

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

2
blade-ops/blade-xxljob-admin/pom.xml

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

2
blade-ops/blade-xxljob/pom.xml

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

4
blade-ops/pom.xml

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

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

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

4
blade-service-api/pom.xml

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

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

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

4
blade-service/pom.xml

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

2
doc/nacos/blade.yaml

@ -68,7 +68,7 @@ knife4j:
swagger:
title: BladeX 接口文档系统
description: BladeX 接口文档系统
version: 3.0.1.RELEASE
version: 3.1.0.RELEASE
license: Powered By BladeX
license-url: https://bladex.vip
terms-of-service-url: https://bladex.vip

4
pom.xml

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

2
script/docker/app/.env

@ -1,2 +1,2 @@
REGISTER=192.168.0.157/blade
TAG=3.0.1.RELEASE
TAG=3.1.0.RELEASE

11
script/docker/app/deploy.sh

@ -1,3 +1,4 @@
#!/bin/bash
#使用说明,用来提示输入参数
usage() {
@ -13,6 +14,8 @@ port(){
firewall-cmd --add-port=8000/tcp --permanent
#nacos
firewall-cmd --add-port=8848/tcp --permanent
firewall-cmd --add-port=9848/tcp --permanent
firewall-cmd --add-port=9849/tcp --permanent
#sentinel
firewall-cmd --add-port=8858/tcp --permanent
#grafana
@ -24,13 +27,11 @@ port(){
#admin
firewall-cmd --add-port=7002/tcp --permanent
#ureport
firewall-cmd --add-port=7003/tcp --permanent
firewall-cmd --add-port=8108/tcp --permanent
#zipkin
firewall-cmd --add-port=9411/tcp --permanent
#prometheus
firewall-cmd --add-port=9090/tcp --permanent
#flowdesign
firewall-cmd --add-port=9999/tcp --permanent
#swagger
firewall-cmd --add-port=18000/tcp --permanent
#firewalld
@ -90,12 +91,12 @@ base(){
#启动监控模块
monitor(){
docker-compose up -d blade-admin blade-turbine
docker-compose up -d blade-admin
}
#启动程序模块
modules(){
docker-compose up -d blade-gateway1 blade-gateway2 blade-auth1 blade-auth2 blade-swagger blade-report 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-swagger blade-report blade-desk blade-system blade-log blade-flow blade-resource
}
#启动普罗米修斯模块

41
script/docker/app/docker-compose.yml

@ -6,16 +6,18 @@ services:
####################################################################################################
nacos:
image: nacos/nacos-server:1.3.2
image: nacos/nacos-server:2.1.2
hostname: "nacos-standalone"
environment:
- MODE=standalone
- TZ=Asia/Shanghai
volumes:
- /docker/nacos/standalone-logs/:/home/nacos/logs
- /docker/nacos/init.d/custom.properties:/home/nacos/init.d/custom.properties
- /docker/nacos/conf/application.properties:/home/nacos/conf/application.properties
ports:
- 8848:8848
- 9848:9848
- 9849:9849
networks:
blade_net:
ipv4_address: 172.30.0.48
@ -33,7 +35,7 @@ services:
ipv4_address: 172.30.0.58
seata-server:
image: seataio/seata-server:1.4.1
image: seataio/seata-server:1.6.1
hostname: "seata-server"
ports:
- 8091:8091
@ -116,17 +118,6 @@ services:
networks:
- blade_net
blade-turbine:
image: "${REGISTER}/blade-turbine:${TAG}"
environment:
- TZ=Asia/Shanghai
ports:
- 7003:7003
privileged: true
restart: always
networks:
- blade_net
blade-gateway1:
image: "${REGISTER}/blade-gateway:${TAG}"
environment:
@ -173,6 +164,8 @@ services:
- TZ=Asia/Shanghai
privileged: true
restart: always
ports:
- 8108:8108
networks:
blade_net:
ipv4_address: 172.30.0.98
@ -195,15 +188,6 @@ services:
networks:
- blade_net
blade-user:
image: "${REGISTER}/blade-user:${TAG}"
environment:
- TZ=Asia/Shanghai
privileged: true
restart: always
networks:
- blade_net
blade-system:
image: "${REGISTER}/blade-system:${TAG}"
environment:
@ -222,17 +206,6 @@ services:
networks:
- blade_net
blade-flow-design:
image: "${REGISTER}/blade-flow-design:${TAG}"
environment:
- TZ=Asia/Shanghai
privileged: true
restart: always
ports:
- 9999:9999
networks:
- blade_net
blade-resource:
image: "${REGISTER}/blade-resource:${TAG}"
environment:

46
script/docker/app/nacos/conf/application.properties

@ -0,0 +1,46 @@
# spring
server.servlet.contextPath=${SERVER_SERVLET_CONTEXTPATH:/nacos}
server.contextPath=/nacos
server.port=${NACOS_APPLICATION_PORT:8848}
server.tomcat.accesslog.max-days=30
server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i
spring.datasource.platform=${SPRING_DATASOURCE_PLATFORM:""}
nacos.cmdb.dumpTaskInterval=3600
nacos.cmdb.eventTaskInterval=10
nacos.cmdb.labelTaskInterval=300
nacos.cmdb.loadDataAtStart=false
db.num=${MYSQL_DATABASE_NUM:1}
db.url.0=jdbc:mysql://${MYSQL_SERVICE_HOST}:${MYSQL_SERVICE_PORT:3306}/${MYSQL_SERVICE_DB_NAME}?${MYSQL_SERVICE_DB_PARAM:characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false}
db.url.1=jdbc:mysql://${MYSQL_SERVICE_HOST}:${MYSQL_SERVICE_PORT:3306}/${MYSQL_SERVICE_DB_NAME}?${MYSQL_SERVICE_DB_PARAM:characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false}
db.user=${MYSQL_SERVICE_USER}
db.password=${MYSQL_SERVICE_PASSWORD}
### The auth system to use, currently only 'nacos' and 'ldap' is supported:
nacos.core.auth.system.type=${NACOS_AUTH_SYSTEM_TYPE:nacos}
### worked when nacos.core.auth.system.type=nacos
### The token expiration in seconds:
nacos.core.auth.plugin.nacos.token.expire.seconds=${NACOS_AUTH_TOKEN_EXPIRE_SECONDS:18000}
### The default token:
nacos.core.auth.plugin.nacos.token.secret.key=${NACOS_AUTH_TOKEN:SecretKey012345678901234567890123456789012345678901234567890123456789}
### Turn on/off caching of auth information. By turning on this switch, the update of auth information would have a 15 seconds delay.
nacos.core.auth.caching.enabled=${NACOS_AUTH_CACHE_ENABLE:false}
nacos.core.auth.enable.userAgentAuthWhite=${NACOS_AUTH_USER_AGENT_AUTH_WHITE_ENABLE:false}
nacos.core.auth.server.identity.key=${NACOS_AUTH_IDENTITY_KEY:serverIdentity}
nacos.core.auth.server.identity.value=${NACOS_AUTH_IDENTITY_VALUE:security}
server.tomcat.accesslog.enabled=${TOMCAT_ACCESSLOG_ENABLED:false}
# default current work dir
server.tomcat.basedir=file:.
## spring security config
### turn off security
nacos.security.ignore.urls=${NACOS_SECURITY_IGNORE_URLS:/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-fe/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**}
# metrics for elastic search
management.metrics.export.elastic.enabled=false
management.metrics.export.influx.enabled=false
nacos.naming.distro.taskDispatchThreadCount=10
nacos.naming.distro.taskDispatchPeriod=200
nacos.naming.distro.batchSyncKeyCount=1000
nacos.naming.distro.initDataRatio=0.9
nacos.naming.distro.syncRetryDelay=5000
nacos.naming.data.warmup=true

19
script/docker/app/nacos/init.d/custom.properties

@ -1,19 +0,0 @@
#spring.security.enabled=false
#management.security=false
#security.basic.enabled=false
#nacos.security.ignore.urls=/**
#management.metrics.export.elastic.host=http://localhost:9200
# metrics for prometheus
management.endpoints.web.exposure.include=*
# metrics for elastic search
#management.metrics.export.elastic.enabled=false
#management.metrics.export.elastic.host=http://localhost:9200
# metrics for influx
#management.metrics.export.influx.enabled=false
#management.metrics.export.influx.db=springboot
#management.metrics.export.influx.uri=http://localhost:8086
#management.metrics.export.influx.auto-create-db=true
#management.metrics.export.influx.consistency=one
#management.metrics.export.influx.compressed=true
Loading…
Cancel
Save