Skip to content

Commit

Permalink
📌 feat: v2.6.7.0
Browse files Browse the repository at this point in the history
- 主要更新
  - Spring Boot 版本升级至 2.6.7
  - 去除 Spring Integration 强制降级配置,恢复使用 Spring Boot 默认依赖版本
  - 由于 Fastjson 2.0.1 版本存在破坏性升级,暂不做升级处理。
  - 使用最新版本 Antisamy XSS 防护配置文件。
  - Debezium 相关 Docker 版本升级至 1.9
- 其它更新
  - Lombok 版本升级至 1.18.24
  - Springdoc版本升级至 1.6.8
  - WxJava 版本升级至 4.3.1.B
  - Bce-java-sdk 版本升级至 0.10.206
  - Alipay-sdk-java 版本升级至 4.22.110.ALL
  - Aliyun-sdk-oss 版本升级至 3.14.1
  • Loading branch information
herodotus-ecosystem committed Apr 23, 2022
1 parent f969ac2 commit a85a66a
Show file tree
Hide file tree
Showing 43 changed files with 122 additions and 95 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<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="./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.6.20-red" alt="Version 2.6.6.20"></a>
<a href="#" target="_blank"><img src="https://shields.io/badge/Version-2.6.7.0-red" alt="Version 2.6.7.0"></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>
Expand All @@ -29,7 +29,7 @@

## 企业级技术中台微服务架构与服务能力开发平台

Eurynome Cloud是一款企业级微服务架构和服务能力开发平台。基于Spring Boot 2.6.6、Spring Cloud 2021.0.1、Spring Cloud Alibaba 2021.0.1.0、Nacos 2.0.4 等最新版本开发,遵循SpringBoot编程思想,高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能,代码简洁,架构清晰,非常适合学习和企业作为基础框架使用。
Eurynome Cloud是一款企业级微服务架构和服务能力开发平台。基于Spring Boot 2.6.7、Spring Cloud 2021.0.1、Spring Cloud Alibaba 2021.0.1.0、Nacos 2.0.4 等最新版本开发,遵循SpringBoot编程思想,高度模块化和可配置化。具备服务发现、配置、熔断、限流、降级、监控、多级缓存、分布式事务、工作流等功能,代码简洁,架构清晰,非常适合学习和企业作为基础框架使用。

## 平台定位

Expand Down Expand Up @@ -79,7 +79,7 @@ Eurynome Cloud是一款企业级微服务架构和服务能力开发平台。基

| 组件 | 版本 |
|----------------------|------------|
| Spring Boot | 2.6.6 |
| Spring Boot | 2.6.7 |
| Spring Cloud | 2021.0.1 |
| Spring Cloud Alibaba | 2021.0.1.0 |
| Spring Boot Admin | 2.6.6 |
Expand Down
2 changes: 1 addition & 1 deletion configurations/docker/docker-compose/linux/herodotus/.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=2.6.6.20
VERSION=2.6.7.0
GATEWAY_SERVICE_NAME=eurynome-cloud-gateway
GATEWAY_SERVICE_PORT=8847
UAA_SERVICE_NAME=eurynome-cloud-uaa
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
- "9849:9849"

zookeeper:
image: debezium/zookeeper:1.8.0.Final
image: debezium/zookeeper:1.9
container_name: zookeeper
hostname: zookeeper
restart: always
Expand All @@ -34,7 +34,7 @@ services:
- "3888:3888"

kafka:
image: debezium/kafka:1.8.0.Final
image: debezium/kafka:1.9
container_name: kafka
hostname: kafka
restart: always
Expand All @@ -53,7 +53,7 @@ services:
- zookeeper

connect:
image: debezium/connect:1.8.0.Final
image: debezium/connect:1.9
container_name: connect
hostname: connect
restart: always
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
- "9849:9849"

zookeeper:
image: debezium/zookeeper:1.8.0.Final
image: debezium/zookeeper:1.9
container_name: zookeeper
hostname: zookeeper
environment:
Expand All @@ -32,7 +32,7 @@ services:
- "3888:3888"

kafka:
image: debezium/kafka:1.8.0.Final
image: debezium/kafka:1.9
container_name: kafka
hostname: kafka
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
- "5432:5432"

zookeeper:
image: debezium/zookeeper:1.8.0.Final
image: debezium/zookeeper:1.9
container_name: zookeeper
restart: always
ports:
Expand All @@ -20,7 +20,7 @@ services:
- "3888:3888"

kafka:
image: debezium/kafka:1.8.0.Final
image: debezium/kafka:1.9
container_name: kafka
restart: always
ports:
Expand All @@ -32,7 +32,7 @@ services:
- zookeeper

connect:
image: debezium/connect:1.8.0.Final
image: debezium/connect:1.9
container_name: connect
restart: always
ports:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3"
services:
zookeeper:
image: debezium/zookeeper:1.8.0.Final
image: debezium/zookeeper:1.9
container_name: zookeeper
hostname: zookeeper
environment:
Expand All @@ -12,7 +12,7 @@ services:
- "3888:3888"

kafka:
image: debezium/kafka:1.8.0.Final
image: debezium/kafka:1.9
container_name: kafka
hostname: kafka
ports:
Expand All @@ -30,7 +30,7 @@ services:
- zookeeper

connect:
image: debezium/connect:1.8.0.Final
image: debezium/connect:1.9
container_name: connect
hostname: connect
ports:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=2.6.6.20
VERSION=2.6.7.0
GATEWAY_SERVICE_NAME=eurynome-cloud-gateway
GATEWAY_SERVICE_PORT=8847
UAA_SERVICE_NAME=eurynome-cloud-uaa
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
- "9849:9849"

zookeeper:
image: debezium/zookeeper:1.8.0.Final
image: debezium/zookeeper:1.9
container_name: zookeeper
hostname: zookeeper
restart: always
Expand All @@ -34,7 +34,7 @@ services:
- "3888:3888"

kafka:
image: debezium/kafka:1.8.0.Final
image: debezium/kafka:1.9
container_name: kafka
hostname: kafka
restart: always
Expand All @@ -53,7 +53,7 @@ services:
- zookeeper

connect:
image: debezium/connect:1.8.0.Final
image: debezium/connect:1.9
container_name: connect
hostname: connect
restart: always
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
- "9849:9849"

zookeeper:
image: debezium/zookeeper:1.8.0.Final
image: debezium/zookeeper:1.9
container_name: zookeeper
environment:
ZOOKEEPER_SERVER_ID: 1
Expand All @@ -30,7 +30,7 @@ services:
- "3888:3888"

kafka:
image: debezium/kafka:1.8.0.Final
image: debezium/kafka:1.9
container_name: kafka
ports:
- "9092:9092"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
- "5432:5432"

zookeeper:
image: debezium/zookeeper:1.8.0.Final
image: debezium/zookeeper:1.9
container_name: zookeeper
restart: always
ports:
Expand All @@ -20,7 +20,7 @@ services:
- "3888:3888"

kafka:
image: debezium/kafka:1.8.0.Final
image: debezium/kafka:1.9
container_name: kafka
restart: always
ports:
Expand All @@ -32,7 +32,7 @@ services:
- zookeeper

connect:
image: debezium/connect:1.8.0.Final
image: debezium/connect:1.9
container_name: connect
restart: always
ports:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3"
services:
zookeeper:
image: debezium/zookeeper:1.8.0.Final
image: debezium/zookeeper:1.9
container_name: zookeeper
hostname: zookeeper
environment:
Expand All @@ -12,7 +12,7 @@ services:
- "3888:3888"

kafka:
image: debezium/kafka:1.8.0.Final
image: debezium/kafka:1.9
container_name: kafka
hostname: kafka
ports:
Expand All @@ -30,7 +30,7 @@ services:
- zookeeper

connect:
image: debezium/connect:1.8.0.Final
image: debezium/connect:1.9
container_name: connect
hostname: connect
ports:
Expand Down
17 changes: 8 additions & 9 deletions dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.6</version>
<version>2.6.7</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

<groupId>cn.herodotus.eurynome</groupId>
<artifactId>dependencies</artifactId>
<version>2.6.6.20</version>
<version>2.6.7.0</version>
<packaging>pom</packaging>

<name>eurynome-cloud-dependencies</name>
Expand All @@ -59,7 +59,7 @@

<properties>
<!--Spring 家族-->
<spring-boot-dependencies.version>2.6.6</spring-boot-dependencies.version>
<spring-boot-dependencies.version>2.6.7</spring-boot-dependencies.version>
<spring-cloud-dependencies.version>2021.0.1</spring-cloud-dependencies.version>
<spring-cloud-alibaba-dependencies.version>2021.0.1.0</spring-cloud-alibaba-dependencies.version>
<spring-boot-admin.version>2.6.6</spring-boot-admin.version>
Expand All @@ -80,26 +80,26 @@
<jackson-component.version>2.13.2</jackson-component.version>

<!-- 应用开发辅助工具组件 -->
<lombok.version>1.18.22</lombok.version>
<lombok.version>1.18.24</lombok.version>
<redisson.version>3.17.0</redisson.version>
<p6spy.version>3.9.1</p6spy.version>
<springdoc.version>1.6.7</springdoc.version>
<springdoc.version>1.6.8</springdoc.version>
<logstash-logback-encoder.version>7.1.1</logstash-logback-encoder.version>

<!-- 阿里巴巴开源工具依赖 -->
<fastjson.version>1.2.80</fastjson.version>
<jetcache.version>2.6.3</jetcache.version>
<jetcache.version>2.6.4</jetcache.version>
<nacos.version>2.0.4</nacos.version>

<!-- 国内开源通用组件 -->
<hutool.version>5.7.22</hutool.version>
<okhttps.version>3.5.0</okhttps.version>
<just-auth.verison>1.16.5</just-auth.verison>
<knife4j.version>3.0.3</knife4j.version>
<weixin-java-sdk.version>4.3.0</weixin-java-sdk.version>
<weixin-java-sdk.version>4.3.1.B</weixin-java-sdk.version>

<!--支付 SDK-->
<alipay-sdk-java.version>4.22.86.ALL</alipay-sdk-java.version>
<alipay-sdk-java.version>4.22.110.ALL</alipay-sdk-java.version>

<!--第三方starter-->
<jasypt-spring-boot-starter.version>3.0.4</jasypt-spring-boot-starter.version>
Expand All @@ -115,7 +115,6 @@
<logback.version>1.2.11</logback.version>
<bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
<bcpkix-jdk15on.version>1.70</bcpkix-jdk15on.version>
<spring-integration.version>5.5.9</spring-integration.version>

</properties>

Expand Down
2 changes: 1 addition & 1 deletion packages/eurynome-cloud-assistant/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<artifactId>packages</artifactId>
<groupId>cn.herodotus.eurynome</groupId>
<version>2.6.6.20</version>
<version>2.6.7.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,32 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>


<!--
~ Copyright (c) 2020-2030 ZHENGGENGWEI(???)<[email protected]>
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
~ Eurynome Cloud ??APACHE LICENSE 2.0??????????????????????
~
~ 1.?????????????LICENSE???
~ 2.???????? Eurynome Cloud ??????????
~ 3.????????????????????????
~ 4.?????????????? https://gitee.com/herodotus/eurynome-cloud
~ 5.????????????????????????? https://gitee.com/herodotus/eurynome-cloud
~ 6.?????????????????????
-->


<!--
W3C rules retrieved from:
http://www.w3.org/TR/html401/struct/global.html
Expand All @@ -16,6 +42,7 @@ http://www.w3.org/TR/html401/struct/global.html
<directive name="maxInputSize" value="200000"/>
<directive name="useXHTML" value="true"/>
<directive name="formatOutput" value="true"/>
<directive name="noopenerAndNoreferrerAnchors" value="true"/>

<!--
remember, this won't work for relative URIs - AntiSamy doesn't
Expand Down Expand Up @@ -99,11 +126,11 @@ http://www.w3.org/TR/html401/struct/global.html
<regexp name="integer" value="(-|\+)?[0-9]+"/>
<regexp name="positiveInteger" value="(\+)?[0-9]+"/>
<regexp name="number" value="(-|\+)?([0-9]+(\.[0-9]+)?)"/>
<regexp name="angle" value="(-|\+)?([0-9]+(\.[0-9]+)?)(deg|grads|rad)"/>
<regexp name="angle" value="(-|\+)?([0-9]+(\.[0-9]+)?)(deg|grad|rad)"/>
<regexp name="time" value="([0-9]+(\.[0-9]+)?)(ms|s)"/>
<regexp name="frequency" value="([0-9]+(\.[0-9]+)?)(hz|khz)"/>
<regexp name="length" value="((-|\+)?0|(-|\+)?([0-9]+(\.[0-9]+)?)(em|ex|px|in|cm|mm|pt|pc))"/>
<regexp name="positiveLength" value="((\+)?0|(\+)?([0-9]+(\.[0-9]+)?)(em|ex|px|in|cm|mm|pt|pc))"/>
<regexp name="length" value="((-|\+)?0|(-|\+)?([0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?)(rem|vw|vh|em|ex|px|in|cm|mm|pt|pc))"/>
<regexp name="positiveLength" value="((\+)?0|(\+)?([0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?)(rem|vw|vh|em|ex|px|in|cm|mm|pt|pc))"/>
<regexp name="percentage" value="(-|\+)?([0-9]+(\.[0-9]+)?)%"/>
<regexp name="positivePercentage" value="(\+)?([0-9]+(\.[0-9]+)?)%"/>

Expand Down Expand Up @@ -152,7 +179,7 @@ http://www.w3.org/TR/html401/struct/global.html

<attribute name="lang" description="The 'lang' attribute tells the browser what language the element's attribute values and content are written in">
<regexp-list>
<regexp value="[a-zA-Z]{2,20}"/>
<regexp value="[a-zA-Z0-9-]{2,20}"/>
</regexp-list>
</attribute>
<attribute name="title" description="The 'title' attribute provides text that shows up in a 'tooltip' when a user hovers their mouse over the element">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@ http://www.w3.org/TR/html401/struct/global.html
<regexp name="integer" value="(-|\+)?[0-9]+"/>
<regexp name="positiveInteger" value="(\+)?[0-9]+"/>
<regexp name="number" value="(-|\+)?([0-9]+(\.[0-9]+)?)"/>
<regexp name="angle" value="(-|\+)?([0-9]+(\.[0-9]+)?)(deg|grads|rad)"/>
<regexp name="angle" value="(-|\+)?([0-9]+(\.[0-9]+)?)(deg|grad|rad)"/>
<regexp name="time" value="([0-9]+(\.[0-9]+)?)(ms|s)"/>
<regexp name="frequency" value="([0-9]+(\.[0-9]+)?)(hz|khz)"/>
<regexp name="length" value="((-|\+)?0|(-|\+)?([0-9]+(\.[0-9]+)?)(em|ex|px|in|cm|mm|pt|pc))"/>
<regexp name="positiveLength" value="((\+)?0|(\+)?([0-9]+(\.[0-9]+)?)(em|ex|px|in|cm|mm|pt|pc))"/>
<regexp name="length" value="((-|\+)?0|(-|\+)?([0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?)(rem|vw|vh|em|ex|px|in|cm|mm|pt|pc))"/>
<regexp name="positiveLength" value="((\+)?0|(\+)?([0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?)(rem|vw|vh|em|ex|px|in|cm|mm|pt|pc))"/>
<regexp name="percentage" value="(-|\+)?([0-9]+(\.[0-9]+)?)%"/>
<regexp name="positivePercentage" value="(\+)?([0-9]+(\.[0-9]+)?)%"/>

Expand Down Expand Up @@ -150,7 +150,7 @@ http://www.w3.org/TR/html401/struct/global.html

<attribute name="lang" description="The 'lang' attribute tells the browser what language the element's attribute values and content are written in">
<regexp-list>
<regexp value="[a-zA-Z]{2,20}"/>
<regexp value="[a-zA-Z0-9-]{2,20}"/>
</regexp-list>
</attribute>
<attribute name="title" description="The 'title' attribute provides text that shows up in a 'tooltip' when a user hovers their mouse over the element">
Expand Down
Loading

0 comments on commit a85a66a

Please sign in to comment.