!63 v2.7.4.1

Merge pull request !63 from 码匠君/develop
dromara · Oct 1, 2022 · 7f51f24 · 7f51f24
2 parents 8c19ec5 + 404a668
commit 7f51f24
Show file tree

Hide file tree

Showing 32 changed files with 50 additions and 55 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@
     <a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://shields.io/badge/Nacos-2.1.1-brightgreen" alt="Nacos 2.1.1"></a>
 </p>
 <p align="center">
-    <a href="#" target="_blank"><img src="https://shields.io/badge/Version-2.7.4.0-red" alt="Version 2.7.4.0"></a>
+    <a href="#" target="_blank"><img src="https://shields.io/badge/Version-2.7.4.1-red" alt="Version 2.7.4.1"></a>
     <a href="https://www.oracle.com/java/technologies/javase-downloads.html" target="_blank"><img src="https://img.shields.io/badge/JDK-8%2C11%2C17-green" alt="Java 8,11,17"></a>
     <a href="./LICENSE"><img src="https://shields.io/badge/License-Apache--2.0-blue" alt="License Apache 2.0"></a>
     <a href="https://blog.csdn.net/Pointer_v" target="_blank"><img src="https://shields.io/badge/Author-%E7%A0%81%E5%8C%A0%E5%90%9B-orange" alt="码匠君"></a>

diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=2.7.4.0
+VERSION=2.7.4.1
 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=2.7.4.0
+VERSION=2.7.4.1
 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,13 @@
     <parent>
         <groupId>cn.herodotus.engine</groupId>
         <artifactId>dependencies</artifactId>
-        <version>2.7.4.0</version>
+        <version>2.7.4.1</version>
         <relativePath/>
     </parent>
 
     <groupId>cn.herodotus.dante</groupId>
     <artifactId>dependencies</artifactId>
-    <version>2.7.4.0</version>
+    <version>2.7.4.1</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,11 +32,11 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.4.0</version>
+        <version>2.7.4.1</version>
     </parent>
 
     <artifactId>dante-module-common</artifactId>
-    <version>2.7.4.0</version>
+    <version>2.7.4.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/modules/dante-module-security/pom.xml b/modules/dante-module-security/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.4.0</version>
+        <version>2.7.4.1</version>
     </parent>
 
     <artifactId>dante-module-security</artifactId>
-    <version>2.7.4.0</version>
+    <version>2.7.4.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/modules/dante-module-strategy/pom.xml b/modules/dante-module-strategy/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.4.0</version>
+        <version>2.7.4.1</version>
     </parent>
 
     <artifactId>dante-module-strategy</artifactId>
-    <version>2.7.4.0</version>
+    <version>2.7.4.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/modules/dante-module-upms-logic/pom.xml b/modules/dante-module-upms-logic/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.4.0</version>
+        <version>2.7.4.1</version>
     </parent>
 
     <artifactId>dante-module-upms-logic</artifactId>
-    <version>2.7.4.0</version>
+    <version>2.7.4.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/modules/dante-module-upms-rest/pom.xml b/modules/dante-module-upms-rest/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.4.0</version>
+        <version>2.7.4.1</version>
     </parent>
 
     <artifactId>dante-module-upms-rest</artifactId>
-    <version>2.7.4.0</version>
+    <version>2.7.4.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/modules/pom.xml b/modules/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.4.0</version>
+        <version>2.7.4.1</version>
     </parent>
 
     <artifactId>modules</artifactId>
-    <version>2.7.4.0</version>
+    <version>2.7.4.1</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,11 +32,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.4.0</version>
+        <version>2.7.4.1</version>
     </parent>
 
     <artifactId>authentication-spring-boot-starter</artifactId>
-    <version>2.7.4.0</version>
+    <version>2.7.4.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/packages/pom.xml b/packages/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.4.0</version>
+        <version>2.7.4.1</version>
     </parent>
 
     <artifactId>packages</artifactId>
-    <version>2.7.4.0</version>
+    <version>2.7.4.1</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,11 +32,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.4.0</version>
+        <version>2.7.4.1</version>
     </parent>
 
     <artifactId>service-spring-boot-starter</artifactId>
-    <version>2.7.4.0</version>
+    <version>2.7.4.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/platform/dante-cloud-gateway/pom.xml b/platform/dante-cloud-gateway/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.4.0</version>
+        <version>2.7.4.1</version>
     </parent>
 
     <artifactId>dante-cloud-gateway</artifactId>
-    <version>2.7.4.0</version>
+    <version>2.7.4.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

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>2.7.4.0</version>
+        <version>2.7.4.1</version>
     </parent>
 
     <artifactId>dante-cloud-monitor</artifactId>
-    <version>2.7.4.0</version>
+    <version>2.7.4.1</version>
     <name>dante-cloud-monitor</name>
     <description>dante-cloud-monitor</description>
     <dependencies>

diff --git a/platform/dante-cloud-monitor/src/main/resources/configs/common/dante-cloud-redis.yaml b/platform/dante-cloud-monitor/src/main/resources/configs/common/dante-cloud-redis.yaml
@@ -12,6 +12,7 @@ spring:
         max-idle: 10
         min-idle: 5
     redisson:
-      enabled: ${herodotus.switch.redisson.enabled}
+      enabled: false
       single-server-config:
-        address: redis://${spring.redis.password}@${spring.redis.host}:${spring.redis.port}
+        address: redis://${spring.redis.host}:${spring.redis.port}
+#        password: ${spring.redis.password}
diff --git a/...m/dante-cloud-monitor/src/main/resources/configs/development/dante-cloud-environment.yaml b/...m/dante-cloud-monitor/src/main/resources/configs/development/dante-cloud-environment.yaml
@@ -25,8 +25,6 @@ herodotus:
       generate-statistics: false
     swagger:
       enabled: true
-    redisson:
-      enabled: false
     rest:
       scan:
         enabled: true

diff --git a/platform/dante-cloud-monitor/src/main/resources/configs/docker/dante-cloud-environment.yaml b/platform/dante-cloud-monitor/src/main/resources/configs/docker/dante-cloud-environment.yaml
@@ -25,8 +25,6 @@ herodotus:
       generate-statistics: false
     swagger:
       enabled: true
-    redisson:
-      enabled: false
     rest:
       scan:
         enabled: true

diff --git a/...rm/dante-cloud-monitor/src/main/resources/configs/production/dante-cloud-environment.yaml b/...rm/dante-cloud-monitor/src/main/resources/configs/production/dante-cloud-environment.yaml
@@ -25,8 +25,6 @@ herodotus:
       generate-statistics: false
     swagger:
       enabled: true
-    redisson:
-      enabled: false
     rest:
       scan:
         enabled: true

diff --git a/...-cloud-monitor/src/main/resources/imports/v2.7.3.6/nacos_config_export_20220912201555.zip b/...-cloud-monitor/src/main/resources/imports/v2.7.3.6/nacos_config_export_20220912201555.zip
diff --git a/...-cloud-monitor/src/main/resources/imports/v2.7.4.1/nacos_config_export_20221001172445.zip b/...-cloud-monitor/src/main/resources/imports/v2.7.4.1/nacos_config_export_20221001172445.zip
diff --git a/platform/dante-cloud-uaa/pom.xml b/platform/dante-cloud-uaa/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.4.0</version>
+        <version>2.7.4.1</version>
     </parent>
 
     <artifactId>dante-cloud-uaa</artifactId>
-    <version>2.7.4.0</version>
+    <version>2.7.4.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/platform/dante-cloud-uaa/src/main/resources/bootstrap.yml b/platform/dante-cloud-uaa/src/main/resources/bootstrap.yml
@@ -39,6 +39,13 @@ spring:
       transport:
         port: 8719
         dashboard: @sentinel.server-addr@
+  sql:
+    init:
+      # 第一种方式启动的时候 Jpa 会自动创建表，import.sql 只负责创建表单后的初始化数据。第二种方式启动的时候不会创建表，需要在初始化脚本中判断表是否存在，再初始化脚本的步骤
+      # refer: https://www.cnblogs.com/ityouknow/p/7089170.html
+      data-locations:
+        #        - classpath*:sqls/uaa-data-mysql.sql
+        - classpath*:sqls/uaa-data-postgresql.sql
 
 herodotus:
   platform:

diff --git a/...c/main/resources/sqls/upms-data-mysql.sql → ...rc/main/resources/sqls/uaa-data-mysql.sql b/...c/main/resources/sqls/upms-data-mysql.sql → ...rc/main/resources/sqls/uaa-data-mysql.sql
diff --git a/...n/resources/sqls/upms-data-postgresql.sql → ...in/resources/sqls/uaa-data-postgresql.sql b/...n/resources/sqls/upms-data-postgresql.sql → ...in/resources/sqls/uaa-data-postgresql.sql
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>2.7.4.0</version>
+        <version>2.7.4.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dante-cloud-upms</artifactId>
-    <version>2.7.4.0</version>
+    <version>2.7.4.1</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
@@ -39,13 +39,6 @@ spring:
       transport:
         port: 8719
         dashboard: @sentinel.server-addr@
-  sql:
-    init:
-      # 第一种方式启动的时候 Jpa 会自动创建表，import.sql 只负责创建表单后的初始化数据。第二种方式启动的时候不会创建表，需要在初始化脚本中判断表是否存在，再初始化脚本的步骤
-      # refer: https://www.cnblogs.com/ityouknow/p/7089170.html
-      data-locations:
-#        - classpath*:sqls/upms-data-mysql.sql
-        - classpath*:sqls/upms-data-postgresql.sql
 
 logging:
   file:

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>2.7.4.0</version>
+        <version>2.7.4.1</version>
     </parent>
 
     <artifactId>platform</artifactId>

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

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>2.7.4.0</version>
+        <version>2.7.4.1</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-ability</artifactId>
-    <version>2.7.4.0</version>
+    <version>2.7.4.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
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.4.0</version>
+        <version>2.7.4.1</version>
     </parent>
 
     <artifactId>dante-cloud-bpmn-logic</artifactId>
-    <version>2.7.4.0</version>
+    <version>2.7.4.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/services/pom.xml b/services/pom.xml
@@ -32,11 +32,11 @@
     <parent>
         <artifactId>dante-cloud</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.4.0</version>
+        <version>2.7.4.1</version>
     </parent>
 
     <artifactId>services</artifactId>
-    <version>2.7.4.0</version>
+    <version>2.7.4.1</version>
     <packaging>pom</packaging>
 
     <name>dante-cloud-services</name>