diff --git a/hippo4j-config/pom.xml b/hippo4j-config/pom.xml index 11c8eac7..3f1feb21 100644 --- a/hippo4j-config/pom.xml +++ b/hippo4j-config/pom.xml @@ -73,6 +73,12 @@ ${version} + + cn.hippo4j + hippo4j-console + ${version} + + io.netty netty-all diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifyVerifyReqDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifyVerifyReqDTO.java index ab590105..2b5c37fc 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifyVerifyReqDTO.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifyVerifyReqDTO.java @@ -17,8 +17,9 @@ package cn.hippo4j.config.model.biz.threadpool; -import cn.hippo4j.adapter.base.ThreadPoolAdapterParameter; import cn.hippo4j.common.model.ThreadPoolParameterInfo; +import cn.hippo4j.config.model.biz.adapter.ThreadPoolAdapterReqDTO; +import cn.hippo4j.console.model.WebThreadPoolReqDTO; import lombok.Data; /** @@ -48,7 +49,12 @@ public class ConfigModifyVerifyReqDTO { private ThreadPoolParameterInfo threadPoolParameterInfo; /** - * thread pool adapter parameter + * web thread pool req dto */ - private ThreadPoolAdapterParameter threadPoolAdapterParameter; + private WebThreadPoolReqDTO webThreadPoolReqDTO; + + /** + * thread pool adapter req dto + */ + private ThreadPoolAdapterReqDTO threadPoolAdapterReqDTO; } diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModifyVerifyService.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModifyVerifyService.java index 82bfd650..8083058a 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModifyVerifyService.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModifyVerifyService.java @@ -17,7 +17,6 @@ package cn.hippo4j.config.service.biz.impl; -import cn.hippo4j.common.enums.EnableEnum; import cn.hippo4j.common.enums.VerifyEnum; import cn.hippo4j.common.toolkit.JSONUtil; import cn.hippo4j.common.toolkit.UserContext; diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AdapterThreadPoolConfigModifyVerifyServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AdapterThreadPoolConfigModifyVerifyServiceImpl.java index a3785ab0..c25f9a8d 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AdapterThreadPoolConfigModifyVerifyServiceImpl.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AdapterThreadPoolConfigModifyVerifyServiceImpl.java @@ -17,16 +17,18 @@ package cn.hippo4j.config.service.biz.impl; -import cn.hippo4j.adapter.base.ThreadPoolAdapter; -import cn.hippo4j.adapter.base.ThreadPoolAdapterParameter; + import cn.hippo4j.common.constant.ConfigModifyTypeConstants; +import cn.hippo4j.common.toolkit.JSONUtil; +import cn.hippo4j.config.model.biz.adapter.ThreadPoolAdapterReqDTO; import cn.hippo4j.config.model.biz.threadpool.ConfigModifyVerifyReqDTO; +import cn.hutool.core.text.StrBuilder; +import cn.hutool.http.HttpUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.Optional; +import static cn.hippo4j.common.constant.Constants.HTTP_EXECUTE_TIMEOUT; -import static cn.hippo4j.adapter.base.ThreadPoolAdapterBeanContainer.THREAD_POOL_ADAPTER_BEAN_CONTAINER; @Slf4j @Service @@ -39,8 +41,10 @@ public class AdapterThreadPoolConfigModifyVerifyServiceImpl extends AbstractConf @Override protected void updateThreadPoolParameter(ConfigModifyVerifyReqDTO reqDTO) { - ThreadPoolAdapterParameter adapterParameter = reqDTO.getThreadPoolAdapterParameter(); - ThreadPoolAdapter threadPoolAdapter = THREAD_POOL_ADAPTER_BEAN_CONTAINER.get(adapterParameter.getMark()); - Optional.ofNullable(threadPoolAdapter).ifPresent(each -> each.updateThreadPool(adapterParameter)); + ThreadPoolAdapterReqDTO threadPoolAdapterReqDTO = reqDTO.getThreadPoolAdapterReqDTO(); + for (String each : threadPoolAdapterReqDTO.getClientAddressList()) { + String urlString = StrBuilder.create("http://", each, "/adapter/thread-pool/update").toString(); + HttpUtil.post(urlString, JSONUtil.toJSONString(threadPoolAdapterReqDTO), HTTP_EXECUTE_TIMEOUT); + } } } diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/WebThreadPoolConfigModifyVerifyServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/WebThreadPoolConfigModifyVerifyServiceImpl.java index 0b4e56dd..bbe8a5bf 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/WebThreadPoolConfigModifyVerifyServiceImpl.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/WebThreadPoolConfigModifyVerifyServiceImpl.java @@ -17,21 +17,22 @@ package cn.hippo4j.config.service.biz.impl; -import cn.hippo4j.adapter.web.WebThreadPoolHandlerChoose; import cn.hippo4j.common.constant.ConfigModifyTypeConstants; -import cn.hippo4j.common.model.ThreadPoolParameterInfo; +import cn.hippo4j.common.toolkit.JSONUtil; import cn.hippo4j.config.model.biz.threadpool.ConfigModifyVerifyReqDTO; +import cn.hippo4j.console.model.WebThreadPoolReqDTO; +import cn.hutool.core.text.StrBuilder; +import cn.hutool.http.HttpUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.annotation.Resource; + +import static cn.hippo4j.common.constant.Constants.HTTP_EXECUTE_TIMEOUT; @Slf4j @Service public class WebThreadPoolConfigModifyVerifyServiceImpl extends AbstractConfigModifyVerifyService { - @Resource - private WebThreadPoolHandlerChoose webThreadPoolServiceChoose; @Override public Integer type() { @@ -40,7 +41,10 @@ public class WebThreadPoolConfigModifyVerifyServiceImpl extends AbstractConfigMo @Override protected void updateThreadPoolParameter(ConfigModifyVerifyReqDTO reqDTO) { - ThreadPoolParameterInfo poolParameterInfo = reqDTO.getThreadPoolParameterInfo(); - webThreadPoolServiceChoose.choose().updateWebThreadPool(poolParameterInfo); + WebThreadPoolReqDTO webThreadPoolReqDTO = reqDTO.getWebThreadPoolReqDTO(); + for (String each : webThreadPoolReqDTO.getClientAddressList()) { + String urlString = StrBuilder.create("http://", each, "/adapter/thread-pool/update").toString(); + HttpUtil.post(urlString, JSONUtil.toJSONString(webThreadPoolReqDTO), HTTP_EXECUTE_TIMEOUT); + } } }