diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/controller/ConfigController.java b/hippo4j-config/src/main/java/cn/hippo4j/config/controller/ConfigController.java index 65872d19..4b4ce318 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/controller/ConfigController.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/controller/ConfigController.java @@ -79,7 +79,7 @@ public class ConfigController { modifySaveReqDTO.setMaximumPoolSize(config.getMaxSize()); modifySaveReqDTO.setModifyUser(UserContext.getUserName()); modifySaveReqDTO.setModifyAll(StringUtil.isEmpty(identify) ? true : false); - modifySaveReqDTO.setInstanceId(identify); + modifySaveReqDTO.setIdentify(identify); modifySaveReqDTO.setType(ConfigModifyTypeConstants.THREAD_POOL_INSTANCE); configModifyVerifyServiceChoose.choose(modifySaveReqDTO.getType()).saveConfigModifyApplication(modifySaveReqDTO); } diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/HisConfigVerifyInfo.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/HisConfigVerifyInfo.java index d8446251..b18381a8 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/HisConfigVerifyInfo.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/HisConfigVerifyInfo.java @@ -61,9 +61,9 @@ public class HisConfigVerifyInfo { private String mark; /** - * thread pool instance id + * thread pool instance identify */ - private String instanceId; + private String identify; /** * config content diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifySaveReqDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifySaveReqDTO.java index 984e2120..02704795 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifySaveReqDTO.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifySaveReqDTO.java @@ -34,7 +34,7 @@ public class ConfigModifySaveReqDTO { /** * thread pool instance id */ - private String instanceId; + private String identify; /** * weather modify all instances 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 74671b22..3bac7f68 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 @@ -49,9 +49,9 @@ public class ConfigModifyVerifyReqDTO { private String itemId; /** - * instance id + * instance identify */ - private String instanceId; + private String identify; /** * Thread-pool id 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 669997e9..c0c5946c 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 @@ -30,7 +30,6 @@ import cn.hippo4j.config.service.biz.ConfigModifyVerifyService; import cn.hippo4j.config.toolkit.BeanUtil; import cn.hippo4j.discovery.core.BaseInstanceRegistry; import cn.hippo4j.discovery.core.Lease; -import cn.hutool.core.text.StrBuilder; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import javax.annotation.Resource; @@ -86,14 +85,16 @@ public abstract class AbstractConfigModifyVerifyService implements ConfigModifyV */ protected List getClientAddress(ConfigModifyVerifyReqDTO reqDTO) { List clientAddressList = new ArrayList<>(); + List> leases = baseInstanceRegistry.listInstance(reqDTO.getItemId()); ConditionUtil .condition(reqDTO.getModifyAll(), () -> { - List> leases = baseInstanceRegistry.listInstance(reqDTO.getItemId()); - leases.stream() - .forEach(lease -> clientAddressList.add(StrBuilder.create(lease.getHolder().getHostName(), ":", lease.getHolder().getPort()).toString())); + leases.forEach(lease -> clientAddressList.add(lease.getHolder().getCallBackUrl())); }, - () -> clientAddressList.add(reqDTO.getInstanceId().split("_")[0])); + () -> clientAddressList.add( + leases.stream() + .filter(lease -> lease.getHolder().getIdentify().equals(reqDTO.getIdentify())).findAny().orElseThrow(() -> new RuntimeException("线程池实例并不存在")).getHolder() + .getCallBackUrl())); return clientAddressList; } 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 6f55ee5d..38cdb0be 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 @@ -44,7 +44,7 @@ public class ThreadPoolInstanceConfigModifyVerifyServiceImpl extends AbstractCon ConfigAllInfo config = BeanUtil.convert(reqDTO, ConfigAllInfo.class); config.setCoreSize(reqDTO.getCorePoolSize()); config.setMaxSize(reqDTO.getMaximumPoolSize()); - configService.insertOrUpdate(reqDTO.getInstanceId(), true, config); + configService.insertOrUpdate(reqDTO.getIdentify(), 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 ab0598d3..4e4d8ab9 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 @@ -25,6 +25,7 @@ import cn.hutool.http.HttpUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; + import static cn.hippo4j.common.constant.Constants.HTTP_EXECUTE_TIMEOUT; @Slf4j diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolAdapterController.java b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolAdapterController.java index c70c50c1..fc9e79ae 100644 --- a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolAdapterController.java +++ b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolAdapterController.java @@ -78,7 +78,6 @@ public class ThreadPoolAdapterController { modifySaveReqDTO.setTenantId(requestParameter.getTenant()); modifySaveReqDTO.setItemId(requestParameter.getItem()); modifySaveReqDTO.setTpId(requestParameter.getThreadPoolKey()); - modifySaveReqDTO.setInstanceId(requestParameter.getIdentify()); modifySaveReqDTO.setType(ConfigModifyTypeConstants.ADAPTER_THREAD_POOL); configModifyVerifyServiceChoose.choose(modifySaveReqDTO.getType()).saveConfigModifyApplication(modifySaveReqDTO); } diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/model/WebThreadPoolReqDTO.java b/hippo4j-console/src/main/java/cn/hippo4j/console/model/WebThreadPoolReqDTO.java index 9f98eabd..349207d1 100644 --- a/hippo4j-console/src/main/java/cn/hippo4j/console/model/WebThreadPoolReqDTO.java +++ b/hippo4j-console/src/main/java/cn/hippo4j/console/model/WebThreadPoolReqDTO.java @@ -40,7 +40,7 @@ public class WebThreadPoolReqDTO { /** * thread pool instance id */ - private String instanceId; + private String identify; /** * Core pool size