diff --git a/README.md b/README.md index e07d8bce4..e4f373022 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Nacos 2.0.3 License Apache 2.0 码匠君 - Version 2.6.2.0 + Version 2.6.2.10 Gitee star Gitee fork

diff --git a/configurations/docker/docker-compose/linux/herodotus/.env b/configurations/docker/docker-compose/linux/herodotus/.env index a02668c46..76be0ccf0 100644 --- 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 index a02668c46..76be0ccf0 100644 --- 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 index 158b1ccbc..5245815da 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -35,7 +35,7 @@ cn.herodotus.eurynome dependencies - 2.6.2.0 + 2.6.2.10 pom eurynome-cloud-dependencies diff --git a/integrates/eurynome-integration-influxdb/pom.xml b/integrates/eurynome-integration-influxdb/pom.xml index eff3c1639..f1084778a 100644 --- a/integrates/eurynome-integration-influxdb/pom.xml +++ b/integrates/eurynome-integration-influxdb/pom.xml @@ -27,12 +27,12 @@ integrates cn.herodotus.eurynome - 2.6.2.0 + 2.6.2.10 4.0.0 eurynome-integration-influxdb - 2.6.2.0 + 2.6.2.10 jar diff --git a/integrates/eurynome-integration-oss/pom.xml b/integrates/eurynome-integration-oss/pom.xml index 3435808ca..4eef92d8a 100644 --- a/integrates/eurynome-integration-oss/pom.xml +++ b/integrates/eurynome-integration-oss/pom.xml @@ -27,12 +27,12 @@ integrates cn.herodotus.eurynome - 2.6.2.0 + 2.6.2.10 4.0.0 eurynome-integration-oss - 2.6.2.0 + 2.6.2.10 jar diff --git a/integrates/pom.xml b/integrates/pom.xml index a2fce96d8..577dae347 100644 --- a/integrates/pom.xml +++ b/integrates/pom.xml @@ -29,11 +29,11 @@ eurynome-cloud cn.herodotus.eurynome - 2.6.2.0 + 2.6.2.10 integrates - 2.6.2.0 + 2.6.2.10 pom eurynome-cloud-integrates diff --git a/packages/eurynome-cloud-assistant/pom.xml b/packages/eurynome-cloud-assistant/pom.xml index e61e39a3f..2685f5f35 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.2.0 + 2.6.2.10 4.0.0 diff --git a/packages/eurynome-cloud-cache/pom.xml b/packages/eurynome-cloud-cache/pom.xml index 9dbec0592..17ee0a666 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.2.0 + 2.6.2.10 4.0.0 eurynome-cloud-cache - 2.6.2.0 + 2.6.2.10 jar 将Cache和Redis相关抽取出独立组件包。降低代码耦合性，提升代码包的独立性。解决依赖过多，使用过程中还需要进行排除的问题。 diff --git a/packages/eurynome-cloud-data/pom.xml b/packages/eurynome-cloud-data/pom.xml index c768acf64..161153789 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.2.0 + 2.6.2.10 eurynome-cloud-data - 2.6.2.0 + 2.6.2.10 jar 数据相关通用代码组件包，包括JPA,Redis,数据实体等相关内容 @@ -41,7 +41,7 @@ ${project.groupId} - eurynome-cloud-cache + eurynome-cloud-assistant diff --git a/packages/eurynome-cloud-data/src/main/java/cn/herodotus/eurynome/data/annotation/EnableHerodotusData.java b/packages/eurynome-cloud-data/src/main/java/cn/herodotus/eurynome/data/annotation/EnableHerodotusData.java index d41ef2ad8..6afcbc330 100644 --- a/packages/eurynome-cloud-data/src/main/java/cn/herodotus/eurynome/data/annotation/EnableHerodotusData.java +++ b/packages/eurynome-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 index f3ff911a3..0e3da8850 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.2.0 + 2.6.2.10 eurynome-cloud-kernel - 2.6.2.0 + 2.6.2.10 jar 平台通用的基础依赖，以及接入及管理等通用代码，上中台必需的基础代码。增加这层包，主要目的是抽取webflux和web依赖的通用性，降低其它包之间的耦合性，比如之前data要依赖logstash，logstash要依赖managementproperties diff --git a/packages/eurynome-cloud-message/pom.xml b/packages/eurynome-cloud-message/pom.xml index 81e9b7f8b..1bcc243e4 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.2.0 + 2.6.2.10 4.0.0 eurynome-cloud-message - 2.6.2.0 + 2.6.2.10 jar diff --git a/packages/eurynome-cloud-oauth-starter/pom.xml b/packages/eurynome-cloud-oauth-starter/pom.xml index 5a62a73b8..cedcb7148 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.2.0 + 2.6.2.10 eurynome-cloud-oauth-starter - 2.6.2.0 + 2.6.2.10 jar diff --git a/packages/eurynome-cloud-oauth-starter/src/main/java/cn/herodotus/eurynome/oauth/autoconfigure/AutoConfiguration.java b/packages/eurynome-cloud-oauth-starter/src/main/java/cn/herodotus/eurynome/oauth/autoconfigure/AutoConfiguration.java index fa27b8d16..e58b8f6d9 100644 --- a/packages/eurynome-cloud-oauth-starter/src/main/java/cn/herodotus/eurynome/oauth/autoconfigure/AutoConfiguration.java +++ b/packages/eurynome-cloud-oauth-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 index 1c0fcce6c..815abaace 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.2.0 + 2.6.2.10 eurynome-cloud-oauth - 2.6.2.0 + 2.6.2.10 jar diff --git a/packages/eurynome-cloud-rest/pom.xml b/packages/eurynome-cloud-rest/pom.xml index b23f18fb2..e71f09709 100644 --- a/packages/eurynome-cloud-rest/pom.xml +++ b/packages/eurynome-cloud-rest/pom.xml @@ -29,14 +29,19 @@ packages cn.herodotus.eurynome - 2.6.2.0 + 2.6.2.10 eurynome-cloud-rest - 2.6.2.0 + 2.6.2.10 jar + + ${project.groupId} + eurynome-cloud-cache + + ${project.groupId} eurynome-cloud-data diff --git a/packages/eurynome-cloud-rest/src/main/java/cn/herodotus/eurynome/rest/annotation/EnableHerodotusRest.java b/packages/eurynome-cloud-rest/src/main/java/cn/herodotus/eurynome/rest/annotation/EnableHerodotusRest.java index 70d7f70d4..ef0531fb7 100644 --- a/packages/eurynome-cloud-rest/src/main/java/cn/herodotus/eurynome/rest/annotation/EnableHerodotusRest.java +++ b/packages/eurynome-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 index b5ab00737..4cf86d088 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.2.0 + 2.6.2.10 eurynome-cloud-security - 2.6.2.0 + 2.6.2.10 jar diff --git a/packages/eurynome-cloud-starter/pom.xml b/packages/eurynome-cloud-starter/pom.xml index 7be55ada0..60b61851f 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.2.0 + 2.6.2.10 eurynome-cloud-starter - 2.6.2.0 + 2.6.2.10 通用配置starter,此包的定位是统一未来接入的微服务使用 jar diff --git a/packages/eurynome-cloud-web/pom.xml b/packages/eurynome-cloud-web/pom.xml index 918119d31..00d188675 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.2.0 + 2.6.2.10 4.0.0 eurynome-cloud-web - 2.6.2.0 + 2.6.2.10 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 c5d82e262..1553aa7cc 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 @@ -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 index babde4d6a..cf94a969f 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.2.0 + 2.6.2.10 4.0.0 eurynome-cloud-websocket - 2.6.2.0 + 2.6.2.10 jar diff --git a/packages/pom.xml b/packages/pom.xml index 16c3bedbf..7a61918ce 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -29,7 +29,7 @@ eurynome-cloud cn.herodotus.eurynome - 2.6.2.0 + 2.6.2.10 packages diff --git a/platform/eurynome-cloud-gateway/pom.xml b/platform/eurynome-cloud-gateway/pom.xml index 17b57c810..b46a730ef 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.2.0 + 2.6.2.10 eurynome-cloud-gateway - 2.6.2.0 + 2.6.2.10 jar diff --git a/platform/eurynome-cloud-monitor/pom.xml b/platform/eurynome-cloud-monitor/pom.xml index 76e024edd..658375edb 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.2.0 + 2.6.2.10 eurynome-cloud-monitor - 2.6.2.0 + 2.6.2.10 jar diff --git a/platform/eurynome-cloud-uaa/pom.xml b/platform/eurynome-cloud-uaa/pom.xml index 8b2f87bd7..903fbc1e0 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.2.0 + 2.6.2.10 eurynome-cloud-uaa - 2.6.2.0 + 2.6.2.10 jar diff --git a/platform/pom.xml b/platform/pom.xml index ff38a84c2..653c9c4d6 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -29,7 +29,7 @@ eurynome-cloud cn.herodotus.eurynome - 2.6.2.0 + 2.6.2.10 4.0.0 diff --git a/pom.xml b/pom.xml index 5a753c86f..8534f403a 100644 --- a/pom.xml +++ b/pom.xml @@ -7,12 +7,12 @@ cn.herodotus.eurynome dependencies - 2.6.2.0 + 2.6.2.10 dependencies/pom.xml eurynome-cloud - 2.6.2.0 + 2.6.2.10 pom eurynome-cloud diff --git a/services/eurynome-cloud-bpmn-ability/pom.xml b/services/eurynome-cloud-bpmn-ability/pom.xml index 4761db1fa..31290e96d 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.2.0 + 2.6.2.10 4.0.0 eurynome-cloud-bpmn-ability - 2.6.2.0 + 2.6.2.10 基于Camunda工作流的服务 diff --git a/services/eurynome-cloud-bpmn-rest/pom.xml b/services/eurynome-cloud-bpmn-rest/pom.xml index 17a2dc887..55d5ab473 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.2.0 + 2.6.2.10 4.0.0 eurynome-cloud-bpmn-rest - 2.6.2.0 + 2.6.2.10 jar diff --git a/services/eurynome-cloud-upms-ability/pom.xml b/services/eurynome-cloud-upms-ability/pom.xml index ac2f381ee..96a960918 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.2.0 + 2.6.2.10 4.0.0 eurynome-cloud-upms-ability - 2.6.2.0 + 2.6.2.10 diff --git a/services/eurynome-cloud-upms-api/pom.xml b/services/eurynome-cloud-upms-api/pom.xml index 02c87c806..697ffcac4 100644 --- a/services/eurynome-cloud-upms-api/pom.xml +++ b/services/eurynome-cloud-upms-api/pom.xml @@ -29,11 +29,11 @@ services cn.herodotus.eurynome - 2.6.2.0 + 2.6.2.10 eurynome-cloud-upms-api - 2.6.2.0 + 2.6.2.10 diff --git a/services/eurynome-cloud-upms-logic/pom.xml b/services/eurynome-cloud-upms-logic/pom.xml index 00b3e60db..c3e90fda3 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.2.0 + 2.6.2.10 eurynome-cloud-upms-logic - 2.6.2.0 + 2.6.2.10 diff --git a/services/eurynome-cloud-upms-logic/src/main/java/cn/herodotus/eurynome/upms/logic/configuration/UpmsLogicConfiguration.java b/services/eurynome-cloud-upms-logic/src/main/java/cn/herodotus/eurynome/upms/logic/configuration/UpmsLogicConfiguration.java index 6a0fd1f20..77268dc94 100644 --- a/services/eurynome-cloud-upms-logic/src/main/java/cn/herodotus/eurynome/upms/logic/configuration/UpmsLogicConfiguration.java +++ b/services/eurynome-cloud-upms-logic/src/main/java/cn/herodotus/eurynome/upms/logic/configuration/UpmsLogicConfiguration.java @@ -22,7 +22,8 @@ package cn.herodotus.eurynome.upms.logic.configuration; -import lombok.extern.slf4j.Slf4j; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; @@ -53,10 +54,8 @@ * @author : gengwei.zheng * @date : 2020/2/3 17:13 */ -@Slf4j @Configuration @ComponentScan(basePackages = { - "cn.herodotus.eurynome.upms.logic.configuration", "cn.herodotus.eurynome.upms.logic.service.system", "cn.herodotus.eurynome.upms.logic.service.hr", "cn.herodotus.eurynome.upms.logic.service.oauth", @@ -72,6 +71,8 @@ }) public class UpmsLogicConfiguration { + private static final Logger log = LoggerFactory.getLogger(UpmsLogicConfiguration.class); + @PostConstruct public void postConstruct() { log.info("[Herodotus] |- Components [Upms Logic] Auto Configure."); diff --git a/services/eurynome-cloud-upms-rest/pom.xml b/services/eurynome-cloud-upms-rest/pom.xml index 9682ad02d..07af75aa4 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.2.0 + 2.6.2.10 eurynome-cloud-upms-rest - 2.6.2.0 + 2.6.2.10 eurynome-cloud-upms-rest 通用权限，人员信息服务供应商 diff --git a/services/pom.xml b/services/pom.xml index 0d9c19586..2bbfce8bf 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -31,7 +31,7 @@ eurynome-cloud cn.herodotus.eurynome - 2.6.2.0 + 2.6.2.10 services