Skip to content

Commit 8082ea2

Browse files
herodotus-ecosystemgitee-org
herodotus-ecosystem
authored and
gitee-org
committed
!218 v3.3.0.3
Merge pull request !218 from 码匠君/develop
2 parents 6a16a0e + 4e0a52a commit 8082ea2

File tree

39 files changed

+103
-87
lines changed

39 files changed

+103
-87
lines changed

‎README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
<p align="center">
88
<a href="https://github.com/spring-projects/spring-authorization-server" target="_blank"><img src="https://img.shields.io/badge/Spring%20Authorization%20Server-1.3.0-blue.svg?logo=spring" alt="Spring Authorization Server 1.3.0"></a>
99
<a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-3.3.0-blue.svg?logo=spring" alt="Spring Boot 3.3.0"></a>
10-
<a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud-2023.0.1-blue.svg?logo=spring" alt="Spring Cloud 2023.0.1"></a>
10+
<a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud-2023.0.2-blue.svg?logo=spring" alt="Spring Cloud 2023.0.2"></a>
1111
<a href="https://github.com/alibaba/spring-cloud-alibaba" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Alibaba-2023.0.1.0-blue.svg?logo=alibabadotcom" alt="Spring Cloud Alibaba 2023.0.1.0"></a>
1212
<a href="https://github.com/Tencent/spring-cloud-tencent" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Tencent-1.14.0--2023.0.0-blue.svg?logo=tencentqq" alt="Spring Cloud Tencent 1.14.0--2023.0.0-SNAPSHOT"></a>
1313
<a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://img.shields.io/badge/Nacos-2.3.2-brightgreen.svg?logo=alibabadotcom" alt="Nacos 2.3.2"></a>
1414
</p>
1515
<p align="center">
16-
<a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.3.0.2-red.svg?logo=spring" alt="Version 3.3.0.2"></a>
17-
<a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.3.0.2-red.svg?logo=spring" alt="Dante Engine 3.3.0.2"></a>
18-
<a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.3.0.2-red.svg?logo=spring" alt="Dante OSS 3.3.0.2"></a>
16+
<a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.3.0.3-red.svg?logo=spring" alt="Version 3.3.0.3"></a>
17+
<a href="https://www.herodotus.cn" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.3.0.3-red.svg?logo=spring" alt="Dante Engine 3.3.0.3"></a>
18+
<a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.3.0.3-red.svg?logo=spring" alt="Dante OSS 3.3.0.3"></a>
1919
<a href="https://bell-sw.com/pages/downloads/#downloads" target="_blank"><img src="https://img.shields.io/badge/JDK-17%2B-green.svg?logo=openjdk" alt="Java 17"></a>
2020
<a href="./LICENSE"><img src="https://img.shields.io/badge/License-AGPL--3.0-blue.svg?logo=apache" alt="License AGPL 3.0"></a>
2121
<a href="https://www.herodotus.cn"><img src="https://visitor-badge.laobi.icu/badge?page_id=dante-cloud&title=Total%20Visits" alt="Total Visits"></a>
@@ -28,7 +28,7 @@
2828
<p align="center">
2929
<a href="https://github.com/herodotus-cloud/dante-cloud">Github 仓库</a> &nbsp; | &nbsp;
3030
<a href="https://gitee.com/dromara/dante-cloud">Gitee 仓库</a> &nbsp; | &nbsp;
31-
<a href="https://gitee.com/herodotus/dante-engine">核心组件仓库</a> &nbsp; | &nbsp;
31+
<a href="https://www.herodotus.cn">核心组件仓库</a> &nbsp; | &nbsp;
3232
<a href="https://www.herodotus.cn">文档</a>
3333
</p>
3434

@@ -157,7 +157,7 @@
157157
| 组件 | 版本 |
158158
|-----------------------------|-----------------|
159159
| Spring Boot | 3.3.0 |
160-
| Spring Cloud | 2023.0.1 |
160+
| Spring Cloud | 2023.0.2 |
161161
| Spring Cloud Alibaba | 2023.0.1.0 |
162162
| Spring Cloud Tencent | 1.14.0-2023.0.0 |
163163
| Spring Authorization Server | 1.3.0 |
@@ -213,10 +213,10 @@
213213

214214
| 分支名称 | 对应 Spring 生态版本 | 对应 JDK 版本 | 用途 | 现状 |
215215
|------------------------|-----------------------------------------|-----------|--------------------|-------------------------------------------------------------|
216-
| master | Spring Boot 3.3 和 Spring Cloud 2023.0.1 | JDK 17 | 主要发布分支 | 推荐使用代码分支 |
217-
| develop | Spring Boot 3.3 和 Spring Cloud 2023.0.1 | JDK 17 | Development 分支 | 新功能、ISSUE 均以此分支作为开发，发布后会 PR 至 master 分支。开发分支不保证可用 |
218-
| reactive-master | Spring Boot 3.3 和 Spring Cloud 2023.0.1 | JDK 21 | 响应式版本主要发布分支 | 推荐使用代码分支 |
219-
| reactive-develop | Spring Boot 3.3 和 Spring Cloud 2023.0.1 | JDK 21 | 响应式 Development 分支 | 下一代响应式微服务版本开发分支。开发分支不保证可用 |
216+
| master | Spring Boot 3.3 和 Spring Cloud 2023.0.2 | JDK 17 | 主要发布分支 | 推荐使用代码分支 |
217+
| develop | Spring Boot 3.3 和 Spring Cloud 2023.0.2 | JDK 17 | Development 分支 | 新功能、ISSUE 均以此分支作为开发，发布后会 PR 至 master 分支。开发分支不保证可用 |
218+
| reactive-master | Spring Boot 3.3 和 Spring Cloud 2023.0.2 | JDK 21 | 响应式版本主要发布分支 | 推荐使用代码分支 |
219+
| reactive-develop | Spring Boot 3.3 和 Spring Cloud 2023.0.2 | JDK 21 | 响应式 Development 分支 | 下一代响应式微服务版本开发分支。开发分支不保证可用 |
220220
| 3.1.X | Spring Boot 3.1 和 Spring Cloud 2022.0.X | JDK 17 | 历史代码，不再维护 | 基于 Spring Boot 3.1 时代开发的代码分支，稳定可用，不再维护 |
221221
| 2.7.X | Spring Boot 2.7 和 Spring Cloud 2021.0.X | JDK 8 | 历史代码，不再维护 | 基于 Spring Boot 2.7 时代开发的代码分支，稳定可用，不再维护 |
222222
| spring-security-oauth2 | Spring Boot 2.6 和 Spring Cloud 2021.0.X | JDK 8 | 历史代码，不再维护 | 基于原 Spring Security OAuth2 实现的微服务，稳定可用，因相关组件均不在维护，所以该版本不再维护 |
@@ -251,7 +251,7 @@ dante-cloud
251251
## [7]、项目地址
252252

253253
- 后端主工程地址：[https://gitee.com/dromara/dante-cloud](https://gitee.com/dromara/dante-cloud)
254-
- 后端核心组件库地址：[https://gitee.com/herodotus/dante-engine](https://gitee.com/herodotus/dante-engine)
254+
- 后端核心组件库地址：[https://www.herodotus.cn](https://www.herodotus.cn)
255255
- 后端单体版示例工程地址：[https://gitee.com/herodotus/dante-cloud-athena](https://gitee.com/herodotus/dante-cloud-athena)
256256
- 前端工程地址：[https://gitee.com/herodotus/dante-cloud-ui](https://gitee.com/herodotus/dante-cloud-ui)
257257

‎configurations/backup/alibaba/3.3.0.3/nacos_config_export_20240531173140.zip

12.3 KB
Binary file not shown.

‎configurations/backup/tencent/3.3.0.3/polaris_config_202405311904.zip

13 KB
Binary file not shown.

‎configurations/backup/yamls/common/dante-cloud-database-opengauss5.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
herodotus:
2+
database-information:
3+
platform: postgresql
4+
driver-class-name: org.opengauss.Driver
5+
dialect: cn.herodotus.engine.data.jpa.hibernate.dialect.OpenGaussDialect
6+
url: jdbc:opengauss://${herodotus.environment.database.host}:${herodotus.environment.database.port}/${herodotus.environment.database.name}

‎configurations/backup/yamls/common/dante-cloud-database.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ spring:
5353
jakarta:
5454
cache:
5555
missing_cache_strategy: create
56-
temp:
57-
use_jdbc_metadata_defaults: true
56+
boot:
57+
allow_jdbc_metadata_access: true
5858

5959
mybatis-plus:
6060
global-config:

‎configurations/docker/docker-compose/linux/herodotus/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=3.3.0.2
1+
VERSION=3.3.0.3
22
GATEWAY_SERVICE_NAME=dante-cloud-gateway
33
GATEWAY_SERVICE_PORT=8847
44
UAA_SERVICE_NAME=dante-cloud-uaa

‎configurations/docker/docker-compose/linux/herodotus/env.base.yml

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,25 @@ services:
2929
- "9848:9848"
3030
- "9849:9849"
3131

32-
zookeeper:
33-
image: debezium/zookeeper:2.6
34-
container_name: zookeeper
35-
hostname: zookeeper
36-
environment:
37-
ZOOKEEPER_SERVER_ID: 1
38-
ports:
39-
- "2181:2181"
40-
- "2888:2888"
41-
- "3888:3888"
42-
4332
kafka:
44-
image: debezium/kafka:2.6
33+
image: apache/kafka:3.7.0
4534
container_name: kafka
46-
hostname: kafka
35+
hostname: broker
36+
environment:
37+
KAFKA_NODE_ID: 1
38+
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
39+
KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT_HOST://192.168.101.10:9092,PLAINTEXT://broker:19092'
40+
KAFKA_PROCESS_ROLES: 'broker,controller'
41+
KAFKA_CONTROLLER_QUORUM_VOTERS: '1@broker:29093'
42+
KAFKA_LISTENERS: 'CONTROLLER://:29093,PLAINTEXT_HOST://:9092,PLAINTEXT://:19092'
43+
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
44+
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
45+
KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
46+
KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
47+
KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
48+
KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
4749
ports:
4850
- "9092:9092"
49-
environment:
50-
BROKER_ID: 1
51-
ZOOKEEPER_CONNECT: zookeeper:2181
52-
KAFKA_LISTENERS: LISTENER_INNER://kafka:29092,LISTENER_OUTER://0.0.0.0:9092
53-
KAFKA_ADVERTISED_LISTENERS: LISTENER_INNER://kafka:29092,LISTENER_OUTER://192.168.101.10:9092
54-
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: LISTENER_INNER:PLAINTEXT,LISTENER_OUTER:PLAINTEXT
55-
KAFKA_INTER_BROKER_LISTENER_NAME: LISTENER_INNER
56-
KAFKA_ALLOW_PLAINTEXT_LISTENER: 'yes'
57-
KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'
58-
depends_on:
59-
- zookeeper
6051

6152
elk:
6253
image: sebp/elk:latest

‎configurations/docker/docker-compose/linux/herodotus/env.oss.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
minio:
3-
image: quay.io/minio/minio:RELEASE.2024-05-10T01-41-38Z
3+
image: quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z
44
container_name: minio
55
hostname: minio
66
ports:

‎configurations/docker/docker-compose/windows/herodotus/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=3.3.0.2
1+
VERSION=3.3.0.3
22
GATEWAY_SERVICE_NAME=dante-cloud-gateway
33
GATEWAY_SERVICE_PORT=8847
44
UAA_SERVICE_NAME=dante-cloud-uaa

‎configurations/docker/docker-compose/windows/herodotus/env.base.yml

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,32 +28,25 @@ services:
2828
- "9848:9848"
2929
- "9849:9849"
3030

31-
zookeeper:
32-
image: debezium/zookeeper:2.6
33-
container_name: zookeeper
34-
environment:
35-
ZOOKEEPER_SERVER_ID: 1
36-
ports:
37-
- "2181:2181"
38-
- "2888:2888"
39-
- "3888:3888"
40-
4131
kafka:
42-
image: debezium/kafka:2.6
32+
image: apache/kafka:3.7.0
4333
container_name: kafka
34+
hostname: broker
35+
environment:
36+
KAFKA_NODE_ID: 1
37+
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
38+
KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT_HOST://192.168.101.10:9092,PLAINTEXT://broker:19092'
39+
KAFKA_PROCESS_ROLES: 'broker,controller'
40+
KAFKA_CONTROLLER_QUORUM_VOTERS: '1@broker:29093'
41+
KAFKA_LISTENERS: 'CONTROLLER://:29093,PLAINTEXT_HOST://:9092,PLAINTEXT://:19092'
42+
KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
43+
KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
44+
KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
45+
KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
46+
KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
47+
KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
4448
ports:
4549
- "9092:9092"
46-
environment:
47-
BROKER_ID: 1
48-
ZOOKEEPER_CONNECT: zookeeper:2181
49-
KAFKA_LISTENERS: LISTENER_INNER://kafka:29092,LISTENER_OUTER://0.0.0.0:9092
50-
KAFKA_ADVERTISED_LISTENERS: LISTENER_INNER://kafka:29092,LISTENER_OUTER://192.168.101.10:9092
51-
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: LISTENER_INNER:PLAINTEXT,LISTENER_OUTER:PLAINTEXT
52-
KAFKA_INTER_BROKER_LISTENER_NAME: LISTENER_INNER
53-
KAFKA_ALLOW_PLAINTEXT_LISTENER: 'yes'
54-
KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'
55-
depends_on:
56-
- zookeeper
5750

5851
elk:
5952
image: sebp/elk:latest

‎configurations/docker/docker-compose/windows/herodotus/env.oss.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
minio:
3-
image: quay.io/minio/minio:RELEASE.2024-05-10T01-41-38Z
3+
image: quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z
44
container_name: minio
55
hostname: minio
66
ports:

‎dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<groupId>cn.herodotus.engine</groupId>
3030
<artifactId>dependencies</artifactId>
31-
<version>3.3.0.2</version>
31+
<version>3.3.0.3</version>
3232
<relativePath/>
3333
</parent>
3434

‎modules/dante-module-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<artifactId>modules</artifactId>
3030
<groupId>cn.herodotus.dante</groupId>
31-
<version>3.3.0.2</version>
31+
<version>3.3.0.3</version>
3232
</parent>
3333

3434
<artifactId>dante-module-common</artifactId>

‎modules/dante-module-metadata/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<artifactId>modules</artifactId>
3030
<groupId>cn.herodotus.dante</groupId>
31-
<version>3.3.0.2</version>
31+
<version>3.3.0.3</version>
3232
</parent>
3333

3434
<artifactId>dante-module-metadata</artifactId>

‎modules/dante-module-social/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<artifactId>modules</artifactId>
3030
<groupId>cn.herodotus.dante</groupId>
31-
<version>3.3.0.2</version>
31+
<version>3.3.0.3</version>
3232
</parent>
3333

3434
<artifactId>dante-module-social</artifactId>

‎modules/dante-module-strategy/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<artifactId>modules</artifactId>
3030
<groupId>cn.herodotus.dante</groupId>
31-
<version>3.3.0.2</version>
31+
<version>3.3.0.3</version>
3232
</parent>
3333

3434
<artifactId>dante-module-strategy</artifactId>

‎modules/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<artifactId>dante-cloud</artifactId>
3030
<groupId>cn.herodotus.dante</groupId>
31-
<version>3.3.0.2</version>
31+
<version>3.3.0.3</version>
3232
</parent>
3333

3434
<artifactId>modules</artifactId>

‎packages/authentication-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<artifactId>packages</artifactId>
3030
<groupId>cn.herodotus.dante</groupId>
31-
<version>3.3.0.2</version>
31+
<version>3.3.0.3</version>
3232
</parent>
3333

3434
<artifactId>authentication-spring-boot-starter</artifactId>

‎packages/facility-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<artifactId>packages</artifactId>
2828
<groupId>cn.herodotus.dante</groupId>
29-
<version>3.3.0.2</version>
29+
<version>3.3.0.3</version>
3030
</parent>
3131
<modelVersion>4.0.0</modelVersion>
3232

‎packages/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<artifactId>dante-cloud</artifactId>
3030
<groupId>cn.herodotus.dante</groupId>
31-
<version>3.3.0.2</version>
31+
<version>3.3.0.3</version>
3232
</parent>
3333

3434
<artifactId>packages</artifactId>

‎packages/service-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<artifactId>packages</artifactId>
3030
<groupId>cn.herodotus.dante</groupId>
31-
<version>3.3.0.2</version>
31+
<version>3.3.0.3</version>
3232
</parent>
3333

3434
<artifactId>service-spring-boot-starter</artifactId>

‎platform/dante-cloud-gateway/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<artifactId>platform</artifactId>
3030
<groupId>cn.herodotus.dante</groupId>
31-
<version>3.3.0.2</version>
31+
<version>3.3.0.3</version>
3232
</parent>
3333

3434
<artifactId>dante-cloud-gateway</artifactId>

‎platform/dante-cloud-gateway/src/main/resources/bootstrap.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ spring:
4949
on-profile: alibaba
5050
cloud:
5151
nacos:
52+
username: ${ALIBABA_USERNAME:@alibaba.username@}
53+
password: ${ALIBABA_PASSWORD:@alibaba.password@}
5254
config:
5355
namespace: ${ALIBABA_NAMESPACE:@alibaba.namespace@}
5456
server-addr: ${ALIBABA_CONFIG_SERVER_ADDR:@alibaba.config.server-addr@}

‎platform/dante-cloud-message/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<parent>
2828
<groupId>cn.herodotus.dante</groupId>
2929
<artifactId>platform</artifactId>
30-
<version>3.3.0.2</version>
30+
<version>3.3.0.3</version>
3131
</parent>
3232

3333
<artifactId>dante-cloud-message</artifactId>

‎platform/dante-cloud-message/src/main/resources/bootstrap.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ spring:
1616
on-profile: alibaba
1717
cloud:
1818
nacos:
19+
username: ${ALIBABA_USERNAME:@alibaba.username@}
20+
password: ${ALIBABA_PASSWORD:@alibaba.password@}
1921
config:
2022
namespace: ${ALIBABA_NAMESPACE:@alibaba.namespace@}
2123
server-addr: ${ALIBABA_CONFIG_SERVER_ADDR:@alibaba.config.server-addr@}

‎platform/dante-cloud-monitor/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
<parent>
2727
<artifactId>platform</artifactId>
2828
<groupId>cn.herodotus.dante</groupId>
29-
<version>3.3.0.2</version>
29+
<version>3.3.0.3</version>
3030
</parent>
3131

3232
<artifactId>dante-cloud-monitor</artifactId>
33-
<version>3.3.0.2</version>
33+
<version>3.3.0.3</version>
3434
<name>dante-cloud-monitor</name>
3535
<description>dante-cloud-monitor</description>
3636
<dependencies>

‎platform/dante-cloud-monitor/src/main/resources/bootstrap.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ spring:
2222
on-profile: alibaba
2323
cloud:
2424
nacos:
25+
username: ${ALIBABA_USERNAME:@alibaba.username@}
26+
password: ${ALIBABA_PASSWORD:@alibaba.password@}
2527
config:
2628
namespace: ${ALIBABA_NAMESPACE:@alibaba.namespace@}
2729
server-addr: ${ALIBABA_CONFIG_SERVER_ADDR:@alibaba.config.server-addr@}

‎platform/dante-cloud-uaa/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<artifactId>platform</artifactId>
3030
<groupId>cn.herodotus.dante</groupId>
31-
<version>3.3.0.2</version>
31+
<version>3.3.0.3</version>
3232
</parent>
3333

3434
<artifactId>dante-cloud-uaa</artifactId>

‎platform/dante-cloud-uaa/src/main/resources/bootstrap.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ spring:
1616
on-profile: alibaba
1717
cloud:
1818
nacos:
19+
username: ${ALIBABA_USERNAME:@alibaba.username@}
20+
password: ${ALIBABA_PASSWORD:@alibaba.password@}
1921
config:
2022
namespace: ${ALIBABA_NAMESPACE:@alibaba.namespace@}
2123
server-addr: ${ALIBABA_CONFIG_SERVER_ADDR:@alibaba.config.server-addr@}

‎platform/dante-cloud-upms/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
<parent>
2727
<artifactId>platform</artifactId>
2828
<groupId>cn.herodotus.dante</groupId>
29-
<version>3.3.0.2</version>
29+
<version>3.3.0.3</version>
3030
</parent>
3131
<modelVersion>4.0.0</modelVersion>
3232

3333
<artifactId>dante-cloud-upms</artifactId>
34-
<version>3.3.0.2</version>
34+
<version>3.3.0.3</version>
3535

3636
<dependencies>
3737
<dependency>

‎platform/dante-cloud-upms/src/main/resources/bootstrap.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ spring:
1717
on-profile: alibaba
1818
cloud:
1919
nacos:
20+
username: ${ALIBABA_USERNAME:@alibaba.username@}
21+
password: ${ALIBABA_PASSWORD:@alibaba.password@}
2022
config:
2123
namespace: ${ALIBABA_NAMESPACE:@alibaba.namespace@}
2224
server-addr: ${ALIBABA_CONFIG_SERVER_ADDR:@alibaba.config.server-addr@}

0 commit comments

Comments
 (0)