⬆️ v2.5.4.60

1. Spring Boot 版本升级至 2.5.4 2. Skywalking 版本升级至 8.7.0 3. 微服务日志输出至日志中心格式。
dromara · Aug 20, 2021 · 1fd013e · 1fd013e
1 parent fd9096b
commit 1fd013e
Show file tree

Hide file tree

Showing 31 changed files with 88 additions and 71 deletions.
diff --git a/README.md b/README.md
@@ -6,13 +6,13 @@
 
 <p align="center">
     <a href="https://www.oracle.com/java/technologies/javase-downloads.html" target="_blank"><img src="https://img.shields.io/badge/JDK-1.8%2B-green" alt="JDK 1.8+"></a>
-    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-2.5.3-blue" alt="Spring Boot 2.5.3"></a>
+    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-2.5.4-blue" alt="Spring Boot 2.5.4"></a>
     <a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud-2020.0.3-blue" alt="Spring Cloud 2020.0.3"></a>
     <a href="https://github.com/alibaba/spring-cloud-alibaba" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Alibaba-2021.1-blue" alt="Spring Cloud Alibaba 2021.1"></a>
     <a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://img.shields.io/badge/Nacos-2.0.3-brightgreen" alt="Nacos 2.0.3"></a>
     <a href="./LICENSE"><img src="https://img.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://img.shields.io/badge/Author-%E7%A0%81%E5%8C%A0%E5%90%9B-orange" alt="码匠君"></a>
-    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-2.5.4.55-red" alt="Version 2.5.4.55"></a>
+    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-2.5.4.60-red" alt="Version 2.5.4.60"></a>
     <a href="https://gitee.com/herodotus/eurynome-cloud"><img src="https://gitee.com/herodotus/eurynome-cloud/badge/star.svg?theme=dark" alt="Gitee star"></a>
     <a href="https://gitee.com/herodotus/eurynome-cloud"><img src="https://gitee.com/herodotus/eurynome-cloud/badge/fork.svg?theme=dark" alt="Gitee fork"></a>
 </p>
@@ -28,7 +28,7 @@
 ---
 ## 企业级技术中台微服务架构与服务能力开发平台
 
-Eurynome Cloud是一款企业级微服务架构和服务能力开发平台。基于Spring Boot 2.5.3、Spring Cloud 2020.0.3、Spring Cloud Alibaba 2021.1、Nacos 2.0.3 等最新版本开发，遵循SpringBoot编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能，代码简洁，架构清晰，非常适合学习和企业作为基础框架使用。
+Eurynome Cloud是一款企业级微服务架构和服务能力开发平台。基于Spring Boot 2.5.4、Spring Cloud 2020.0.3、Spring Cloud Alibaba 2021.1、Nacos 2.0.3 等最新版本开发，遵循SpringBoot编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能，代码简洁，架构清晰，非常适合学习和企业作为基础框架使用。
 
 ## [1]、总体架构
 
@@ -145,7 +145,7 @@ Eurynome Cloud是一款企业级微服务架构和服务能力开发平台。基
 
 组件 | 版本 
 ---|---
-Spring Boot | 2.5.3
+Spring Boot | 2.5.4
 Spring Cloud | 2020.0.3 
 Spring Cloud Alibaba | 2021.1
 Spring Boot Admin | 2.4.2

diff --git a/...text/agent/skywalking-agent-es7-8.6.0.jar → ...text/agent/skywalking-agent-es7-8.7.0.jar b/...text/agent/skywalking-agent-es7-8.6.0.jar → ...text/agent/skywalking-agent-es7-8.7.0.jar
diff --git a/configurations/docker/context/production/Dockerfile b/configurations/docker/context/production/Dockerfile
@@ -28,7 +28,7 @@ VOLUME /tmp
 
 # 应用构建成功后的jar文件被复制到镜像内，名字也改成了app.jar
 ADD ./target/${SERVICE_NAME}-${VERSION}.jar /usr/local/app.jar
-COPY ./agent/skywalking-agent-es7-8.6.0.jar /usr/local/sw/agent.jar
+COPY ./agent/skywalking-agent-es7-8.7.0.jar /usr/local/sw/agent.jar
 
 # 声明运行时端口
 EXPOSE ${SERVICE_PORT}

diff --git a/configurations/docker/docker-compose/herodotus/.env b/configurations/docker/docker-compose/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=2.5.4.55
+VERSION=2.5.4.60
 GATEWAY_SERVICE_NAME=eurynome-cloud-gateway
 GATEWAY_SERVICE_PORT=8847
 UAA_SERVICE_NAME=eurynome-cloud-uaa

diff --git a/configurations/docker/docker-compose/herodotus/env.skywalking.yml b/configurations/docker/docker-compose/herodotus/env.skywalking.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   oap:
-    image: apache/skywalking-oap-server:8.6.0-es7
+    image: apache/skywalking-oap-server:8.7.0-es7
     container_name: skywalking-oap
     hostname: skywalking-oap
     ports:
@@ -13,12 +13,12 @@ services:
       TZ: Asia/Shanghai
 
   ui:
-    image: apache/skywalking-ui:8.6.0
+    image: apache/skywalking-ui:8.7.0
     container_name: skywalking-ui
     hostname: skywalking-ui
     depends_on:
       - oap
     ports:
-      - 8878:8080
+      - "8878:8080"
     environment:
       SW_OAP_ADDRESS: oap:12800
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -29,13 +29,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
     <groupId>cn.herodotus.eurynome</groupId>
     <artifactId>dependencies</artifactId>
-    <version>2.5.4.55</version>
+    <version>2.5.4.60</version>
     <packaging>pom</packaging>
 
     <name>eurynome-cloud-dependencies</name>
@@ -59,7 +59,7 @@
 
     <properties>
         <!--Spring 家族-->
-        <spring-boot-dependencies.version>2.5.3</spring-boot-dependencies.version>
+        <spring-boot-dependencies.version>2.5.4</spring-boot-dependencies.version>
         <spring-cloud-dependencies.version>2020.0.3</spring-cloud-dependencies.version>
         <spring-cloud-alibaba-dependencies.version>2021.1</spring-cloud-alibaba-dependencies.version>
         <spring-boot-admin.version>2.5.0</spring-boot-admin.version>

diff --git a/packages/eurynome-cloud-assistant/pom.xml b/packages/eurynome-cloud-assistant/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.5.4.55</version>
+        <version>2.5.4.60</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/packages/eurynome-cloud-common/pom.xml b/packages/eurynome-cloud-common/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.5.4.55</version>
+        <version>2.5.4.60</version>
     </parent>
 
     <artifactId>eurynome-cloud-common</artifactId>
-    <version>2.5.4.55</version>
+    <version>2.5.4.60</version>
     <packaging>jar</packaging>
 
     <description>结对基础通用的工具类包,此包的定位是放在任何工程中都可以使用，而且尽可能依赖少的存在上下文组件</description>

diff --git a/packages/eurynome-cloud-crud/pom.xml b/packages/eurynome-cloud-crud/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.5.4.55</version>
+        <version>2.5.4.60</version>
     </parent>
 
     <artifactId>eurynome-cloud-crud</artifactId>
-    <version>2.5.4.55</version>
+    <version>2.5.4.60</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/packages/eurynome-cloud-data/pom.xml b/packages/eurynome-cloud-data/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.5.4.55</version>
+        <version>2.5.4.60</version>
     </parent>
 
     <artifactId>eurynome-cloud-data</artifactId>
-    <version>2.5.4.55</version>
+    <version>2.5.4.60</version>
     <packaging>jar</packaging>
 
     <description>数据相关通用代码组件包，包括JPA,Redis,数据实体等相关内容</description>
@@ -106,4 +106,18 @@
             <artifactId>h2</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${project.basedir}/src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
 </project>
diff --git a/packages/eurynome-cloud-data/src/main/resources/logback-config-center.xml b/packages/eurynome-cloud-data/src/main/resources/logback-config-center.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
-    
+
     <!--source指定的是application.yml配置文件中key,日志配置文件直接用${logstash-server-addr}引用这个值-->
     <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue="logs"/>
-    <springProperty scop="context" name="logstash-server-addr" source="eurynome.environment.logstash-server-addr" defaultValue="logs"/>
+    <springProperty scop="context" name="logstash-server-addr" source="herodotus.environment.logstash-server-addr"
+                    defaultValue="logs"/>
     <!-- Example for logging into the build folder of your project -->
-    <property name="LOG_FILE" value="logs/${spring.application.name}"/>
+    <property name="LOG_FILE" value="logs/${spring.application.name}"/>
 
     <!-- You can override this to have a custom pattern -->
     <!-- <property name="FILE_LOG_PATTERN" value="${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } -&#45;&#45; [%t] %-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>-->
@@ -20,7 +21,7 @@
         </encoder>
     </appender>
 
-    <!-- Appender to log to file -->
+    <!-- Appender to log to file -->
     <!-- Log file debug output -->
     <appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${LOG_FILE}/debug.log</file>
@@ -91,7 +92,7 @@
             </providers>
         </encoder>
     </appender>
-    
+
     <!--开发环境:打印控制台-->
     <springProfile name="development">
         <root level="debug">

diff --git a/packages/eurynome-cloud-kernel/pom.xml b/packages/eurynome-cloud-kernel/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.5.4.55</version>
+        <version>2.5.4.60</version>
     </parent>
 
     <artifactId>eurynome-cloud-kernel</artifactId>
-    <version>2.5.4.55</version>
+    <version>2.5.4.60</version>
     <packaging>jar</packaging>
 
     <description>平台通用的基础依赖，以及接入及管理等通用代码，上中台必需的基础代码。增加这层包，主要目的是抽取webflux和web依赖的通用性，降低其它包之间的耦合性，比如之前data要依赖logstash，logstash要依赖managementproperties</description>

diff --git a/...nome-cloud-kernel/src/main/java/cn/herodotus/eurynome/kernel/logback/LogstashPattern.java b/...nome-cloud-kernel/src/main/java/cn/herodotus/eurynome/kernel/logback/LogstashPattern.java
@@ -22,6 +22,8 @@
 
 package cn.herodotus.eurynome.kernel.logback;
 
+import com.google.common.base.MoreObjects;
+
 import java.io.Serializable;
 
 /**
@@ -125,17 +127,17 @@ public void setLog(String log) {
 
     @Override
     public String toString() {
-        return "LogstashPattern{" +
-                "level='" + level + '\'' +
-                ", service='" + service + '\'' +
-                ", trace='" + trace + '\'' +
-                ", span='" + span + '\'' +
-                ", parent='" + parent + '\'' +
-                ", exportable='" + exportable + '\'' +
-                ", pid='" + pid + '\'' +
-                ", thread='" + thread + '\'' +
-                ", clazz='" + clazz + '\'' +
-                ", log='" + log + '\'' +
-                '}';
+        return MoreObjects.toStringHelper(this)
+                .add("level", level)
+                .add("service", service)
+                .add("trace", trace)
+                .add("span", span)
+                .add("parent", parent)
+                .add("exportable", exportable)
+                .add("pid", pid)
+                .add("thread", thread)
+                .add("clazz", clazz)
+                .add("log", log)
+                .toString();
     }
 }
diff --git a/packages/eurynome-cloud-oauth-starter/pom.xml b/packages/eurynome-cloud-oauth-starter/pom.xml
@@ -30,11 +30,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.5.4.55</version>
+        <version>2.5.4.60</version>
     </parent>
 
     <artifactId>eurynome-cloud-oauth-starter</artifactId>
-    <version>2.5.4.55</version>
+    <version>2.5.4.60</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/packages/eurynome-cloud-oauth/pom.xml b/packages/eurynome-cloud-oauth/pom.xml
@@ -29,12 +29,12 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.5.4.55</version>
+        <version>2.5.4.60</version>
     </parent>
 
 
     <artifactId>eurynome-cloud-oauth</artifactId>
-    <version>2.5.4.55</version>
+    <version>2.5.4.60</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/packages/eurynome-cloud-rest/pom.xml b/packages/eurynome-cloud-rest/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.5.4.55</version>
+        <version>2.5.4.60</version>
     </parent>
 
     <artifactId>eurynome-cloud-rest</artifactId>
-    <version>2.5.4.55</version>
+    <version>2.5.4.60</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/packages/eurynome-cloud-security/pom.xml b/packages/eurynome-cloud-security/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.5.4.55</version>
+        <version>2.5.4.60</version>
     </parent>
 
     <artifactId>eurynome-cloud-security</artifactId>
-    <version>2.5.4.55</version>
+    <version>2.5.4.60</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/packages/eurynome-cloud-starter/pom.xml b/packages/eurynome-cloud-starter/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.5.4.55</version>
+        <version>2.5.4.60</version>
     </parent>
 
     <artifactId>eurynome-cloud-starter</artifactId>
-    <version>2.5.4.55</version>
+    <version>2.5.4.60</version>
 
     <description>通用配置starter,此包的定位是统一未来接入的微服务使用</description>
     <packaging>jar</packaging>

diff --git a/packages/pom.xml b/packages/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>eurynome-cloud</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.5.4.55</version>
+        <version>2.5.4.60</version>
     </parent>
 
     <artifactId>packages</artifactId>

diff --git a/platform/eurynome-cloud-gateway/pom.xml b/platform/eurynome-cloud-gateway/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.5.4.55</version>
+        <version>2.5.4.60</version>
     </parent>
 
     <artifactId>eurynome-cloud-gateway</artifactId>
-    <version>2.5.4.55</version>
+    <version>2.5.4.60</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/platform/eurynome-cloud-management/pom.xml b/platform/eurynome-cloud-management/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.5.4.55</version>
+        <version>2.5.4.60</version>
     </parent>
 
     <artifactId>eurynome-cloud-management</artifactId>
-    <version>2.5.4.55</version>
+    <version>2.5.4.60</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/platform/eurynome-cloud-uaa/pom.xml b/platform/eurynome-cloud-uaa/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.5.4.55</version>
+        <version>2.5.4.60</version>
     </parent>
 
     <artifactId>eurynome-cloud-uaa</artifactId>
-    <version>2.5.4.55</version>
+    <version>2.5.4.60</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/platform/pom.xml b/platform/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>eurynome-cloud</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.5.4.55</version>
+        <version>2.5.4.60</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>