diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index 4d979cef..549d1f45 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -8,7 +8,7 @@ BladeX org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE blade-auth diff --git a/blade-common/pom.xml b/blade-common/pom.xml index e41b4e50..bbf8c2ee 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ BladeX org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 02024953..6a255238 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ BladeX org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-ops-api/blade-flow-api/pom.xml b/blade-ops-api/blade-flow-api/pom.xml index 25060e7c..471a530a 100644 --- a/blade-ops-api/blade-flow-api/pom.xml +++ b/blade-ops-api/blade-flow-api/pom.xml @@ -5,7 +5,7 @@ blade-ops-api org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-ops-api/blade-resource-api/pom.xml b/blade-ops-api/blade-resource-api/pom.xml index 174b6ab4..889149c9 100644 --- a/blade-ops-api/blade-resource-api/pom.xml +++ b/blade-ops-api/blade-resource-api/pom.xml @@ -5,7 +5,7 @@ blade-ops-api org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-ops-api/pom.xml b/blade-ops-api/pom.xml index 912c7fc9..858ae4fd 100644 --- a/blade-ops-api/pom.xml +++ b/blade-ops-api/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 blade-ops-api ${project.artifactId} - 3.0.1.RELEASE + 3.1.0.RELEASE pom BladeX 微服务API集合 diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index cf686456..8965a264 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index bb8533de..1a4e8a7e 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-ops - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-flow/pom.xml b/blade-ops/blade-flow/pom.xml index 3b595c35..869562d4 100644 --- a/blade-ops/blade-flow/pom.xml +++ b/blade-ops/blade-flow/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-log/pom.xml b/blade-ops/blade-log/pom.xml index 5bec4c44..bb277b8b 100644 --- a/blade-ops/blade-log/pom.xml +++ b/blade-ops/blade-log/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-report/pom.xml b/blade-ops/blade-report/pom.xml index 7b9ad4fa..2f434ec7 100644 --- a/blade-ops/blade-report/pom.xml +++ b/blade-ops/blade-report/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index bb3c9a0a..7cf19762 100644 --- a/blade-ops/blade-resource/pom.xml +++ b/blade-ops/blade-resource/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-ops/blade-swagger/pom.xml b/blade-ops/blade-swagger/pom.xml index fe4d6be1..cfe10759 100644 --- a/blade-ops/blade-swagger/pom.xml +++ b/blade-ops/blade-swagger/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index 01afc708..6a221ff0 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,13 +5,13 @@ BladeX 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-plugin-api/pom.xml b/blade-plugin-api/pom.xml index 3eb9fbf1..55f7d52e 100644 --- a/blade-plugin-api/pom.xml +++ b/blade-plugin-api/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 blade-plugin-api ${project.artifactId} - 3.0.1.RELEASE + 3.1.0.RELEASE pom diff --git a/blade-plugin/pom.xml b/blade-plugin/pom.xml index e9d85a24..1916c58d 100644 --- a/blade-plugin/pom.xml +++ b/blade-plugin/pom.xml @@ -5,13 +5,13 @@ BladeX org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 blade-plugin ${project.artifactId} - 3.0.1.RELEASE + 3.1.0.RELEASE pom diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index fdca91c8..2d998963 100644 --- a/blade-service-api/blade-desk-api/pom.xml +++ b/blade-service-api/blade-desk-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/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml index 4cca9878..af068c1c 100644 --- a/blade-service-api/blade-dict-api/pom.xml +++ b/blade-service-api/blade-dict-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/blade-scope-api/pom.xml b/blade-service-api/blade-scope-api/pom.xml index 74f801ca..3374a8a2 100644 --- a/blade-service-api/blade-scope-api/pom.xml +++ b/blade-service-api/blade-scope-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/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml index b49f61bd..39622b94 100644 --- a/blade-service-api/blade-system-api/pom.xml +++ b/blade-service-api/blade-system-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/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml index 9a13678d..048acbb3 100644 --- a/blade-service-api/blade-user-api/pom.xml +++ b/blade-service-api/blade-user-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 4d0a132e..beb2453f 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,13 +5,13 @@ BladeX 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-desk/pom.xml b/blade-service/blade-desk/pom.xml index 17c740e6..abc1db91 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/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/blade-system/pom.xml b/blade-service/blade-system/pom.xml index ea3d7bd3..36b5f1e2 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 diff --git a/blade-service/pom.xml b/blade-service/pom.xml index f812a3ce..eb76462c 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -6,14 +6,14 @@ org.springblade BladeX - 3.0.1.RELEASE + 3.1.0.RELEASE 4.0.0 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 9da418f9..507fc36f 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 1b3521ce..78e7fb5c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ org.springblade BladeX - 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 2dd593ef..795c1284 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/docker-compose.yml b/script/docker/app/docker-compose.yml index d6a6e57d..1c57f7a5 100644 --- a/script/docker/app/docker-compose.yml +++ b/script/docker/app/docker-compose.yml @@ -6,14 +6,14 @@ services: #################################################################################################### nacos: - image: nacos/nacos-server:2.0.1 + 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 @@ -35,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 diff --git a/script/docker/app/nacos/conf/application.properties b/script/docker/app/nacos/conf/application.properties new file mode 100644 index 00000000..ac357a54 --- /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 f6fd2a0e..00000000 --- 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