🏁 feat: v2.6.7.20

- 主要更新 - Nacos 版本更新至 2.1.0, 同步更新 Nacos Docker 版本，新增 Nacos 2.1.0 SQL 脚本。(提示：该版本有数据结构变化，建议备份已有配置信息，重新导入数据库脚本) - 其它更新 - 删除 commons-beanutils 依赖，并重构该依赖涉及的代码，解决由其依赖的 commons-collections 3.X 包引起的安全漏洞。 - 删除 h2 database 依赖，解决由于 Spring Boot 默认依赖版本 h2 driver 引起的安全漏洞问题。 - 依赖更新 - Minio 版本升级至 8.4.0 - Okhttps 版本升级至 3.5.1 - Alipay-sdk-java 版本升级至 4.23.0.ALL
dromara · May 7, 2022 · 565e71b · 565e71b
1 parent b71598c
commit 565e71b
Show file tree

Hide file tree

Showing 41 changed files with 69 additions and 139 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.6.7-blue" alt="Spring Boot 2.6.7"></a>
     <a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://shields.io/badge/Spring%20Cloud-2021.0.2-blue" alt="Spring Cloud 2021.0.2"></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.0.4-brightgreen" alt="Nacos 2.0.4"></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="./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.7.10-red" alt="Version 2.6.7.10"></a>
+    <a href="#" target="_blank"><img src="https://shields.io/badge/Version-2.6.7.20-red" alt="Version 2.6.7.20"></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>
@@ -29,7 +29,7 @@
 
 ## 企业级技术中台微服务架构与服务能力开发平台
 
-Eurynome Cloud是一款企业级微服务架构和服务能力开发平台。基于Spring Boot 2.6.7、Spring Cloud 2021.0.2、Spring Cloud Alibaba 2021.0.1.0、Nacos 2.0.4 等最新版本开发，遵循SpringBoot编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能，代码简洁，架构清晰，非常适合学习和企业作为基础框架使用。
+Eurynome Cloud是一款企业级微服务架构和服务能力开发平台。基于Spring Boot 2.6.7、Spring Cloud 2021.0.2、Spring Cloud Alibaba 2021.0.1.0、Nacos 2.1.0 等最新版本开发，遵循SpringBoot编程思想，高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能，代码简洁，架构清晰，非常适合学习和企业作为基础框架使用。
 
 ## 平台定位
 
@@ -83,7 +83,7 @@ Eurynome Cloud是一款企业级微服务架构和服务能力开发平台。基
 | Spring Cloud         | 2021.0.2   |
 | Spring Cloud Alibaba | 2021.0.1.0 |
 | Spring Boot Admin    | 2.6.6      |
-| Nacos                | 2.0.4      |
+| Nacos                | 2.1.0      |
 | Sentinel             | 1.8.3      |
 | Seata                | 1.3.0      |
 

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.7.10
+VERSION=2.6.7.20
 GATEWAY_SERVICE_NAME=eurynome-cloud-gateway
 GATEWAY_SERVICE_PORT=8847
 UAA_SERVICE_NAME=eurynome-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.0
     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:v2.0.4
+    image: nacos/nacos-server:v2.1.0
     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.6.7.10
+VERSION=2.6.7.20
 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.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.0
     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:v2.0.4
+    image: nacos/nacos-server:v2.1.0
     container_name: nacos
     environment:
       MODE: standalone

diff --git a/configurations/scripts/nacos-mysql_2.0.3.sql → configurations/scripts/nacos-mysql_2.1.0.sql b/configurations/scripts/nacos-mysql_2.0.3.sql → configurations/scripts/nacos-mysql_2.1.0.sql
@@ -35,6 +35,7 @@ CREATE TABLE `config_info` (
   `effect` varchar(64) DEFAULT NULL,
   `type` varchar(64) DEFAULT NULL,
   `c_schema` text,
+  `encrypted_data_key` text NOT NULL COMMENT '秘钥',
   PRIMARY KEY (`id`),
   UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info';
@@ -74,6 +75,7 @@ CREATE TABLE `config_info_beta` (
   `src_user` text COMMENT 'source user',
   `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip',
   `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段',
+  `encrypted_data_key` text NOT NULL COMMENT '秘钥',
   PRIMARY KEY (`id`),
   UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta';
@@ -153,6 +155,7 @@ CREATE TABLE `his_config_info` (
   `src_ip` varchar(50) DEFAULT NULL,
   `op_type` char(10) DEFAULT NULL,
   `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段',
+  `encrypted_data_key` text NOT NULL COMMENT '秘钥',
   PRIMARY KEY (`nid`),
   KEY `idx_gmt_create` (`gmt_create`),
   KEY `idx_gmt_modified` (`gmt_modified`),

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.7.10</version>
+    <version>2.6.7.20</version>
     <packaging>pom</packaging>
 
     <name>eurynome-cloud-dependencies</name>
@@ -74,7 +74,6 @@
         <antisamy.version>1.6.8</antisamy.version>
         <commons-collections4.version>4.4</commons-collections4.version>
         <commons-text.version>1.9</commons-text.version>
-        <commons-beanutils.version>1.9.4</commons-beanutils.version>
         <commons-io.version>2.11.0</commons-io.version>
         <guava.version>31.1-jre</guava.version>
         <jackson-component.version>2.13.2</jackson-component.version>
@@ -89,11 +88,11 @@
         <!-- 阿里巴巴开源工具依赖 -->
         <fastjson.version>1.2.80</fastjson.version>
         <jetcache.version>2.6.4</jetcache.version>
-        <nacos.version>2.0.4</nacos.version>
+        <nacos.version>2.1.0</nacos.version>
 
         <!-- 国内开源通用组件 -->
         <hutool.version>5.7.22</hutool.version>
-        <okhttps.version>3.5.0</okhttps.version>
+        <okhttps.version>3.5.1</okhttps.version>
         <just-auth.verison>1.16.5</just-auth.verison>
         <knife4j.version>3.0.3</knife4j.version>
         <weixin-java-sdk.version>4.3.2.B</weixin-java-sdk.version>
@@ -222,11 +221,6 @@
 
 
             <!-- 开源通用工具包 -->
-            <dependency>
-                <groupId>commons-beanutils</groupId>
-                <artifactId>commons-beanutils</artifactId>
-                <version>${commons-beanutils.version}</version>
-            </dependency>
             <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-collections4 -->
             <dependency>
                 <groupId>org.apache.commons</groupId>

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.7.10</version>
+        <version>2.6.7.20</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -45,10 +45,6 @@
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>

diff --git a/...rynome-cloud-assistant/src/main/java/cn/herodotus/eurynome/assistant/utils/BeanUtils.java b/...rynome-cloud-assistant/src/main/java/cn/herodotus/eurynome/assistant/utils/BeanUtils.java
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.7.10</version>
+        <version>2.6.7.20</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eurynome-cloud-cache</artifactId>
-    <version>2.6.7.10</version>
+    <version>2.6.7.20</version>
     <packaging>jar</packaging>
 
     <description>将Cache和Redis相关抽取出独立组件包。降低代码耦合性，提升代码包的独立性。解决依赖过多，使用过程中还需要进行排除的问题。</description>

diff --git a/packages/eurynome-cloud-captcha/pom.xml b/packages/eurynome-cloud-captcha/pom.xml
@@ -27,12 +27,12 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.7.10</version>
+        <version>2.6.7.20</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eurynome-cloud-captcha</artifactId>
-    <version>2.6.7.10</version>
+    <version>2.6.7.20</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.6.7.10</version>
+        <version>2.6.7.20</version>
     </parent>
 
     <artifactId>eurynome-cloud-data</artifactId>
-    <version>2.6.7.10</version>
+    <version>2.6.7.20</version>
     <packaging>jar</packaging>
 
     <description>数据相关通用代码组件包，包括JPA,Redis,数据实体等相关内容</description>
@@ -61,10 +61,6 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.baomidou</groupId>

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.7.10</version>
+        <version>2.6.7.20</version>
     </parent>
 
     <artifactId>eurynome-cloud-kernel</artifactId>
-    <version>2.6.7.10</version>
+    <version>2.6.7.20</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.7.10</version>
+        <version>2.6.7.20</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eurynome-cloud-message</artifactId>
-    <version>2.6.7.10</version>
+    <version>2.6.7.20</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.7.10</version>
+        <version>2.6.7.20</version>
     </parent>
 
     <artifactId>eurynome-cloud-oauth-starter</artifactId>
-    <version>2.6.7.10</version>
+    <version>2.6.7.20</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.6.7.10</version>
+        <version>2.6.7.20</version>
     </parent>
 
 
     <artifactId>eurynome-cloud-oauth</artifactId>
-    <version>2.6.7.10</version>
+    <version>2.6.7.20</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/packages/eurynome-cloud-pay/pom.xml b/packages/eurynome-cloud-pay/pom.xml
@@ -27,12 +27,12 @@
     <parent>
         <artifactId>packages</artifactId>
         <groupId>cn.herodotus.eurynome</groupId>
-        <version>2.6.7.10</version>
+        <version>2.6.7.20</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>eurynome-cloud-pay</artifactId>
-    <version>2.6.7.10</version>
+    <version>2.6.7.20</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.6.7.10</version>
+        <version>2.6.7.20</version>
     </parent>
 
     <artifactId>eurynome-cloud-rest</artifactId>
-    <version>2.6.7.10</version>
+    <version>2.6.7.20</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.6.7.10</version>
+        <version>2.6.7.20</version>
     </parent>
 
     <artifactId>eurynome-cloud-security</artifactId>
-    <version>2.6.7.10</version>
+    <version>2.6.7.20</version>
     <packaging>jar</packaging>
 
     <dependencies>