Browse Source

🎉 3.1.0.RELEASE

test v3.1.0.release
smallchill 2 years ago
parent
commit
f432655aa8
  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/pom.xml
  10. 2
      blade-ops/blade-log/pom.xml
  11. 2
      blade-ops/blade-report/pom.xml
  12. 2
      blade-ops/blade-resource/pom.xml
  13. 2
      blade-ops/blade-swagger/pom.xml
  14. 4
      blade-ops/pom.xml
  15. 4
      blade-plugin-api/pom.xml
  16. 4
      blade-plugin/pom.xml
  17. 2
      blade-service-api/blade-desk-api/pom.xml
  18. 2
      blade-service-api/blade-dict-api/pom.xml
  19. 2
      blade-service-api/blade-scope-api/pom.xml
  20. 2
      blade-service-api/blade-system-api/pom.xml
  21. 2
      blade-service-api/blade-user-api/pom.xml
  22. 4
      blade-service-api/pom.xml
  23. 2
      blade-service/blade-desk/pom.xml
  24. 2
      blade-service/blade-system/pom.xml
  25. 4
      blade-service/pom.xml
  26. 2
      doc/nacos/blade.yaml
  27. 4
      pom.xml
  28. 2
      script/docker/app/.env
  29. 6
      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-auth/pom.xml

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

2
blade-common/pom.xml

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

2
blade-gateway/pom.xml

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

2
blade-ops-api/blade-flow-api/pom.xml

@ -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>3.0.1.RELEASE</version> <version>3.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-ops-api/blade-resource-api/pom.xml

@ -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>3.0.1.RELEASE</version> <version>3.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
blade-ops-api/pom.xml

@ -5,13 +5,13 @@
<parent> <parent>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>3.0.1.RELEASE</version> <version>3.1.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>3.0.1.RELEASE</version> <version>3.1.0.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>BladeX 微服务API集合</description> <description>BladeX 微服务API集合</description>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

4
blade-ops/pom.xml

@ -5,13 +5,13 @@
<parent> <parent>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>3.0.1.RELEASE</version> <version>3.1.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>3.0.1.RELEASE</version> <version>3.1.0.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>

4
blade-plugin-api/pom.xml

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

4
blade-plugin/pom.xml

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

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

@ -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>3.0.1.RELEASE</version> <version>3.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

@ -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>3.0.1.RELEASE</version> <version>3.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

@ -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>3.0.1.RELEASE</version> <version>3.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

@ -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>3.0.1.RELEASE</version> <version>3.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

@ -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>3.0.1.RELEASE</version> <version>3.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
blade-service-api/pom.xml

@ -5,13 +5,13 @@
<parent> <parent>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>3.0.1.RELEASE</version> <version>3.1.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>3.0.1.RELEASE</version> <version>3.1.0.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>BladeX 微服务API集合</description> <description>BladeX 微服务API集合</description>

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

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

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

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

4
blade-service/pom.xml

@ -6,14 +6,14 @@
<parent> <parent>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<version>3.0.1.RELEASE</version> <version>3.1.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>3.0.1.RELEASE</version> <version>3.1.0.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>BladeX 微服务集合</description> <description>BladeX 微服务集合</description>

2
doc/nacos/blade.yaml

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

4
pom.xml

@ -5,11 +5,11 @@
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<version>3.0.1.RELEASE</version> <version>3.1.0.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <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> <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

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

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

@ -6,14 +6,14 @@ services:
#################################################################################################### ####################################################################################################
nacos: nacos:
image: nacos/nacos-server:2.0.1 image: nacos/nacos-server:2.1.2
hostname: "nacos-standalone" hostname: "nacos-standalone"
environment: environment:
- MODE=standalone - MODE=standalone
- TZ=Asia/Shanghai - TZ=Asia/Shanghai
volumes: volumes:
- /docker/nacos/standalone-logs/:/home/nacos/logs - /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: ports:
- 8848:8848 - 8848:8848
- 9848:9848 - 9848:9848
@ -35,7 +35,7 @@ services:
ipv4_address: 172.30.0.58 ipv4_address: 172.30.0.58
seata-server: seata-server:
image: seataio/seata-server:1.4.1 image: seataio/seata-server:1.6.1
hostname: "seata-server" hostname: "seata-server"
ports: ports:
- 8091:8091 - 8091:8091

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