✨ feat: v3.3.0.2

- 主要更新
  - [升级] Spring Cloud 版本升级至 2023.0.2
  - [新增] 新增 Token Exchange 授权模式选项
  - [新增] 新增 Kafka 3 Docker Compose 配置，无需再额外 Zookeeper（如果要使用 Debezium，建议使用 Debezium 套件，这种情况下还需要启动 Zookeeper。目前还没有找到 Debezium Kafka 单点环境脱离 Zookeeper 的方案）
  - [新增] 新增 opengauss 数据库支持
  - [新增] 新增 Nacos 鉴权配置。系统默认在 Nacos 鉴权环境运行。
- 其它更新
  - [重构] 按照最新版 Spring Authorization Server 重构自定义授权模式以及扩展已有授权模式代码
  - [修复] 修复授权服务器 Security Security 没有捕获不会按照统一格式输出问题
  - [修复] 修复 Client Credentials 模式，Scope 授权接口校验越权问题
  - [优化] 优化 Spring Data 相关配置，采用最新配置替换已过时配置
  - [升级] minio docker 镜像版本升级至 RELEASE.2024-05-28T17-19-04Z
- 依赖更新
  - [升级] redisson 版本升级至 3.31.0
  - [升级] aws-java-sdk-s3 版本升级至 1.12.733
  - [升级] software.amazon.awssdk 版本升级至 2.25.63
  - [升级] hutool 5.X 版本升级至 5.8.28
  - [升级] hutool 版本升级至 6.0.0-M13
  - [升级] alipay-sdk-java 版本升级至 4.39.86.ALL
  - [升级] com.baidu.aip 版本升级至 4.16.19
  - [升级] sqlite-jdbc 版本升级至 3.46.0.0
  - [升级] vue webjars 版本升级至 3.4.27

README.md

@@ -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>
@@ -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 实现的微服务，稳定可用，因相关组件均不在维护，所以该版本不再维护 |

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}

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:

configurations/backup/yamls/logs/loki-logback-spring.xml

@@ -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" />

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

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:

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:

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:

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

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"

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

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:

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:

dependencies/pom.xml

@@ -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>
 

modules/herodotus-module-common/pom.xml

@@ -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>

modules/herodotus-module-metadata/pom.xml

@@ -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>

modules/herodotus-module-social/pom.xml

@@ -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>

modules/pom.xml

@@ -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>

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

@@ -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>

packages/authentication-spring-boot-starter/src/main/java/cn/herodotus/cloud/authentication/autoconfigure/AuthorizationServerAutoConfiguration.java

@@ -27,7 +27,6 @@
 import cn.herodotus.stirrup.core.identity.service.ClientDetailsService;
 import cn.herodotus.stirrup.logic.identity.response.OAuth2DeviceVerificationResponseHandler;
 import cn.herodotus.stirrup.oauth2.authentication.autoconfigure.customizer.OAuth2AuthorizationServerConfigurerCustomizer;
-import cn.herodotus.stirrup.oauth2.authentication.autoconfigure.customizer.OAuth2ExceptionHandlingConfigurerCustomizer;
 import cn.herodotus.stirrup.oauth2.authentication.autoconfigure.response.OidcClientRegistrationResponseHandler;
 import cn.herodotus.stirrup.oauth2.authentication.configurer.OAuth2AuthenticationProviderConfigurer;
 import cn.herodotus.stirrup.oauth2.authentication.customizer.OAuth2FormLoginConfigurerCustomizer;
@@ -124,7 +123,6 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(
                 .formLogin(oauth2FormLoginConfigurerCustomizer)
                 .sessionManagement(oauth2sessionManagementConfigurerCustomer)
                 .addFilterBefore(new MultiTenantFilter(), AuthorizationFilter.class)
-                .exceptionHandling(new OAuth2ExceptionHandlingConfigurerCustomizer())
                 // 不配置 oauth2ResourceServer 就不会启用BearerTokenAuthenticationFilter
                 .oauth2ResourceServer(oauth2ResourceServerConfigurerCustomer)
                 .with(new OAuth2AuthenticationProviderConfigurer(sessionRegistry, passwordEncoder, userDetailsService, oauth2AuthenticationProperties), (configurer) -> {

packages/authorization-reactive-spring-boot-starter/pom.xml

@@ -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>

packages/authorization-servlet-spring-boot-starter/pom.xml

@@ -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>

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

@@ -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>

packages/pom.xml

@@ -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>

packages/rpc-client-uaa-spring-boot-starter/pom.xml

@@ -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>

packages/rpc-server-upms-spring-boot-starter/pom.xml

@@ -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>

platform/herodotus-cloud-gateway/pom.xml

@@ -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>

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@}

platform/herodotus-cloud-message/pom.xml

@@ -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>

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@}

platform/herodotus-cloud-monitor/pom.xml

@@ -26,11 +26,11 @@
     <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-monitor</artifactId>
-    <version>3.3.0.1</version>
+    <version>3.3.0.2</version>
     <name>herodotus-cloud-monitor</name>
     <description>herodotus-cloud-monitor</description>
 

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@}

platform/herodotus-cloud-uaa/pom.xml

@@ -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-uaa</artifactId>

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@}

platform/herodotus-cloud-upms/pom.xml

@@ -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-upms</artifactId>

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@}
@@ -79,7 +81,7 @@ logging:
     org.apache.kafka: warn
 grpc:
   server:
-    port: 5070
+    port: 6070
 
 ---
 # spring cloud tencent 基础设施配置

platform/pom.xml

@@ -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>platform</artifactId>