🍻 refactor: v2.6.2.0

1. 重构平台基础核心代码，调整部分核心代码归属模块，让各个核心代码模块逻辑更加清晰、职责更加内聚。 2. 调整核心代码模块依赖关系，降低模块间的耦合程度，减少部分核心模块被过度依赖的情况。 3. 升级大量基础核心依赖包版本 - Fastjson 版本升级至 1.2.78 - JetCache 版本升级至 2.6.1 - Redisson 版本升级至 3.16.6 - SpringDoc 版本升级至 1.5.13 - Minio 版本升级至 8.3.4 - Okhttps 版本升级至 3.4.1 4. 前端工程升级使用依赖包版本，重新编译组件库。
dromara · Dec 10, 2021 · 13a5ca0 · 13a5ca0
1 parent 83cca2a
commit 13a5ca0
Show file tree

Hide file tree

Showing 37 changed files with 74 additions and 65 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.0.3-brightgreen" alt="Nacos 2.0.3"></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>
-    <a href="#" target="_blank"><img src="https://shields.io/badge/Version-2.6.2.0-red" alt="Version 2.6.2.0"></a>
+    <a href="#" target="_blank"><img src="https://shields.io/badge/Version-2.6.2.10-red" alt="Version 2.6.2.10"></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>

diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env
@@ -1,4 +1,4 @@
-VERSION=2.6.2.0
+VERSION=2.6.2.10
 GATEWAY_SERVICE_NAME=eurynome-cloud-gateway
 GATEWAY_SERVICE_PORT=8847
 UAA_SERVICE_NAME=eurynome-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.6.2.0
+VERSION=2.6.2.10
 GATEWAY_SERVICE_NAME=eurynome-cloud-gateway
 GATEWAY_SERVICE_PORT=8847
 UAA_SERVICE_NAME=eurynome-cloud-uaa

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -35,7 +35,7 @@
 
     <groupId>cn.herodotus.eurynome</groupId>
     <artifactId>dependencies</artifactId>
-    <version>2.6.2.0</version>
+    <version>2.6.2.10</version>
     <packaging>pom</packaging>
 
     <name>eurynome-cloud-dependencies</name>

diff --git a/integrates/eurynome-integration-influxdb/pom.xml b/integrates/eurynome-integration-influxdb/pom.xml
@@ -27,12 +27,12 @@
     <parent>
         <artifactId>integrates</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.2.0</version>
+        <version>2.6.2.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eurynome-integration-influxdb</artifactId>
-    <version>2.6.2.0</version>
+    <version>2.6.2.10</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/integrates/eurynome-integration-oss/pom.xml b/integrates/eurynome-integration-oss/pom.xml
@@ -27,12 +27,12 @@
     <parent>
         <artifactId>integrates</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.2.0</version>
+        <version>2.6.2.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eurynome-integration-oss</artifactId>
-    <version>2.6.2.0</version>
+    <version>2.6.2.10</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/integrates/pom.xml b/integrates/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <artifactId>eurynome-cloud</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.2.0</version>
+        <version>2.6.2.10</version>
     </parent>
 
     <artifactId>integrates</artifactId>
-    <version>2.6.2.0</version>
+    <version>2.6.2.10</version>
     <packaging>pom</packaging>
 
     <name>eurynome-cloud-integrates</name>

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.6.2.0</version>
+        <version>2.6.2.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/packages/eurynome-cloud-cache/pom.xml b/packages/eurynome-cloud-cache/pom.xml
@@ -27,12 +27,12 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.2.0</version>
+        <version>2.6.2.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eurynome-cloud-cache</artifactId>
-    <version>2.6.2.0</version>
+    <version>2.6.2.10</version>
     <packaging>jar</packaging>
 
     <description>将Cache和Redis相关抽取出独立组件包。降低代码耦合性，提升代码包的独立性。解决依赖过多，使用过程中还需要进行排除的问题。</description>

diff --git a/packages/eurynome-cloud-data/pom.xml b/packages/eurynome-cloud-data/pom.xml
@@ -29,19 +29,19 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.2.0</version>
+        <version>2.6.2.10</version>
     </parent>
 
     <artifactId>eurynome-cloud-data</artifactId>
-    <version>2.6.2.0</version>
+    <version>2.6.2.10</version>
     <packaging>jar</packaging>
 
     <description>数据相关通用代码组件包，包括JPA,Redis,数据实体等相关内容</description>
 
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>eurynome-cloud-cache</artifactId>
+            <artifactId>eurynome-cloud-assistant</artifactId>
         </dependency>
 
         <dependency>

diff --git a/...e-cloud-data/src/main/java/cn/herodotus/eurynome/data/annotation/EnableHerodotusData.java b/...e-cloud-data/src/main/java/cn/herodotus/eurynome/data/annotation/EnableHerodotusData.java
@@ -22,7 +22,6 @@
 
 package cn.herodotus.eurynome.data.annotation;
 
-import cn.herodotus.eurynome.cache.annotation.EnableHerodotusCache;
 import cn.herodotus.eurynome.data.configuration.DataConfiguration;
 import org.springframework.context.annotation.Import;
 
@@ -45,7 +44,6 @@
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@EnableHerodotusCache
 @Import(DataConfiguration.class)
 public @interface EnableHerodotusData {
 }
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.6.2.0</version>
+        <version>2.6.2.10</version>
     </parent>
 
     <artifactId>eurynome-cloud-kernel</artifactId>
-    <version>2.6.2.0</version>
+    <version>2.6.2.10</version>
     <packaging>jar</packaging>
 
     <description>平台通用的基础依赖，以及接入及管理等通用代码，上中台必需的基础代码。增加这层包，主要目的是抽取webflux和web依赖的通用性，降低其它包之间的耦合性，比如之前data要依赖logstash，logstash要依赖managementproperties</description>

diff --git a/packages/eurynome-cloud-message/pom.xml b/packages/eurynome-cloud-message/pom.xml
@@ -27,12 +27,12 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.2.0</version>
+        <version>2.6.2.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eurynome-cloud-message</artifactId>
-    <version>2.6.2.0</version>
+    <version>2.6.2.10</version>
     <packaging>jar</packaging>
 
     <dependencies>

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.6.2.0</version>
+        <version>2.6.2.10</version>
     </parent>
 
     <artifactId>eurynome-cloud-oauth-starter</artifactId>
-    <version>2.6.2.0</version>
+    <version>2.6.2.10</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/...th-starter/src/main/java/cn/herodotus/eurynome/oauth/autoconfigure/AutoConfiguration.java b/...th-starter/src/main/java/cn/herodotus/eurynome/oauth/autoconfigure/AutoConfiguration.java
@@ -30,6 +30,8 @@
 import cn.herodotus.eurynome.upms.api.annotation.EnableUpmsInterface;
 import cn.herodotus.eurynome.upms.logic.annotation.EnableUpmsLogic;
 import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -89,13 +91,14 @@
  * @author : gengwei.zheng
  * @date : 2021/1/17 11:07
  */
-@Slf4j
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableHerodotusRest
 @EnableUpmsInterface
 @EnableUpmsLogic
 public class AutoConfiguration {
 
+    private static final Logger log = LoggerFactory.getLogger(AutoConfiguration.class);
+
     @PostConstruct
     public void postConstruct() {
         log.info("[Herodotus] |- Starter [Herodotus OAuth Starter] Auto Configure.");

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.6.2.0</version>
+        <version>2.6.2.10</version>
     </parent>
 
 
     <artifactId>eurynome-cloud-oauth</artifactId>
-    <version>2.6.2.0</version>
+    <version>2.6.2.10</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/packages/eurynome-cloud-rest/pom.xml b/packages/eurynome-cloud-rest/pom.xml
@@ -29,14 +29,19 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.2.0</version>
+        <version>2.6.2.10</version>
     </parent>
 
     <artifactId>eurynome-cloud-rest</artifactId>
-    <version>2.6.2.0</version>
+    <version>2.6.2.10</version>
     <packaging>jar</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>eurynome-cloud-cache</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>eurynome-cloud-data</artifactId>

diff --git a/...e-cloud-rest/src/main/java/cn/herodotus/eurynome/rest/annotation/EnableHerodotusRest.java b/...e-cloud-rest/src/main/java/cn/herodotus/eurynome/rest/annotation/EnableHerodotusRest.java
@@ -22,6 +22,7 @@
 
 package cn.herodotus.eurynome.rest.annotation;
 
+import cn.herodotus.eurynome.cache.annotation.EnableHerodotusCache;
 import cn.herodotus.eurynome.data.annotation.EnableHerodotusData;
 import cn.herodotus.eurynome.rest.configuration.RestConfiguration;
 import cn.herodotus.eurynome.web.annotation.EnableHerodotusWeb;
@@ -44,6 +45,7 @@
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
+@EnableHerodotusCache
 @EnableHerodotusData
 @EnableHerodotusWeb
 @Import({RestConfiguration.class})

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.6.2.0</version>
+        <version>2.6.2.10</version>
     </parent>
 
     <artifactId>eurynome-cloud-security</artifactId>
-    <version>2.6.2.0</version>
+    <version>2.6.2.10</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.6.2.0</version>
+        <version>2.6.2.10</version>
     </parent>
 
     <artifactId>eurynome-cloud-starter</artifactId>
-    <version>2.6.2.0</version>
+    <version>2.6.2.10</version>
 
     <description>通用配置starter,此包的定位是统一未来接入的微服务使用</description>
     <packaging>jar</packaging>

diff --git a/packages/eurynome-cloud-web/pom.xml b/packages/eurynome-cloud-web/pom.xml
@@ -27,12 +27,12 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.2.0</version>
+        <version>2.6.2.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eurynome-cloud-web</artifactId>
-    <version>2.6.2.0</version>
+    <version>2.6.2.10</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/...cloud-web/src/main/java/cn/herodotus/eurynome/web/configuration/OpenApiConfiguration.java b/...cloud-web/src/main/java/cn/herodotus/eurynome/web/configuration/OpenApiConfiguration.java
@@ -84,7 +84,7 @@ public OpenAPI createOpenAPI() {
                 .servers(getServers())
                 .info(new Info().title("Eurynome Cloud")
                         .description("Eurynome Cloud Microservices Architecture")
-                        .version("2.6.2.0")
+                        .version("2.6.2.10")
                         .license(new License().name("Apache 2.0").url("http://www.apache.org/licenses/")))
                 .externalDocs(new ExternalDocumentation()
                         .description("Eurynome Cloud Documentation")

diff --git a/packages/eurynome-cloud-websocket/pom.xml b/packages/eurynome-cloud-websocket/pom.xml
@@ -27,12 +27,12 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.2.0</version>
+        <version>2.6.2.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eurynome-cloud-websocket</artifactId>
-    <version>2.6.2.0</version>
+    <version>2.6.2.10</version>
     <packaging>jar</packaging>
 
     <dependencies>

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.6.2.0</version>
+        <version>2.6.2.10</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.6.2.0</version>
+        <version>2.6.2.10</version>
     </parent>
 
     <artifactId>eurynome-cloud-gateway</artifactId>
-    <version>2.6.2.0</version>
+    <version>2.6.2.10</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/platform/eurynome-cloud-monitor/pom.xml b/platform/eurynome-cloud-monitor/pom.xml
@@ -29,11 +29,11 @@
     <parent>
         <artifactId>platform</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.2.0</version>
+        <version>2.6.2.10</version>
     </parent>
 
     <artifactId>eurynome-cloud-monitor</artifactId>
-    <version>2.6.2.0</version>
+    <version>2.6.2.10</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.6.2.0</version>
+        <version>2.6.2.10</version>
     </parent>
 
     <artifactId>eurynome-cloud-uaa</artifactId>
-    <version>2.6.2.0</version>
+    <version>2.6.2.10</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.6.2.0</version>
+        <version>2.6.2.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>