From b256db65d486067df9f07d018f4af9e250e4b3d8 Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Thu, 16 Nov 2023 13:16:42 +0800
Subject: [PATCH] =?UTF-8?q?ClusterAgent=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/org/redkale/cluster/ClusterAgent.java       | 6 +++---
 .../java/org/redkale/cluster/HttpClusterRpcClient.java    | 2 +-
 src/main/java/org/redkale/net/http/HttpSimpleRequest.java | 8 ++++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/redkale/cluster/ClusterAgent.java b/src/main/java/org/redkale/cluster/ClusterAgent.java
index 5ac92165a..384ad37cb 100644
--- a/src/main/java/org/redkale/cluster/ClusterAgent.java
+++ b/src/main/java/org/redkale/cluster/ClusterAgent.java
@@ -213,7 +213,7 @@ public abstract class ClusterAgent {
             try {
                 Thread.sleep(s * 1000);
             } catch (InterruptedException ex) {
-            //do nothing
+                //do nothing
             }
             logger.info(this.getClass().getSimpleName() + " wait for " + s * 1000 + "ms after deregister");
         }
@@ -285,12 +285,12 @@ public abstract class ClusterAgent {
     }
 
     public String generateSncpServiceName(String protocol, String restype, String resname) {
-        return protocol.toLowerCase() + ":" + restype + (resname == null || resname.isEmpty() ? "" : ("-" + resname));
+        return protocol.toLowerCase() + ":" + restype + (Utility.isEmpty(resname) ? "" : ("-" + resname));
     }
 
     //也会提供给HttpMessageClusterAgent适用
     public String generateHttpServiceName(String protocol, String module, String resname) {
-        return protocol.toLowerCase() + ":" + module + (resname == null || resname.isEmpty() ? "" : ("-" + resname));
+        return protocol.toLowerCase() + ":" + module + (Utility.isEmpty(resname) ? "" : ("-" + resname));
     }
 
     //格式: protocol:classtype-resourcename
diff --git a/src/main/java/org/redkale/cluster/HttpClusterRpcClient.java b/src/main/java/org/redkale/cluster/HttpClusterRpcClient.java
index 06cf987ed..b5c51575a 100644
--- a/src/main/java/org/redkale/cluster/HttpClusterRpcClient.java
+++ b/src/main/java/org/redkale/cluster/HttpClusterRpcClient.java
@@ -83,7 +83,7 @@ public class HttpClusterRpcClient extends HttpRpcClient {
         module = module.substring(1); //去掉/
         module = module.substring(0, module.indexOf('/'));
         Map<String, String> headers = req.getHeaders();
-        String resname = headers == null ? "" : headers.getOrDefault(Rest.REST_HEADER_RESNAME, "");
+        String resname = req.getHeader(Rest.REST_HEADER_RESNAME, "");
         final String localModule = module;
         if (logger.isLoggable(Level.FINEST)) {
             logger.log(Level.FINEST, "httpAsync.queryHttpAddress: module=" + localModule + ", resname=" + resname);
diff --git a/src/main/java/org/redkale/net/http/HttpSimpleRequest.java b/src/main/java/org/redkale/net/http/HttpSimpleRequest.java
index 6c469bff8..68b5063eb 100644
--- a/src/main/java/org/redkale/net/http/HttpSimpleRequest.java
+++ b/src/main/java/org/redkale/net/http/HttpSimpleRequest.java
@@ -351,6 +351,14 @@ public class HttpSimpleRequest extends ClientRequest implements java.io.Serializ
         return this;
     }
 
+    public String getHeader(String name) {
+        return headers == null ? null : headers.get(name);
+    }
+
+    public String getHeader(String name, String defaultValue) {
+        return headers == null ? defaultValue : headers.getOrDefault(name, defaultValue);
+    }
+
     public boolean isRpc() {
         return rpc;
     }