🐳 feat: v3.3.1.1

- 主要更新 - [新增] 新增使用 Docker Compose 启动服务顺序控制 - [新增] 新增使用 Docker Compose 打包镜像多系统环境支持 - 其它更新 - [修复] 修复使用 Docker Compose 打包镜像启动出错问题 - [修复] 修复 Spring Boot Admin 数据不会上报错误 - [优化] 系统使用关键镜像同步至 Quay.IO 方便使用。 - [优化] Spring Boot Admin 相关依赖修改为 pom import 方式 - [升级] minio docker 镜像版本升级至 RELEASE.2024-06-22T05-26-45Z - 依赖更新 - [升级] aws-java-sdk-s3 版本升级至 1.12.748 - [升级] minio 版本升级至 8.5.11 - [升级] redisson 版本升级至 3.32.0 - [升级] alipay-sdk-java 版本升级至 4.39.113.ALL
dromara · Jun 24, 2024 · 1487ffe · 1487ffe
1 parent a02ac94
commit 1487ffe
Show file tree

Hide file tree

Showing 28 changed files with 45 additions and 32 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.3.2-brightgreen.svg?logo=alibabadotcom" alt="Nacos 2.3.2"></a>
 </p>
 <p align="center">
-    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.3.1.0-red.svg?logo=spring" alt="Version 3.3.1.0"></a>
-    <a href="https://www.herodotus.cn" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.3.1.0-red.svg?logo=spring" alt="Dante Engine 3.3.1.0"></a>
-    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.3.1.0-red.svg?logo=spring" alt="Dante OSS 3.3.1.0"></a>
+    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.3.1.1-red.svg?logo=spring" alt="Version 3.3.1.1"></a>
+    <a href="https://www.herodotus.cn" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.3.1.1-red.svg?logo=spring" alt="Dante Engine 3.3.1.1"></a>
+    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.3.1.1-red.svg?logo=spring" alt="Dante OSS 3.3.1.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>

diff --git a/....6/nacos_config_export_20240531173140.zip → ....1/nacos_config_export_20240531173140.zip b/....6/nacos_config_export_20240531173140.zip → ....1/nacos_config_export_20240531173140.zip
diff --git a/...t/3.3.0.6/polaris_config_202405311904.zip → ...t/3.3.1.1/polaris_config_202405311904.zip b/...t/3.3.0.6/polaris_config_202405311904.zip → ...t/3.3.1.1/polaris_config_202405311904.zip
diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env
@@ -1,5 +1,13 @@
-VERSION=3.3.1.0
+VERSION=3.3.1.1
 SPRING_PROFILES_ACTIVE=alibaba
+PROFILE=development
+DATABASE=postgresql
+ALIBABA_USERNAME=nacos
+ALIBABA_PASSWORD=nacos
+# ALIBABA_NAMESPACE=00a14001-348d-40a7-82aa-e2e032f6e03c
+ALIBABA_CONFIG_SERVER_ADDR=192.168.101.10:8848
+ALIBABA_DISCOVERY_SERVER_ADDR=192.168.101.10:8848
+ALIBABA_SENTINEL_SERVER_ADDR=192.168.101.10:8858
 GATEWAY_SERVICE_NAME=herodotus-cloud-gateway
 GATEWAY_SERVICE_PORT=8847
 UAA_SERVICE_NAME=herodotus-cloud-uaa

diff --git a/configurations/docker/docker-compose/windows/herodotus/.env b/configurations/docker/docker-compose/windows/herodotus/.env
@@ -1,5 +1,13 @@
-VERSION=3.3.1.0
+VERSION=3.3.1.1
 SPRING_PROFILES_ACTIVE=alibaba
+PROFILE=development
+DATABASE=postgresql
+ALIBABA_USERNAME=nacos
+ALIBABA_PASSWORD=nacos
+#ALIBABA_NAMESPACE=00a14001-348d-40a7-82aa-e2e032f6e03c
+ALIBABA_CONFIG_SERVER_ADDR=192.168.101.10:8848
+ALIBABA_DISCOVERY_SERVER_ADDR=192.168.101.10:8848
+ALIBABA_SENTINEL_SERVER_ADDR=192.168.101.10:8858
 GATEWAY_SERVICE_NAME=herodotus-cloud-gateway
 GATEWAY_SERVICE_PORT=8847
 UAA_SERVICE_NAME=herodotus-cloud-uaa

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.1.0</version>
+        <version>3.3.1.1</version>
         <relativePath/>
     </parent>
 

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>cn.herodotus.dante</groupId>
-        <version>3.3.1.0</version>
+        <version>3.3.1.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>cn.herodotus.dante</groupId>
-        <version>3.3.1.0</version>
+        <version>3.3.1.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>cn.herodotus.dante</groupId>
-        <version>3.3.1.0</version>
+        <version>3.3.1.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>cn.herodotus.dante</groupId>
-        <version>3.3.1.0</version>
+        <version>3.3.1.1</version>
     </parent>
 
     <artifactId>dante-module-strategy</artifactId>

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

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>cn.herodotus.dante</groupId>
-        <version>3.3.1.0</version>
+        <version>3.3.1.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>cn.herodotus.dante</groupId>
-        <version>3.3.1.0</version>
+        <version>3.3.1.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>cn.herodotus.dante</groupId>
-        <version>3.3.1.0</version>
+        <version>3.3.1.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>cn.herodotus.dante</groupId>
-        <version>3.3.1.0</version>
+        <version>3.3.1.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>cn.herodotus.dante</groupId>
-        <version>3.3.1.0</version>
+        <version>3.3.1.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>cn.herodotus.dante</groupId>
         <artifactId>platform</artifactId>
-        <version>3.3.1.0</version>
+        <version>3.3.1.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>cn.herodotus.dante</groupId>
-        <version>3.3.1.0</version>
+        <version>3.3.1.1</version>
     </parent>
 
     <artifactId>dante-cloud-monitor</artifactId>
-    <version>3.3.1.0</version>
+    <version>3.3.1.1</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
@@ -10,9 +10,6 @@ management:
   health:
     redis:
       enabled: false
-herodotus:
-  platform:
-    architecture: monocoque
 
 ---
 # spring cloud alibaba 基础设施配置

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>cn.herodotus.dante</groupId>
-        <version>3.3.1.0</version>
+        <version>3.3.1.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>cn.herodotus.dante</groupId>
-        <version>3.3.1.0</version>
+        <version>3.3.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dante-cloud-upms</artifactId>
-    <version>3.3.1.0</version>
+    <version>3.3.1.1</version>
 
     <dependencies>
         <dependency>

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

diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>cn.herodotus.dante</groupId>
         <artifactId>dependencies</artifactId>
-        <version>3.3.1.0</version>
+        <version>3.3.1.1</version>
         <relativePath>dependencies/pom.xml</relativePath>
     </parent>
 

diff --git a/readme/spring-boot-admin-1.png b/readme/spring-boot-admin-1.png
diff --git a/services/dante-cloud-bpmn-ability/pom.xml b/services/dante-cloud-bpmn-ability/pom.xml
@@ -27,11 +27,11 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.1.0</version>
+        <version>3.3.1.1</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-ability</artifactId>
-    <version>3.3.1.0</version>
+    <version>3.3.1.1</version>
 
     <name>dante-cloud-bpmn-ability</name>
     <description>基于Camunda工作流的服务</description>

diff --git a/services/dante-cloud-bpmn-logic/pom.xml b/services/dante-cloud-bpmn-logic/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.1.0</version>
+        <version>3.3.1.1</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-logic</artifactId>

diff --git a/services/dante-cloud-oss-ability/pom.xml b/services/dante-cloud-oss-ability/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>cn.herodotus.dante</groupId>
         <artifactId>services</artifactId>
-        <version>3.3.1.0</version>
+        <version>3.3.1.1</version>
     </parent>
 
     <artifactId>dante-cloud-oss-ability</artifactId>

diff --git a/services/pom.xml b/services/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.3.1.0</version>
+        <version>3.3.1.1</version>
     </parent>
 
     <artifactId>services</artifactId>