diff --git a/ruoyi-common/ruoyi-common-loadbalancer/pom.xml b/ruoyi-common/ruoyi-common-loadbalancer/pom.xml index c975e5c5..0441f185 100644 --- a/ruoyi-common/ruoyi-common-loadbalancer/pom.xml +++ b/ruoyi-common/ruoyi-common-loadbalancer/pom.xml @@ -31,5 +31,10 @@ lombok + + com.ruoyi + ruoyi-common-core + + diff --git a/ruoyi-common/ruoyi-common-loadbalancer/src/main/java/com/ruoyi/common/loadbalance/constant/LoadBalancerConstant.java b/ruoyi-common/ruoyi-common-loadbalancer/src/main/java/com/ruoyi/common/loadbalance/constant/LoadBalancerConstant.java deleted file mode 100644 index a352096b..00000000 --- a/ruoyi-common/ruoyi-common-loadbalancer/src/main/java/com/ruoyi/common/loadbalance/constant/LoadBalancerConstant.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.ruoyi.common.loadbalance.constant; - -import lombok.extern.slf4j.Slf4j; - -import java.net.InetAddress; -import java.net.UnknownHostException; - -/** - * 常量类 - * - * @author Lion Li - */ -@Slf4j -public class LoadBalancerConstant { - - /** - * 获取服务host - * 默认自动获取 - */ - public static String getHost() { - String host = "127.0.0.1"; - try { - // 如需自定义ip可修改此处 - String address = InetAddress.getLocalHost().getHostAddress(); - if (address != null) { - host = address; - } - } catch (UnknownHostException e) { - e.printStackTrace(); - } - log.debug("[LoadBalancer] - 本机IP地址: {}", host); - return host; - } -} diff --git a/ruoyi-common/ruoyi-common-loadbalancer/src/main/java/com/ruoyi/common/loadbalance/core/CustomDubboLoadBalancer.java b/ruoyi-common/ruoyi-common-loadbalancer/src/main/java/com/ruoyi/common/loadbalance/core/CustomDubboLoadBalancer.java index e348069c..8c73b457 100644 --- a/ruoyi-common/ruoyi-common-loadbalancer/src/main/java/com/ruoyi/common/loadbalance/core/CustomDubboLoadBalancer.java +++ b/ruoyi-common/ruoyi-common-loadbalancer/src/main/java/com/ruoyi/common/loadbalance/core/CustomDubboLoadBalancer.java @@ -1,6 +1,6 @@ package com.ruoyi.common.loadbalance.core; -import com.ruoyi.common.loadbalance.constant.LoadBalancerConstant; +import cn.hutool.core.net.NetUtil; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.common.URL; import org.apache.dubbo.rpc.Invocation; @@ -21,7 +21,7 @@ public class CustomDubboLoadBalancer extends AbstractLoadBalance { @Override protected Invoker doSelect(List> invokers, URL url, Invocation invocation) { for (Invoker invoker : invokers) { - if (invoker.getUrl().getHost().equals(LoadBalancerConstant.getHost())) { + if (NetUtil.localIpv4s().contains(invoker.getUrl().getHost())) { return invoker; } } diff --git a/ruoyi-common/ruoyi-common-loadbalancer/src/main/java/com/ruoyi/common/loadbalance/core/CustomSpringCloudLoadBalancer.java b/ruoyi-common/ruoyi-common-loadbalancer/src/main/java/com/ruoyi/common/loadbalance/core/CustomSpringCloudLoadBalancer.java index 8bf4c002..2842f8ab 100644 --- a/ruoyi-common/ruoyi-common-loadbalancer/src/main/java/com/ruoyi/common/loadbalance/core/CustomSpringCloudLoadBalancer.java +++ b/ruoyi-common/ruoyi-common-loadbalancer/src/main/java/com/ruoyi/common/loadbalance/core/CustomSpringCloudLoadBalancer.java @@ -1,6 +1,6 @@ package com.ruoyi.common.loadbalance.core; -import com.ruoyi.common.loadbalance.constant.LoadBalancerConstant; +import cn.hutool.core.net.NetUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.ObjectProvider; @@ -54,7 +54,7 @@ public class CustomSpringCloudLoadBalancer implements ReactorServiceInstanceLoad return new EmptyResponse(); } for (ServiceInstance instance : instances) { - if (instance.getHost().equals(LoadBalancerConstant.getHost())) { + if (NetUtil.localIpv4s().contains(instance.getHost())) { return new DefaultResponse(instance); } }