✨ feat: v3.2.0-RC1

- 主要更新 - [升级] Spring Boot 版本升级至 3.2.0 - [升级] Spring Cloud 版本升级至 2023.0.0-RC1 - [升级] Spring Authorization Server 版本升级至 1.2.0 - 其它更新 - [重构] 重构相关代码，适配 Spring Boot 3.2.0 fix: #I7W5C3 - [重构] 重构相关代码，适配 Spring Cloud 2023.0.0-RC1 fix: #7W5C6 - [重构] 重构 Spring Authorization Server 自定义 Provider 代码，适配最新的 Spring Authorization Server 1.2.0 版本。fix: #I7W5BY - [重构] 重构 Spring Authorization Server 配置代码，去除过时方法，适配最新代码。 - [修复] 修复 Emqx 监控数据转 Influxdb2 的 Spring Integration 流程注入配置条件错误。 - [修复] 修复 docker-compose 文件中，polaris 镜像名称不正确问题。 - [新增] Spring Cloud Tencent Polaris 配置导入包，方便环境搭建和配置 - [优化] 调整 Polaris 本地配置缓存目录，防止与新增配置导入包冲突和混淆 - [修复] 调整 polaris docker-compose 默认端口，适配最新版本 Polarismesh Server。 - [优化] 优化各个服务中，Spring Cloud Tencent 相关配置，去除无用的或者与默认参数相同的配置。 - [新增] 新增 Spring Cloud Tencent 读取和使用本地缓存统一化配置。 - [优化] 临时解决 SAS 1.2.0 不兼容问题，后续根据实际情况进行完善和修改。spring-projects/spring-authorization-server#1435 - [优化] 删除 dependencies 中重复的或无用的版本控制配置，统一使用 Spring Boot Dependencies 控制依赖版本
dromara · Nov 26, 2023 · 0f22fe0 · 0f22fe0
1 parent 61b2c33
commit 0f22fe0
Show file tree

Hide file tree

Showing 14 changed files with 465 additions and 61 deletions.
diff --git a/configurations/backup/tencent/3.2.0-RC1/polaris_config_202311261657.zip b/configurations/backup/tencent/3.2.0-RC1/polaris_config_202311261657.zip
diff --git a/configurations/docker/docker-compose/linux/herodotus/env.base.tencent.yml b/configurations/docker/docker-compose/linux/herodotus/env.base.tencent.yml
@@ -5,13 +5,15 @@ services:
     container_name: polarismesh
     ports:
       - "15010:15010"
+      - "8101:8101"
+      - "8100:8100"
       - "8088:8080"
       - "8090:8090"
       - "8091:8091"
       - "8093:8093"
       - "8761:8761"
-      - "9000:9000"
       - "9090:9090"
+      - "9091:9091"
 
   zookeeper:
     image: debezium/zookeeper:2.4

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.base.tencent.yml b/configurations/docker/docker-compose/windows/herodotus/env.base.tencent.yml
@@ -5,13 +5,15 @@ services:
     container_name: polarismesh
     ports:
       - "15010:15010"
+      - "8101:8101"
+      - "8100:8100"
       - "8088:8080"
       - "8090:8090"
       - "8091:8091"
       - "8093:8093"
       - "8761:8761"
-      - "9000:9000"
       - "9090:9090"
+      - "9091:9091"
 
   zookeeper:
     image: debezium/zookeeper:2.4

diff --git a/.../authorization/config/annotation/web/configurers/OAuth2AuthorizationServerConfigurer.java b/.../authorization/config/annotation/web/configurers/OAuth2AuthorizationServerConfigurer.java
diff --git a/packages/facility-spring-boot-starter/pom.xml b/packages/facility-spring-boot-starter/pom.xml
@@ -37,16 +37,16 @@
     <artifactId>facility-spring-boot-starter</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>cn.herodotus.engine</groupId>
-            <artifactId>facility-alibaba-spring-boot-starter</artifactId>
-        </dependency>
-
 <!--        <dependency>-->
 <!--            <groupId>cn.herodotus.engine</groupId>-->
-<!--            <artifactId>facility-tencent-spring-boot-starter</artifactId>-->
+<!--            <artifactId>facility-alibaba-spring-boot-starter</artifactId>-->
 <!--        </dependency>-->
 
+        <dependency>
+            <groupId>cn.herodotus.engine</groupId>
+            <artifactId>facility-tencent-spring-boot-starter</artifactId>
+        </dependency>
+
         <!--        <dependency>-->
         <!--            <groupId>cn.herodotus.engine</groupId>-->
         <!--            <artifactId>facility-orginal-spring-boot-starter</artifactId>-->

diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml
@@ -38,10 +38,6 @@
     <artifactId>dante-cloud-gateway</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>cn.herodotus.dante</groupId>
-            <artifactId>facility-spring-boot-starter</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
@@ -61,10 +57,15 @@
         </dependency>
 
         <dependency>
-            <groupId>cn.herodotus.engine</groupId>
-            <artifactId>facility-gateway-spring-boot-starter</artifactId>
+            <groupId>cn.herodotus.dante</groupId>
+            <artifactId>facility-spring-boot-starter</artifactId>
         </dependency>
 
+<!--        <dependency>-->
+<!--            <groupId>cn.herodotus.engine</groupId>-->
+<!--            <artifactId>facility-gateway-spring-boot-starter</artifactId>-->
+<!--        </dependency>-->
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>

diff --git a/platform/dante-cloud-gateway/src/main/resources/bootstrap.yml b/platform/dante-cloud-gateway/src/main/resources/bootstrap.yml
@@ -109,14 +109,11 @@ spring:
       ignored-interfaces:
         - eth0
     polaris:
-      enabled: true
       address: ${TENCENT_POLARIS_SERVER_ADDR:grpc://@tencent.polaris.server-addr@}
       namespace: ${TENCENT_POLARIS_NAMESPACE:@tencent.polaris.namespace@}
-      discovery:
-        service: ${spring.application.name}
-        namespace: ${TENCENT_POLARIS_NAMESPACE:@tencent.polaris.namespace@}
       config:
         address: ${TENCENT_POLARIS_CONFIG_ADDR:grpc://@tencent.polaris.config-addr@}
+        data-source: ${TENCENT_POLARIS_DATA_SOURCE:@tencent.polaris.data.source@}
         local-file-root-path: ${TENCENT_POLARIS_LOCAL_DIR:@tencent.polaris.local.dir@}
         groups:
           - name: ${PROFILE:@profile@}

diff --git a/platform/dante-cloud-message/src/main/resources/bootstrap.yml b/platform/dante-cloud-message/src/main/resources/bootstrap.yml
@@ -87,14 +87,11 @@ spring:
       ignored-interfaces:
         - eth0
     polaris:
-      enabled: true
       address: ${TENCENT_POLARIS_SERVER_ADDR:grpc://@tencent.polaris.server-addr@}
       namespace: ${TENCENT_POLARIS_NAMESPACE:@tencent.polaris.namespace@}
-      discovery:
-        service: ${spring.application.name}
-        namespace: ${TENCENT_POLARIS_NAMESPACE:@tencent.polaris.namespace@}
       config:
         address: ${TENCENT_POLARIS_CONFIG_ADDR:grpc://@tencent.polaris.config-addr@}
+        data-source: ${TENCENT_POLARIS_DATA_SOURCE:@tencent.polaris.data.source@}
         local-file-root-path: ${TENCENT_POLARIS_LOCAL_DIR:@tencent.polaris.local.dir@}
         groups:
           - name: ${PROFILE:@profile@}

diff --git a/platform/dante-cloud-monitor/src/main/resources/bootstrap.yml b/platform/dante-cloud-monitor/src/main/resources/bootstrap.yml
@@ -44,12 +44,9 @@ spring:
 #      ignored-interfaces:
 #        - eth0
     polaris:
-      enabled: true
       address: ${TENCENT_POLARIS_SERVER_ADDR:grpc://@tencent.polaris.server-addr@}
       namespace: ${TENCENT_POLARIS_NAMESPACE:@tencent.polaris.namespace@}
       discovery:
-        service: ${spring.application.name}
-        namespace: ${TENCENT_POLARIS_NAMESPACE:@tencent.polaris.namespace@}
         heartbeat-interval: 30
 ---
 # spring 全家桶基础设施配置

diff --git a/platform/dante-cloud-uaa/src/main/resources/bootstrap.yml b/platform/dante-cloud-uaa/src/main/resources/bootstrap.yml
@@ -92,19 +92,15 @@ spring:
     activate:
       on-profile: tencent
   cloud:
-    inetutils:
-      ignored-interfaces:
-        - eth0
+#    inetutils:
+#      ignored-interfaces:
+#        - eth0
     polaris:
-      enabled: true
       address: ${TENCENT_POLARIS_SERVER_ADDR:grpc://@tencent.polaris.server-addr@}
       namespace: ${TENCENT_POLARIS_NAMESPACE:@tencent.polaris.namespace@}
-      discovery:
-        service: ${spring.application.name}
-        namespace: ${TENCENT_POLARIS_NAMESPACE:@tencent.polaris.namespace@}
-        heartbeat-interval: 30
       config:
         address: ${TENCENT_POLARIS_CONFIG_ADDR:grpc://@tencent.polaris.config-addr@}
+        data-source: ${TENCENT_POLARIS_DATA_SOURCE:@tencent.polaris.data.source@}
         local-file-root-path: ${TENCENT_POLARIS_LOCAL_DIR:@tencent.polaris.local.dir@}
         groups:
           - name: ${PROFILE:@profile@}

diff --git a/platform/dante-cloud-upms/src/main/resources/bootstrap.yml b/platform/dante-cloud-upms/src/main/resources/bootstrap.yml
@@ -88,14 +88,11 @@ spring:
       ignored-interfaces:
         - eth0
     polaris:
-      enabled: true
       address: ${TENCENT_POLARIS_SERVER_ADDR:grpc://@tencent.polaris.server-addr@}
       namespace: ${TENCENT_POLARIS_NAMESPACE:@tencent.polaris.namespace@}
-      discovery:
-        service: ${spring.application.name}
-        namespace: ${TENCENT_POLARIS_NAMESPACE:@tencent.polaris.namespace@}
       config:
         address: ${TENCENT_POLARIS_CONFIG_ADDR:grpc://@tencent.polaris.config-addr@}
+        data-source: ${TENCENT_POLARIS_DATA_SOURCE:@tencent.polaris.data.source@}
         local-file-root-path: ${TENCENT_POLARIS_LOCAL_DIR:@tencent.polaris.local.dir@}
         groups:
           - name: ${PROFILE:@profile@}

diff --git a/pom.xml b/pom.xml
@@ -63,21 +63,6 @@
         <docker.resource.name>${project.build.finalName}.${project.packaging}</docker.resource.name>
     </properties>
 
-    <!-- 所有的子项目默认依赖 -->
-    <dependencies>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-    </dependencies>
-
-    <!-- 管理依赖版本号,子项目不会默认依赖 -->
-    <dependencyManagement>
-        <dependencies>
-
-        </dependencies>
-    </dependencyManagement>
-
     <!-- 环境 -->
     <profiles>
         <!-- 开发 -->
@@ -92,7 +77,7 @@
                 <profile>development</profile>
                 <database>postgresql</database>
                 <!--基础设施：tencent、alibaba、spring-->
-                <facility>alibaba</facility>
+                <facility>tencent</facility>
                 <!--代码构建控制-->
                 <!--跳过构建源代码包-->
                 <skip.build.source.package>false</skip.build.source.package>
@@ -114,6 +99,8 @@
                 <tencent.polaris.config-addr>192.168.101.10:8093</tencent.polaris.config-addr>
                 <!--Spring Cloud Tencent 本地缓存目录-->
                 <tencent.polaris.local.dir>./configurations/backup/cache</tencent.polaris.local.dir>
+                <!--Spring Cloud Tencent 动态配置数据源类型 polaris: 从北极星服务端获取配置文件 local: 从本地磁盘读取配置文件-->
+                <tencent.polaris.data.source>polaris</tencent.polaris.data.source>
             </properties>
         </profile>
         <!-- Docker -->
@@ -147,6 +134,8 @@
                 <tencent.polaris.namespace>default</tencent.polaris.namespace>
                 <!--Spring Cloud Tencent 本地缓存目录-->
                 <tencent.polaris.local.dir>./configurations/backup/cache</tencent.polaris.local.dir>
+                <!--Spring Cloud Tencent 动态配置数据源类型 polaris: 从北极星服务端获取配置文件 local: 从本地磁盘读取配置文件-->
+                <tencent.polaris.data.source>polaris</tencent.polaris.data.source>
             </properties>
         </profile>
         <!-- 生产 -->
@@ -180,10 +169,24 @@
                 <tencent.polaris.config-addr>192.168.101.10:8093</tencent.polaris.config-addr>
                 <!--Spring Cloud Tencent 本地缓存目录-->
                 <tencent.polaris.local.dir>./configurations/backup/cache</tencent.polaris.local.dir>
+                <!--Spring Cloud Tencent 动态配置数据源类型 polaris: 从北极星服务端获取配置文件 local: 从本地磁盘读取配置文件-->
+                <tencent.polaris.data.source>polaris</tencent.polaris.data.source>
             </properties>
         </profile>
     </profiles>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-bom</artifactId>
+                <version>${netty.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <pluginManagement>
             <plugins>

diff --git a/services/dante-cloud-bpmn-ability/src/main/resources/bootstrap.yml b/services/dante-cloud-bpmn-ability/src/main/resources/bootstrap.yml
@@ -85,14 +85,11 @@ spring:
     #      ignored-interfaces:
     #        - eth0
     polaris:
-      enabled: true
       address: ${TENCENT_POLARIS_SERVER_ADDR:grpc://@tencent.polaris.server-addr@}
       namespace: ${TENCENT_POLARIS_NAMESPACE:@tencent.polaris.namespace@}
-      discovery:
-        service: ${spring.application.name}
-        namespace: ${TENCENT_POLARIS_NAMESPACE:@tencent.polaris.namespace@}
       config:
         address: ${TENCENT_POLARIS_CONFIG_ADDR:grpc://@tencent.polaris.config-addr@}
+        data-source: ${TENCENT_POLARIS_DATA_SOURCE:@tencent.polaris.data.source@}
         local-file-root-path: ${TENCENT_POLARIS_LOCAL_DIR:@tencent.polaris.local.dir@}
         groups:
           - name: ${PROFILE:@profile@}

diff --git a/services/dante-cloud-oss-ability/src/main/resources/bootstrap.yml b/services/dante-cloud-oss-ability/src/main/resources/bootstrap.yml
@@ -95,14 +95,11 @@ spring:
       ignored-interfaces:
         - eth0
     polaris:
-      enabled: true
       address: ${TENCENT_POLARIS_SERVER_ADDR:grpc://@tencent.polaris.server-addr@}
       namespace: ${TENCENT_POLARIS_NAMESPACE:@tencent.polaris.namespace@}
-      discovery:
-        service: ${spring.application.name}
-        namespace: ${TENCENT_POLARIS_NAMESPACE:@tencent.polaris.namespace@}
       config:
         address: ${TENCENT_POLARIS_CONFIG_ADDR:grpc://@tencent.polaris.config-addr@}
+        data-source: ${TENCENT_POLARIS_DATA_SOURCE:@tencent.polaris.data.source@}
         local-file-root-path: ${TENCENT_POLARIS_LOCAL_DIR:@tencent.polaris.local.dir@}
         groups:
           - name: ${PROFILE:@profile@}