diff --git a/README.md b/README.md index ffe0ac722..fa1f696ec 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@

Spring Authorization Server 1.3.0 Spring Boot 3.3.0 - Spring Cloud 2023.0.1 + Spring Cloud 2023.0.2 Spring Cloud Alibaba 2023.0.1.0 Spring Cloud Tencent 1.14.0--2023.0.0-SNAPSHOT Nacos 2.3.2 @@ -134,7 +134,7 @@ | 组件 | 版本 | |-----------------------------|-----------------| | Spring Boot | 3.3.0 | -| Spring Cloud | 2023.0.1 | +| Spring Cloud | 2023.0.2 | | Spring Cloud Alibaba | 2023.0.1.0 | | Spring Cloud Tencent | 1.14.0-2023.0.0 | | Spring Authorization Server | 1.3.0 | @@ -190,10 +190,10 @@ | 分支名称 | 对应 Spring 生态版本 | 对应 JDK 版本 | 用途 | 现状 | |------------------------|-----------------------------------------|-----------|--------------------|-------------------------------------------------------------| -| master | Spring Boot 3.3 和 Spring Cloud 2023.0.1 | JDK 17 | 主要发布分支 | 推荐使用代码分支 | -| develop | Spring Boot 3.3 和 Spring Cloud 2023.0.1 | JDK 17 | Development 分支 | 新功能、ISSUE 均以此分支作为开发，发布后会 PR 至 master 分支。开发分支不保证可用 | -| reactive-master | Spring Boot 3.3 和 Spring Cloud 2023.0.1 | JDK 21 | 响应式主要发布分支 | 推荐使用的响应式代码分支 | -| reactive-develop | Spring Boot 3.3 和 Spring Cloud 2023.0.1 | JDK 21 | 响应式 Development 分支 | 下一代响应式微服务版本开发分支。开发分支不保证可用 | +| master | Spring Boot 3.3 和 Spring Cloud 2023.0.2 | JDK 17 | 主要发布分支 | 推荐使用代码分支 | +| develop | Spring Boot 3.3 和 Spring Cloud 2023.0.2 | JDK 17 | Development 分支 | 新功能、ISSUE 均以此分支作为开发，发布后会 PR 至 master 分支。开发分支不保证可用 | +| reactive-master | Spring Boot 3.3 和 Spring Cloud 2023.0.2 | JDK 21 | 响应式主要发布分支 | 推荐使用的响应式代码分支 | +| reactive-develop | Spring Boot 3.3 和 Spring Cloud 2023.0.2 | JDK 21 | 响应式 Development 分支 | 下一代响应式微服务版本开发分支。开发分支不保证可用 | | 3.1.X | Spring Boot 3.1 和 Spring Cloud 2022.0.X | JDK 17 | 历史代码，不再维护 | 基于 Spring Boot 3.1 时代开发的代码分支，稳定可用，不再维护 | | 2.7.X | Spring Boot 2.7 和 Spring Cloud 2021.0.X | JDK 8 | 历史代码，不再维护 | 基于 Spring Boot 2.7 时代开发的代码分支，稳定可用，不再维护 | | spring-security-oauth2 | Spring Boot 2.6 和 Spring Cloud 2021.0.X | JDK 8 | 历史代码，不再维护 | 基于原 Spring Security OAuth2 实现的微服务，稳定可用，因相关组件均不在维护，所以该版本不再维护 | @@ -324,6 +324,7 @@ Dante Cloud 已通过由第三方进行的软件出厂安全测试。详情参 | 10 | 志国欧巴 | 2023-03-27 | 11 | michael | 2023-04-07 | 12 | 大叔丨小巷 | 2023-04-11 | | 13 | sun_left | 2023-04-19 | 14 | time 丶 sand | 2023-07-06 | 15 | 印第安老斑鸠 | 2023-09-09 | | 16 | 一阵风 | 2023-12-10 | 17 | Jack | 2024-03-01 | 18 | onehelper | 2024-05-24 | +| 19 | 宁哥 | 2024-05-29 | 20 | | | 21 | | | ### 开源项目 diff --git a/configurations/backup/alibaba/3.3.0.2/nacos_config_export_20240531173739.zip b/configurations/backup/alibaba/3.3.0.2/nacos_config_export_20240531173739.zip new file mode 100644 index 000000000..0d4d5d3f2 Binary files /dev/null and b/configurations/backup/alibaba/3.3.0.2/nacos_config_export_20240531173739.zip differ diff --git a/configurations/backup/tencent/3.3.0.0-M1/polaris_config_202402191534.zip b/configurations/backup/tencent/3.3.0.0-M1/polaris_config_202402191534.zip deleted file mode 100644 index a7424a91a..000000000 Binary files a/configurations/backup/tencent/3.3.0.0-M1/polaris_config_202402191534.zip and /dev/null differ diff --git a/configurations/backup/tencent/3.3.0.0-M2/polaris_config_202402281839.zip b/configurations/backup/tencent/3.3.0.0-M2/polaris_config_202402281839.zip deleted file mode 100644 index d88716a76..000000000 Binary files a/configurations/backup/tencent/3.3.0.0-M2/polaris_config_202402281839.zip and /dev/null differ diff --git a/configurations/backup/tencent/3.3.0.0/polaris-config-202405312026.zip b/configurations/backup/tencent/3.3.0.0/polaris-config-202405312026.zip new file mode 100644 index 000000000..152198c84 Binary files /dev/null and b/configurations/backup/tencent/3.3.0.0/polaris-config-202405312026.zip differ diff --git a/configurations/backup/tencent/3.3.0.1/polaris-config-202405312026.zip b/configurations/backup/tencent/3.3.0.1/polaris-config-202405312026.zip new file mode 100644 index 000000000..152198c84 Binary files /dev/null and b/configurations/backup/tencent/3.3.0.1/polaris-config-202405312026.zip differ diff --git a/configurations/backup/tencent/3.3.0.2/polaris-config-202405312026.zip b/configurations/backup/tencent/3.3.0.2/polaris-config-202405312026.zip new file mode 100644 index 000000000..152198c84 Binary files /dev/null and b/configurations/backup/tencent/3.3.0.2/polaris-config-202405312026.zip differ diff --git a/configurations/backup/yamls/common/herodotus-cloud-database-opengauss5.yaml b/configurations/backup/yamls/common/herodotus-cloud-database-opengauss5.yaml new file mode 100644 index 000000000..2f9a7b3fa --- /dev/null +++ b/configurations/backup/yamls/common/herodotus-cloud-database-opengauss5.yaml @@ -0,0 +1,6 @@ +herodotus: + database-information: + platform: postgresql + driver-class-name: org.opengauss.Driver + dialect: cn.herodotus.stirrup.data.hibernate.dialect.OpenGaussDialect + url: jdbc:opengauss://${herodotus.environment.database.host}:${herodotus.environment.database.port}/${herodotus.environment.database.name} \ No newline at end of file diff --git a/configurations/backup/yamls/common/herodotus-cloud-database.yaml b/configurations/backup/yamls/common/herodotus-cloud-database.yaml index 366c5e51a..d2425fd97 100644 --- a/configurations/backup/yamls/common/herodotus-cloud-database.yaml +++ b/configurations/backup/yamls/common/herodotus-cloud-database.yaml @@ -68,8 +68,8 @@ spring: jakarta: cache: missing_cache_strategy: create - temp: - use_jdbc_metadata_defaults: true + boot: + allow_jdbc_metadata_access: true mybatis-plus: global-config: diff --git a/configurations/backup/yamls/logs/loki-logback-spring.xml b/configurations/backup/yamls/logs/loki-logback-spring.xml index 590d97c4d..a94c899dd 100644 --- a/configurations/backup/yamls/logs/loki-logback-spring.xml +++ b/configurations/backup/yamls/logs/loki-logback-spring.xml @@ -1,14 +1,4 @@ - - diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env index 40c4ec415..687ac9bc8 100644 --- a/configurations/docker/docker-compose/linux/herodotus/.env +++ b/configurations/docker/docker-compose/linux/herodotus/.env @@ -1,4 +1,4 @@ -VERSION=3.3.0.1 +VERSION=3.3.0.2 GATEWAY_SERVICE_NAME=herodotus-cloud-gateway GATEWAY_SERVICE_PORT=8847 UAA_SERVICE_NAME=herodotus-cloud-uaa diff --git a/configurations/docker/docker-compose/linux/herodotus/env.base.yml b/configurations/docker/docker-compose/linux/herodotus/env.base.yml index 7e09acc1d..8f2cd515c 100644 --- a/configurations/docker/docker-compose/linux/herodotus/env.base.yml +++ b/configurations/docker/docker-compose/linux/herodotus/env.base.yml @@ -22,6 +22,7 @@ services: NACOS_AUTH_IDENTITY_KEY: serverIdentity NACOS_AUTH_IDENTITY_VALUE: security NACOS_AUTH_TOKEN: SecretKey012345678901234567890123456789012345678901234567890123456789 + NACOS_AUTH_ENABLE: true volumes: - /usr/local/docker-volumes/nacos/data:/home/nacos/data ports: @@ -29,34 +30,25 @@ services: - "9848:9848" - "9849:9849" - zookeeper: - image: debezium/zookeeper:2.6 - container_name: zookeeper - hostname: zookeeper - environment: - ZOOKEEPER_SERVER_ID: 1 - ports: - - "2181:2181" - - "2888:2888" - - "3888:3888" - kafka: - image: debezium/kafka:2.6 + image: apache/kafka:3.7.0 container_name: kafka - hostname: kafka + hostname: broker + environment: + KAFKA_NODE_ID: 1 + KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT' + KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT_HOST://192.168.101.10:9092,PLAINTEXT://broker:19092' + KAFKA_PROCESS_ROLES: 'broker,controller' + KAFKA_CONTROLLER_QUORUM_VOTERS: '1@broker:29093' + KAFKA_LISTENERS: 'CONTROLLER://:29093,PLAINTEXT_HOST://:9092,PLAINTEXT://:19092' + KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT' + KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER' + KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1 + KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0 + KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1 + KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1 ports: - "9092:9092" - environment: - BROKER_ID: 1 - ZOOKEEPER_CONNECT: zookeeper:2181 - KAFKA_LISTENERS: LISTENER_INNER://kafka:29092,LISTENER_OUTER://0.0.0.0:9092 - KAFKA_ADVERTISED_LISTENERS: LISTENER_INNER://kafka:29092,LISTENER_OUTER://192.168.101.10:9092 - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: LISTENER_INNER:PLAINTEXT,LISTENER_OUTER:PLAINTEXT - KAFKA_INTER_BROKER_LISTENER_NAME: LISTENER_INNER - KAFKA_ALLOW_PLAINTEXT_LISTENER: 'yes' - KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true' - depends_on: - - zookeeper sentinel: image: herodotus/sentinel-dashboard:1.8.7 diff --git a/configurations/docker/docker-compose/linux/herodotus/env.full.debezium.yml b/configurations/docker/docker-compose/linux/herodotus/env.full.debezium.yml index ebff37777..023ac06a3 100644 --- a/configurations/docker/docker-compose/linux/herodotus/env.full.debezium.yml +++ b/configurations/docker/docker-compose/linux/herodotus/env.full.debezium.yml @@ -23,6 +23,7 @@ services: NACOS_AUTH_IDENTITY_KEY: serverIdentity NACOS_AUTH_IDENTITY_VALUE: security NACOS_AUTH_TOKEN: SecretKey012345678901234567890123456789012345678901234567890123456789 + NACOS_AUTH_ENABLE: true volumes: - /usr/local/docker-volumes/nacos/data:/home/nacos/data ports: diff --git a/configurations/docker/docker-compose/linux/herodotus/env.oss.yml b/configurations/docker/docker-compose/linux/herodotus/env.oss.yml index 259721d26..2f294e641 100644 --- a/configurations/docker/docker-compose/linux/herodotus/env.oss.yml +++ b/configurations/docker/docker-compose/linux/herodotus/env.oss.yml @@ -1,6 +1,6 @@ services: minio: - image: quay.io/minio/minio:RELEASE.2024-05-10T01-41-38Z + image: quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z container_name: minio hostname: minio ports: diff --git a/configurations/docker/docker-compose/windows/herodotus/.env b/configurations/docker/docker-compose/windows/herodotus/.env index 40c4ec415..687ac9bc8 100644 --- a/configurations/docker/docker-compose/windows/herodotus/.env +++ b/configurations/docker/docker-compose/windows/herodotus/.env @@ -1,4 +1,4 @@ -VERSION=3.3.0.1 +VERSION=3.3.0.2 GATEWAY_SERVICE_NAME=herodotus-cloud-gateway GATEWAY_SERVICE_PORT=8847 UAA_SERVICE_NAME=herodotus-cloud-uaa diff --git a/configurations/docker/docker-compose/windows/herodotus/db.yml b/configurations/docker/docker-compose/windows/herodotus/db.yml new file mode 100644 index 000000000..ca21e50dd --- /dev/null +++ b/configurations/docker/docker-compose/windows/herodotus/db.yml @@ -0,0 +1,10 @@ +services: + opengauss: + image: enmotech/opengauss:latest + container_name: opengauss + environment: + GS_PASSWORD: Hero00362255!QAZ2wsx + volumes: + - D:\\local-cached\\docker-volumes\\db\\opengauss:/var/lib/opengauss + ports: + - "25432:5432" \ No newline at end of file diff --git a/configurations/docker/docker-compose/windows/herodotus/env.base.without.elk.yml b/configurations/docker/docker-compose/windows/herodotus/env.base.without.elk.yml index 1afb5c330..8dea8b575 100644 --- a/configurations/docker/docker-compose/windows/herodotus/env.base.without.elk.yml +++ b/configurations/docker/docker-compose/windows/herodotus/env.base.without.elk.yml @@ -19,7 +19,7 @@ services: POSTGRESQL_SERVICE_DB_NAME: nacos POSTGRESQL_SERVICE_DB_PARAM: tcpKeepAlive=true&reWriteBatchedInserts=true&ApplicationName=nacos NACOS_AUTH_SYSTEM_TYPE: nacos - NACOS_AUTH_ENABLE: false + NACOS_AUTH_ENABLE: true NACOS_AUTH_TOKEN_EXPIRE_SECONDS: 18000 NACOS_AUTH_TOKEN: SecretKey012345678901234567890123456789012345678901234567890123456789 NACOS_AUTH_IDENTITY_KEY: serverIdentity diff --git a/configurations/docker/docker-compose/windows/herodotus/env.base.yml b/configurations/docker/docker-compose/windows/herodotus/env.base.yml index e6b1c96bc..8aff70450 100644 --- a/configurations/docker/docker-compose/windows/herodotus/env.base.yml +++ b/configurations/docker/docker-compose/windows/herodotus/env.base.yml @@ -21,7 +21,7 @@ services: NACOS_AUTH_IDENTITY_KEY: serverIdentity NACOS_AUTH_IDENTITY_VALUE: security NACOS_AUTH_TOKEN: SecretKey012345678901234567890123456789012345678901234567890123456789 -# NACOS_AUTH_ENABLE: true + NACOS_AUTH_ENABLE: true volumes: - D:\\local-cached\\docker-volumes\\nacos\\datas:/home/nacos/data ports: @@ -29,32 +29,26 @@ services: - "9848:9848" - "9849:9849" - zookeeper: - image: debezium/zookeeper:2.6 - container_name: zookeeper - environment: - ZOOKEEPER_SERVER_ID: 1 - ports: - - "2181:2181" - - "2888:2888" - - "3888:3888" - kafka: - image: debezium/kafka:2.6 + image: apache/kafka:3.7.0 container_name: kafka + hostname: broker + environment: + KAFKA_NODE_ID: 1 + KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT' + KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT_HOST://192.168.101.10:9092,PLAINTEXT://broker:19092' + KAFKA_PROCESS_ROLES: 'broker,controller' + KAFKA_CONTROLLER_QUORUM_VOTERS: '1@broker:29093' + KAFKA_LISTENERS: 'CONTROLLER://:29093,PLAINTEXT_HOST://:9092,PLAINTEXT://:19092' + KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT' + KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER' + KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1 + KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0 + KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1 + KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1 ports: - "9092:9092" - environment: - BROKER_ID: 1 - ZOOKEEPER_CONNECT: zookeeper:2181 - KAFKA_LISTENERS: LISTENER_INNER://kafka:29092,LISTENER_OUTER://0.0.0.0:9092 - KAFKA_ADVERTISED_LISTENERS: LISTENER_INNER://kafka:29092,LISTENER_OUTER://192.168.101.10:9092 - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: LISTENER_INNER:PLAINTEXT,LISTENER_OUTER:PLAINTEXT - KAFKA_INTER_BROKER_LISTENER_NAME: LISTENER_INNER - KAFKA_ALLOW_PLAINTEXT_LISTENER: 'yes' - KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true' - depends_on: - - zookeeper + sentinel: image: herodotus/sentinel-dashboard:1.8.7 container_name: sentinel-dashboard diff --git a/configurations/docker/docker-compose/windows/herodotus/env.tracing.yml b/configurations/docker/docker-compose/windows/herodotus/env.tracing.yml index 9a5dc6b31..4c6794211 100644 --- a/configurations/docker/docker-compose/windows/herodotus/env.tracing.yml +++ b/configurations/docker/docker-compose/windows/herodotus/env.tracing.yml @@ -1,6 +1,6 @@ services: minio: - image: quay.io/minio/minio:RELEASE.2024-05-10T01-41-38Z + image: quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z container_name: minio hostname: minio ports: diff --git a/dependencies/pom.xml b/dependencies/pom.xml index d443cfd9f..c7c23d43a 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -32,7 +32,7 @@ cn.herodotus.stirrup dependencies - 3.3.0.1 + 3.3.0.2 diff --git a/modules/herodotus-module-common/pom.xml b/modules/herodotus-module-common/pom.xml index d24e8bb82..d824bf817 100644 --- a/modules/herodotus-module-common/pom.xml +++ b/modules/herodotus-module-common/pom.xml @@ -28,7 +28,7 @@ modules cn.herodotus.reactive - 3.3.0.1 + 3.3.0.2 herodotus-module-common diff --git a/modules/herodotus-module-metadata/pom.xml b/modules/herodotus-module-metadata/pom.xml index 17fc546c7..e20158d63 100644 --- a/modules/herodotus-module-metadata/pom.xml +++ b/modules/herodotus-module-metadata/pom.xml @@ -28,7 +28,7 @@ modules cn.herodotus.reactive - 3.3.0.1 + 3.3.0.2 herodotus-module-metadata diff --git a/modules/herodotus-module-social/pom.xml b/modules/herodotus-module-social/pom.xml index 2ba4dac13..4e7d07f6a 100644 --- a/modules/herodotus-module-social/pom.xml +++ b/modules/herodotus-module-social/pom.xml @@ -28,7 +28,7 @@ modules cn.herodotus.reactive - 3.3.0.1 + 3.3.0.2 herodotus-module-social diff --git a/modules/pom.xml b/modules/pom.xml index b6f3c55f0..1ff04c48f 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -28,7 +28,7 @@ herodotus-cloud cn.herodotus.reactive - 3.3.0.1 + 3.3.0.2 modules diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml index fac6f87cd..5eac09909 100644 --- a/packages/authentication-spring-boot-starter/pom.xml +++ b/packages/authentication-spring-boot-starter/pom.xml @@ -28,7 +28,7 @@ packages cn.herodotus.reactive - 3.3.0.1 + 3.3.0.2 authentication-spring-boot-starter diff --git a/packages/authorization-reactive-spring-boot-starter/pom.xml b/packages/authorization-reactive-spring-boot-starter/pom.xml index fa02a651e..032f291d3 100644 --- a/packages/authorization-reactive-spring-boot-starter/pom.xml +++ b/packages/authorization-reactive-spring-boot-starter/pom.xml @@ -27,7 +27,7 @@ cn.herodotus.reactive packages - 3.3.0.1 + 3.3.0.2 authorization-reactive-spring-boot-starter diff --git a/packages/authorization-servlet-spring-boot-starter/pom.xml b/packages/authorization-servlet-spring-boot-starter/pom.xml index d6528c0f4..0b837a12d 100644 --- a/packages/authorization-servlet-spring-boot-starter/pom.xml +++ b/packages/authorization-servlet-spring-boot-starter/pom.xml @@ -28,7 +28,7 @@ packages cn.herodotus.reactive - 3.3.0.1 + 3.3.0.2 authorization-servlet-spring-boot-starter diff --git a/packages/facility-spring-boot-starter/pom.xml b/packages/facility-spring-boot-starter/pom.xml index c8b740c40..9e85f4c47 100644 --- a/packages/facility-spring-boot-starter/pom.xml +++ b/packages/facility-spring-boot-starter/pom.xml @@ -28,7 +28,7 @@ packages cn.herodotus.reactive - 3.3.0.1 + 3.3.0.2 facility-spring-boot-starter diff --git a/packages/pom.xml b/packages/pom.xml index 02febbbf0..9cb54fc3a 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -28,7 +28,7 @@ herodotus-cloud cn.herodotus.reactive - 3.3.0.1 + 3.3.0.2 packages diff --git a/packages/rpc-client-uaa-spring-boot-starter/pom.xml b/packages/rpc-client-uaa-spring-boot-starter/pom.xml index b3d7a5a06..270edac64 100644 --- a/packages/rpc-client-uaa-spring-boot-starter/pom.xml +++ b/packages/rpc-client-uaa-spring-boot-starter/pom.xml @@ -27,7 +27,7 @@ cn.herodotus.reactive packages - 3.3.0.1 + 3.3.0.2 rpc-client-uaa-spring-boot-starter diff --git a/packages/rpc-server-upms-spring-boot-starter/pom.xml b/packages/rpc-server-upms-spring-boot-starter/pom.xml index 4c515bdfb..dbec29ec5 100644 --- a/packages/rpc-server-upms-spring-boot-starter/pom.xml +++ b/packages/rpc-server-upms-spring-boot-starter/pom.xml @@ -27,7 +27,7 @@ cn.herodotus.reactive packages - 3.3.0.1 + 3.3.0.2 rpc-server-upms-spring-boot-starter diff --git a/platform/herodotus-cloud-gateway/pom.xml b/platform/herodotus-cloud-gateway/pom.xml index fa6b80eeb..60034f281 100644 --- a/platform/herodotus-cloud-gateway/pom.xml +++ b/platform/herodotus-cloud-gateway/pom.xml @@ -27,7 +27,7 @@ platform cn.herodotus.reactive - 3.3.0.1 + 3.3.0.2 herodotus-cloud-gateway diff --git a/platform/herodotus-cloud-gateway/src/main/resources/bootstrap.yml b/platform/herodotus-cloud-gateway/src/main/resources/bootstrap.yml index c8f33d21d..b71509620 100644 --- a/platform/herodotus-cloud-gateway/src/main/resources/bootstrap.yml +++ b/platform/herodotus-cloud-gateway/src/main/resources/bootstrap.yml @@ -50,6 +50,8 @@ spring: on-profile: alibaba cloud: nacos: + username: ${ALIBABA_USERNAME:@alibaba.username@} + password: ${ALIBABA_PASSWORD:@alibaba.password@} config: namespace: ${ALIBABA_NAMESPACE:@alibaba.namespace@} server-addr: ${ALIBABA_CONFIG_SERVER_ADDR:@alibaba.config.server-addr@} diff --git a/platform/herodotus-cloud-message/pom.xml b/platform/herodotus-cloud-message/pom.xml index 953c5a405..7bf88100c 100644 --- a/platform/herodotus-cloud-message/pom.xml +++ b/platform/herodotus-cloud-message/pom.xml @@ -27,7 +27,7 @@ cn.herodotus.reactive platform - 3.3.0.1 + 3.3.0.2 herodotus-cloud-message diff --git a/platform/herodotus-cloud-message/src/main/resources/bootstrap.yml b/platform/herodotus-cloud-message/src/main/resources/bootstrap.yml index c619306e7..0a7dd978e 100644 --- a/platform/herodotus-cloud-message/src/main/resources/bootstrap.yml +++ b/platform/herodotus-cloud-message/src/main/resources/bootstrap.yml @@ -21,6 +21,8 @@ spring: on-profile: alibaba cloud: nacos: + username: ${ALIBABA_USERNAME:@alibaba.username@} + password: ${ALIBABA_PASSWORD:@alibaba.password@} config: namespace: ${ALIBABA_NAMESPACE:@alibaba.namespace@} server-addr: ${ALIBABA_CONFIG_SERVER_ADDR:@alibaba.config.server-addr@} diff --git a/platform/herodotus-cloud-monitor/pom.xml b/platform/herodotus-cloud-monitor/pom.xml index 18a81977f..75f15bda0 100644 --- a/platform/herodotus-cloud-monitor/pom.xml +++ b/platform/herodotus-cloud-monitor/pom.xml @@ -26,11 +26,11 @@ platform cn.herodotus.reactive - 3.3.0.1 + 3.3.0.2 herodotus-cloud-monitor - 3.3.0.1 + 3.3.0.2 herodotus-cloud-monitor herodotus-cloud-monitor diff --git a/platform/herodotus-cloud-monitor/src/main/resources/bootstrap.yml b/platform/herodotus-cloud-monitor/src/main/resources/bootstrap.yml index abadc43ec..41770ac56 100644 --- a/platform/herodotus-cloud-monitor/src/main/resources/bootstrap.yml +++ b/platform/herodotus-cloud-monitor/src/main/resources/bootstrap.yml @@ -22,6 +22,8 @@ spring: on-profile: alibaba cloud: nacos: + username: ${ALIBABA_USERNAME:@alibaba.username@} + password: ${ALIBABA_PASSWORD:@alibaba.password@} config: namespace: ${ALIBABA_NAMESPACE:@alibaba.namespace@} server-addr: ${ALIBABA_CONFIG_SERVER_ADDR:@alibaba.config.server-addr@} diff --git a/platform/herodotus-cloud-uaa/pom.xml b/platform/herodotus-cloud-uaa/pom.xml index 721c91af9..204b36847 100644 --- a/platform/herodotus-cloud-uaa/pom.xml +++ b/platform/herodotus-cloud-uaa/pom.xml @@ -27,7 +27,7 @@ platform cn.herodotus.reactive - 3.3.0.1 + 3.3.0.2 herodotus-cloud-uaa diff --git a/platform/herodotus-cloud-uaa/src/main/resources/bootstrap.yml b/platform/herodotus-cloud-uaa/src/main/resources/bootstrap.yml index 39d71d8c5..bdf2ea11e 100644 --- a/platform/herodotus-cloud-uaa/src/main/resources/bootstrap.yml +++ b/platform/herodotus-cloud-uaa/src/main/resources/bootstrap.yml @@ -18,6 +18,8 @@ spring: on-profile: alibaba cloud: nacos: + username: ${ALIBABA_USERNAME:@alibaba.username@} + password: ${ALIBABA_PASSWORD:@alibaba.password@} config: namespace: ${ALIBABA_NAMESPACE:@alibaba.namespace@} server-addr: ${ALIBABA_CONFIG_SERVER_ADDR:@alibaba.config.server-addr@} @@ -75,7 +77,7 @@ logging: com.ulisesbocchio: error # 开发、调试需要的日志 cn.herodotus: debug - org.springframework.security: info + org.springframework.security: trace org.springframework.web: info com.alicp.jetcache: trace org.springframework.cloud.bus: info diff --git a/platform/herodotus-cloud-upms/pom.xml b/platform/herodotus-cloud-upms/pom.xml index c8771eaef..821dfbf6f 100644 --- a/platform/herodotus-cloud-upms/pom.xml +++ b/platform/herodotus-cloud-upms/pom.xml @@ -27,7 +27,7 @@ platform cn.herodotus.reactive - 3.3.0.1 + 3.3.0.2 herodotus-cloud-upms diff --git a/platform/herodotus-cloud-upms/src/main/resources/bootstrap.yml b/platform/herodotus-cloud-upms/src/main/resources/bootstrap.yml index e96e36e23..03f5c87fd 100644 --- a/platform/herodotus-cloud-upms/src/main/resources/bootstrap.yml +++ b/platform/herodotus-cloud-upms/src/main/resources/bootstrap.yml @@ -17,6 +17,8 @@ spring: on-profile: alibaba cloud: nacos: + username: ${ALIBABA_USERNAME:@alibaba.username@} + password: ${ALIBABA_PASSWORD:@alibaba.password@} config: namespace: ${ALIBABA_NAMESPACE:@alibaba.namespace@} server-addr: ${ALIBABA_CONFIG_SERVER_ADDR:@alibaba.config.server-addr@} diff --git a/platform/pom.xml b/platform/pom.xml index a2c04ef95..2503f6c47 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -28,7 +28,7 @@ herodotus-cloud cn.herodotus.reactive - 3.3.0.1 + 3.3.0.2 platform diff --git a/pom.xml b/pom.xml index 510b1acbd..4a24cd397 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ cn.herodotus.reactive dependencies - 3.3.0.1 + 3.3.0.2 dependencies/pom.xml @@ -81,6 +81,10 @@ false 00a14001-348d-40a7-82aa-e2e032f6e03c + + nacos + + nacos 192.168.101.10:8848 @@ -113,6 +117,10 @@ false false + + nacos + + nacos @@ -147,6 +155,10 @@ true false + + nacos + + nacos diff --git a/services/herodotus-cloud-bpmn-ability/pom.xml b/services/herodotus-cloud-bpmn-ability/pom.xml index fafdb0109..5ecd0ac7a 100644 --- a/services/herodotus-cloud-bpmn-ability/pom.xml +++ b/services/herodotus-cloud-bpmn-ability/pom.xml @@ -26,11 +26,11 @@ services cn.herodotus.reactive - 3.3.0.1 + 3.3.0.2 herodotus-cloud-bpmn-ability - 3.3.0.1 + 3.3.0.2 herodotus-cloud-bpmn-ability herodotus-cloud-bpmn-ability diff --git a/services/herodotus-cloud-bpmn-ability/src/main/resources/bootstrap.yml b/services/herodotus-cloud-bpmn-ability/src/main/resources/bootstrap.yml index 5844c1641..f158f836a 100644 --- a/services/herodotus-cloud-bpmn-ability/src/main/resources/bootstrap.yml +++ b/services/herodotus-cloud-bpmn-ability/src/main/resources/bootstrap.yml @@ -16,6 +16,8 @@ spring: on-profile: alibaba cloud: nacos: + username: ${ALIBABA_USERNAME:@alibaba.username@} + password: ${ALIBABA_PASSWORD:@alibaba.password@} config: namespace: ${ALIBABA_NAMESPACE:@alibaba.namespace@} server-addr: ${ALIBABA_CONFIG_SERVER_ADDR:@alibaba.config.server-addr@} diff --git a/services/herodotus-cloud-manage-ability/pom.xml b/services/herodotus-cloud-manage-ability/pom.xml index bc4a0b7f9..724164cae 100644 --- a/services/herodotus-cloud-manage-ability/pom.xml +++ b/services/herodotus-cloud-manage-ability/pom.xml @@ -27,7 +27,7 @@ cn.herodotus.reactive services - 3.3.0.1 + 3.3.0.2 herodotus-cloud-manage-ability diff --git a/services/herodotus-cloud-manage-ability/src/main/resources/bootstrap.yml b/services/herodotus-cloud-manage-ability/src/main/resources/bootstrap.yml index 478e32658..4daac3e53 100644 --- a/services/herodotus-cloud-manage-ability/src/main/resources/bootstrap.yml +++ b/services/herodotus-cloud-manage-ability/src/main/resources/bootstrap.yml @@ -16,6 +16,8 @@ spring: on-profile: alibaba cloud: nacos: + username: ${ALIBABA_USERNAME:@alibaba.username@} + password: ${ALIBABA_PASSWORD:@alibaba.password@} config: namespace: ${ALIBABA_NAMESPACE:@alibaba.namespace@} server-addr: ${ALIBABA_CONFIG_SERVER_ADDR:@alibaba.config.server-addr@} diff --git a/services/herodotus-cloud-oss-ability/pom.xml b/services/herodotus-cloud-oss-ability/pom.xml index ddc66efc6..379aa817a 100644 --- a/services/herodotus-cloud-oss-ability/pom.xml +++ b/services/herodotus-cloud-oss-ability/pom.xml @@ -27,7 +27,7 @@ cn.herodotus.reactive services - 3.3.0.1 + 3.3.0.2 herodotus-cloud-oss-ability diff --git a/services/herodotus-cloud-oss-ability/src/main/resources/bootstrap.yml b/services/herodotus-cloud-oss-ability/src/main/resources/bootstrap.yml index c1d835b87..2557ed235 100644 --- a/services/herodotus-cloud-oss-ability/src/main/resources/bootstrap.yml +++ b/services/herodotus-cloud-oss-ability/src/main/resources/bootstrap.yml @@ -17,6 +17,8 @@ spring: on-profile: alibaba cloud: nacos: + username: ${ALIBABA_USERNAME:@alibaba.username@} + password: ${ALIBABA_PASSWORD:@alibaba.password@} config: namespace: ${ALIBABA_NAMESPACE:@alibaba.namespace@} server-addr: ${ALIBABA_CONFIG_SERVER_ADDR:@alibaba.config.server-addr@} diff --git a/services/pom.xml b/services/pom.xml index dd02297ad..e8299335b 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -28,7 +28,7 @@ herodotus-cloud cn.herodotus.reactive - 3.3.0.1 + 3.3.0.2 services