From 0092e78629c41ebe34e155595a2068bf7f2c1101 Mon Sep 17 00:00:00 2001 From: airoger Date: Fri, 23 Sep 2022 00:13:43 +0800 Subject: [PATCH] fix bug --- .../model/biz/threadpool/ConfigModifyVerifyReqDTO.java | 5 ----- .../service/biz/impl/AbstractConfigModifyVerifyService.java | 4 +--- .../impl/AdapterThreadPoolConfigModifyVerifyServiceImpl.java | 2 +- .../ThreadPoolInstanceConfigModifyVerifyServiceImpl.java | 2 ++ .../biz/impl/WebThreadPoolConfigModifyVerifyServiceImpl.java | 2 +- 5 files changed, 5 insertions(+), 10 deletions(-) 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 b65087fa..74671b22 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 @@ -64,11 +64,6 @@ public class ConfigModifyVerifyReqDTO { */ private Boolean modifyAll; - /** - * Client address list - */ - private List clientAddressList; - /** * weather accept config modification */ 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 eb6a91ed..669997e9 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 @@ -76,8 +76,6 @@ public abstract class AbstractConfigModifyVerifyService implements ConfigModifyV hisConfigVerifyMapper.update(null, updateWrapper); - reqDTO.setClientAddressList(getClientAddress(reqDTO)); - updateThreadPoolParameter(reqDTO); } @@ -86,7 +84,7 @@ public abstract class AbstractConfigModifyVerifyService implements ConfigModifyV * @param reqDTO * @return */ - private List getClientAddress(ConfigModifyVerifyReqDTO reqDTO) { + protected List getClientAddress(ConfigModifyVerifyReqDTO reqDTO) { List clientAddressList = new ArrayList<>(); ConditionUtil .condition(reqDTO.getModifyAll(), 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 289e87d4..405a8700 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 @@ -39,7 +39,7 @@ public class AdapterThreadPoolConfigModifyVerifyServiceImpl extends AbstractConf @Override protected void updateThreadPoolParameter(ConfigModifyVerifyReqDTO reqDTO) { - for (String each : reqDTO.getClientAddressList()) { + for (String each : getClientAddress(reqDTO)) { String urlString = StrBuilder.create("http://", each, "/adapter/thread-pool/update").toString(); HttpUtil.post(urlString, JSONUtil.toJSONString(reqDTO), HTTP_EXECUTE_TIMEOUT); } diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolInstanceConfigModifyVerifyServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolInstanceConfigModifyVerifyServiceImpl.java index b3db2c46..6f55ee5d 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolInstanceConfigModifyVerifyServiceImpl.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolInstanceConfigModifyVerifyServiceImpl.java @@ -42,6 +42,8 @@ public class ThreadPoolInstanceConfigModifyVerifyServiceImpl extends AbstractCon @Override protected void updateThreadPoolParameter(ConfigModifyVerifyReqDTO reqDTO) { ConfigAllInfo config = BeanUtil.convert(reqDTO, ConfigAllInfo.class); + config.setCoreSize(reqDTO.getCorePoolSize()); + config.setMaxSize(reqDTO.getMaximumPoolSize()); configService.insertOrUpdate(reqDTO.getInstanceId(), true, config); } 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 4ce4aa81..ab0598d3 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 @@ -38,7 +38,7 @@ public class WebThreadPoolConfigModifyVerifyServiceImpl extends AbstractConfigMo @Override protected void updateThreadPoolParameter(ConfigModifyVerifyReqDTO reqDTO) { - for (String each : reqDTO.getClientAddressList()) { + for (String each : getClientAddress(reqDTO)) { String urlString = StrBuilder.create("http://", each, "/web/update/pool").toString(); HttpUtil.post(urlString, JSONUtil.toJSONString(reqDTO), HTTP_EXECUTE_TIMEOUT); }