diff --git a/README.md b/README.md index 49a34b5ad..55c5c4adc 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Nacos 2.1.1

- Version 2.7.4.0 + Version 2.7.4.1 Java 8,11,17 License Apache 2.0 码匠君 diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env index 72429d553..e88a9efd6 100644 --- a/configurations/docker/docker-compose/linux/herodotus/.env +++ b/configurations/docker/docker-compose/linux/herodotus/.env @@ -1,4 +1,4 @@ -VERSION=2.7.4.0 +VERSION=2.7.4.1 GATEWAY_SERVICE_NAME=dante-cloud-gateway GATEWAY_SERVICE_PORT=8847 UAA_SERVICE_NAME=dante-cloud-uaa diff --git a/configurations/docker/docker-compose/windows/herodotus/.env b/configurations/docker/docker-compose/windows/herodotus/.env index 72429d553..e88a9efd6 100644 --- a/configurations/docker/docker-compose/windows/herodotus/.env +++ b/configurations/docker/docker-compose/windows/herodotus/.env @@ -1,4 +1,4 @@ -VERSION=2.7.4.0 +VERSION=2.7.4.1 GATEWAY_SERVICE_NAME=dante-cloud-gateway GATEWAY_SERVICE_PORT=8847 UAA_SERVICE_NAME=dante-cloud-uaa diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 57cdde8eb..3e43267c4 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -32,13 +32,13 @@ cn.herodotus.engine dependencies - 2.7.4.0 + 2.7.4.1 cn.herodotus.dante dependencies - 2.7.4.0 + 2.7.4.1 pom dante-cloud-dependencies diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml index bee57d7d5..02bc093ae 100644 --- a/modules/dante-module-common/pom.xml +++ b/modules/dante-module-common/pom.xml @@ -32,11 +32,11 @@ modules cn.herodotus.dante - 2.7.4.0 + 2.7.4.1 dante-module-common - 2.7.4.0 + 2.7.4.1 jar diff --git a/modules/dante-module-security/pom.xml b/modules/dante-module-security/pom.xml index 4bf4a7e54..ac2ba3fb7 100644 --- a/modules/dante-module-security/pom.xml +++ b/modules/dante-module-security/pom.xml @@ -32,11 +32,11 @@ modules cn.herodotus.dante - 2.7.4.0 + 2.7.4.1 dante-module-security - 2.7.4.0 + 2.7.4.1 jar diff --git a/modules/dante-module-strategy/pom.xml b/modules/dante-module-strategy/pom.xml index f12580168..cd4289f75 100644 --- a/modules/dante-module-strategy/pom.xml +++ b/modules/dante-module-strategy/pom.xml @@ -32,11 +32,11 @@ modules cn.herodotus.dante - 2.7.4.0 + 2.7.4.1 dante-module-strategy - 2.7.4.0 + 2.7.4.1 jar diff --git a/modules/dante-module-upms-logic/pom.xml b/modules/dante-module-upms-logic/pom.xml index a1920e51a..961d23f3f 100644 --- a/modules/dante-module-upms-logic/pom.xml +++ b/modules/dante-module-upms-logic/pom.xml @@ -32,11 +32,11 @@ modules cn.herodotus.dante - 2.7.4.0 + 2.7.4.1 dante-module-upms-logic - 2.7.4.0 + 2.7.4.1 jar diff --git a/modules/dante-module-upms-rest/pom.xml b/modules/dante-module-upms-rest/pom.xml index bf557e063..d4df339ce 100644 --- a/modules/dante-module-upms-rest/pom.xml +++ b/modules/dante-module-upms-rest/pom.xml @@ -32,11 +32,11 @@ modules cn.herodotus.dante - 2.7.4.0 + 2.7.4.1 dante-module-upms-rest - 2.7.4.0 + 2.7.4.1 jar diff --git a/modules/pom.xml b/modules/pom.xml index 2839801bd..9da2a3faa 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -32,11 +32,11 @@ dante-cloud cn.herodotus.dante - 2.7.4.0 + 2.7.4.1 modules - 2.7.4.0 + 2.7.4.1 pom dante-cloud-modules diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml index 1d266ee93..fc84fae79 100644 --- a/packages/authentication-spring-boot-starter/pom.xml +++ b/packages/authentication-spring-boot-starter/pom.xml @@ -32,11 +32,11 @@ packages cn.herodotus.dante - 2.7.4.0 + 2.7.4.1 authentication-spring-boot-starter - 2.7.4.0 + 2.7.4.1 jar diff --git a/packages/pom.xml b/packages/pom.xml index 5ced43d44..e4462f855 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -32,11 +32,11 @@ dante-cloud cn.herodotus.dante - 2.7.4.0 + 2.7.4.1 packages - 2.7.4.0 + 2.7.4.1 pom dante-cloud-packages diff --git a/packages/service-spring-boot-starter/pom.xml b/packages/service-spring-boot-starter/pom.xml index a3e70d554..a6ea8829c 100644 --- a/packages/service-spring-boot-starter/pom.xml +++ b/packages/service-spring-boot-starter/pom.xml @@ -32,11 +32,11 @@ packages cn.herodotus.dante - 2.7.4.0 + 2.7.4.1 service-spring-boot-starter - 2.7.4.0 + 2.7.4.1 jar diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml index bc9447ed5..ea5a61321 100644 --- a/platform/dante-cloud-gateway/pom.xml +++ b/platform/dante-cloud-gateway/pom.xml @@ -32,11 +32,11 @@ platform cn.herodotus.dante - 2.7.4.0 + 2.7.4.1 dante-cloud-gateway - 2.7.4.0 + 2.7.4.1 jar diff --git a/platform/dante-cloud-monitor/pom.xml b/platform/dante-cloud-monitor/pom.xml index 72e01c64f..e2179ee41 100644 --- a/platform/dante-cloud-monitor/pom.xml +++ b/platform/dante-cloud-monitor/pom.xml @@ -30,11 +30,11 @@ platform cn.herodotus.dante - 2.7.4.0 + 2.7.4.1 dante-cloud-monitor - 2.7.4.0 + 2.7.4.1 dante-cloud-monitor dante-cloud-monitor diff --git a/platform/dante-cloud-monitor/src/main/resources/configs/common/dante-cloud-redis.yaml b/platform/dante-cloud-monitor/src/main/resources/configs/common/dante-cloud-redis.yaml index a123533f4..289aafcf2 100644 --- a/platform/dante-cloud-monitor/src/main/resources/configs/common/dante-cloud-redis.yaml +++ b/platform/dante-cloud-monitor/src/main/resources/configs/common/dante-cloud-redis.yaml @@ -12,6 +12,7 @@ spring: max-idle: 10 min-idle: 5 redisson: - enabled: ${herodotus.switch.redisson.enabled} + enabled: false single-server-config: - address: redis://${spring.redis.password}@${spring.redis.host}:${spring.redis.port} \ No newline at end of file + address: redis://${spring.redis.host}:${spring.redis.port} +# password: ${spring.redis.password} \ No newline at end of file diff --git a/platform/dante-cloud-monitor/src/main/resources/configs/development/dante-cloud-environment.yaml b/platform/dante-cloud-monitor/src/main/resources/configs/development/dante-cloud-environment.yaml index cc696ca91..9bf962445 100644 --- a/platform/dante-cloud-monitor/src/main/resources/configs/development/dante-cloud-environment.yaml +++ b/platform/dante-cloud-monitor/src/main/resources/configs/development/dante-cloud-environment.yaml @@ -25,8 +25,6 @@ herodotus: generate-statistics: false swagger: enabled: true - redisson: - enabled: false rest: scan: enabled: true diff --git a/platform/dante-cloud-monitor/src/main/resources/configs/docker/dante-cloud-environment.yaml b/platform/dante-cloud-monitor/src/main/resources/configs/docker/dante-cloud-environment.yaml index cd51ff66c..7e3519d9e 100644 --- a/platform/dante-cloud-monitor/src/main/resources/configs/docker/dante-cloud-environment.yaml +++ b/platform/dante-cloud-monitor/src/main/resources/configs/docker/dante-cloud-environment.yaml @@ -25,8 +25,6 @@ herodotus: generate-statistics: false swagger: enabled: true - redisson: - enabled: false rest: scan: enabled: true diff --git a/platform/dante-cloud-monitor/src/main/resources/configs/production/dante-cloud-environment.yaml b/platform/dante-cloud-monitor/src/main/resources/configs/production/dante-cloud-environment.yaml index 0e57d49ed..95fc72e2f 100644 --- a/platform/dante-cloud-monitor/src/main/resources/configs/production/dante-cloud-environment.yaml +++ b/platform/dante-cloud-monitor/src/main/resources/configs/production/dante-cloud-environment.yaml @@ -25,8 +25,6 @@ herodotus: generate-statistics: false swagger: enabled: true - redisson: - enabled: false rest: scan: enabled: true diff --git a/platform/dante-cloud-monitor/src/main/resources/imports/v2.7.3.6/nacos_config_export_20220912201555.zip b/platform/dante-cloud-monitor/src/main/resources/imports/v2.7.3.6/nacos_config_export_20220912201555.zip deleted file mode 100644 index b2bf4fb25..000000000 Binary files a/platform/dante-cloud-monitor/src/main/resources/imports/v2.7.3.6/nacos_config_export_20220912201555.zip and /dev/null differ diff --git a/platform/dante-cloud-monitor/src/main/resources/imports/v2.7.4.1/nacos_config_export_20221001172445.zip b/platform/dante-cloud-monitor/src/main/resources/imports/v2.7.4.1/nacos_config_export_20221001172445.zip new file mode 100644 index 000000000..d808522d3 Binary files /dev/null and b/platform/dante-cloud-monitor/src/main/resources/imports/v2.7.4.1/nacos_config_export_20221001172445.zip differ diff --git a/platform/dante-cloud-uaa/pom.xml b/platform/dante-cloud-uaa/pom.xml index 2a0d00d89..417d24b9e 100644 --- a/platform/dante-cloud-uaa/pom.xml +++ b/platform/dante-cloud-uaa/pom.xml @@ -32,11 +32,11 @@ platform cn.herodotus.dante - 2.7.4.0 + 2.7.4.1 dante-cloud-uaa - 2.7.4.0 + 2.7.4.1 jar diff --git a/platform/dante-cloud-uaa/src/main/resources/bootstrap.yml b/platform/dante-cloud-uaa/src/main/resources/bootstrap.yml index 278eb6775..88114b756 100644 --- a/platform/dante-cloud-uaa/src/main/resources/bootstrap.yml +++ b/platform/dante-cloud-uaa/src/main/resources/bootstrap.yml @@ -39,6 +39,13 @@ spring: transport: port: 8719 dashboard: @sentinel.server-addr@ + sql: + init: + # 第一种方式启动的时候 Jpa 会自动创建表，import.sql 只负责创建表单后的初始化数据。第二种方式启动的时候不会创建表，需要在初始化脚本中判断表是否存在，再初始化脚本的步骤 + # refer: https://www.cnblogs.com/ityouknow/p/7089170.html + data-locations: + # - classpath*:sqls/uaa-data-mysql.sql + - classpath*:sqls/uaa-data-postgresql.sql herodotus: platform: diff --git a/platform/dante-cloud-upms/src/main/resources/sqls/upms-data-mysql.sql b/platform/dante-cloud-uaa/src/main/resources/sqls/uaa-data-mysql.sql similarity index 100% rename from platform/dante-cloud-upms/src/main/resources/sqls/upms-data-mysql.sql rename to platform/dante-cloud-uaa/src/main/resources/sqls/uaa-data-mysql.sql diff --git a/platform/dante-cloud-upms/src/main/resources/sqls/upms-data-postgresql.sql b/platform/dante-cloud-uaa/src/main/resources/sqls/uaa-data-postgresql.sql similarity index 100% rename from platform/dante-cloud-upms/src/main/resources/sqls/upms-data-postgresql.sql rename to platform/dante-cloud-uaa/src/main/resources/sqls/uaa-data-postgresql.sql diff --git a/platform/dante-cloud-upms/pom.xml b/platform/dante-cloud-upms/pom.xml index 578ea58e7..055edf272 100644 --- a/platform/dante-cloud-upms/pom.xml +++ b/platform/dante-cloud-upms/pom.xml @@ -30,12 +30,12 @@ platform cn.herodotus.dante - 2.7.4.0 + 2.7.4.1 4.0.0 dante-cloud-upms - 2.7.4.0 + 2.7.4.1 diff --git a/platform/dante-cloud-upms/src/main/resources/bootstrap.yml b/platform/dante-cloud-upms/src/main/resources/bootstrap.yml index a8fbcd842..d3b0a796e 100644 --- a/platform/dante-cloud-upms/src/main/resources/bootstrap.yml +++ b/platform/dante-cloud-upms/src/main/resources/bootstrap.yml @@ -39,13 +39,6 @@ spring: transport: port: 8719 dashboard: @sentinel.server-addr@ - sql: - init: - # 第一种方式启动的时候 Jpa 会自动创建表，import.sql 只负责创建表单后的初始化数据。第二种方式启动的时候不会创建表，需要在初始化脚本中判断表是否存在，再初始化脚本的步骤 - # refer: https://www.cnblogs.com/ityouknow/p/7089170.html - data-locations: -# - classpath*:sqls/upms-data-mysql.sql - - classpath*:sqls/upms-data-postgresql.sql logging: file: diff --git a/platform/pom.xml b/platform/pom.xml index d0329d73b..a555e5299 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -32,7 +32,7 @@ dante-cloud cn.herodotus.dante - 2.7.4.0 + 2.7.4.1 platform diff --git a/pom.xml b/pom.xml index 9d83ff7bf..2ead77078 100644 --- a/pom.xml +++ b/pom.xml @@ -32,12 +32,12 @@ cn.herodotus.dante dependencies - 2.7.4.0 + 2.7.4.1 dependencies/pom.xml dante-cloud - 2.7.4.0 + 2.7.4.1 pom dante-cloud diff --git a/services/dante-cloud-bpmn-ability/pom.xml b/services/dante-cloud-bpmn-ability/pom.xml index 8d2e909d4..d5b85bad1 100644 --- a/services/dante-cloud-bpmn-ability/pom.xml +++ b/services/dante-cloud-bpmn-ability/pom.xml @@ -31,11 +31,11 @@ services cn.herodotus.dante - 2.7.4.0 + 2.7.4.1 dante-cloud-bpmn-ability - 2.7.4.0 + 2.7.4.1 dante-cloud-bpmn-ability 基于Camunda工作流的服务 diff --git a/services/dante-cloud-bpmn-logic/pom.xml b/services/dante-cloud-bpmn-logic/pom.xml index eb496874c..c63221374 100644 --- a/services/dante-cloud-bpmn-logic/pom.xml +++ b/services/dante-cloud-bpmn-logic/pom.xml @@ -32,11 +32,11 @@ services cn.herodotus.dante - 2.7.4.0 + 2.7.4.1 dante-cloud-bpmn-logic - 2.7.4.0 + 2.7.4.1 jar diff --git a/services/pom.xml b/services/pom.xml index d37f4175e..441cc406c 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -32,11 +32,11 @@ dante-cloud cn.herodotus.dante - 2.7.4.0 + 2.7.4.1 services - 2.7.4.0 + 2.7.4.1 pom dante-cloud-services