!151 v3.1.3.6

Merge pull request !151 from 码匠君/develop
dromara · Sep 14, 2023 · 8021d30 · 8021d30
2 parents e1c60a2 + 1689bfb
commit 8021d30
Show file tree

Hide file tree

Showing 33 changed files with 90 additions and 102 deletions.
diff --git a/README.md b/README.md
@@ -9,13 +9,13 @@
     <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-3.1.3-blue.svg?logo=spring" alt="Spring Boot 3.1.3"></a>
     <a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud-2022.0.4-blue.svg?logo=spring" alt="Spring Cloud 2022.0.4"></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.11.9--2022.0.1-blue.svg?logo=tencentqq" alt="Spring Cloud Tencent 1.11.9-2022.0.1"></a>
+    <a href="https://github.com/Tencent/spring-cloud-tencent" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Tencent-1.12.1--2022.0.4-blue.svg?logo=tencentqq" alt="Spring Cloud Tencent 1.12.1-2022.0.4"></a>
     <a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://img.shields.io/badge/Nacos-2.2.4-brightgreen.svg?logo=alibabadotcom" alt="Nacos 2.2.4"></a>
 </p>
 <p align="center">
-    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.1.3.5-red.svg?logo=spring" alt="Version 3.1.3.5"></a>
-    <a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.1.3.5-red.svg?logo=spring" alt="Dante Engine 3.1.3.5"></a>
-    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.1.3.5-red.svg?logo=spring" alt="Dante OSS 3.1.3.5"></a>
+    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.1.3.6-red.svg?logo=spring" alt="Version 3.1.3.6"></a>
+    <a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.1.3.6-red.svg?logo=spring" alt="Dante Engine 3.1.3.6"></a>
+    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.1.3.6-red.svg?logo=spring" alt="Dante OSS 3.1.3.6"></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>
@@ -25,9 +25,6 @@
     <a href="https://gitee.com/dromara/dante-cloud"><img src="https://gitee.com/dromara/dante-cloud/badge/star.svg?theme=dark" alt="Gitee star"></a>
     <a href="https://gitee.com/dromara/dante-cloud"><img src="https://gitee.com/dromara/dante-cloud/badge/fork.svg?theme=dark" alt="Gitee fork"></a>
 </p>
-<p align="center">
-  <a href="https://www.murphysec.com/console/report/1657950953842561024/1676584359397769216" alt="Security Status"><img src="https://www.murphysec.com/platform3/v31/badge/1676584359397769216.svg" /></a>
-</p>
 <p align="center">
     <a href="https://github.com/herodotus-cloud/dante-cloud">Github 仓库</a> &nbsp; | &nbsp;
     <a href="https://gitee.com/dromara/dante-cloud">Gitee 仓库</a> &nbsp; | &nbsp;
@@ -41,7 +38,7 @@
 
 ## 企业级技术中台微服务架构与服务能力开发平台
 
-Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和服务能力开发平台，是采用领域驱动模型(DDD)设计思想的、全面拥抱 Spring Authorization Server 的、基于 OAuth2.1 协议的、支持智能电视、IoT等物联网设备认证的微服务架构。基于 Spring Authorization Server 1.1.2、Spring Boot 3.1.3、Spring Cloud 2022.0.4、Spring Cloud Tencent 1.11.9-2022.0.1、Spring Cloud Alibaba 2022.0.0.0、Nacos 2.2.4 等主流技术栈开发的多租户系统，遵循SpringBoot 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能。
+Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和服务能力开发平台，是采用领域驱动模型(DDD)设计思想的、全面拥抱 Spring Authorization Server 的、基于 OAuth2.1 协议的、支持智能电视、IoT等物联网设备认证的微服务架构。基于 Spring Authorization Server 1.1.2、Spring Boot 3.1.3、Spring Cloud 2022.0.4、Spring Cloud Tencent 1.12.1-2022.0.4、Spring Cloud Alibaba 2022.0.0.0、Nacos 2.2.4 等主流技术栈开发的多租户系统，遵循SpringBoot 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能。
 
 ## 定位
 
@@ -149,7 +146,7 @@ Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和
 | Spring Boot                 | 3.1.3           |
 | Spring Cloud                | 2022.0.4        |
 | Spring Cloud Alibaba        | 2022.0.0.0      |
-| Spring Cloud Tencent        | 1.11.9-2022.0.1 |
+| Spring Cloud Tencent        | 1.12.1-2022.0.4 |
 | Spring Authorization Server | 1.1.2           |
 | Spring Boot Admin           | 3.1.5           |
 | Nacos                       | 2.2.4           |
@@ -321,13 +318,13 @@ dante-cloud
 
 ### 赞助人列表
 
-| 序号 |   赞助人    |     赞助时间     | 序号 |     赞助人     |     赞助时间     | 序号 |    赞助人    |     赞助时间     |
-|:--:|:--------:|:------------:|:--:|:-----------:|:------------:|:--:|:---------:|:------------:|
-| 1  |  ご沉默菋噵   |  2021-10-25  | 2  |    偷土豆的人    |  2021-11-24  | 3  |  lorron   |  2022-04-04  |
-| 4  |   在云端    |  2022-12-26  | 5  |     西晽      |  2022-12-27  | 6  | p911gt3rs |  2023-01-03  |
-| 7  |  jacsty  |  2023-01-31  | 8  | hubert_rust |  2023-03-16  | 9  |  Zkey Z   |  2023-03-18  |
-| 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  |
+| 序号 |   赞助人    |    赞助时间    | 序号 |     赞助人     |    赞助时间    | 序号 |    赞助人    |    赞助时间    |
+|:--:|:--------:|:----------:|:--:|:-----------:|:----------:|:--:|:---------:|:----------:|
+| 1  |  ご沉默菋噵   | 2021-10-25 | 2  |    偷土豆的人    | 2021-11-24 | 3  |  lorron   | 2022-04-04 |
+| 4  |   在云端    | 2022-12-26 | 5  |     西晽      | 2022-12-27 | 6  | p911gt3rs | 2023-01-03 |
+| 7  |  jacsty  | 2023-01-31 | 8  | hubert_rust | 2023-03-16 | 9  |  Zkey Z   | 2023-03-18 |
+| 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 |
 
 ### 开源项目
 

diff --git a/configurations/backup/alibaba/3.1.3.6/nacos_config_export_20230914231708.zip b/configurations/backup/alibaba/3.1.3.6/nacos_config_export_20230914231708.zip
diff --git a/configurations/backup/yamls/common/dante-cloud-kafka.yaml b/configurations/backup/yamls/common/dante-cloud-kafka.yaml
@@ -1,8 +1,8 @@
 spring:
   cloud:
     bus:
-      destination: SecurityMetadata
       id: ${spring.application.name}:${server.port}
+      destination: herodotus-cloud-bus
     stream:
       kafka:
         binder:
@@ -16,10 +16,17 @@ spring:
             default.key.serde: org.apache.kafka.common.serialization.Serdes$StringSerde
             default.value.serde: org.apache.kafka.common.serialization.Serdes$StringSerde
           producer-properties:
+            # 发生错误后，消息重发的次数。
             retries: 1
+            # acks=0 ： 生产者在成功写入消息之前不会等待任何来自服务器的响应。
+            # acks=1 ： 只要集群的首领节点收到消息，生产者就会收到一个来自服务器成功响应。
+            # acks=all ：只有当所有参与复制的节点全部收到消息时，生产者才会收到一个来自服务器的成功响应。
             acks: 1
+            #当有多个消息需要被发送到同一个分区时，生产者会把它们放在同一个批次里。该参数指定了一个批次可以使用的内存大小，按照字节数计算。
             batch.size: 16384
+            # 设置生产者内存缓冲区的大小。
             buffer.memory: 33554432
+            # 10ms的延迟
             linger.ms: 1
           consumer-properties:
             allow.auto.create.topics: true
@@ -28,9 +35,19 @@ spring:
         bindings:
           busConsumer-out-0: springCloudBusOutput
           busConsumer-in-0: springCloudBusInput
+          webSocketConsumer-out-0: webSocketMultipleInstanceSyncOutput
+          webSocketConsumer-in-0: webSocketMultipleInstanceSyncInput
       bindings:
         springCloudBusOutput:
           content-type: application/json
+          destination: ${spring.cloud.bus.destination}
         springCloudBusInput:
           content-type: application/json
-          group: ${spring.application.name}
+          destination: ${spring.cloud.bus.destination}
+          group: ${spring.application.name}
+        webSocketMultipleInstanceSyncOutput:
+          content-type: application/json
+          destination: WebSocketMultipleInstanceSync
+        webSocketMultipleInstanceSyncInput:
+          content-type: application/json
+          destination: WebSocketMultipleInstanceSync
diff --git a/configurations/backup/yamls/service/dante-cloud-message.yaml b/configurations/backup/yamls/service/dante-cloud-message.yaml
@@ -7,4 +7,8 @@ spring:
           jwk-set-uri: ${herodotus.endpoint.jwk-set-uri}
         opaquetoken:
           client-id: 5e8a9dc4ade843b9953cdf3b108a0765
-          client-secret: b2985ee0306145109078c3eec7d65926
+          client-secret: b2985ee0306145109078c3eec7d65926
+herodotus:
+  message:
+    websocket:
+      mode: single
diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=3.1.3.5
+VERSION=3.1.3.6
 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 b/configurations/docker/docker-compose/windows/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=3.1.3.5
+VERSION=3.1.3.6
 GATEWAY_SERVICE_NAME=dante-cloud-gateway
 GATEWAY_SERVICE_PORT=8847
 UAA_SERVICE_NAME=dante-cloud-uaa

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -32,13 +32,12 @@
     <parent>
         <groupId>cn.herodotus.engine</groupId>
         <artifactId>dependencies</artifactId>
-        <version>3.1.3.5</version>
+        <version>3.1.3.6</version>
         <relativePath/>
     </parent>
 
     <groupId>cn.herodotus.dante</groupId>
     <artifactId>dependencies</artifactId>
-    <version>3.1.3.5</version>
     <packaging>pom</packaging>
 
     <name>dante-cloud-dependencies</name>

diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml
@@ -32,12 +32,10 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.3.5</version>
+        <version>3.1.3.6</version>
     </parent>
 
     <artifactId>dante-module-common</artifactId>
-    <version>3.1.3.5</version>
-    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>

diff --git a/modules/dante-module-metadata/pom.xml b/modules/dante-module-metadata/pom.xml
@@ -32,16 +32,14 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.3.5</version>
+        <version>3.1.3.6</version>
     </parent>
 
     <artifactId>dante-module-metadata</artifactId>
-    <version>3.1.3.5</version>
-    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>cn.herodotus.dante</groupId>
             <artifactId>dante-module-social</artifactId>
         </dependency>
 
@@ -51,7 +49,7 @@
         </dependency>
 
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>cn.herodotus.dante</groupId>
             <artifactId>dante-module-security</artifactId>
         </dependency>
     </dependencies>

diff --git a/...n/herodotus/dante/module/metadata/converter/SysAttributeToSecurityAttributeConverter.java b/...n/herodotus/dante/module/metadata/converter/SysAttributeToSecurityAttributeConverter.java
@@ -21,10 +21,10 @@
 import java.util.Set;
 
 /**
- * <p>Description: SysAttribute 转 SecurityAttribute 转换器</p>
+ * <p>Description: SysAttribute 转 SecurityAttribute 转换器 </p>
  *
  * @author : gengwei.zheng
- * @date : 3.1.3.5
+ * @date : 2023/9/15 0:29
  */
 public class SysAttributeToSecurityAttributeConverter implements Converter<SysAttribute, SecurityAttribute> {
     @Override

diff --git a/...ava/cn/herodotus/dante/module/metadata/processor/SecurityMetadataDistributeProcessor.java b/...ava/cn/herodotus/dante/module/metadata/processor/SecurityMetadataDistributeProcessor.java
@@ -47,8 +47,6 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>Description: SecurityMetadata数据处理器 </p>
@@ -109,19 +107,20 @@ public void postRequestMappings(List<RequestMapping> requestMappings) {
                 log.debug("[Herodotus] |- No security attribute requires merge, SKIP!");
             }
 
-            log.debug("[Herodotus] |- [6] Synchronization current permissions to every service!");
-
-            List<SysAttribute> sysAttributes = sysAttributeService.findAll();
-            this.postGroupProcess(sysAttributes);
+            distributeServiceSecurityAttributes(storedInterfaces);
         }
     }
 
-    private void postGroupProcess(List<SysAttribute> sysAttributes) {
-        if (CollectionUtils.isNotEmpty(sysAttributes)) {
-            Map<String, List<SecurityAttribute>> grouped = sysAttributes.stream().map(toSecurityAttribute::convert).collect(Collectors.groupingBy(SecurityAttribute::getServiceId));
-            log.debug("[Herodotus] |- Grouping SysInterface and distribute to every server.");
-            grouped.forEach(this::postProcess);
-        }
+    private void distributeServiceSecurityAttributes(List<SysInterface> storedInterfaces) {
+        storedInterfaces.stream().findAny().ifPresent(item -> {
+            String serviceId = item.getServiceId();
+            List<SysAttribute> sysAttributes = sysAttributeService.findAllByServiceId(item.getServiceId());
+            if (CollectionUtils.isNotEmpty(sysAttributes)) {
+                List<SecurityAttribute> securityAttributes = sysAttributes.stream().map(toSecurityAttribute::convert).toList();
+                log.debug("[Herodotus] |- [6] Synchronization permissions to service [{}]", serviceId);
+                this.postProcess(serviceId, securityAttributes);
+            }
+        });
     }
 
     public void distributeChangedSecurityAttribute(SysAttribute sysAttribute) {

diff --git a/modules/dante-module-security/pom.xml b/modules/dante-module-security/pom.xml
@@ -32,16 +32,14 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.3.5</version>
+        <version>3.1.3.6</version>
     </parent>
 
     <artifactId>dante-module-security</artifactId>
-    <version>3.1.3.5</version>
-    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>cn.herodotus.dante</groupId>
             <artifactId>dante-module-common</artifactId>
         </dependency>
 

diff --git a/modules/dante-module-social/pom.xml b/modules/dante-module-social/pom.xml
@@ -32,12 +32,10 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.3.5</version>
+        <version>3.1.3.6</version>
     </parent>
 
     <artifactId>dante-module-social</artifactId>
-    <version>3.1.3.5</version>
-    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>

diff --git a/modules/dante-module-strategy/pom.xml b/modules/dante-module-strategy/pom.xml
@@ -32,12 +32,10 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.3.5</version>
+        <version>3.1.3.6</version>
     </parent>
 
     <artifactId>dante-module-strategy</artifactId>
-    <version>3.1.3.5</version>
-    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>

diff --git a/modules/pom.xml b/modules/pom.xml
@@ -32,11 +32,10 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.3.5</version>
+        <version>3.1.3.6</version>
     </parent>
 
     <artifactId>modules</artifactId>
-    <version>3.1.3.5</version>
     <packaging>pom</packaging>
 
     <name>dante-cloud-modules</name>

diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml
@@ -32,12 +32,10 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.3.5</version>
+        <version>3.1.3.6</version>
     </parent>
 
     <artifactId>authentication-spring-boot-starter</artifactId>
-    <version>3.1.3.5</version>
-    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>

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.1.3.5</version>
+        <version>3.1.3.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/packages/pom.xml b/packages/pom.xml
@@ -32,11 +32,10 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.3.5</version>
+        <version>3.1.3.6</version>
     </parent>
 
     <artifactId>packages</artifactId>
-    <version>3.1.3.5</version>
     <packaging>pom</packaging>
 
     <name>dante-cloud-packages</name>

diff --git a/packages/service-spring-boot-starter/pom.xml b/packages/service-spring-boot-starter/pom.xml
@@ -32,21 +32,19 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.3.5</version>
+        <version>3.1.3.6</version>
     </parent>
 
     <artifactId>service-spring-boot-starter</artifactId>
-    <version>3.1.3.5</version>
-    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>cn.herodotus.dante</groupId>
             <artifactId>dante-module-security</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>cn.herodotus.dante</groupId>
             <artifactId>facility-spring-boot-starter</artifactId>
         </dependency>
     </dependencies>

diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml
@@ -32,16 +32,14 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.1.3.5</version>
+        <version>3.1.3.6</version>
     </parent>
 
     <artifactId>dante-cloud-gateway</artifactId>
-    <version>3.1.3.5</version>
-    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>cn.herodotus.dante</groupId>
             <artifactId>facility-spring-boot-starter</artifactId>
         </dependency>
         <dependency>