Skip to content

Commit

Permalink
!219 v3.3.0.2
Browse files Browse the repository at this point in the history
Merge pull request !219 from 码匠君/reactive-develop
  • Loading branch information
herodotus-ecosystem authored and gitee-org committed May 31, 2024
2 parents b1936a6 + ef96bc5 commit d68c33a
Show file tree
Hide file tree
Showing 50 changed files with 118 additions and 96 deletions.
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<p align="center">
<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>
<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>
<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>
<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>
<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>
<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>
<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>
Expand Down Expand Up @@ -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 |
Expand Down Expand Up @@ -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 实现的微服务,稳定可用,因相关组件均不在维护,所以该版本不再维护 |
Expand Down Expand Up @@ -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 | | |

### 开源项目

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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}
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 0 additions & 10 deletions configurations/backup/yamls/logs/loki-logback-spring.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
~
~ Copyright 2020-2030 ZHENGGENGWEI<码匠君>. All rights reserved.
~
~ * Author: ZHENGGENGWEI<码匠君>
~ * Contact: <[email protected]>
~ * Blog and source code availability: <https://gitee.com/herodotus/herodotus-cloud>
-->

<configuration>

<include resource="org/springframework/boot/logging/logback/defaults.xml" />
Expand Down
2 changes: 1 addition & 1 deletion configurations/docker/docker-compose/linux/herodotus/.env
Original file line number Diff line number Diff line change
@@ -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
Expand Down
40 changes: 16 additions & 24 deletions configurations/docker/docker-compose/linux/herodotus/env.base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,41 +22,33 @@ 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:
- "8848:8848"
- "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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 10 additions & 0 deletions configurations/docker/docker-compose/windows/herodotus/db.yml
Original file line number Diff line number Diff line change
@@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
40 changes: 17 additions & 23 deletions configurations/docker/docker-compose/windows/herodotus/env.base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,40 +21,34 @@ 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:
- "8848:8848"
- "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
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<parent>
<groupId>cn.herodotus.stirrup</groupId>
<artifactId>dependencies</artifactId>
<version>3.3.0.1</version>
<version>3.3.0.2</version>
<relativePath/>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/herodotus-module-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>modules</artifactId>
<groupId>cn.herodotus.reactive</groupId>
<version>3.3.0.1</version>
<version>3.3.0.2</version>
</parent>

<artifactId>herodotus-module-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion modules/herodotus-module-metadata/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>modules</artifactId>
<groupId>cn.herodotus.reactive</groupId>
<version>3.3.0.1</version>
<version>3.3.0.2</version>
</parent>

<artifactId>herodotus-module-metadata</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion modules/herodotus-module-social/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>modules</artifactId>
<groupId>cn.herodotus.reactive</groupId>
<version>3.3.0.1</version>
<version>3.3.0.2</version>
</parent>

<artifactId>herodotus-module-social</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion modules/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>herodotus-cloud</artifactId>
<groupId>cn.herodotus.reactive</groupId>
<version>3.3.0.1</version>
<version>3.3.0.2</version>
</parent>

<artifactId>modules</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion packages/authentication-spring-boot-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>packages</artifactId>
<groupId>cn.herodotus.reactive</groupId>
<version>3.3.0.1</version>
<version>3.3.0.2</version>
</parent>

<artifactId>authentication-spring-boot-starter</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>cn.herodotus.reactive</groupId>
<artifactId>packages</artifactId>
<version>3.3.0.1</version>
<version>3.3.0.2</version>
</parent>

<artifactId>authorization-reactive-spring-boot-starter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion packages/authorization-servlet-spring-boot-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>packages</artifactId>
<groupId>cn.herodotus.reactive</groupId>
<version>3.3.0.1</version>
<version>3.3.0.2</version>
</parent>

<artifactId>authorization-servlet-spring-boot-starter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion packages/facility-spring-boot-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>packages</artifactId>
<groupId>cn.herodotus.reactive</groupId>
<version>3.3.0.1</version>
<version>3.3.0.2</version>
</parent>

<artifactId>facility-spring-boot-starter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion packages/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>herodotus-cloud</artifactId>
<groupId>cn.herodotus.reactive</groupId>
<version>3.3.0.1</version>
<version>3.3.0.2</version>
</parent>

<artifactId>packages</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion packages/rpc-client-uaa-spring-boot-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>cn.herodotus.reactive</groupId>
<artifactId>packages</artifactId>
<version>3.3.0.1</version>
<version>3.3.0.2</version>
</parent>

<artifactId>rpc-client-uaa-spring-boot-starter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion packages/rpc-server-upms-spring-boot-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>cn.herodotus.reactive</groupId>
<artifactId>packages</artifactId>
<version>3.3.0.1</version>
<version>3.3.0.2</version>
</parent>

<artifactId>rpc-server-upms-spring-boot-starter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion platform/herodotus-cloud-gateway/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<artifactId>platform</artifactId>
<groupId>cn.herodotus.reactive</groupId>
<version>3.3.0.1</version>
<version>3.3.0.2</version>
</parent>

<artifactId>herodotus-cloud-gateway</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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@}
Expand Down
2 changes: 1 addition & 1 deletion platform/herodotus-cloud-message/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>cn.herodotus.reactive</groupId>
<artifactId>platform</artifactId>
<version>3.3.0.1</version>
<version>3.3.0.2</version>
</parent>

<artifactId>herodotus-cloud-message</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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@}
Expand Down
Loading

0 comments on commit d68c33a

Please sign in to comment.