From 545ae165844a65653090644bb3af084698c40892 Mon Sep 17 00:00:00 2001 From: weihubeats Date: Mon, 5 Sep 2022 10:47:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=20(#648)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add etcd * add etcd * remove redundant dependencies --- hippo4j-server/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hippo4j-server/pom.xml b/hippo4j-server/pom.xml index 35fda466..4b8ee0f2 100644 --- a/hippo4j-server/pom.xml +++ b/hippo4j-server/pom.xml @@ -14,11 +14,6 @@ - - cn.hippo4j - hippo4j-config - ${revision} - cn.hippo4j From 77668c0fc70c0e7d40ac11b97b0bf87bd4bd1249 Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Mon, 5 Sep 2022 12:11:49 +0800 Subject: [PATCH 2/2] Config Add web configuration injection --- .../starter/config/DynamicThreadPoolCoreAutoConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/config/DynamicThreadPoolCoreAutoConfiguration.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/config/DynamicThreadPoolCoreAutoConfiguration.java index b7f4d7c7..0817b202 100644 --- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/config/DynamicThreadPoolCoreAutoConfiguration.java +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/config/DynamicThreadPoolCoreAutoConfiguration.java @@ -36,6 +36,7 @@ import cn.hippo4j.message.config.MessageConfiguration; import cn.hippo4j.message.service.AlarmControlHandler; import cn.hippo4j.message.service.Hippo4jBaseSendMessageService; import cn.hippo4j.message.service.Hippo4jSendMessageService; +import cn.hippo4j.springboot.starter.adapter.web.EnableWebAdapter; import lombok.AllArgsConstructor; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @@ -53,6 +54,7 @@ import org.springframework.core.annotation.Order; * Dynamic thread-pool core auto configuration. */ @Configuration +@EnableWebAdapter @AllArgsConstructor @ConditionalOnBean(MarkerConfiguration.Marker.class) @EnableConfigurationProperties(BootstrapConfigProperties.class)