新增：Java通用ZHub客户端分支

2、本地模式返回结果与目标类型不一致的转换

pom.xml

@@ -4,9 +4,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>net.tccn</groupId>
+    <groupId>dev.zhub</groupId>
-    <artifactId>zhub-client-spring</artifactId>
+    <artifactId>zhub-client</artifactId>
-    <version>0.1.2</version>
+    <version>0.1.0424.dev</version>
+
+    <description>ZHub-Java 通用客户端</description>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -14,18 +16,10 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <version>3.2.1</version>
-            <scope>compile</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
             <version>2.10.1</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -33,17 +27,21 @@
             <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <repositories>
         <repository>
-            <id>maven-nexus</id>
+            <id>maven-release</id>
             <name>maven-nexus</name>
             <url>https://nexus.1216.top/repository/maven-public/</url>
         </repository>
     </repositories>
-
-
     <distributionManagement>
         <repository>
             <id>mvn-release</id>
@@ -51,5 +49,12 @@
             <url>https://nexus.1216.top/repository/maven-releases/</url>
         </repository>
     </distributionManagement>
+    <!--<distributionManagement>
+        <repository>
+            <id>mvn-recloud</id>
+            <name>mvn-release</name>
+            <url>http://nexus.recloud.cn/repository/maven-releases/</url>
+        </repository>
+    </distributionManagement>-->
 
 </project>

src/main/java/dev/zhub/AbstractConsumer.java

@@ -1,13 +1,13 @@
-package tccn;
+package dev.zhub;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import tccn.zhub.Rpc;
+import dev.zhub.client.Rpc;
 
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
 
 /**
@@ -18,7 +18,7 @@ public abstract class AbstractConsumer implements IConsumer {
 
     public Gson gson = Rpc.gson;
 
-    private Map<String, EventType> eventMap = new HashMap<>();
+    protected Map<String, EventType<?>> eventMap = new ConcurrentHashMap<>();
 
     protected abstract String getGroupid();
 
@@ -36,6 +36,7 @@ public abstract class AbstractConsumer implements IConsumer {
         return set;
     }
 
+    // topic 消息消费前处理
     protected void accept(String topic, String value) {
         EventType eventType = eventMap.get(topic);
 
@@ -49,6 +50,19 @@ public abstract class AbstractConsumer implements IConsumer {
         eventType.accept(data);
     }
 
+    // rpc 被调用端
+    protected <T> void rpcAccept(String topic, T value) {
+        EventType eventType = eventMap.get(topic);
+
+        /*// eventType 与 T 的类型比较、
+        if (!eventType.typeToken.getType().getTypeName().equals(value.getClass().getTypeName())) {
+            eventType.accept(toStr(value));
+        } else {
+            eventType.accept(value);
+        }*/
+        eventType.accept(value);
+    }
+
     protected final void removeEventType(String topic) {
         eventMap.remove(topic);
     }
@@ -76,4 +90,13 @@ public abstract class AbstractConsumer implements IConsumer {
         }
     }
 
+    protected String toStr(Object v) {
+        if (v instanceof String) {
+            return (String) v;
+        } else if (v == null) {
+            return null;
+        }
+        return gson.toJson(v);
+    }
+
 }

src/main/java/dev/zhub/Event.java

@@ -1,4 +1,4 @@
-package tccn;
+package dev.zhub;
 
 /**
  * 发布订阅 事件
@@ -19,5 +19,4 @@ public class Event<V> {
         return new Event<>(topic, value);
     }
 
-
 }

src/main/java/dev/zhub/EventType.java

@@ -1,4 +1,4 @@
-package tccn;
+package dev.zhub;
 
 
 import com.google.gson.reflect.TypeToken;

src/main/java/dev/zhub/IConsumer.java

@@ -1,4 +1,4 @@
-package tccn;
+package dev.zhub;
 
 import com.google.gson.reflect.TypeToken;
 

src/main/java/dev/zhub/IProducer.java

@@ -1,4 +1,4 @@
-package tccn;
+package dev.zhub;
 
 import java.util.logging.Logger;
 

src/main/java/dev/zhub/IType.java

@@ -1,4 +1,4 @@
-package tccn;
+package dev.zhub;
 
 import com.google.gson.reflect.TypeToken;
 
@@ -10,8 +10,14 @@ public interface IType {
     TypeToken<String> STRING = new TypeToken<String>() {
     };
 
+    TypeToken<Short> SHORT = new TypeToken<Short>() {
+    };
     TypeToken<Integer> INT = new TypeToken<Integer>() {
     };
+    TypeToken<Long> LONG = new TypeToken<Long>() {
+    };
+    TypeToken<Double> DOUBLE = new TypeToken<Double>() {
+    };
 
     TypeToken<Map<String, String>> MAP = new TypeToken<Map<String, String>>() {
     };

src/main/java/dev/zhub/client/Lock.java

@@ -1,4 +1,4 @@
-package tccn.zhub;
+package dev.zhub.client;
 
 // ================================================== lock ==================================================
 public class Lock {

src/main/java/dev/zhub/client/Rpc.java

@@ -1,8 +1,15 @@
-package tccn.zhub;
+package dev.zhub.client;
 
 import com.google.gson.Gson;
 import com.google.gson.annotations.Expose;
+import com.google.gson.reflect.TypeToken;
+import lombok.Getter;
+import lombok.Setter;
 
+import java.util.UUID;
+
+@Getter
+@Setter
 public class Rpc<T> {
     /*public final static Gson gson = new GsonBuilder()
             .excludeFieldsWithoutExposeAnnotation()
@@ -16,48 +23,18 @@ public class Rpc<T> {
     @Expose(deserialize = false, serialize = false)
     private RpcResult rpcResult;
 
-    public Rpc() {
+    @Expose(deserialize = false, serialize = false)
-    }
+    private TypeToken typeToken;
 
-    public Rpc(String appname, String ruk, String topic, Object value) {
+    /*public Rpc() {
-        this.ruk = appname + "::" + ruk;
+    }*/
+
+    protected Rpc(String appname, String topic, T value) {
+        this.ruk = appname + "::" + UUID.randomUUID().toString().replaceAll("-", "");
         this.topic = topic;
-        this.value = (T) gson.toJson(value);
-    }
-
-    public String getRuk() {
-        return ruk;
-    }
-
-    public void setRuk(String ruk) {
-        this.ruk = ruk;
-    }
-
-    public String getTopic() {
-        return topic;
-    }
-
-    public void setTopic(String topic) {
-        this.topic = topic;
-    }
-
-    public T getValue() {
-        return value;
-    }
-
-    public void setValue(T value) {
         this.value = value;
     }
 
-
-    public RpcResult getRpcResult() {
-        return rpcResult;
-    }
-
-    public void setRpcResult(RpcResult rpcResult) {
-        this.rpcResult = rpcResult;
-    }
-
     public String getBackTopic() {
         return ruk.split("::")[0];
     }

src/main/java/dev/zhub/client/RpcResult.java

@@ -0,0 +1,13 @@
+package dev.zhub.client;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class RpcResult<R> {
+    private String ruk;
+    private int retcode;
+    private String retinfo;
+    private R result;
+}

src/main/java/dev/zhub/client/ZHubClient.java

@@ -1,15 +1,10 @@
-package tccn.zhub;
+package dev.zhub.client;
 
 import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Value;
+import dev.zhub.*;
-import org.springframework.stereotype.Component;
+import dev.zhub.timer.Timers;
-import tccn.AbstractConsumer;
+import lombok.Setter;
-import tccn.Event;
-import tccn.IConsumer;
-import tccn.IProducer;
-import tccn.timer.Timers;
 
-import javax.annotation.PostConstruct;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -17,51 +12,44 @@ import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketException;
-import java.util.HashMap;
+import java.util.*;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.UUID;
 import java.util.concurrent.*;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-@Component
 public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer {
 
     public Logger logger = Logger.getLogger(ZHubClient.class.getSimpleName());
-    @Value("${zhub.addr}")
+    @Setter
     private String addr = "127.0.0.1:1216";
-
+    @Setter
-    @Value("${zhub.groupid}")
     private String groupid = "";
-
+    @Setter
-    @Value("${zhub.auth}")
     private String auth = "";
-
+    @Setter
-    @Value("${zhub.appid}")
     protected String appid = "";
 
-    @PostConstruct
     public void init() {
         init(null);
     }
 
+    private Socket client;
     private OutputStream writer;
     private BufferedReader reader;
 
     private final LinkedBlockingQueue<Timer> timerQueue = new LinkedBlockingQueue<>();
     private final LinkedBlockingQueue<Event<String>> topicQueue = new LinkedBlockingQueue<>();
-    private final LinkedBlockingQueue<Event<String>> rpcBackQueue = new LinkedBlockingQueue<>(); // RPC BACK MSG
+    private final LinkedBlockingQueue<Event<Object>> rpcBackQueue = new LinkedBlockingQueue<>(); // RPC BACK MSG [=> Object]
-    private final LinkedBlockingQueue<Event<String>> rpcCallQueue = new LinkedBlockingQueue<>(); // RPC CALL MSG
+    private final LinkedBlockingQueue<Event<Object>> rpcCallQueue = new LinkedBlockingQueue<>(); // RPC CALL MSG [=> Object]
     private final LinkedBlockingQueue<String> sendMsgQueue = new LinkedBlockingQueue<>(); // SEND MSG
 
-    /*private static boolean isFirst = true;
+    private static Map<String, ZHubClient> mainHub = new HashMap<>(); // 127.0.0.1:1216 - ZHubClient
-    private boolean isMain = false;*/
+
-    private static final Map<String, ZHubClient> mainHub = new HashMap<>(); // 127.0.0.1:1216 - ZHubClient
+    public ZHubClient() {
+
+    }
 
     public ZHubClient(String addr, String groupid, String appid, String auth) {
         this.addr = addr;
@@ -84,14 +72,11 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
         }
 
         // 设置第一个启动的 实例为主实例
-        /*if (isFirst) {
-            isMain = true;
-            isFirst = false;
-        }*/
         if (!mainHub.containsKey(addr)) { // 确保同步执行此 init 逻辑
             mainHub.put(addr, this);
         }
 
+        CompletableFuture.runAsync(() -> {
             if (!initSocket(0)) {
                 return;
             }
@@ -104,7 +89,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                             continue;
                         }
 
-                    String type;
+                        String type = "";
 
                         // +ping
                         if ("+ping".equals(readLine)) {
@@ -114,8 +99,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
 
                         // 主题订阅消息
                         if ("*3".equals(readLine)) {
-                        reader.readLine(); // $7 len()
+                            readLine = reader.readLine(); // $7 len()
-
                             type = reader.readLine(); // message
                             if (!"message".equals(type)) {
                                 continue;
@@ -131,13 +115,14 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
 
                             String value = "";
                             do {
-                            if (value.length() > 0) {
+                                if (!value.isEmpty()) {
                                     value += "\r\n";
                                 }
                                 String s = reader.readLine();
                                 value += s; // value
                             } while (clen > 0 && clen > strLength(value));
 
+                            logger.finest("topic[" + topic + "]: " + value);
 
                             // lock msg
                             if ("lock".equals(topic)) {
@@ -181,8 +166,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
 
                         // timer 消息
                         if ("*2".equals(readLine)) {
-                        reader.readLine(); // $7 len()
+                            readLine = reader.readLine(); // $7 len()
-
                             type = reader.readLine(); // message
                             if (!"timer".equals(type)) {
                                 continue;
@@ -190,6 +174,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                             reader.readLine(); //$n len(key)
                             String topic = reader.readLine(); // name
 
+                            logger.finest("timer[" + topic + "]: ");
                             timerQueue.add(timerMap.get(topic));
                             continue;
                         }
@@ -203,98 +188,91 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                     }
                 }
             }).start();
-
+        }).thenAcceptAsync(x -> {
-        // 定时调度事件
+            // 定时调度事件，已加入耗时监控
             new Thread(() -> {
-            ExecutorService executor = Executors.newSingleThreadExecutor();
+                ExecutorService pool = Executors.newFixedThreadPool(1);
                 while (true) {
                     Timer timer = null;
                     try {
                         timer = timerQueue.take();
+
                         long start = System.currentTimeMillis();
-                    executor.submit(timer.runnable).get(5, TimeUnit.SECONDS);
+                        pool.submit(timer.runnable).get(5, TimeUnit.SECONDS);
                         long end = System.currentTimeMillis();
                         logger.finest(String.format("timer [%s] : elapsed time %s ms", timer.name, end - start));
-                } catch (InterruptedException | ExecutionException | TimeoutException e) {
+                    } catch (InterruptedException e) {
-                    if (e instanceof TimeoutException) {
-                        executor = Executors.newSingleThreadExecutor();
-                        logger.log(Level.WARNING, "TimeoutException [" + timer.name + "]", e);
-                    } else {
                         e.printStackTrace();
-                    }
+                    } catch (TimeoutException e) {
+                        logger.log(Level.SEVERE, "timer [" + timer.name + "] time out: " + 5 + " S", e);
+                        pool = Executors.newFixedThreadPool(1);
+                    } catch (Exception e) {
+                        logger.log(Level.WARNING, "timer [" + timer.name + "]", e);
                     }
                 }
             }).start();
 
-        // topic msg
+            // topic msg，已加入耗时监控
             new Thread(() -> {
-            ExecutorService executor = Executors.newSingleThreadExecutor();
+                ExecutorService pool = Executors.newFixedThreadPool(1);
                 while (true) {
                     Event<String> event = null;
                     try {
                         event = topicQueue.take();
-                    logger.log(Level.FINE, "topic[" + event.topic + "] :" + event.value);
 
                         String topic = event.topic;
                         String value = event.value;
-                    executor.submit(() -> accept(topic, value)).get(5, TimeUnit.SECONDS);
+                        pool.submit(() -> accept(topic, value)).get(5, TimeUnit.SECONDS);
-                } catch (InterruptedException | ExecutionException | TimeoutException e) {
+                    } catch (InterruptedException e) {
-                    if (e instanceof TimeoutException) {
+                        e.printStackTrace();
-                        executor = Executors.newSingleThreadExecutor();
+                    } catch (TimeoutException e) {
-                        logger.log(Level.WARNING, "TimeoutException, topic[" + event.topic + "], value[" + event.value + "]", e);
+                        logger.log(Level.SEVERE, "topic[" + event.topic + "] event deal time out: " + 5 + " S, value: " + toStr(event.value), e);
-                    } else if (event != null) {
+                        pool = Executors.newFixedThreadPool(1);
-                        logger.log(Level.WARNING, "topic[" + event.topic + "] event accept error :" + event.value, e);
+                    } catch (Exception e) {
-                    }
+                        logger.log(Level.WARNING, "topic[" + event.topic + "] event accept error :" + toStr(event.value), e);
-                }
-            }
-        }, "ZHub-topic-accept").start();
-        // rpc back
-        new Thread(() -> {
-            ExecutorService executor = Executors.newSingleThreadExecutor();
-            while (true) {
-                Event<String> event = null;
-                try {
-                    event = rpcBackQueue.take();
-                    logger.info(String.format("rpc-back:[%s]: %s", event.topic, event.value));
-                    rpcAccept(event.value);
-
-                    String value = event.value;
-                    executor.submit(() -> rpcAccept(value)).get(5, TimeUnit.SECONDS);
-
-                } catch (InterruptedException | ExecutionException | TimeoutException e) {
-                    if (e instanceof TimeoutException) {
-                        executor = Executors.newSingleThreadExecutor();
-                        logger.log(Level.WARNING, "rpc-back TimeoutException, topic[" + event.topic + "], value[" + event.value + "]", e);
-                    } else if (event != null) {
-                        logger.log(Level.WARNING, "rpc-back[" + event.topic + "] event accept error :" + event.value, e);
-                    }
-                    throw new RuntimeException(e);
                     }
                 }
             }).start();
 
-        // rpc call
+            // rpc back ,仅做数据解析，暂无耗时监控
             new Thread(() -> {
-            ExecutorService executor = Executors.newSingleThreadExecutor();
                 while (true) {
-                Event<String> event = null;
+                    Event<Object> event = null;
+                    try {
+                        event = rpcBackQueue.take();
+                        //if (event)
+                        logger.finest(String.format("rpc-back:[%s]: %s", event.topic, toStr(event.value)));
+                        rpcAccept(event.value);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    } catch (Exception e) {
+                        logger.log(Level.WARNING, "rpc-back[" + event.topic + "] event accept error :" + toStr(event.value), e);
+                    }
+                }
+            }).start();
+
+            // rpc call，已加入耗时监控
+            new Thread(() -> {
+                ExecutorService pool = Executors.newFixedThreadPool(1);
+                while (true) {
+                    Event<Object> event = null;
                     try {
                         event = rpcCallQueue.take();
-                    logger.info(String.format("rpc-call:[%s] %s", event.topic, event.value));
 
+                        logger.finest(String.format("rpc-call:[%s] %s", event.topic, toStr(event.value)));
                         String topic = event.topic;
-                    String value = event.value;
+                        Object value = event.value;
-                    executor.submit(() -> accept(topic, value)).get(5, TimeUnit.SECONDS);
+                        pool.submit(() -> rpcAccept(topic, value)).get(5, TimeUnit.SECONDS);
-                } catch (InterruptedException | ExecutionException | TimeoutException e) {
+                    } catch (InterruptedException e) {
-                    if (e instanceof TimeoutException) {
+                        e.printStackTrace();
-                        executor = Executors.newSingleThreadExecutor();
+                    } catch (TimeoutException e) {
-                        logger.log(Level.WARNING, "rpc-call TimeoutException, topic[" + event.topic + "], value[" + event.value + "]", e);
+                        logger.log(Level.SEVERE, "topic[" + event.topic + "] event deal time out: " + 5 + " S, value: " + toStr(event.value), e);
-                    } else if (event != null) {
+                        pool = Executors.newFixedThreadPool(1);
-                        logger.log(Level.WARNING, "rpc-call[" + event.topic + "] event accept error :" + event.value, e);
+                    } catch (Exception e) {
+                        logger.log(Level.WARNING, "rpc-call[" + event.topic + "] event accept error :" + toStr(event.value), e);
                     }
                 }
-            }
+            }).start();
-        }, "ZHub-rpc-call").start();
 
             // send msg
             new Thread(() -> {
@@ -302,23 +280,18 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                     String msg = null;
                     try {
                         msg = sendMsgQueue.take();
-                    writer.write(msg.getBytes(UTF_8));
-                    writer.flush();
-                } catch (InterruptedException | IOException e) {
-                    logger.log(Level.WARNING, "send-msg[" + msg + "] event accept error :", e);
 
-                    try {
+                        // logger.log(Level.FINEST, "send-msg: [" + msg + "]");
-                        Thread.sleep(3000);
+                        writer.write(msg.getBytes());
-                        assert msg != null;
-                        writer.write(msg.getBytes(UTF_8));
                         writer.flush();
-                    } catch (IOException | InterruptedException | NullPointerException ex) {
+                    } catch (InterruptedException e) {
                         e.printStackTrace();
-                    }
+                    } catch (Exception e) {
+                        logger.log(Level.WARNING, "send-msg[" + msg + "] event accept error :", e);
                     }
                 }
             }).start();
-
+        });
     }
 
     // ---------------------
@@ -365,16 +338,6 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
         return str.length();
     }
 
-    private String toStr(Object v) {
-        if (v instanceof String) {
-            return (String) v;
-        } else if (v == null) {
-            return null;
-        }
-
-        return gson.toJson(v);
-    }
-
     protected boolean initSocket(int retry) {
         for (int i = 0; i <= retry; i++) {
             try {
@@ -382,8 +345,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                 String host = hostPort[0];
                 int port = Integer.parseInt(hostPort[1]);
 
-                //private ReentrantLock lock = new ReentrantLock();
+                client = new Socket();
-                Socket client = new Socket();
                 client.connect(new InetSocketAddress(host, port));
                 client.setKeepAlive(true);
 
@@ -397,9 +359,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                 send("auth", auth);
                 send("groupid " + groupid);
 
-                StringBuffer buf = new StringBuffer("subscribe lock trylock");
+                StringBuilder buf = new StringBuilder("subscribe lock trylock");
-                /*if (isMain) {
-                }*/
                 if (mainHub.containsValue(this)) {
                     buf.append(" ").append(appid);
                 }
@@ -411,13 +371,13 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                 // 重连 timer 订阅
                 timerMap.forEach((name, timer) -> send("timer", name));
                 if (retry > 0) {
-                    logger.warning(String.format("ZHubClient[%s][%s] %s Succeed！", getGroupid(), i + 1, retry > 0 ? "reconnection" : "init"));
+                    logger.warning(String.format("ZHubClient[%s][%s] %s Succeed！", getGroupid(), i + 1, "reconnection"));
                 } else {
-                    logger.fine(String.format("ZHubClient[%s] %s Succeed！", getGroupid(), retry > 0 ? "reconnection" : "init"));
+                    logger.fine(String.format("ZHubClient[%s] %s Succeed！", getGroupid(), "init"));
                 }
                 return true;
             } catch (Exception e) {
-                if (retry == 0 || i == 0) {
+                if (i == 0) {
                     logger.log(Level.WARNING, String.format("ZHubClient[%s] %s Failed 初始化失败！", getGroupid(), retry == 0 ? "init" : "reconnection"), e);
                     try {
                         Thread.sleep(1000);
@@ -444,11 +404,15 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
     }
 
     public boolean publish(String topic, Object v) {
+        /*if (eventMap.containsKey(topic)) { // 本地调用
+            topicQueue.add(Event.of(topic, v));
+            return true;
+        }*/
         return send("publish", topic, toStr(v));
     }
 
     public void broadcast(String topic, Object v) {
-        send("broadcast", topic, toStr(v));
+        send("broadcast", topic, toStr(v)); // 广播必须走远端模式
     }
 
     // 发送 publish 主题消息，若多次发送的 topic + "-" + value 相同，将会做延时重置
@@ -474,22 +438,16 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
             }
         }
 
-        switch (endchar) {
+        if ("M".equals(endchar)) {
-            case "M":
             delay *= (1000 * 60 * 60 * 24 * 30);
-                break;
+        } else if ("d".equals(endchar)) {
-            case "d":
             delay *= (1000 * 60 * 60 * 24);
-                break;
+        } else if ("H".equals(endchar)) {
-            case "H":
             delay *= (1000 * 60 * 60);
-                break;
+        } else if ("m".equals(endchar)) {
-            case "m":
             delay *= (1000 * 60);
-                break;
+        } else if ("s".equals(endchar)) {
-            case "s":
             delay *= 1000;
-                break;
         }
 
         delay(topic, v, delay);
@@ -506,7 +464,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
     }
 
     // ================================================== lock ==================================================
-    private final Map<String, Lock> lockTag = new ConcurrentHashMap<>();
+    private Map<String, Lock> lockTag = new ConcurrentHashMap<>();
 
     /**
      * 尝试加锁，立即返回，
@@ -547,7 +505,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
     }
 
     // ================================================== timer ==================================================
-    private final ConcurrentHashMap<String, Timer> timerMap = new ConcurrentHashMap();
+    private ConcurrentHashMap<String, Timer> timerMap = new ConcurrentHashMap();
 
     class Timer {
         String name;
@@ -575,6 +533,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
         send("timer", name);
     }
 
+    @Deprecated
     public void reloadTimer() {
         send("cmd", "reload-timer");
     }
@@ -582,7 +541,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
     // ================================================== rpc ==================================================
     // -- 调用端 --
     private static final Map<String, Rpc> rpcMap = new ConcurrentHashMap<>();
-    private static final Map<String, TypeToken> rpcRetType = new ConcurrentHashMap<>();
+    // private static final Map<String, TypeToken> rpcRetType = new ConcurrentHashMap<>();
 
     // rpc call
     public RpcResult<Void> rpc(String topic, Object v) {
@@ -596,14 +555,18 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
 
     // rpc call
     public <T, R> RpcResult<R> rpc(String topic, T v, TypeToken<R> typeToken, long timeout) {
-        Rpc rpc = new Rpc<>(appid, UUID.randomUUID().toString().replaceAll("-", ""), topic, v);
+        Rpc rpc = new Rpc<>(appid, topic, v);
+        rpc.setTypeToken(typeToken);
+
         String ruk = rpc.getRuk();
         rpcMap.put(ruk, rpc);
-        if (typeToken != null) {
-            rpcRetType.put(ruk, typeToken);
-        }
         try {
+            if (eventMap.containsKey(topic)) { // 本地调用
+                rpcCallQueue.add(Event.of(topic, rpc));
+            } else {
+                rpc.setValue(toStr(rpc.getValue()));
                 publish(topic, rpc); // send("rpc", topic, toStr(rpc));
+            }
             synchronized (rpc) {
                 if (timeout <= 0) {
                     timeout = 1000 * 15;
@@ -653,8 +616,30 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
 
     // RpcResult: {ruk:xxx-xxxx, retcode:0}
     // rpc call back consumer
-    private void rpcAccept(String value) {
+    private <T> void rpcAccept(T value) {
-        RpcResult resp = gson.fromJson(value, new TypeToken<RpcResult<String>>() {
+        // 接收到 本地调用返回的 RpcResult
+        if (value instanceof RpcResult) {
+            String ruk = ((RpcResult) value).getRuk();
+            Rpc rpc = rpcMap.remove(ruk);
+            if (rpc == null) {
+                return;
+            }
+
+            // TODO, 本地模式下返回的数据对象类型需要和处理端一致，不然会出现类型转换异常 - 解决办法，当出现不一致的情况取数据做转换
+            TypeToken typeToken = rpc.getTypeToken();
+            if (typeToken.getType() != ((RpcResult<?>) value).getResult().getClass()) {
+                Object result = gson.fromJson(toStr(((RpcResult<?>) value).getResult()), typeToken.getType());
+                ((RpcResult<Object>) value).setResult(result);
+            }
+
+            rpc.setRpcResult((RpcResult) value);
+            synchronized (rpc) {
+                rpc.notify();
+            }
+            return;
+        }
+
+        RpcResult resp = gson.fromJson((String) value, new TypeToken<RpcResult<String>>() {
         }.getType());
 
         String ruk = resp.getRuk();
@@ -662,10 +647,10 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
         if (rpc == null) {
             return;
         }
-        TypeToken typeToken = rpcRetType.get(ruk);
+        TypeToken typeToken = rpc.getTypeToken();
 
         Object result = resp.getResult();
-        if (result != null && typeToken != null && !"java.lang.String".equals(typeToken.getType().getTypeName())) {
+        if (result != null && typeToken != null && !"java.lang.String".equals(typeToken.getType().getTypeName()) && !"java.lang.Void".equals(typeToken.getType().getTypeName())) {
             result = gson.fromJson((String) resp.getResult(), typeToken.getType());
         }
 
@@ -677,22 +662,38 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
     }
 
     // -- 订阅端 --
-    private final HashSet rpcTopics = new HashSet();
+    private Set<String> rpcTopics = new HashSet();
+
+    // rpc call consumer
+    public <R> void rpcSubscribe(String topic, Function<Rpc<String>, RpcResult<R>> fun) {
+        rpcSubscribe(topic, IType.STRING, fun);
+    }
 
     // rpc call consumer
     public <T, R> void rpcSubscribe(String topic, TypeToken<T> typeToken, Function<Rpc<T>, RpcResult<R>> fun) {
-        Consumer<String> consumer = v -> {
+        Consumer<T> consumer = v -> {
             Rpc<T> rpc = null;
             try {
-                rpc = gson.fromJson(v, new TypeToken<Rpc<String>>() {
+                if (v instanceof String) {
+                    rpc = gson.fromJson((String) v, new TypeToken<Rpc<String>>() {
                     }.getType());
+                } else {
+                    rpc = (Rpc<T>) v;
+                }
 
                 // 参数转换
+                if (rpc.getValue() instanceof String && !"java.lang.String".equals(typeToken.getType().getTypeName())) {
                     T paras = gson.fromJson((String) rpc.getValue(), typeToken.getType());
                     rpc.setValue(paras);
+                }
+
                 RpcResult result = fun.apply(rpc);
-                result.setResult(toStr(result.getResult()));
+                if (appid.equals(rpc.getBackTopic())) {
+                    rpcBackQueue.add(Event.of(topic, result));
+                } else {
+                    result.setResult(toStr(result.getResult())); // 远程模式 结果转换
                     publish(rpc.getBackTopic(), result);
+                }
             } catch (Exception e) {
                 logger.log(Level.WARNING, "rpc call consumer error: " + v, e);
                 publish(rpc.getBackTopic(), rpc.retError("服务调用失败！"));
@@ -701,6 +702,12 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
         };
 
         rpcTopics.add(topic);
-        subscribe(topic, consumer);
+        subscribe(topic, typeToken, consumer);
+    }
+
+    public static void main(String[] args) {
+        System.out.println(IType.INT.getType());
+        Integer a = 1;
+        System.out.println(a.getClass());
     }
 }

src/main/java/dev/zhub/timer/TimerExecutor.java

@@ -1,7 +1,7 @@
-package tccn.timer;
+package dev.zhub.timer;
 
-import tccn.timer.queue.TimerQueue;
+import dev.zhub.timer.queue.TimerQueue;
-import tccn.timer.task.Task;
+import dev.zhub.timer.task.Task;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -24,7 +24,7 @@ public class TimerExecutor {
         for (Task t : task) {
             t.setTimerExecutor(this);
             queue.push(t);
-            logger.finest("add new task : " + t.getName());
+            // logger.finest("add new task : " + t.getName());
         }
     }
 

src/main/java/dev/zhub/timer/TimerTask.java

@@ -1,8 +1,8 @@
-package tccn.timer;
+package dev.zhub.timer;
 
-import tccn.timer.scheduled.Scheduled;
+import dev.zhub.timer.scheduled.Scheduled;
-import tccn.timer.task.Job;
+import dev.zhub.timer.task.Job;
-import tccn.timer.task.Task;
+import dev.zhub.timer.task.Task;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -93,10 +93,10 @@ public class TimerTask implements Task {
         if (!isComplete) {
             int count = execCount.incrementAndGet(); // 执行次数+1
 
-            long start = System.currentTimeMillis();
+            // long start = System.currentTimeMillis();
             job.execute(this);
-            long end = System.currentTimeMillis();
+            // long end = System.currentTimeMillis();
-            logger.finest(String.format("task [%s] : not complete -> %s, time: %s ms, exec count: %s.", getName(), isComplete ? "had complete" : "not complete", end - start, count));
+            // logger.finest(String.format("task [%s] : not complete -> %s, time: %s ms, exec count: %s.", getName(), isComplete ? "had complete" : "not complete", end - start, count));
 
             if (!isComplete) {
                 timerExecutor.add(this, true);

src/main/java/dev/zhub/timer/Timers.java

@@ -1,6 +1,6 @@
-package tccn.timer;
+package dev.zhub.timer;
 
-import tccn.timer.scheduled.ScheduledCycle;
+import dev.zhub.timer.scheduled.ScheduledCycle;
 
 import java.util.UUID;
 import java.util.function.Supplier;

src/main/java/dev/zhub/timer/queue/TimerQueue.java

@@ -1,6 +1,6 @@
-package tccn.timer.queue;
+package dev.zhub.timer.queue;
 
-import tccn.timer.task.Task;
+import dev.zhub.timer.task.Task;
 
 import java.util.LinkedList;
 import java.util.concurrent.TimeUnit;

src/main/java/dev/zhub/timer/scheduled/Scheduled.java

@@ -1,4 +1,4 @@
-package tccn.timer.scheduled;
+package dev.zhub.timer.scheduled;
 
 import java.time.LocalDateTime;
 

src/main/java/dev/zhub/timer/scheduled/ScheduledCycle.java

@@ -1,4 +1,4 @@
-package tccn.timer.scheduled;
+package dev.zhub.timer.scheduled;
 
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;

src/main/java/dev/zhub/timer/scheduled/ScheduledExpres.java

@@ -1,4 +1,4 @@
-package tccn.timer.scheduled;
+package dev.zhub.timer.scheduled;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;

src/main/java/dev/zhub/timer/task/Job.java

@@ -1,4 +1,4 @@
-package tccn.timer.task;
+package dev.zhub.timer.task;
 
 /**
  * @author: liangxianyou at 2018/12/8 17:24.

src/main/java/dev/zhub/timer/task/Task.java

@@ -1,7 +1,7 @@
-package tccn.timer.task;
+package dev.zhub.timer.task;
 
-import tccn.timer.TimerExecutor;
+import dev.zhub.timer.TimerExecutor;
-import tccn.timer.scheduled.Scheduled;
+import dev.zhub.timer.scheduled.Scheduled;
 
 /**
  * @author: liangxianyou at 2018/8/5 19:32.

src/main/java/tccn/zhub/RpcResult.java

@@ -1,40 +0,0 @@
-package tccn.zhub;
-
-public class RpcResult<R> {
-    private String ruk;
-    private int retcode;
-    private String retinfo;
-    private R result;
-
-    public String getRuk() {
-        return ruk;
-    }
-
-    public void setRuk(String ruk) {
-        this.ruk = ruk;
-    }
-
-    public int getRetcode() {
-        return retcode;
-    }
-
-    public void setRetcode(int retcode) {
-        this.retcode = retcode;
-    }
-
-    public String getRetinfo() {
-        return retinfo;
-    }
-
-    public void setRetinfo(String retinfo) {
-        this.retinfo = retinfo;
-    }
-
-    public R getResult() {
-        return result;
-    }
-
-    public void setResult(R result) {
-        this.result = result;
-    }
-}

test/HelloService.java

@@ -1,8 +1,8 @@
 import org.junit.Before;
 import org.junit.Test;
-import tccn.IType;
+import net.tccn.IType;
-import tccn.zhub.Lock;
+import net.tccn.zhub.Lock;
-import tccn.zhub.ZHubClient;
+import net.tccn.zhub.ZHubClient;
 
 // @RestService(automapping = true)
 public class HelloService {