!52 v2.7.2.5

Merge pull request !52 from 码匠君/develop
dromara · Aug 13, 2022 · 4064e03 · 4064e03
2 parents df1ae48 + c2ccce2
commit 4064e03
Show file tree

Hide file tree

Showing 37 changed files with 62 additions and 62 deletions.
diff --git a/README.md b/README.md
@@ -9,10 +9,10 @@
     <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://shields.io/badge/Spring%20Boot-2.7.2-blue" alt="Spring Boot 2.7.2"></a>
     <a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://shields.io/badge/Spring%20Cloud-2021.0.3-blue" alt="Spring Cloud 2021.0.3"></a>
     <a href="https://github.com/alibaba/spring-cloud-alibaba" target="_blank"><img src="https://shields.io/badge/Spring%20Cloud%20Alibaba-2021.0.1.0-blue" alt="Spring Cloud Alibaba 2021.0.1.0"></a>
-    <a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://shields.io/badge/Nacos-2.1.0-brightgreen" alt="Nacos 2.1.0"></a>
+    <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.2.4-red" alt="Version 2.7.2.4"></a>
+    <a href="#" target="_blank"><img src="https://shields.io/badge/Version-2.7.2.5-red" alt="Version 2.7.2.5"></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>
@@ -41,7 +41,7 @@
 
 ## 企业级技术中台微服务架构与服务能力开发平台
 
-Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和服务能力开发平台。基于 Spring Boot 2.7.2、Spring Cloud 2021.0.3、Spring Cloud Alibaba 2021.0.1.0、Spring Authorization Server 0.3.1、Nacos 2.1.0 等最新版本开发，遵循 SpringBoot 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能，代码简洁，架构清晰，非常适合学习和企业作为基础框架使用。
+Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和服务能力开发平台。基于 Spring Boot 2.7.2、Spring Cloud 2021.0.3、Spring Cloud Alibaba 2021.0.1.0、Spring Authorization Server 0.3.1、Nacos 2.1.1 等最新版本开发，遵循 SpringBoot 编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能，代码简洁，架构清晰，非常适合学习和企业作为基础框架使用。
 
 ## 平台定位
 
@@ -144,7 +144,7 @@ Dante Cloud  (但丁，原 Eurynome Cloud) 是一款企业级微服务架构和
 | Spring Cloud Alibaba        | 2021.0.1.0 |
 | Spring Authorization Server | 0.3.1      |
 | Spring Boot Admin           | 2.7.4      |
-| Nacos                       | 2.1.0      |
+| Nacos                       | 2.1.1      |
 | Sentinel                    | 1.8.3      |
 | Seata                       | 1.3.0      |
 

diff --git a/configurations/docker/context/development/Dockerfile b/configurations/docker/context/development/Dockerfile
@@ -31,4 +31,4 @@ ADD ./target/${SERVICE_NAME}-${VERSION}.jar app.jar
 EXPOSE ${SERVICE_PORT}
 
 # 启动容器时的进程
-ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /app.jar
+ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar -Dfile.encoding=utf-8 /app.jar
diff --git a/configurations/docker/context/production/Dockerfile b/configurations/docker/context/production/Dockerfile
@@ -35,4 +35,4 @@ COPY ./agent/skywalking-agent-8.11.0.jar /usr/local/sw/agent.jar
 EXPOSE ${SERVICE_PORT}
 
 # 启动容器时的进程
-ENTRYPOINT java -javaagent:/usr/local/sw/agent.jar=agent.service_name=${SW_AGENT_SERVICE_NAME},collector.backend_service=${SW_COLLECTOR_BACKEND_SERVICE} ${JAVA_OPTS} -jar /usr/local/app.jar
+ENTRYPOINT java -javaagent:/usr/local/sw/agent.jar=agent.service_name=${SW_AGENT_SERVICE_NAME},collector.backend_service=${SW_COLLECTOR_BACKEND_SERVICE} ${JAVA_OPTS} -jar -Dfile.encoding=utf-8 /usr/local/app.jar
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.2.4
+VERSION=2.7.2.5
 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
@@ -1,7 +1,7 @@
 version: "3"
 services:
   nacos:
-    image: nacos/nacos-server:latest
+    image: nacos/nacos-server:v2.1.1
     container_name: nacos
     hostname: nacos
     restart: always

diff --git a/configurations/docker/docker-compose/linux/herodotus/env.base.yml b/configurations/docker/docker-compose/linux/herodotus/env.base.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   nacos:
-    image: nacos/nacos-server:latest
+    image: nacos/nacos-server:v2.1.1
     container_name: nacos
     hostname: nacos
     environment:

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.2.4
+VERSION=2.7.2.5
 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
@@ -1,7 +1,7 @@
 version: "3"
 services:
   nacos:
-    image: nacos/nacos-server:latest
+    image: nacos/nacos-server:v2.1.1
     container_name: nacos
     hostname: nacos
     restart: always

diff --git a/configurations/docker/docker-compose/windows/herodotus/env.base.yml b/configurations/docker/docker-compose/windows/herodotus/env.base.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   nacos:
-    image: nacos/nacos-server:latest
+    image: nacos/nacos-server:v2.1.1
     container_name: nacos
     environment:
       MODE: standalone

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.2.4</version>
+        <version>2.7.2.5</version>
         <relativePath/>
     </parent>
 
     <groupId>cn.herodotus.dante</groupId>
     <artifactId>dependencies</artifactId>
-    <version>2.7.2.4</version>
+    <version>2.7.2.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,11 +32,11 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.2.4</version>
+        <version>2.7.2.5</version>
     </parent>
 
     <artifactId>dante-module-common</artifactId>
-    <version>2.7.2.4</version>
+    <version>2.7.2.5</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.2.4</version>
+        <version>2.7.2.5</version>
     </parent>
 
     <artifactId>dante-module-security</artifactId>
-    <version>2.7.2.4</version>
+    <version>2.7.2.5</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.2.4</version>
+        <version>2.7.2.5</version>
     </parent>
 
     <artifactId>dante-module-strategy</artifactId>
-    <version>2.7.2.4</version>
+    <version>2.7.2.5</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.2.4</version>
+        <version>2.7.2.5</version>
     </parent>
 
     <artifactId>dante-module-upms-logic</artifactId>
-    <version>2.7.2.4</version>
+    <version>2.7.2.5</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/...logic/src/main/java/cn/herodotus/dante/module/upms/logic/entity/system/SysSocialUser.java b/...logic/src/main/java/cn/herodotus/dante/module/upms/logic/entity/system/SysSocialUser.java
@@ -85,7 +85,7 @@ public class SysSocialUser extends BaseSysEntity implements SocialUserDetails {
     private String nickName;
 
     @Schema(title = "用户头像")
-    @Column(name = "avatar", length = 2000)
+    @Column(name = "avatar", length = 1000)
     private String avatar;
 
     @Schema(title = "用户网址")
@@ -121,27 +121,27 @@ public class SysSocialUser extends BaseSysEntity implements SocialUserDetails {
 
 
     @Schema(title = "用户的授权令牌")
-    @Column(name = "access_token", length = 4000)
+    @Column(name = "access_token", columnDefinition="TEXT")
     private String accessToken;
 
     @Schema(title = "第三方用户的授权令牌的有效期", description = "部分平台可能没有")
     @Column(name = "expire_in")
     private Integer expireIn;
 
     @Schema(title = "刷新令牌", description = "部分平台可能没有")
-    @Column(name = "refresh_token", length = 4000)
+    @Column(name = "refresh_token", columnDefinition="TEXT")
     private String refreshToken;
 
     @Schema(title = "第三方用户的刷新令牌的有效期", description = "部分平台可能没有")
     @Column(name = "refresh_token_expire_in")
     private Integer refreshTokenExpireIn;
 
     @Schema(title = "第三方用户授予的权限", description = "部分平台可能没有")
-    @Column(name = "scope", length = 4000)
+    @Column(name = "scope", length = 1200)
     private String scope;
 
     @Schema(title = "个别平台的授权信息", description = "部分平台可能没有")
-    @Column(name = "token_type", length = 4000)
+    @Column(name = "token_type", length = 100)
     private String tokenType;
 
     @Schema(title = "第三方用户的 ID", description = "部分平台可能没有")
@@ -165,7 +165,7 @@ public class SysSocialUser extends BaseSysEntity implements SocialUserDetails {
     private String appId;
 
     @Schema(title = "手机号码", description = "部分平台可能没有")
-    @Column(name = "phone_number", length = 256)
+    @Column(name = "phone_number", length = 50)
     private String phoneNumber;
 
     @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE, region = UpmsConstants.REGION_SYS_USER)

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.2.4</version>
+        <version>2.7.2.5</version>
     </parent>
 
     <artifactId>dante-module-upms-rest</artifactId>
-    <version>2.7.2.4</version>
+    <version>2.7.2.5</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.2.4</version>
+        <version>2.7.2.5</version>
     </parent>
 
     <artifactId>modules</artifactId>
-    <version>2.7.2.4</version>
+    <version>2.7.2.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,11 +32,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.2.4</version>
+        <version>2.7.2.5</version>
     </parent>
 
     <artifactId>authentication-spring-boot-starter</artifactId>
-    <version>2.7.2.4</version>
+    <version>2.7.2.5</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.2.4</version>
+        <version>2.7.2.5</version>
     </parent>
 
     <artifactId>packages</artifactId>
-    <version>2.7.2.4</version>
+    <version>2.7.2.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,11 +32,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.dante</groupId>
-        <version>2.7.2.4</version>
+        <version>2.7.2.5</version>
     </parent>
 
     <artifactId>service-spring-boot-starter</artifactId>
-    <version>2.7.2.4</version>
+    <version>2.7.2.5</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.2.4</version>
+        <version>2.7.2.5</version>
     </parent>
 
     <artifactId>dante-cloud-gateway</artifactId>
-    <version>2.7.2.4</version>
+    <version>2.7.2.5</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.2.4</version>
+        <version>2.7.2.5</version>
     </parent>
 
     <artifactId>dante-cloud-monitor</artifactId>
-    <version>2.7.2.4</version>
+    <version>2.7.2.5</version>
     <name>dante-cloud-monitor</name>
     <description>dante-cloud-monitor</description>
     <dependencies>

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
@@ -34,7 +34,7 @@ herodotus:
   log-center:
     server-addr: ${herodotus.environment.logstash-server-addr}
     loggers:
-      cn.herodotus.dante: debug
+      cn.herodotus: debug
       org.springframework.security: debug
       com.alibaba.nacos.client.naming: error
       com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.grpc.netty: error

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
@@ -34,7 +34,7 @@ herodotus:
   log-center:
     server-addr: ${herodotus.environment.logstash-server-addr}
     loggers:
-      cn.herodotus.dante: debug
+      cn.herodotus: debug
       org.springframework.security: debug
       com.alibaba.nacos.client.naming: error
       com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.grpc.netty: error

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
@@ -34,7 +34,7 @@ herodotus:
   log-center:
     server-addr: ${herodotus.environment.logstash-server-addr}
     loggers:
-      cn.herodotus.dante: debug
+      cn.herodotus: debug
       org.springframework.security: debug
       com.alibaba.nacos.client.naming: error
       com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.grpc.netty: error

diff --git a/...-cloud-monitor/src/main/resources/imports/v2.7.2.2/nacos_config_export_20220730154325.zip b/...-cloud-monitor/src/main/resources/imports/v2.7.2.2/nacos_config_export_20220730154325.zip
diff --git a/...-cloud-monitor/src/main/resources/imports/v2.7.2.3/nacos_config_export_20220730154325.zip b/...-cloud-monitor/src/main/resources/imports/v2.7.2.3/nacos_config_export_20220730154325.zip
diff --git a/...-cloud-monitor/src/main/resources/imports/v2.7.2.5/nacos_config_export_20220812220738.zip b/...-cloud-monitor/src/main/resources/imports/v2.7.2.5/nacos_config_export_20220812220738.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.2.4</version>
+        <version>2.7.2.5</version>
     </parent>
 
     <artifactId>dante-cloud-uaa</artifactId>
-    <version>2.7.2.4</version>
+    <version>2.7.2.5</version>
     <packaging>jar</packaging>
 
     <dependencies>

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.2.4</version>
+        <version>2.7.2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dante-cloud-upms</artifactId>
-    <version>2.7.2.4</version>
+    <version>2.7.2.5</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>2.7.2.4</version>
+        <version>2.7.2.5</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.2.4</version>
+        <version>2.7.2.5</version>
         <relativePath>dependencies/pom.xml</relativePath>
     </parent>
 
     <artifactId>dante-cloud</artifactId>
-    <version>2.7.2.4</version>
+    <version>2.7.2.5</version>
     <packaging>pom</packaging>
 
     <name>dante-cloud</name>