!190 v3.2.3.0

Merge pull request !190 from 码匠君/develop
dromara · Feb 23, 2024 · 55a4819 · 55a4819
2 parents 23581cc + 56b9afa
commit 55a4819
Show file tree

Hide file tree

Showing 39 changed files with 67 additions and 77 deletions.
diff --git a/README.md b/README.md
@@ -5,17 +5,17 @@
 ---
 
 <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.2.1-blue.svg?logo=spring" alt="Spring Authorization Server 1.2.1"></a>
-    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-3.2.2-blue.svg?logo=spring" alt="Spring Boot 3.2.2"></a>
+    <a href="https://github.com/spring-projects/spring-authorization-server" target="_blank"><img src="https://img.shields.io/badge/Spring%20Authorization%20Server-1.2.2-blue.svg?logo=spring" alt="Spring Authorization Server 1.2.2"></a>
+    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-3.2.3-blue.svg?logo=spring" alt="Spring Boot 3.2.3"></a>
     <a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud-2023.0.0-blue.svg?logo=spring" alt="Spring Cloud 2023.0.0"></a>
     <a href="https://github.com/alibaba/spring-cloud-alibaba" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Alibaba-2022.0.0.0-blue.svg?logo=alibabadotcom" alt="Spring Cloud Alibaba 2022.0.0.0"></a>
-    <a href="https://github.com/Tencent/spring-cloud-tencent" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Tencent-1.12.4--2022.0.4-blue.svg?logo=tencentqq" alt="Spring Cloud Tencent 1.12.4-2022.0.4"></a>
+    <a href="https://github.com/Tencent/spring-cloud-tencent" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Tencent-1.13.0--2023.0.0-blue.svg?logo=tencentqq" alt="Spring Cloud Tencent 1.13.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.0-brightgreen.svg?logo=alibabadotcom" alt="Nacos 2.3.0"></a>
 </p>
 <p align="center">
-    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.2.2.3-red.svg?logo=spring" alt="Version 3.2.2.3"></a>
-    <a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.2.2.3-red.svg?logo=spring" alt="Dante Engine 3.2.2.3"></a>
-    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.2.2.3-red.svg?logo=spring" alt="Dante OSS 3.2.2.3"></a>
+    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.2.3.0-red.svg?logo=spring" alt="Version 3.2.3.0"></a>
+    <a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.2.3.0-red.svg?logo=spring" alt="Dante Engine 3.2.3.0"></a>
+    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.2.3.0-red.svg?logo=spring" alt="Dante OSS 3.2.3.0"></a>
     <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>
     <a href="./LICENSE"><img src="https://img.shields.io/badge/License-Apache--2.0-blue.svg?logo=apache" alt="License Apache 2.0"></a>
     <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>
@@ -38,7 +38,7 @@
 
 ## 企业级技术中台微服务架构与服务能力开发平台
 
-Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和服务能力开发平台，是采用领域驱动模型(DDD)设计思想的、全面拥抱 Spring Authorization Server 的、基于 OAuth2.1 协议的、支持智能电视、IoT等物联网设备认证的微服务架构。基于 Spring Authorization Server 1.2.1、Spring Boot 3.2.2、Spring Cloud 2023.0.0、Spring Cloud Tencent 1.12.4-2022.0.4、Spring Cloud Alibaba 2022.0.0.0、Nacos 2.3.0 等主流技术栈开发的多租户系统，遵循SpringBoot 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能。
+Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和服务能力开发平台，是采用领域驱动模型(DDD)设计思想的、全面拥抱 Spring Authorization Server 的、基于 OAuth2.1 协议的、支持智能电视、IoT等物联网设备认证的微服务架构。基于 Spring Authorization Server 1.2.2、Spring Boot 3.2.3、Spring Cloud 2023.0.0、Spring Cloud Tencent 1.12.4-2022.0.4、Spring Cloud Alibaba 2022.0.0.0、Nacos 2.3.0 等主流技术栈开发的多租户系统，遵循SpringBoot 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能。
 
 ## 定位
 
@@ -153,12 +153,12 @@ Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和
 
 | 组件                          | 版本              |
 |-----------------------------|-----------------|
-| Spring Boot                 | 3.2.2           |
+| Spring Boot                 | 3.2.3           |
 | Spring Cloud                | 2023.0.0        |
 | Spring Cloud Alibaba        | 2022.0.0.0      |
-| Spring Cloud Tencent        | 1.12.4-2022.0.4 |
-| Spring Authorization Server | 1.2.1           |
-| Spring Boot Admin           | 3.2.1           |
+| Spring Cloud Tencent        | 1.13.0-2023.0.0 |
+| Spring Authorization Server | 1.2.2           |
+| Spring Boot Admin           | 3.2.2           |
 | Nacos                       | 2.3.0           |
 | Sentinel                    | 1.8.7           |
 | Seata                       | 1.7.0           |

diff --git a/configurations/backup/alibaba/3.2.2.1/nacos_config_export_20240114153144.zip b/configurations/backup/alibaba/3.2.2.1/nacos_config_export_20240114153144.zip
diff --git a/configurations/backup/alibaba/3.2.2.2/nacos_config_export_20240114153144.zip b/configurations/backup/alibaba/3.2.2.2/nacos_config_export_20240114153144.zip
diff --git a/....0/nacos_config_export_20240114153144.zip → ....0/nacos_config_export_20240114153144.zip b/....0/nacos_config_export_20240114153144.zip → ....0/nacos_config_export_20240114153144.zip
diff --git a/configurations/backup/tencent/3.2.2.1/polaris_config_202401141533.zip b/configurations/backup/tencent/3.2.2.1/polaris_config_202401141533.zip
diff --git a/configurations/backup/tencent/3.2.2.2/polaris_config_202401141533.zip b/configurations/backup/tencent/3.2.2.2/polaris_config_202401141533.zip
diff --git a/...t/3.2.2.0/polaris_config_202401141533.zip → ...t/3.2.3.0/polaris_config_202401141533.zip b/...t/3.2.2.0/polaris_config_202401141533.zip → ...t/3.2.3.0/polaris_config_202401141533.zip
diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=3.2.2.3
+VERSION=3.2.3.0
 GATEWAY_SERVICE_NAME=dante-cloud-gateway
 GATEWAY_SERVICE_PORT=8847
 UAA_SERVICE_NAME=dante-cloud-uaa

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.oss.yml b/configurations/docker/docker-compose/linux/herodotus/env.oss.yml
@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   minio:
-    image: quay.io/minio/minio:RELEASE.2024-02-09T21-25-16Z
+    image: quay.io/minio/minio:RELEASE.2024-02-17T01-15-57Z
     container_name: minio
     hostname: minio
     ports:

diff --git a/configurations/docker/docker-compose/windows/herodotus/.env b/configurations/docker/docker-compose/windows/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=3.2.2.3
+VERSION=3.2.3.0
 GATEWAY_SERVICE_NAME=dante-cloud-gateway
 GATEWAY_SERVICE_PORT=8847
 UAA_SERVICE_NAME=dante-cloud-uaa

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.oss.yml b/configurations/docker/docker-compose/windows/herodotus/env.oss.yml
@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   minio:
-    image: quay.io/minio/minio:RELEASE.2024-02-09T21-25-16Z
+    image: quay.io/minio/minio:RELEASE.2024-02-17T01-15-57Z
     container_name: minio
     hostname: minio
     ports:

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>cn.herodotus.engine</groupId>
         <artifactId>dependencies</artifactId>
-        <version>3.2.2.3</version>
+        <version>3.2.3.0</version>
         <relativePath/>
     </parent>
 

diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.2.2.3</version>
+        <version>3.2.3.0</version>
     </parent>
 
     <artifactId>dante-module-common</artifactId>

diff --git a/modules/dante-module-metadata/pom.xml b/modules/dante-module-metadata/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.2.2.3</version>
+        <version>3.2.3.0</version>
     </parent>
 
     <artifactId>dante-module-metadata</artifactId>

diff --git a/modules/dante-module-social/pom.xml b/modules/dante-module-social/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.2.2.3</version>
+        <version>3.2.3.0</version>
     </parent>
 
     <artifactId>dante-module-social</artifactId>

diff --git a/modules/dante-module-strategy/pom.xml b/modules/dante-module-strategy/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.2.2.3</version>
+        <version>3.2.3.0</version>
     </parent>
 
     <artifactId>dante-module-strategy</artifactId>

diff --git a/modules/pom.xml b/modules/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.2.2.3</version>
+        <version>3.2.3.0</version>
     </parent>
 
     <artifactId>modules</artifactId>

diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.2.2.3</version>
+        <version>3.2.3.0</version>
     </parent>
 
     <artifactId>authentication-spring-boot-starter</artifactId>

diff --git a/packages/facility-spring-boot-starter/pom.xml b/packages/facility-spring-boot-starter/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.2.2.3</version>
+        <version>3.2.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/packages/pom.xml b/packages/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.2.2.3</version>
+        <version>3.2.3.0</version>
     </parent>
 
     <artifactId>packages</artifactId>

diff --git a/packages/service-spring-boot-starter/pom.xml b/packages/service-spring-boot-starter/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.2.2.3</version>
+        <version>3.2.3.0</version>
     </parent>
 
     <artifactId>service-spring-boot-starter</artifactId>

diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.2.2.3</version>
+        <version>3.2.3.0</version>
     </parent>
 
     <artifactId>dante-cloud-gateway</artifactId>

diff --git a/platform/dante-cloud-gateway/src/main/resources/bootstrap.yml b/platform/dante-cloud-gateway/src/main/resources/bootstrap.yml
@@ -105,10 +105,11 @@ 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@}
       config:
@@ -131,13 +132,9 @@ logging:
     name: logs/${spring.application.name}.log
   level:
     root: INFO
-    # 关闭不必要的日志
-    org.reflections.Reflections: off
-    com.ulisesbocchio: error
-    org.springframework.cloud.gateway: debug
     # 开发、调试需要的日志
-    cn.herodotus: trace
-    com.alicp.jetcache: info
+    cn.herodotus: debug
+
 ---
 # spring 全家桶基础设施配置
 spring:

diff --git a/platform/dante-cloud-message/pom.xml b/platform/dante-cloud-message/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>cn.herodotus.dante</groupId>
         <artifactId>platform</artifactId>
-        <version>3.2.2.3</version>
+        <version>3.2.3.0</version>
     </parent>
 
     <artifactId>dante-cloud-message</artifactId>

diff --git a/platform/dante-cloud-message/src/main/resources/bootstrap.yml b/platform/dante-cloud-message/src/main/resources/bootstrap.yml
@@ -83,10 +83,11 @@ 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@}
       config:
@@ -116,15 +117,12 @@ logging:
     name: logs/${spring.application.name}.log
   level:
     root: INFO
-    # 关闭不必要的日志
-    org.reflections.Reflections: off
-    com.ulisesbocchio: error
     # 开发、调试需要的日志
     org.springframework.security: info
     org.springframework.web: debug
-    com.alicp.jetcache: debug
     org.springframework.cloud.bus: info
     org.apache.kafka: warn
+    cn.herodotus: info
 ---
 # spring 全家桶基础设施配置
 spring:

diff --git a/platform/dante-cloud-monitor/pom.xml b/platform/dante-cloud-monitor/pom.xml
@@ -30,11 +30,11 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.2.2.3</version>
+        <version>3.2.3.0</version>
     </parent>
 
     <artifactId>dante-cloud-monitor</artifactId>
-    <version>3.2.2.3</version>
+    <version>3.2.3.0</version>
     <name>dante-cloud-monitor</name>
     <description>dante-cloud-monitor</description>
     <dependencies>

diff --git a/platform/dante-cloud-monitor/src/main/resources/bootstrap.yml b/platform/dante-cloud-monitor/src/main/resources/bootstrap.yml
@@ -44,6 +44,7 @@ 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:

diff --git a/platform/dante-cloud-uaa/pom.xml b/platform/dante-cloud-uaa/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.2.2.3</version>
+        <version>3.2.3.0</version>
     </parent>
 
     <artifactId>dante-cloud-uaa</artifactId>

diff --git a/platform/dante-cloud-uaa/src/main/resources/bootstrap.yml b/platform/dante-cloud-uaa/src/main/resources/bootstrap.yml
@@ -96,6 +96,7 @@ spring:
 #      ignored-interfaces:
 #        - eth0
     polaris:
+      enabled: true
       address: ${TENCENT_POLARIS_SERVER_ADDR:grpc://@tencent.polaris.server-addr@}
       namespace: ${TENCENT_POLARIS_NAMESPACE:@tencent.polaris.namespace@}
       config:
@@ -125,15 +126,12 @@ logging:
     name: logs/${spring.application.name}.log
   level:
     root: INFO
-    # 关闭不必要的日志
-    org.reflections.Reflections: off
-    com.ulisesbocchio: error
     # 开发、调试需要的日志
     org.springframework.security: info
-    org.springframework.web: info
-    com.alicp.jetcache: trace
+    org.springframework.web: debug
     org.springframework.cloud.bus: info
     org.apache.kafka: warn
+    cn.herodotus: info
 ---
 # spring 全家桶基础设施配置
 spring:

diff --git a/platform/dante-cloud-upms/pom.xml b/platform/dante-cloud-upms/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.2.2.3</version>
+        <version>3.2.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dante-cloud-upms</artifactId>
-    <version>3.2.2.3</version>
+    <version>3.2.3.0</version>
 
     <dependencies>
         <dependency>

diff --git a/platform/dante-cloud-upms/src/main/resources/bootstrap.yml b/platform/dante-cloud-upms/src/main/resources/bootstrap.yml
@@ -84,10 +84,11 @@ 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@}
       config:

diff --git a/platform/pom.xml b/platform/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.2.2.3</version>
+        <version>3.2.3.0</version>
     </parent>
 
     <artifactId>platform</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>cn.herodotus.dante</groupId>
         <artifactId>dependencies</artifactId>
-        <version>3.2.2.3</version>
+        <version>3.2.3.0</version>
         <relativePath>dependencies/pom.xml</relativePath>
     </parent>
 
@@ -77,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>

diff --git a/services/dante-cloud-bpmn-ability/pom.xml b/services/dante-cloud-bpmn-ability/pom.xml
@@ -31,11 +31,11 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.2.2.3</version>
+        <version>3.2.3.0</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-ability</artifactId>
-    <version>3.2.2.3</version>
+    <version>3.2.3.0</version>
 
     <name>dante-cloud-bpmn-ability</name>
     <description>基于Camunda工作流的服务</description>