修改：包结构名称

2、其他优化

pom.xml

@@ -4,9 +4,9 @@
          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-redkale</artifactId>
-    <version>0.1.1-dev</version>
+    <version>x.1.1.dev</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -14,11 +14,26 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <repositories>
+        <repository>
+            <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>
+            <name>mvn-release</name>
+            <url>https://nexus.1216.top/repository/maven-releases/</url>
+        </repository>
+    </distributionManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.redkale</groupId>
             <artifactId>redkale</artifactId>
-            <version>2.8.0-dev</version>
+            <version>2.8.0.dev</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -28,22 +43,4 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
-
-
-    <repositories>
-        <repository>
-            <id>maven-nexus</id>
-            <name>maven-nexus</name>
-            <url>http://47.106.237.198:8081/repository/maven-public/</url>
-        </repository>
-    </repositories>
-
-
-    <distributionManagement>
-        <repository>
-            <id>mvn-release</id>
-            <name>mvn-release</name>
-            <url>http://47.106.237.198:8081/repository/maven-releases/</url>
-        </repository>
-    </distributionManagement>
 </project>

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

@@ -1,4 +1,4 @@
-package net.tccn;
+package dev.zhub;
 
 import org.redkale.convert.json.JsonConvert;
 import org.redkale.util.Resourcable;
@@ -19,7 +19,7 @@ public abstract class AbstractConsumer extends ZhubAgentProvider implements ICon
 
     protected static String APP_NAME = "";
 
-    private Map<String, EventType> eventMap = new ConcurrentHashMap<>();
+    protected Map<String, EventType<?>> eventMap = new ConcurrentHashMap<>();
 
     protected abstract String getGroupid();
 
@@ -31,6 +31,7 @@ public abstract class AbstractConsumer extends ZhubAgentProvider implements ICon
         return Set.of("-");
     }
 
+    // topic 消息消费前处理
     protected void accept(String topic, String value) {
         EventType eventType = eventMap.get(topic);
 
@@ -44,6 +45,12 @@ public abstract class AbstractConsumer extends ZhubAgentProvider implements ICon
         eventType.accept(data);
     }
 
+    // rpc 被调用端
+    protected <T> void rpcAccept(String topic, T value) {
+        EventType eventType = eventMap.get(topic);
+        eventType.accept(value);
+    }
+
     protected final void removeEventType(String topic) {
         eventMap.remove(topic);
     }
@@ -77,4 +84,13 @@ public abstract class AbstractConsumer extends ZhubAgentProvider implements ICon
     public String resourceName() {
         return super.getName();
     }
+
+    protected String toStr(Object v) {
+        if (v instanceof String) {
+            return (String) v;
+        } else if (v == null) {
+            return null;
+        }
+        return convert.convertTo(v);
+    }
 }

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

@@ -1,4 +1,4 @@
-package net.tccn;
+package dev.zhub;
 
 /**
  * 发布订阅 事件
@@ -15,8 +15,8 @@ public class Event<V> {
         this.value = value;
     }
 
-    public static <V> Event of(String topic, V value) {
+    public static <V> Event<V> of(String topic, V value) {
-        return new Event<V>(topic, value);
+        return new Event<>(topic, value);
     }
 
 

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

@@ -1,4 +1,4 @@
-package net.tccn;
+package dev.zhub;
 
 import org.redkale.util.TypeToken;
 

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

@@ -1,4 +1,4 @@
-package net.tccn;
+package dev.zhub;
 
 import org.redkale.util.TypeToken;
 

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

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

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

@@ -1,4 +1,4 @@
-package net.tccn;
+package dev.zhub;
 
 import org.redkale.util.TypeToken;
 

src/main/java/dev/zhub/RedisTest.java

@@ -1,4 +1,4 @@
-package net.tccn;
+package dev.zhub;
 
 import org.junit.Test;
 import org.redkale.net.AsyncIOGroup;

src/main/java/dev/zhub/ZhubAgentProvider.java

@@ -1,4 +1,4 @@
-package net.tccn;
+package dev.zhub;
 
 import org.redkale.boot.Application;
 import org.redkale.boot.NodeServer;
@@ -8,7 +8,6 @@ import org.redkale.service.Service;
 import org.redkale.util.ResourceEvent;
 
 import java.net.InetSocketAddress;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 

src/main/java/dev/zhub/ZhubProvider.java

@@ -1,6 +1,6 @@
-package net.tccn;
+package dev.zhub;
 
-import net.tccn.zhub.ZHubClient;
+import dev.zhub.client.ZHubClient;
 import org.redkale.annotation.Priority;
 import org.redkale.cluster.ClusterAgent;
 import org.redkale.cluster.ClusterAgentProvider;

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

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

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

@@ -1,8 +1,9 @@
-package net.tccn.zhub;
+package dev.zhub.client;
 
 import org.redkale.convert.ConvertColumn;
-import org.redkale.convert.json.JsonConvert;
 import org.redkale.service.RetResult;
+import org.redkale.util.TypeToken;
+import org.redkale.util.Utility;
 
 public class Rpc<T> {
     private String ruk;     // request unique key:
@@ -11,13 +12,15 @@ public class Rpc<T> {
 
     private RpcResult rpcResult;
 
+    private TypeToken typeToken;
+
     public Rpc() {
     }
 
-    protected Rpc(String appname, String ruk, String topic, Object value) {
+    protected Rpc(String appname, String topic, T value) {
-        this.ruk = appname + "::" + ruk;
+        this.ruk = appname + "::" + Utility.uuid();
         this.topic = topic;
-        this.value = (T) JsonConvert.root().convertTo(value);
+        this.value = value;
     }
 
     public String getRuk() {
@@ -53,6 +56,16 @@ public class Rpc<T> {
         this.rpcResult = rpcResult;
     }
 
+    @ConvertColumn(ignore = true)
+    public TypeToken getTypeToken() {
+        return typeToken;
+    }
+
+    @ConvertColumn(ignore = true)
+    public void setTypeToken(TypeToken typeToken) {
+        this.typeToken = typeToken;
+    }
+
     @ConvertColumn(ignore = true)
     public String getBackTopic() {
         return ruk.split("::")[0];

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

@@ -1,4 +1,4 @@
-package net.tccn.zhub;
+package dev.zhub.client;
 
 public class RpcResult<R> {
     private String ruk;

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

@@ -1,7 +1,7 @@
-package net.tccn.zhub;
+package dev.zhub.client;
 
-import net.tccn.*;
+import dev.zhub.*;
-import net.tccn.timer.Timers;
+import dev.zhub.timer.Timers;
 import org.redkale.annotation.AutoLoad;
 import org.redkale.annotation.ResourceType;
 import org.redkale.service.Local;
@@ -9,7 +9,6 @@ import org.redkale.service.Service;
 import org.redkale.util.AnyValue;
 import org.redkale.util.Comment;
 import org.redkale.util.TypeToken;
-import org.redkale.util.Utility;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -41,17 +40,11 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
     private BufferedReader reader;
 
     private final LinkedBlockingQueue<Timer> timerQueue = new LinkedBlockingQueue<>();
-    private final LinkedBlockingQueue<Event<String>> topicQueue = new LinkedBlockingQueue<>();
+    private final LinkedBlockingQueue<Event<String>> topicQueue = new LinkedBlockingQueue<>(); // [=> Object]
-    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 BiConsumer<Runnable, Integer> threadBuilder = (r, n) -> {
-        for (int i = 0; i < n; i++) {
-            new Thread(() -> r.run()).start();
-        }
-    };*/
-
     private static Map<String, ZHubClient> mainHub = new HashMap<>(); // 127.0.0.1:1216 - ZHubClient
 
     public ZHubClient() {
@@ -106,12 +99,11 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
         }
 
         CompletableFuture.runAsync(() -> {
-            // 消息 事件接收
-            new Thread(() -> {
             if (!initSocket(0)) {
                 return;
             }
-
+            // 消息 事件接收
+            new Thread(() -> {
                 while (true) {
                     try {
                         String readLine = reader.readLine();
@@ -145,7 +137,7 @@ 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();
@@ -225,9 +217,8 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                 while (true) {
                     Timer timer = null;
                     try {
-                        if ((timer = timerQueue.take()) == null) {
+                        timer = timerQueue.take();
-                            return;
+
-                        }
                         long start = System.currentTimeMillis();
                         pool.submit(timer.runnable).get(5, TimeUnit.SECONDS);
                         long end = System.currentTimeMillis();
@@ -249,9 +240,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                 while (true) {
                     Event<String> event = null;
                     try {
-                        if ((event = topicQueue.take()) == null) {
+                        event = topicQueue.take();
-                            continue;
-                        }
 
                         String topic = event.topic;
                         String value = event.value;
@@ -259,10 +248,10 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     } catch (TimeoutException e) {
-                        logger.log(Level.SEVERE, "topic[" + event.topic + "] event deal time out: " + 5 + " S, value: " + event.value, e);
+                        logger.log(Level.SEVERE, "topic[" + event.topic + "] event deal time out: " + 5 + " S, value: " + toStr(event.value), e);
                         pool = Executors.newFixedThreadPool(1);
                     } catch (Exception e) {
-                        logger.log(Level.WARNING, "topic[" + event.topic + "] event accept error :" + event.value, e);
+                        logger.log(Level.WARNING, "topic[" + event.topic + "] event accept error :" + toStr(event.value), e);
                     }
                 }
             }).start();
@@ -270,18 +259,16 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
             // rpc back ,仅做数据解析，暂无耗时监控
             new Thread(() -> {
                 while (true) {
-                    Event<String> event = null;
+                    Event<Object> event = null;
                     try {
-                        if ((event = rpcBackQueue.take()) == null) {
+                        event = rpcBackQueue.take();
-                            continue;
-                        }
                         //if (event)
-                        logger.finest(String.format("rpc-back:[%s]: %s", event.topic, event.value));
+                        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 :" + event.value, e);
+                        logger.log(Level.WARNING, "rpc-back[" + event.topic + "] event accept error :" + toStr(event.value), e);
                     }
                 }
             }).start();
@@ -290,22 +277,21 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
             new Thread(() -> {
                 ExecutorService pool = Executors.newFixedThreadPool(1);
                 while (true) {
-                    Event<String> event = null;
+                    Event<Object> event = null;
                     try {
-                        if ((event = rpcCallQueue.take()) == null) {
+                        event = rpcCallQueue.take();
-                            continue;
+
-                        }
+                        logger.finest(String.format("rpc-call:[%s] %s", event.topic, toStr(event.value)));
-                        logger.finest(String.format("rpc-call:[%s] %s", event.topic, event.value));
                         String topic = event.topic;
-                        String value = event.value;
+                        Object value = event.value;
-                        pool.submit(() -> accept(topic, value)).get(5, TimeUnit.SECONDS);
+                        pool.submit(() -> rpcAccept(topic, value)).get(5, TimeUnit.SECONDS);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     } catch (TimeoutException e) {
-                        logger.log(Level.SEVERE, "topic[" + event.topic + "] event deal time out: " + 5 + " S, value: " + event.value, e);
+                        logger.log(Level.SEVERE, "topic[" + event.topic + "] event deal time out: " + 5 + " S, value: " + toStr(event.value), e);
                         pool = Executors.newFixedThreadPool(1);
                     } catch (Exception e) {
-                        logger.log(Level.WARNING, "rpc-call[" + event.topic + "] event accept error :" + event.value, e);
+                        logger.log(Level.WARNING, "rpc-call[" + event.topic + "] event accept error :" + toStr(event.value), e);
                     }
                 }
             }).start();
@@ -315,9 +301,8 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                 while (true) {
                     String msg = null;
                     try {
-                        if ((msg = sendMsgQueue.take()) == null) {
+                        msg = sendMsgQueue.take();
-                            continue;
+
-                        }
                         // logger.log(Level.FINEST, "send-msg: [" + msg + "]");
                         writer.write(msg.getBytes());
                         writer.flush();
@@ -402,15 +387,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 convert.convertTo(v);
-    }
-
     protected boolean initSocket(int retry) {
         for (int i = 0; i <= retry; i++) {
             try {
@@ -432,7 +408,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 (mainHub.containsValue(this)) {
                     buf.append(" " + APP_NAME);
                 }
@@ -446,9 +422,9 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                     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) {
@@ -479,11 +455,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 相同，将会做延时重置
@@ -612,7 +592,6 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
     // ================================================== rpc ==================================================
     // -- 调用端 --
     private static Map<String, Rpc> rpcMap = new ConcurrentHashMap<>();
-    private static Map<String, TypeToken> rpcRetType = new ConcurrentHashMap<>();
 
     @Comment("rpc call")
     public RpcResult<Void> rpc(String topic, Object v) {
@@ -626,14 +605,18 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
 
     @Comment("rpc call")
     public <T, R> RpcResult<R> rpc(String topic, T v, TypeToken<R> typeToken, long timeout) {
-        Rpc rpc = new Rpc<>(APP_NAME, Utility.uuid(), topic, v);
+        Rpc rpc = new Rpc<>(APP_NAME, 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;
@@ -683,16 +666,38 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
 
     // RpcResult: {ruk:xxx-xxxx, retcode:0}
     @Comment("rpc call back consumer")
-    private void rpcAccept(String value) {
+    private <T> void rpcAccept(T value) {
+        // 接收到 本地调用返回的 RpcResult
+        if (value instanceof RpcResult) {
+            String ruk = ((RpcResult) value).getRuk();
+            Rpc rpc = rpcMap.remove(ruk);
+            if (rpc == null) {
+                return;
+            }
+
+            // 本地模式下返回的数据对象类型需要和处理端一致，不然会出现类型转换异常 - 解决办法，当出现不一致的情况取数据做转换
+            TypeToken typeToken = rpc.getTypeToken();
+            if (typeToken.getType() != ((RpcResult<?>) value).getResult().getClass()) {
+                Object result = convert.convertFrom(typeToken.getType(), toStr(((RpcResult<?>) value).getResult()));
+                ((RpcResult<Object>) value).setResult(result);
+            }
+
+            rpc.setRpcResult((RpcResult) value);
+            synchronized (rpc) {
+                rpc.notify();
+            }
+            return;
+        }
+
         RpcResult resp = convert.convertFrom(new TypeToken<RpcResult<String>>() {
-        }.getType(), value);
+        }.getType(), (String) value);
 
         String ruk = resp.getRuk();
         Rpc rpc = rpcMap.remove(ruk);
         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()) && !"java.lang.Void".equals(typeToken.getType().getTypeName())) {
@@ -716,18 +721,29 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
 
     @Comment("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 {
+                if (v instanceof String) {
                     rpc = convert.convertFrom(new TypeToken<Rpc<String>>() {
-                }.getType(), v);
+                    }.getType(), (String) v);
+                } else {
+                    rpc = (Rpc<T>) v;
+                }
 
                 // 参数转换
+                if (rpc.getValue() instanceof String && !"java.lang.String".equals(typeToken.getType().getTypeName())) {
                     T paras = convert.convertFrom(typeToken.getType(), (String) rpc.getValue());
                     rpc.setValue(paras);
+                }
+
                 RpcResult result = fun.apply(rpc);
-                result.setResult(toStr(result.getResult()));
+                if (APP_NAME.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("服务调用失败！"));
@@ -736,6 +752,6 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
         };
 
         rpcTopics.add(topic);
-        subscribe(topic, consumer);
+        subscribe(topic, typeToken, consumer);
     }
 }

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

@@ -1,7 +1,7 @@
-package net.tccn.timer;
+package dev.zhub.timer;
 
-import net.tccn.timer.queue.TimerQueue;
+import dev.zhub.timer.queue.TimerQueue;
-import net.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 net.tccn.timer;
+package dev.zhub.timer;
 
-import net.tccn.timer.scheduled.Scheduled;
+import dev.zhub.timer.scheduled.Scheduled;
-import net.tccn.timer.task.Job;
+import dev.zhub.timer.task.Job;
-import net.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 net.tccn.timer;
+package dev.zhub.timer;
 
-import net.tccn.timer.scheduled.ScheduledCycle;
+import dev.zhub.timer.scheduled.ScheduledCycle;
 import org.redkale.util.Utility;
 
 import java.util.function.Supplier;

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

@@ -1,6 +1,6 @@
-package net.tccn.timer.queue;
+package dev.zhub.timer.queue;
 
-import net.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 net.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 net.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 net.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 net.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 net.tccn.timer.task;
+package dev.zhub.timer.task;
 
-import net.tccn.timer.TimerExecutor;
+import dev.zhub.timer.TimerExecutor;
-import net.tccn.timer.scheduled.Scheduled;
+import dev.zhub.timer.scheduled.Scheduled;
 
 /**
  * @author: liangxianyou at 2018/8/5 19:32.

src/main/resources/META-INF/services/org.redkale.cluster.ClusterAgentProvider

@@ -1 +1 @@
-net.tccn.ZhubProvider
+dev.zhub.ZhubProvider

test/net.tccn/mq/AppTest.java

@@ -1,7 +1,7 @@
 package net.tccn.mq;
 
 import net.tccn.Event;
-import net.tccn.timer.Timers;
+import dev.zhub.timer.Timers;
 import org.junit.Test;
 import org.redkale.convert.json.JsonConvert;
 

test/net.tccn/mq/HelloService.java

@@ -27,15 +27,15 @@ public class HelloService implements Service {
     @Resource(name = "vvvvhub2")
     private ZHubClient zhub2;*/
 
-    //private net.tccn.zhub.ZHubClient zhubx = null;
+    //private dev.zhub.client.ZHubClient zhubx = null;
 
 
     @Override
     public void init(AnyValue config) {
 
         /*CompletableFuture.runAsync(() -> {
-            zhubx = new net.tccn.zhub.ZHubClient("127.0.0.1", 1216, "g-dev", "DEV-LOCAL");
+            zhubx = new dev.zhub.client.ZHubClient("127.0.0.1", 1216, "g-dev", "DEV-LOCAL");
-            //zhubx = new net.tccn.zhub.ZHubClient("47.111.150.118", 6066, "g-dev", "DEV-LOCAL");
+            //zhubx = new dev.zhub.client.ZHubClient("47.111.150.118", 6066, "g-dev", "DEV-LOCAL");
         });*/
 
         // Function<Rpc<T>, RpcResult<R>> fun