diff --git a/blade-biz-common/pom.xml b/blade-biz-common/pom.xml index d69cf5048..422a160a4 100644 --- a/blade-biz-common/pom.xml +++ b/blade-biz-common/pom.xml @@ -5,7 +5,7 @@ BladeX-Biz org.springblade - 3.0.1.RELEASE + 3.1.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 d2f4897e7..ea871b2f3 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 - 3.0.1.RELEASE + 3.1.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 7bb063631..075f94512 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 - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-example-api/pom.xml b/blade-example-api/pom.xml index 0f25b7c53..8e9470982 100644 --- a/blade-example-api/pom.xml +++ b/blade-example-api/pom.xml @@ -5,13 +5,13 @@ BladeX-Biz org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 blade-example-api ${project.artifactId} - 3.0.1.RELEASE + 3.1.0.RELEASE pom BladeX 微服务范例API集合 diff --git a/blade-example/blade-dubbo-consumer/pom.xml b/blade-example/blade-dubbo-consumer/pom.xml index fa5c8b717..f2e0e11c9 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 - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-example/blade-dubbo-provider/pom.xml b/blade-example/blade-dubbo-provider/pom.xml index 91bd49026..5a067b344 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 - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-example/blade-easypoi/pom.xml b/blade-example/blade-easypoi/pom.xml index c1f9034f9..93d5fc5a6 100644 --- a/blade-example/blade-easypoi/pom.xml +++ b/blade-example/blade-easypoi/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-example/blade-mq-kafka/pom.xml b/blade-example/blade-mq-kafka/pom.xml index 8ed5eccdd..1123b17eb 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 - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-example/blade-mq-rabbit/pom.xml b/blade-example/blade-mq-rabbit/pom.xml index 8b6883209..19c42a75c 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 - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-example/blade-seata-order/pom.xml b/blade-example/blade-seata-order/pom.xml index 51f1486b4..ff7e9411a 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 - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-example/blade-seata-storage/pom.xml b/blade-example/blade-seata-storage/pom.xml index d5599c2a4..daa68a3ba 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 - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-example/blade-sharding-jdbc/pom.xml b/blade-example/blade-sharding-jdbc/pom.xml index a14df6642..e85a944c2 100644 --- a/blade-example/blade-sharding-jdbc/pom.xml +++ b/blade-example/blade-sharding-jdbc/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 @@ -17,7 +17,6 @@ 5.2.1 - 1.33 @@ -50,7 +49,6 @@ org.yaml snakeyaml - ${snakeyaml.version} diff --git a/blade-example/blade-stream-consumer/pom.xml b/blade-example/blade-stream-consumer/pom.xml index ced4deb69..e936ab8ec 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 - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-example/blade-stream-provider/pom.xml b/blade-example/blade-stream-provider/pom.xml index 57c751b69..82cf720a2 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 - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-example/blade-websocket/pom.xml b/blade-example/blade-websocket/pom.xml index f50b864cd..cacb5c92b 100644 --- a/blade-example/blade-websocket/pom.xml +++ b/blade-example/blade-websocket/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-example/pom.xml b/blade-example/pom.xml index 4448c45de..fa2895bc2 100644 --- a/blade-example/pom.xml +++ b/blade-example/pom.xml @@ -5,13 +5,13 @@ BladeX-Biz org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 blade-example ${project.artifactId} - 3.0.1.RELEASE + 3.1.0.RELEASE pom BladeX 微服务范例集合 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 322430b27..1d7afdf49 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ BladeX-Biz org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-xxljob-admin/pom.xml b/blade-ops/blade-xxljob-admin/pom.xml index f2977cc69..d4cc52278 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 - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-xxljob/pom.xml b/blade-ops/blade-xxljob/pom.xml index e5cfed133..b5453ee8f 100644 --- a/blade-ops/blade-xxljob/pom.xml +++ b/blade-ops/blade-xxljob/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 blade-xxljob diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index d63e60536..919da12e7 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,13 +5,13 @@ BladeX-Biz org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 blade-ops ${project.artifactId} - 3.0.1.RELEASE + 3.1.0.RELEASE pom diff --git a/blade-service-api/blade-demo-api/pom.xml b/blade-service-api/blade-demo-api/pom.xml index bb31ca70c..0537909b4 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 - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 3586edbd5..0345501c7 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,14 +5,14 @@ BladeX-Biz org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 blade-service-api ${project.artifactId} - 3.0.1.RELEASE + 3.1.0.RELEASE pom BladeX 微服务API集合 diff --git a/blade-service/blade-demo/pom.xml b/blade-service/blade-demo/pom.xml index 0ab56f5ad..523890a6a 100644 --- a/blade-service/blade-demo/pom.xml +++ b/blade-service/blade-demo/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 93adf226d..8bbe69b56 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -7,12 +7,12 @@ org.springblade BladeX-Biz - 3.0.1.RELEASE + 3.1.0.RELEASE blade-service ${project.artifactId} - 3.0.1.RELEASE + 3.1.0.RELEASE pom BladeX 微服务集合 diff --git a/doc/nacos/blade.yaml b/doc/nacos/blade.yaml index 856ecf00d..9af0ac3bc 100644 --- a/doc/nacos/blade.yaml +++ b/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 diff --git a/pom.xml b/pom.xml index 9e010f94c..809d39a26 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ org.springblade BladeX-Biz - 3.0.1.RELEASE + 3.1.0.RELEASE pom - 3.0.1.RELEASE + 3.1.0.RELEASE 1.8 3.8.1 diff --git a/script/docker/app/.env b/script/docker/app/.env index 2dd593efc..795c1284f 100644 --- a/script/docker/app/.env +++ b/script/docker/app/.env @@ -1,2 +1,2 @@ REGISTER=192.168.0.157/blade -TAG=3.0.1.RELEASE +TAG=3.1.0.RELEASE diff --git a/script/docker/app/deploy.sh b/script/docker/app/deploy.sh index 5f3a1d6e1..4a08b6e42 100644 --- a/script/docker/app/deploy.sh +++ b/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 } #启动普罗米修斯模块 diff --git a/script/docker/app/docker-compose.yml b/script/docker/app/docker-compose.yml index 92b67f3d4..1c57f7a53 100644 --- a/script/docker/app/docker-compose.yml +++ b/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: diff --git a/script/docker/app/nacos/conf/application.properties b/script/docker/app/nacos/conf/application.properties new file mode 100644 index 000000000..ac357a54a --- /dev/null +++ b/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 + + + diff --git a/script/docker/app/nacos/init.d/custom.properties b/script/docker/app/nacos/init.d/custom.properties deleted file mode 100644 index f6fd2a0eb..000000000 --- a/script/docker/app/nacos/init.d/custom.properties +++ /dev/null @@ -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