!249 v3.3.5.1

Merge pull request !249 from 码匠君/develop
dromara · Nov 6, 2024 · 03aafa0 · 03aafa0
2 parents bd34721 + 98db37e
commit 03aafa0
Show file tree

Hide file tree

Showing 45 changed files with 63 additions and 97 deletions.
diff --git a/README.md b/README.md
@@ -13,9 +13,9 @@
     <a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://img.shields.io/badge/Nacos-2.4.3-brightgreen.svg?logo=alibabadotcom" alt="Nacos 2.4.3"></a>
 </p>
 <p align="center">
-    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.3.5.0-red.svg?logo=spring" alt="Version 3.3.5.0"></a>
-    <a href="https://www.herodotus.cn" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.3.5.0-red.svg?logo=spring" alt="Dante Engine 3.3.5.0"></a>
-    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.3.5.0-red.svg?logo=spring" alt="Dante OSS 3.3.5.0"></a>
+    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.3.5.1-red.svg?logo=spring" alt="Version 3.3.5.1"></a>
+    <a href="https://www.herodotus.cn" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.3.5.1-red.svg?logo=spring" alt="Dante Engine 3.3.5.1"></a>
+    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.3.5.1-red.svg?logo=spring" alt="Dante OSS 3.3.5.1"></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-AGPL--3.0-blue.svg?logo=apache" alt="License AGPL 3.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>
@@ -223,7 +223,8 @@ dante-cloud
 ├    ├── dante-module-common -- Module 相关模块公共辅助代码模块
 ├    ├── dante-module-metadata -- 权限元数据同步模块
 ├    ├── dante-module-social -- 社交登录模块
-├    └── dante-module-strategy -- UAA 核心数据访问策略模块
+├    ├── dante-module-strategy -- UAA 核心数据访问策略模块
+├    └── dante-monomer-autoconfigure -- 单体版自动配置模块
 ├── packages -- 基础核心Starter
 ├    ├── authorization-spring-boot-starter -- OAuth2 认证基础Starter，主要用于 UAA 认证服务器以及单体版 Dante Cloud
 ├    ├── facility-spring-boot-starter -- 基础设施切换依赖starter
@@ -237,13 +238,13 @@ dante-cloud
 ├── services -- 平台业务服务
 ├    ├── dante-cloud-bpmn-ability -- 工作流服务
 ├    ├── dante-cloud-bpmn-logic -- 工作流基础代码包
-└──  └── dante-cloud-oss-ability -- 对象存储服务
+├    ├── dante-cloud-oss-ability -- 对象存储服务
+└──  └── dante-monomer-application -- Dante Cloud 单体版应用模块
 ```
 
 ## [7]、项目地址
 
 - 后端主工程地址：[https://gitcode.com/dromara/dante-cloud](https://gitcode.com/dromara/dante-cloud)
-- 后端单体版示例工程地址：[https://gitcode.com/HerodotusSoftware/dante-cloud-athena](https://gitcode.com/HerodotusSoftware/dante-cloud-athena)
 - 前端工程地址：[https://gitcode.com/HerodotusSoftware/dante-cloud-ui](https://gitcode.com/HerodotusSoftware/dante-cloud-ui)
 
 ## [8]、安全测试
@@ -328,21 +329,21 @@ Dante Cloud 已通过由第三方进行的软件出厂安全测试以及等保
 | 49 |      [Sukari](https://gitee.com/Sukari)       | :white_check_mark: | 50 |         [生活](https://gitee.com/liveok)         | :white_check_mark: | 51 | [hero_zhjms](https://gitee.com/hero_zhjms) | :white_check_mark: | 52 |         [panza](https://gitee.com/panza)         | :white_check_mark: |
 | 53 |       [nian8](https://gitee.com/nian8)        | :white_check_mark: | 54 |       [永恒](https://gitee.com/eternycyh)        | :white_check_mark: | 55 |   [klaus_pd](https://gitee.com/klaus_pd)   | :white_check_mark: | 56 |    [starry](https://gitee.com/starry_fanxin)     | :white_check_mark: |
 | 57 |    [George96](https://gitee.com/george96)     | :white_check_mark: | 58 |  [chenfeida](https://gitee.com/cheffd_admin)   | :white_check_mark: | 59 |    [zt](https://gitee.com/javazhangtao)    | :white_check_mark: | 60 |          [曹维裕](https://gitee.com/dsky)           | :white_check_mark: |
-| 61 |      [弥悠](https://gitee.com/netherworld)      | :white_check_mark: | 62 |                                                | :white_check_mark: | 63 |                                            | :white_check_mark: | 64 |                                                  | :white_check_mark: |
+| 61 |      [弥悠](https://gitee.com/netherworld)      | :white_check_mark: | 62 |       [飞奔中](https://gitee.com/flyflyrun)       | :white_check_mark: | 63 |   [lovenoms](https://gitee.com/lovenoms)   | :white_check_mark: | 64 |                                                  | :white_check_mark: |
 
 ## [14]、鸣谢
 
 ### 赞助人列表
 
-| 序号 |   赞助人    |    赞助时间    | 序号 |     赞助人     |    赞助时间    | 序号 |    赞助人    |    赞助时间    |
-|:--:|:--------:|:----------:|:--:|:-----------:|:----------:|:--:|:---------:|:----------:|
-| 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 |
-| 16 |   一阵风    | 2023-12-10 | 17 |    Jack     | 2024-03-01 | 18 | onehelper | 2024-05-24 |
-| 19 |    宁哥    | 2024-05-29 | 20 |             |            | 21 |           |            |
+| 序号 |                    赞助人                     |    赞助时间    | 序号 |                      赞助人                       |    赞助时间    | 序号 |                   赞助人                    |    赞助时间    |
+|:--:|:------------------------------------------:|:----------:|:--:|:----------------------------------------------:|:----------:|:--:|:----------------------------------------:|:----------:|
+| 1  |                   ご沉默菋噵                    | 2021-10-25 | 2  |    [偷土豆的人](https://gitee.com/dongzongyang)     | 2021-11-24 | 3  |    [lorron](https://gitee.com/lorron)    | 2022-04-04 |
+| 4  |                    在云端                     | 2022-12-26 | 5  |        [西晽](https://gitee.com/syllvin)         | 2022-12-27 | 6  | [p911gt3rs](https://gitee.com/p911gt3rs) | 2023-01-03 |
+| 7  |     [jacsty](https://gitee.com/jacsty)     | 2023-01-31 | 8  |  [hubert_rust](https://gitee.com/hubert_rust)  | 2023-03-16 | 9  |   [Zkey Z](https://gitee.com/zkeyzvip)   | 2023-03-18 |
+| 10 |      [志国欧巴](https://gitee.com/zzgf16)      | 2023-03-27 | 11 |  [michael](https://gitee.com/yiminyangguang)   | 2023-04-07 | 12 |  [大叔丨小巷](https://gitee.com/yushui_wang)  | 2023-04-11 |
+| 13 |   [sun_left](https://gitee.com/sun_left)   | 2023-04-19 | 14 | [time、sand](https://gitee.com/tzy15680905763)  | 2023-07-06 | 15 |   [印第安老斑鸠](https://gitee.com/deadncut)   | 2023-09-09 |
+| 16 |                    一阵风                     | 2023-12-10 | 17 |                      Jack                      | 2024-03-01 | 18 | [onehelper](https://gitee.com/onehelper) | 2024-05-24 |
+| 19 | [宁哥](https://gitee.com/seabuckthorn-syrup) | 2024-05-29 | 20 | [cryptoneedle](https://gitee.com/cryptoneedle) | 2024-11-01 | 21 |                                          |            |
 
 ### 感谢 JetBrains 提供的免费开源 License
 

diff --git a/configurations/backup/alibaba/3.3.5.1/nacos_config_export_20240531173140.zip b/configurations/backup/alibaba/3.3.5.1/nacos_config_export_20240531173140.zip
diff --git a/configurations/backup/tencent/3.3.5.1/polaris_config_202405311904.zip b/configurations/backup/tencent/3.3.5.1/polaris_config_202405311904.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.3.5.0
+VERSION=3.3.5.1
 SPRING_PROFILES_ACTIVE=alibaba
 PROFILE=development
 DATABASE=postgresql

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.base.yml b/configurations/docker/docker-compose/linux/herodotus/env.base.yml
@@ -25,6 +25,7 @@ services:
       NACOS_AUTH_TOKEN: SecretKey012345678901234567890123456789012345678901234567890123456789
     volumes:
       - /usr/local/docker-volumes/nacos/data:/home/nacos/data
+      - /usr/local/docker-volumes/nacos/logs:/home/nacos/logs
     ports:
       - "8848:8848"
       - "9848:9848"

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.full.debezium.yml b/configurations/docker/docker-compose/linux/herodotus/env.full.debezium.yml
@@ -26,6 +26,7 @@ services:
       NACOS_AUTH_TOKEN: SecretKey012345678901234567890123456789012345678901234567890123456789
     volumes:
       - /usr/local/docker-volumes/nacos/data:/home/nacos/data
+      - /usr/local/docker-volumes/nacos/logs:/home/nacos/logs
     ports:
       - "8848:8848"
       - "9848:9848"

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.oss.yml b/configurations/docker/docker-compose/linux/herodotus/env.oss.yml
@@ -1,6 +1,6 @@
 services:
   minio:
-    image: quay.io/minio/minio:RELEASE.2024-10-13T13-34-11Z
+    image: quay.io/minio/minio:RELEASE.2024-10-29T16-01-48Z
     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.3.5.0
+VERSION=3.3.5.1
 SPRING_PROFILES_ACTIVE=alibaba
 PROFILE=development
 DATABASE=postgresql

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.base.yml b/configurations/docker/docker-compose/windows/herodotus/env.base.yml
@@ -24,6 +24,7 @@ services:
       NACOS_AUTH_TOKEN: SecretKey012345678901234567890123456789012345678901234567890123456789
     volumes:
       - D:\\local-cached\\docker-volumes\\nacos\\datas:/home/nacos/data
+      - D:\\local-cached\\docker-volumes\\nacos\\logs:/home/nacos/logs
     ports:
       - "8848:8848"
       - "9848:9848"

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.full.base.yml b/configurations/docker/docker-compose/windows/herodotus/env.full.base.yml
@@ -24,6 +24,7 @@ services:
       NACOS_AUTH_TOKEN: SecretKey012345678901234567890123456789012345678901234567890123456789
     volumes:
       - D:\\local-cached\\docker-volumes\\nacos\\datas:/home/nacos/data
+      - D:\\local-cached\\docker-volumes\\nacos\\logs:/home/nacos/logs
     ports:
       - "8848:8848"
       - "9848:9848"

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.full.debezium.yml b/configurations/docker/docker-compose/windows/herodotus/env.full.debezium.yml
@@ -26,6 +26,7 @@ services:
       NACOS_AUTH_TOKEN: SecretKey012345678901234567890123456789012345678901234567890123456789
     volumes:
       - D:\\local-cached\\docker-volumes\\nacos\\datas:/home/nacos/data
+      - D:\\local-cached\\docker-volumes\\nacos\\logs:/home/nacos/logs
     ports:
       - "8848:8848"
       - "9848:9848"

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.oss.yml b/configurations/docker/docker-compose/windows/herodotus/env.oss.yml
@@ -1,6 +1,6 @@
 services:
   minio:
-    image: quay.io/minio/minio:RELEASE.2024-10-13T13-34-11Z
+    image: quay.io/minio/minio:RELEASE.2024-10-29T16-01-48Z
     container_name: minio
     hostname: minio
     ports:

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>cn.herodotus.engine</groupId>
         <artifactId>dependencies</artifactId>
-        <version>3.3.5.0</version>
+        <version>3.3.5.1</version>
         <relativePath/>
     </parent>
 
@@ -122,7 +122,7 @@
             </dependency>
             <dependency>
                 <groupId>org.dromara.dante</groupId>
-                <artifactId>monomer-autoconfigure</artifactId>
+                <artifactId>dante-monomer-autoconfigure</artifactId>
                 <version>${project.version}</version>
             </dependency>
         </dependencies>

diff --git a/modules/dante-module-common/pom.xml b/modules/dante-module-common/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.5.0</version>
+        <version>3.3.5.1</version>
     </parent>
 
     <artifactId>dante-module-common</artifactId>

diff --git a/modules/dante-module-metadata/pom.xml b/modules/dante-module-metadata/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.5.0</version>
+        <version>3.3.5.1</version>
     </parent>
 
     <artifactId>dante-module-metadata</artifactId>

diff --git a/modules/dante-module-social/pom.xml b/modules/dante-module-social/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.5.0</version>
+        <version>3.3.5.1</version>
     </parent>
 
     <artifactId>dante-module-social</artifactId>

diff --git a/modules/dante-module-strategy/pom.xml b/modules/dante-module-strategy/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.5.0</version>
+        <version>3.3.5.1</version>
     </parent>
 
     <artifactId>dante-module-strategy</artifactId>

diff --git a/...n/java/org/dromara/dante/module/strategy/config/DistributedArchitectureConfiguration.java b/...n/java/org/dromara/dante/module/strategy/config/DistributedArchitectureConfiguration.java
@@ -99,7 +99,7 @@ public StrategyUserDetailsService herodotusRemoteUserDetailsService(RemoteUserDe
 
         @Bean
         @ConditionalOnMissingBean
-        public StrategyPermissionDetailsService HerodotusRemotePermissionDetailsService(RemoteAuthorityDetailsService remoteAuthorityDetailsService) {
+        public StrategyPermissionDetailsService herodotusRemotePermissionDetailsService(RemoteAuthorityDetailsService remoteAuthorityDetailsService) {
             HerodotusRemotePermissionDetailsService herodotusRemotePermissionDetailsService = new HerodotusRemotePermissionDetailsService(remoteAuthorityDetailsService);
             log.debug("[Herodotus] |- Strategy [Remote Permission Details Service] Auto Configure.");
             return herodotusRemotePermissionDetailsService;

diff --git a/monomer/monomer-autoconfigure/pom.xml → modules/dante-monomer-autoconfigure/pom.xml b/monomer/monomer-autoconfigure/pom.xml → modules/dante-monomer-autoconfigure/pom.xml
@@ -26,11 +26,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.dromara.dante</groupId>
-        <artifactId>monomer</artifactId>
-        <version>3.3.5.0</version>
+        <artifactId>modules</artifactId>
+        <version>3.3.5.1</version>
     </parent>
 
-    <artifactId>monomer-autoconfigure</artifactId>
+    <artifactId>dante-monomer-autoconfigure</artifactId>
 
     <dependencies>
         <dependency>

diff --git a/...toconfigure/MonomerAutoConfiguration.java → ...toconfigure/MonomerAutoConfiguration.java b/...toconfigure/MonomerAutoConfiguration.java → ...toconfigure/MonomerAutoConfiguration.java
@@ -21,9 +21,9 @@
 
 package org.dromara.dante.monomer.autoconfigure;
 
+import jakarta.annotation.PostConstruct;
 import org.dromara.dante.monomer.autoconfigure.processor.MonomerBusBridge;
 import org.dromara.dante.monomer.autoconfigure.processor.MonomerCorsFilter;
-import jakarta.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.AutoConfiguration;

diff --git a/...configure/processor/MonomerBusBridge.java → ...configure/processor/MonomerBusBridge.java b/...configure/processor/MonomerBusBridge.java → ...configure/processor/MonomerBusBridge.java
diff --git a/...onfigure/processor/MonomerCorsFilter.java → ...onfigure/processor/MonomerCorsFilter.java b/...onfigure/processor/MonomerCorsFilter.java → ...onfigure/processor/MonomerCorsFilter.java
diff --git a/...t.autoconfigure.AutoConfiguration.imports → ...t.autoconfigure.AutoConfiguration.imports b/...t.autoconfigure.AutoConfiguration.imports → ...t.autoconfigure.AutoConfiguration.imports
diff --git a/modules/pom.xml b/modules/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.5.0</version>
+        <version>3.3.5.1</version>
     </parent>
 
     <artifactId>modules</artifactId>
@@ -65,6 +65,7 @@
         <module>dante-module-social</module>
         <module>dante-module-metadata</module>
         <module>dante-module-strategy</module>
+        <module>dante-monomer-autoconfigure</module>
     </modules>
 
 </project>
diff --git a/monomer/pom.xml b/monomer/pom.xml
diff --git a/packages/authentication-spring-boot-starter/pom.xml b/packages/authentication-spring-boot-starter/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.5.0</version>
+        <version>3.3.5.1</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
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.5.0</version>
+        <version>3.3.5.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/packages/pom.xml b/packages/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.5.0</version>
+        <version>3.3.5.1</version>
     </parent>
 
     <artifactId>packages</artifactId>

diff --git a/packages/service-spring-boot-starter/pom.xml b/packages/service-spring-boot-starter/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.5.0</version>
+        <version>3.3.5.1</version>
     </parent>
 
     <artifactId>service-spring-boot-starter</artifactId>

diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.5.0</version>
+        <version>3.3.5.1</version>
     </parent>
 
     <artifactId>dante-cloud-gateway</artifactId>

diff --git a/platform/dante-cloud-message/pom.xml b/platform/dante-cloud-message/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.dromara.dante</groupId>
         <artifactId>platform</artifactId>
-        <version>3.3.5.0</version>
+        <version>3.3.5.1</version>
     </parent>
 
     <artifactId>dante-cloud-message</artifactId>

diff --git a/platform/dante-cloud-monitor/pom.xml b/platform/dante-cloud-monitor/pom.xml
@@ -26,11 +26,11 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.5.0</version>
+        <version>3.3.5.1</version>
     </parent>
 
     <artifactId>dante-cloud-monitor</artifactId>
-    <version>3.3.5.0</version>
+    <version>3.3.5.1</version>
     <name>dante-cloud-monitor</name>
     <description>dante-cloud-monitor</description>
     <dependencies>

diff --git a/platform/dante-cloud-uaa/pom.xml b/platform/dante-cloud-uaa/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.5.0</version>
+        <version>3.3.5.1</version>
     </parent>
 
     <artifactId>dante-cloud-uaa</artifactId>

diff --git a/platform/dante-cloud-upms/pom.xml b/platform/dante-cloud-upms/pom.xml
@@ -26,12 +26,12 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.5.0</version>
+        <version>3.3.5.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dante-cloud-upms</artifactId>
-    <version>3.3.5.0</version>
+    <version>3.3.5.1</version>
 
     <dependencies>
         <dependency>

diff --git a/platform/pom.xml b/platform/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>org.dromara.dante</groupId>
-        <version>3.3.5.0</version>
+        <version>3.3.5.1</version>
     </parent>
 
     <artifactId>platform</artifactId>