From 565e71b4229fd52d57bc73662f18eebd349905fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Sat, 7 May 2022 23:02:51 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=81=20feat:=20v2.6.7.20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 主要更新 - 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 --- README.md | 8 +-- .../docker-compose/linux/herodotus/.env | 2 +- .../linux/herodotus/env.base.debezium.yml | 2 +- .../linux/herodotus/env.base.yml | 2 +- .../docker-compose/windows/herodotus/.env | 2 +- .../windows/herodotus/env.base.debezium.yml | 2 +- .../windows/herodotus/env.base.yml | 2 +- ...-mysql_2.0.3.sql => nacos-mysql_2.1.0.sql} | 3 + dependencies/pom.xml | 12 +--- packages/eurynome-cloud-assistant/pom.xml | 6 +- .../eurynome/assistant/utils/BeanUtils.java | 59 ------------------ packages/eurynome-cloud-cache/pom.xml | 4 +- packages/eurynome-cloud-captcha/pom.xml | 4 +- packages/eurynome-cloud-data/pom.xml | 8 +-- packages/eurynome-cloud-kernel/pom.xml | 4 +- packages/eurynome-cloud-message/pom.xml | 4 +- packages/eurynome-cloud-oauth-starter/pom.xml | 4 +- packages/eurynome-cloud-oauth/pom.xml | 4 +- packages/eurynome-cloud-pay/pom.xml | 4 +- packages/eurynome-cloud-rest/pom.xml | 4 +- packages/eurynome-cloud-security/pom.xml | 4 +- .../security/utils/SecurityUtils.java | 4 +- packages/eurynome-cloud-starter/pom.xml | 4 +- packages/eurynome-cloud-web/pom.xml | 4 +- .../configuration/OpenApiConfiguration.java | 2 +- packages/eurynome-cloud-websocket/pom.xml | 4 +- packages/pom.xml | 2 +- platform/eurynome-cloud-gateway/pom.xml | 4 +- platform/eurynome-cloud-monitor/pom.xml | 4 +- .../nacos_config_export_20220305123449.zip | Bin platform/eurynome-cloud-uaa/pom.xml | 4 +- platform/pom.xml | 2 +- pom.xml | 4 +- services/eurynome-cloud-bpmn-ability/pom.xml | 4 +- services/eurynome-cloud-bpmn-rest/pom.xml | 4 +- services/eurynome-cloud-upms-ability/pom.xml | 4 +- services/eurynome-cloud-upms-logic/pom.xml | 4 +- .../LocalRequestMappingGatherListener.java | 2 +- .../RemoteRequestMappingGatherListener.java | 2 +- services/eurynome-cloud-upms-rest/pom.xml | 4 +- services/pom.xml | 2 +- 41 files changed, 69 insertions(+), 139 deletions(-) rename configurations/scripts/{nacos-mysql_2.0.3.sql => nacos-mysql_2.1.0.sql} (98%) delete mode 100644 packages/eurynome-cloud-assistant/src/main/java/cn/herodotus/eurynome/assistant/utils/BeanUtils.java rename platform/eurynome-cloud-monitor/src/main/resources/imports/{v2.6.7.0 => v2.6.7.20}/nacos_config_export_20220305123449.zip (100%) diff --git a/README.md b/README.md index 0f8484827..e1ef11d86 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,10 @@ Spring Boot 2.6.7 Spring Cloud 2021.0.2 Spring Cloud Alibaba 2021.0.1.0 - Nacos 2.0.4 + Nacos 2.1.0 License Apache 2.0 码匠君 - Version 2.6.7.10 + Version 2.6.7.20 Gitee star Gitee fork

@@ -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 index 89b6671ae..72e588fc0 100644 --- 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 index 1c5872445..8e0e0cae3 100644 --- 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 index bc9b6362d..7091e2ebf 100644 --- 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 index 89b6671ae..72e588fc0 100644 --- 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 index 11dae1191..3765a2f34 100644 --- 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 index 4af8aa71a..820d10c4a 100644 --- 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 b/configurations/scripts/nacos-mysql_2.1.0.sql similarity index 98% rename from configurations/scripts/nacos-mysql_2.0.3.sql rename to configurations/scripts/nacos-mysql_2.1.0.sql index 551d65987..f56339517 100644 --- a/configurations/scripts/nacos-mysql_2.0.3.sql +++ b/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 index 9af94c96d..61ddb42ef 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -35,7 +35,7 @@ cn.herodotus.eurynome dependencies - 2.6.7.10 + 2.6.7.20 pom eurynome-cloud-dependencies @@ -74,7 +74,6 @@ 1.6.8 4.4 1.9 - 1.9.4 2.11.0 31.1-jre 2.13.2 @@ -89,11 +88,11 @@ 1.2.80 2.6.4 - 2.0.4 + 2.1.0 5.7.22 - 3.5.0 + 3.5.1 1.16.5 3.0.3 4.3.2.B @@ -222,11 +221,6 @@ - - commons-beanutils - commons-beanutils - ${commons-beanutils.version} - org.apache.commons diff --git a/packages/eurynome-cloud-assistant/pom.xml b/packages/eurynome-cloud-assistant/pom.xml index bcb716f37..c37b36c0a 100644 --- a/packages/eurynome-cloud-assistant/pom.xml +++ b/packages/eurynome-cloud-assistant/pom.xml @@ -27,7 +27,7 @@ packages cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 4.0.0 @@ -45,10 +45,6 @@ spring-boot-starter-validation - - commons-beanutils - commons-beanutils - org.apache.commons commons-collections4 diff --git a/packages/eurynome-cloud-assistant/src/main/java/cn/herodotus/eurynome/assistant/utils/BeanUtils.java b/packages/eurynome-cloud-assistant/src/main/java/cn/herodotus/eurynome/assistant/utils/BeanUtils.java deleted file mode 100644 index b5b5e05f3..000000000 --- a/packages/eurynome-cloud-assistant/src/main/java/cn/herodotus/eurynome/assistant/utils/BeanUtils.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2019-2021 Gengwei Zheng (herodotus@aliyun.com) - * - * 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. - * - * Project Name: eurynome-cloud - * Module Name: eurynome-cloud-assistant - * File Name: BeanUtils.java - * Author: gengwei.zheng - * Date: 2021/10/17 22:53:17 - */ - -package cn.herodotus.eurynome.assistant.utils; - -import lombok.extern.slf4j.Slf4j; - -import java.lang.reflect.InvocationTargetException; -import java.util.Map; - -/** - *

Description : 自定义的Bean工具类

- * - * @author : gengwei.zheng - * @date : 2020/3/11 13:36 - */ -@Slf4j -public class BeanUtils extends org.apache.commons.beanutils.BeanUtils { - - /** - * 方法说明：map转化为对象 - *  - * @param map - * @param t - * @return - * @throws InstantiationException - * @throws IllegalAccessException - * @throws InvocationTargetException - */ - public static T mapToBean(Map map, Class t) { - try { - T instance = t.newInstance(); - populate(instance, map); - return instance; - } catch (Exception e) { - log.error("[Herodotus] |- BeanUtils mapToBean error！", e); - return null; - } - } -} diff --git a/packages/eurynome-cloud-cache/pom.xml b/packages/eurynome-cloud-cache/pom.xml index f63134e0a..409ea428c 100644 --- a/packages/eurynome-cloud-cache/pom.xml +++ b/packages/eurynome-cloud-cache/pom.xml @@ -27,12 +27,12 @@ packages cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 4.0.0 eurynome-cloud-cache - 2.6.7.10 + 2.6.7.20 jar 将Cache和Redis相关抽取出独立组件包。降低代码耦合性，提升代码包的独立性。解决依赖过多，使用过程中还需要进行排除的问题。 diff --git a/packages/eurynome-cloud-captcha/pom.xml b/packages/eurynome-cloud-captcha/pom.xml index 1199d13f5..5c5e3e7a4 100644 --- a/packages/eurynome-cloud-captcha/pom.xml +++ b/packages/eurynome-cloud-captcha/pom.xml @@ -27,12 +27,12 @@ packages cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 4.0.0 eurynome-cloud-captcha - 2.6.7.10 + 2.6.7.20 jar diff --git a/packages/eurynome-cloud-data/pom.xml b/packages/eurynome-cloud-data/pom.xml index a856a3f10..89fb1c230 100644 --- a/packages/eurynome-cloud-data/pom.xml +++ b/packages/eurynome-cloud-data/pom.xml @@ -29,11 +29,11 @@ packages cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 eurynome-cloud-data - 2.6.7.10 + 2.6.7.20 jar 数据相关通用代码组件包，包括JPA,Redis,数据实体等相关内容 @@ -61,10 +61,6 @@ org.postgresql postgresql - - com.h2database - h2 - com.baomidou diff --git a/packages/eurynome-cloud-kernel/pom.xml b/packages/eurynome-cloud-kernel/pom.xml index a6de88af5..b82a0ddd4 100644 --- a/packages/eurynome-cloud-kernel/pom.xml +++ b/packages/eurynome-cloud-kernel/pom.xml @@ -29,11 +29,11 @@ packages cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 eurynome-cloud-kernel - 2.6.7.10 + 2.6.7.20 jar 平台通用的基础依赖，以及接入及管理等通用代码，上中台必需的基础代码。增加这层包，主要目的是抽取webflux和web依赖的通用性，降低其它包之间的耦合性，比如之前data要依赖logstash，logstash要依赖managementproperties diff --git a/packages/eurynome-cloud-message/pom.xml b/packages/eurynome-cloud-message/pom.xml index 045a2e841..83d0f49b9 100644 --- a/packages/eurynome-cloud-message/pom.xml +++ b/packages/eurynome-cloud-message/pom.xml @@ -27,12 +27,12 @@ packages cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 4.0.0 eurynome-cloud-message - 2.6.7.10 + 2.6.7.20 jar diff --git a/packages/eurynome-cloud-oauth-starter/pom.xml b/packages/eurynome-cloud-oauth-starter/pom.xml index e748097a9..04bec7a0d 100644 --- a/packages/eurynome-cloud-oauth-starter/pom.xml +++ b/packages/eurynome-cloud-oauth-starter/pom.xml @@ -30,11 +30,11 @@ packages cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 eurynome-cloud-oauth-starter - 2.6.7.10 + 2.6.7.20 jar diff --git a/packages/eurynome-cloud-oauth/pom.xml b/packages/eurynome-cloud-oauth/pom.xml index d075ad88a..c37b28e84 100644 --- a/packages/eurynome-cloud-oauth/pom.xml +++ b/packages/eurynome-cloud-oauth/pom.xml @@ -29,12 +29,12 @@ packages cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 eurynome-cloud-oauth - 2.6.7.10 + 2.6.7.20 jar diff --git a/packages/eurynome-cloud-pay/pom.xml b/packages/eurynome-cloud-pay/pom.xml index 741097993..8580b3a25 100644 --- a/packages/eurynome-cloud-pay/pom.xml +++ b/packages/eurynome-cloud-pay/pom.xml @@ -27,12 +27,12 @@ packages cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 4.0.0 eurynome-cloud-pay - 2.6.7.10 + 2.6.7.20 jar diff --git a/packages/eurynome-cloud-rest/pom.xml b/packages/eurynome-cloud-rest/pom.xml index 27dfd7299..70816faf2 100644 --- a/packages/eurynome-cloud-rest/pom.xml +++ b/packages/eurynome-cloud-rest/pom.xml @@ -29,11 +29,11 @@ packages cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 eurynome-cloud-rest - 2.6.7.10 + 2.6.7.20 jar diff --git a/packages/eurynome-cloud-security/pom.xml b/packages/eurynome-cloud-security/pom.xml index 861243292..f191988f1 100644 --- a/packages/eurynome-cloud-security/pom.xml +++ b/packages/eurynome-cloud-security/pom.xml @@ -29,11 +29,11 @@ packages cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 eurynome-cloud-security - 2.6.7.10 + 2.6.7.20 jar diff --git a/packages/eurynome-cloud-security/src/main/java/cn/herodotus/eurynome/security/utils/SecurityUtils.java b/packages/eurynome-cloud-security/src/main/java/cn/herodotus/eurynome/security/utils/SecurityUtils.java index 6dd629dee..157dc6d11 100644 --- a/packages/eurynome-cloud-security/src/main/java/cn/herodotus/eurynome/security/utils/SecurityUtils.java +++ b/packages/eurynome-cloud-security/src/main/java/cn/herodotus/eurynome/security/utils/SecurityUtils.java @@ -22,9 +22,9 @@ package cn.herodotus.eurynome.security.utils; -import cn.herodotus.eurynome.assistant.utils.BeanUtils; import cn.herodotus.eurynome.security.definition.core.HerodotusUserDetails; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -98,7 +98,7 @@ public static HerodotusUserDetails getPrincipal() { } if (authentication.getPrincipal() instanceof Map) { Map principal = (Map) authentication.getPrincipal(); - return BeanUtils.mapToBean(principal, HerodotusUserDetails.class); + return BeanUtil.mapToBean(principal, HerodotusUserDetails.class, true, new CopyOptions()); } } diff --git a/packages/eurynome-cloud-starter/pom.xml b/packages/eurynome-cloud-starter/pom.xml index 5b1511db7..10aa3ed86 100644 --- a/packages/eurynome-cloud-starter/pom.xml +++ b/packages/eurynome-cloud-starter/pom.xml @@ -29,11 +29,11 @@ packages cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 eurynome-cloud-starter - 2.6.7.10 + 2.6.7.20 通用配置starter,此包的定位是统一未来接入的微服务使用 jar diff --git a/packages/eurynome-cloud-web/pom.xml b/packages/eurynome-cloud-web/pom.xml index d511a2a99..c02c99160 100644 --- a/packages/eurynome-cloud-web/pom.xml +++ b/packages/eurynome-cloud-web/pom.xml @@ -27,12 +27,12 @@ packages cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 4.0.0 eurynome-cloud-web - 2.6.7.10 + 2.6.7.20 jar diff --git a/packages/eurynome-cloud-web/src/main/java/cn/herodotus/eurynome/web/configuration/OpenApiConfiguration.java b/packages/eurynome-cloud-web/src/main/java/cn/herodotus/eurynome/web/configuration/OpenApiConfiguration.java index a07c77fcb..def14670b 100644 --- a/packages/eurynome-cloud-web/src/main/java/cn/herodotus/eurynome/web/configuration/OpenApiConfiguration.java +++ b/packages/eurynome-cloud-web/src/main/java/cn/herodotus/eurynome/web/configuration/OpenApiConfiguration.java @@ -85,7 +85,7 @@ public OpenAPI createOpenAPI() { .servers(getServers()) .info(new Info().title("Eurynome Cloud") .description("Eurynome Cloud Microservices Architecture") - .version("2.6.7.10") + .version("2.6.7.20") .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 index 89fd5a492..b4c50241b 100644 --- a/packages/eurynome-cloud-websocket/pom.xml +++ b/packages/eurynome-cloud-websocket/pom.xml @@ -27,12 +27,12 @@ packages cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 4.0.0 eurynome-cloud-websocket - 2.6.7.10 + 2.6.7.20 jar diff --git a/packages/pom.xml b/packages/pom.xml index 025af84de..7fdb84398 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -29,7 +29,7 @@ eurynome-cloud cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 packages diff --git a/platform/eurynome-cloud-gateway/pom.xml b/platform/eurynome-cloud-gateway/pom.xml index db120cbdb..c759ab518 100644 --- a/platform/eurynome-cloud-gateway/pom.xml +++ b/platform/eurynome-cloud-gateway/pom.xml @@ -29,11 +29,11 @@ platform cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 eurynome-cloud-gateway - 2.6.7.10 + 2.6.7.20 jar diff --git a/platform/eurynome-cloud-monitor/pom.xml b/platform/eurynome-cloud-monitor/pom.xml index b0e4936c6..e9d294c9c 100644 --- a/platform/eurynome-cloud-monitor/pom.xml +++ b/platform/eurynome-cloud-monitor/pom.xml @@ -29,11 +29,11 @@ platform cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 eurynome-cloud-monitor - 2.6.7.10 + 2.6.7.20 jar diff --git a/platform/eurynome-cloud-monitor/src/main/resources/imports/v2.6.7.0/nacos_config_export_20220305123449.zip b/platform/eurynome-cloud-monitor/src/main/resources/imports/v2.6.7.20/nacos_config_export_20220305123449.zip similarity index 100% rename from platform/eurynome-cloud-monitor/src/main/resources/imports/v2.6.7.0/nacos_config_export_20220305123449.zip rename to platform/eurynome-cloud-monitor/src/main/resources/imports/v2.6.7.20/nacos_config_export_20220305123449.zip diff --git a/platform/eurynome-cloud-uaa/pom.xml b/platform/eurynome-cloud-uaa/pom.xml index eb0ee7ae1..c9b0943e3 100644 --- a/platform/eurynome-cloud-uaa/pom.xml +++ b/platform/eurynome-cloud-uaa/pom.xml @@ -29,11 +29,11 @@ platform cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 eurynome-cloud-uaa - 2.6.7.10 + 2.6.7.20 jar diff --git a/platform/pom.xml b/platform/pom.xml index 4c323b92b..957a78c3b 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -29,7 +29,7 @@ eurynome-cloud cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 4.0.0 diff --git a/pom.xml b/pom.xml index ffff0669b..e50fd7e30 100644 --- a/pom.xml +++ b/pom.xml @@ -7,12 +7,12 @@ cn.herodotus.eurynome dependencies - 2.6.7.10 + 2.6.7.20 dependencies/pom.xml eurynome-cloud - 2.6.7.10 + 2.6.7.20 pom eurynome-cloud diff --git a/services/eurynome-cloud-bpmn-ability/pom.xml b/services/eurynome-cloud-bpmn-ability/pom.xml index b7a40b5b6..ffc1080d3 100644 --- a/services/eurynome-cloud-bpmn-ability/pom.xml +++ b/services/eurynome-cloud-bpmn-ability/pom.xml @@ -27,12 +27,12 @@ services cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 4.0.0 eurynome-cloud-bpmn-ability - 2.6.7.10 + 2.6.7.20 基于Camunda工作流的服务 diff --git a/services/eurynome-cloud-bpmn-rest/pom.xml b/services/eurynome-cloud-bpmn-rest/pom.xml index 27bf60b51..2749167bc 100644 --- a/services/eurynome-cloud-bpmn-rest/pom.xml +++ b/services/eurynome-cloud-bpmn-rest/pom.xml @@ -27,12 +27,12 @@ services cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 4.0.0 eurynome-cloud-bpmn-rest - 2.6.7.10 + 2.6.7.20 jar diff --git a/services/eurynome-cloud-upms-ability/pom.xml b/services/eurynome-cloud-upms-ability/pom.xml index 9209979d3..fd3cf0ebf 100644 --- a/services/eurynome-cloud-upms-ability/pom.xml +++ b/services/eurynome-cloud-upms-ability/pom.xml @@ -27,12 +27,12 @@ services cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 4.0.0 eurynome-cloud-upms-ability - 2.6.7.10 + 2.6.7.20 diff --git a/services/eurynome-cloud-upms-logic/pom.xml b/services/eurynome-cloud-upms-logic/pom.xml index cb6622632..ec3f71695 100644 --- a/services/eurynome-cloud-upms-logic/pom.xml +++ b/services/eurynome-cloud-upms-logic/pom.xml @@ -7,11 +7,11 @@ services cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 eurynome-cloud-upms-logic - 2.6.7.10 + 2.6.7.20 diff --git a/services/eurynome-cloud-upms-logic/src/main/java/cn/herodotus/eurynome/upms/logic/listener/LocalRequestMappingGatherListener.java b/services/eurynome-cloud-upms-logic/src/main/java/cn/herodotus/eurynome/upms/logic/listener/LocalRequestMappingGatherListener.java index 5276ad4f2..e448ccc02 100644 --- a/services/eurynome-cloud-upms-logic/src/main/java/cn/herodotus/eurynome/upms/logic/listener/LocalRequestMappingGatherListener.java +++ b/services/eurynome-cloud-upms-logic/src/main/java/cn/herodotus/eurynome/upms/logic/listener/LocalRequestMappingGatherListener.java @@ -25,7 +25,7 @@ import cn.herodotus.eurynome.security.definition.domain.RequestMapping; import cn.herodotus.eurynome.security.event.LocalRequestMappingGatherEvent; import cn.herodotus.eurynome.upms.logic.processor.RequestMappingStoreProcessor; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/services/eurynome-cloud-upms-logic/src/main/java/cn/herodotus/eurynome/upms/logic/listener/RemoteRequestMappingGatherListener.java b/services/eurynome-cloud-upms-logic/src/main/java/cn/herodotus/eurynome/upms/logic/listener/RemoteRequestMappingGatherListener.java index 6341cb1b5..e0f088cbc 100644 --- a/services/eurynome-cloud-upms-logic/src/main/java/cn/herodotus/eurynome/upms/logic/listener/RemoteRequestMappingGatherListener.java +++ b/services/eurynome-cloud-upms-logic/src/main/java/cn/herodotus/eurynome/upms/logic/listener/RemoteRequestMappingGatherListener.java @@ -26,7 +26,7 @@ import cn.herodotus.eurynome.security.event.remote.RemoteRequestMappingGatherEvent; import cn.herodotus.eurynome.upms.logic.processor.RequestMappingStoreProcessor; import com.alibaba.fastjson.JSON; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/services/eurynome-cloud-upms-rest/pom.xml b/services/eurynome-cloud-upms-rest/pom.xml index e1d795398..71ff161ca 100644 --- a/services/eurynome-cloud-upms-rest/pom.xml +++ b/services/eurynome-cloud-upms-rest/pom.xml @@ -6,11 +6,11 @@ services cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 eurynome-cloud-upms-rest - 2.6.7.10 + 2.6.7.20 eurynome-cloud-upms-rest 通用权限，人员信息服务供应商 diff --git a/services/pom.xml b/services/pom.xml index 93718062a..c8736cfd4 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -31,7 +31,7 @@ eurynome-cloud cn.herodotus.eurynome - 2.6.7.10 + 2.6.7.20 services