!180 v3.2.1.2

Merge pull request !180 from 码匠君/develop
dromara · Dec 30, 2023 · 4fb9736 · 4fb9736
2 parents 0328c8e + 5713040
commit 4fb9736
Show file tree

Hide file tree

Showing 34 changed files with 39 additions and 39 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.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.1.1-red.svg?logo=spring" alt="Version 3.2.1.1"></a>
-    <a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.2.1.1-red.svg?logo=spring" alt="Dante Engine 3.2.1.1"></a>
-    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.2.1.1-red.svg?logo=spring" alt="Dante OSS 3.2.1.1"></a>
+    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.2.1.2-red.svg?logo=spring" alt="Version 3.2.1.2"></a>
+    <a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.2.1.2-red.svg?logo=spring" alt="Dante Engine 3.2.1.2"></a>
+    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.2.1.2-red.svg?logo=spring" alt="Dante OSS 3.2.1.2"></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>
@@ -160,7 +160,7 @@ Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和
 | Spring Authorization Server | 1.2.1           |
 | Spring Boot Admin           | 3.2.0           |
 | Nacos                       | 2.3.0           |
-| Sentinel                    | 1.8.6           |
+| Sentinel                    | 1.8.7           |
 | Seata                       | 1.7.0           |
 
 > Spring 全家桶版本对应关系，详见：[版本说明](https://github.com/alibaba/spring-cloud-alibaba/wiki/%E7%89%88%E6%9C%AC%E8%AF%B4%E6%98%8E)
@@ -264,7 +264,7 @@ Dante Cloud 已通过由第三方进行的软件出厂安全测试。详情参
 - 不得将本软件应用于危害国家安全、荣誉和利益的行为，不能以任何形式用于非法为目的的行为。
 - 在延伸的代码中（修改现有源代码衍生的代码中）需要带有原来代码中的协议、版权声明和其他原作者 规定需要包含的说明（请尊重原作者的著作权，不要删除或修改文件中的Copyright和@author信息） 更不要，全局替换源代码中的 Dante Cloud、Herodotus 或 码匠君 等字样，否则你将违反本协议条款承担责任。
 - 您若套用本软件的一些代码或功能参考，请保留源文件中的版权和作者，需要在您的软件介绍明显位置 说明出处，举例：本软件基于 Dante Cloud 微服务架构，并附带链接：https://www.herodotus.cn
-- 任何基于本软件而产生的一切法律纠纷和责任，均于作者无关。
+- 任何基于本软件而产生的一切法律纠纷和责任，均与作者无关。
 - 如果你对本软件有改进，希望可以贡献给我们，双向奔赴互相成就才是王道。
 - 本项目已申请软件著作权，请尊重开源。
 

diff --git a/configurations/backup/alibaba/3.2.1.2/nacos_config_export_20231103170632.zip b/configurations/backup/alibaba/3.2.1.2/nacos_config_export_20231103170632.zip
diff --git a/configurations/backup/tencent/3.2.1.2/polaris_config_202311261657.zip b/configurations/backup/tencent/3.2.1.2/polaris_config_202311261657.zip
diff --git a/configurations/docker/context/development/Dockerfile b/configurations/docker/context/development/Dockerfile
@@ -9,7 +9,7 @@
 ### 在 debian 下则没有这问题。以目前了解的情况看，猜测 alpine 下，为了缩小体系，缺失的内容应该不只是字体库，还有其它内容。
 ### 当然也可能是个人能力有限，一直没有找到正确解决的办法。如果你有更好的解决办法，欢迎提 ISSUE 和 PR。
 
-FROM bellsoft/liberica-openjdk-debian:8u352-8
+FROM bellsoft/liberica-openjdk-debian:17.0.9-11
 #FROM openjdk:17-jdk
 
 # 作者

diff --git a/configurations/docker/context/production/Dockerfile b/configurations/docker/context/production/Dockerfile
@@ -9,7 +9,7 @@
 ### 在 debian 下则没有这问题。以目前了解的情况看，猜测 alpine 下，为了缩小体系，缺失的内容应该不只是字体库，还有其它内容。
 ### 当然也可能是个人能力有限，一直没有找到正确解决的办法。如果你有更好的解决办法，欢迎提 ISSUE 和 PR。
 
-FROM bellsoft/liberica-openjdk-debian:8u352-8
+FROM bellsoft/liberica-openjdk-debian:17.0.9-11
 #FROM openjdk:17-jdk
 
 # 作者

diff --git a/configurations/docker/context/production/Dockerfile-Monitor b/configurations/docker/context/production/Dockerfile-Monitor
@@ -9,7 +9,7 @@
 ### 在 debian 下则没有这问题。以目前了解的情况看，猜测 alpine 下，为了缩小体系，缺失的内容应该不只是字体库，还有其它内容。
 ### 当然也可能是个人能力有限，一直没有找到正确解决的办法。如果你有更好的解决办法，欢迎提 ISSUE 和 PR。
 
-FROM bellsoft/liberica-openjdk-debian:8u352-8
+FROM bellsoft/liberica-openjdk-debian:17.0.9-11
 #FROM openjdk:17-jdk
 
 # 作者

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.1.1
+VERSION=3.2.1.2
 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.base.debezium.yml b/configurations/docker/docker-compose/linux/herodotus/env.base.debezium.yml
@@ -72,7 +72,7 @@ services:
       - kafka
 
   sentinel:
-    image: herodotus/sentinel-dashboard:1.8.5
+    image: herodotus/sentinel-dashboard:1.8.7
     container_name: sentinel-dashboard
     environment:
       SENTINEL_ADMIN_USERNAME: sentinel

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.base.tencent.yml b/configurations/docker/docker-compose/linux/herodotus/env.base.tencent.yml
@@ -45,7 +45,7 @@ services:
       - zookeeper
 
   sentinel:
-    image: herodotus/sentinel-dashboard:1.8.5
+    image: herodotus/sentinel-dashboard:1.8.7
     container_name: sentinel-dashboard
     environment:
       SENTINEL_ADMIN_USERNAME: sentinel

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.base.yml b/configurations/docker/docker-compose/linux/herodotus/env.base.yml
@@ -75,7 +75,7 @@ services:
       - /usr/local/docker-volumes/elk/logstash/conf.d:/etc/logstash/conf.d
 
   sentinel:
-    image: herodotus/sentinel-dashboard:1.8.5
+    image: herodotus/sentinel-dashboard:1.8.7
     container_name: sentinel-dashboard
     environment:
       SENTINEL_ADMIN_USERNAME: sentinel

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.1.1
+VERSION=3.2.1.2
 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.base.debezium.yml b/configurations/docker/docker-compose/windows/herodotus/env.base.debezium.yml
@@ -72,7 +72,7 @@ services:
       - kafka
 
   sentinel:
-    image: herodotus/sentinel-dashboard:1.8.5
+    image: herodotus/sentinel-dashboard:1.8.7
     container_name: sentinel-dashboard
     environment:
       SENTINEL_ADMIN_USERNAME: sentinel

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.base.yml b/configurations/docker/docker-compose/windows/herodotus/env.base.yml
@@ -71,7 +71,7 @@ services:
       - D:\\local-cached\\docker-volumes\\elk\\logstash\\conf.d:/etc/logstash/conf.d
 
   sentinel:
-    image: herodotus/sentinel-dashboard:1.8.5
+    image: herodotus/sentinel-dashboard:1.8.7
     container_name: sentinel-dashboard
     environment:
       SENTINEL_ADMIN_USERNAME: sentinel

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.1.1</version>
+        <version>3.2.1.2</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.1.1</version>
+        <version>3.2.1.2</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.1.1</version>
+        <version>3.2.1.2</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.1.1</version>
+        <version>3.2.1.2</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.1.1</version>
+        <version>3.2.1.2</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.1.1</version>
+        <version>3.2.1.2</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.1.1</version>
+        <version>3.2.1.2</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.1.1</version>
+        <version>3.2.1.2</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.1.1</version>
+        <version>3.2.1.2</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.1.1</version>
+        <version>3.2.1.2</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.1.1</version>
+        <version>3.2.1.2</version>
     </parent>
 
     <artifactId>dante-cloud-gateway</artifactId>

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.1.1</version>
+        <version>3.2.1.2</version>
     </parent>
 
     <artifactId>dante-cloud-message</artifactId>

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.1.1</version>
+        <version>3.2.1.2</version>
     </parent>
 
     <artifactId>dante-cloud-monitor</artifactId>
-    <version>3.2.1.1</version>
+    <version>3.2.1.2</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
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.2.1.1</version>
+        <version>3.2.1.2</version>
     </parent>
 
     <artifactId>dante-cloud-uaa</artifactId>

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.1.1</version>
+        <version>3.2.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dante-cloud-upms</artifactId>
-    <version>3.2.1.1</version>
+    <version>3.2.1.2</version>
 
     <dependencies>
         <dependency>

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.1.1</version>
+        <version>3.2.1.2</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.1.1</version>
+        <version>3.2.1.2</version>
         <relativePath>dependencies/pom.xml</relativePath>
     </parent>
 

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.1.1</version>
+        <version>3.2.1.2</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-ability</artifactId>
-    <version>3.2.1.1</version>
+    <version>3.2.1.2</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
@@ -32,7 +32,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>3.2.1.1</version>
+        <version>3.2.1.2</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
@@ -31,7 +31,7 @@
     <parent>
         <groupId>cn.herodotus.dante</groupId>
         <artifactId>services</artifactId>
-        <version>3.2.1.1</version>
+        <version>3.2.1.2</version>
     </parent>
 
     <artifactId>dante-cloud-oss-ability</artifactId>

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