修改：包结构名称

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

conf/application.properties

@@ -1,13 +0,0 @@
-redkale.name=zhub-dev
-redkale.port=6560
-redkale.server[0].protocol=HTTP
-redkale.server[0].host=127.0.0.1
-redkale.server[0].port=80
-# redkale.server[0].root = root
-redkale.server[0].rest.autoload=true
-redkale.server[0].rest.path=
-redkale.server[0].services[0].autoload=true
-# zhub
-redkale.cluster.zhub[hub].addr=47.111.150.118:6066
-redkale.cluster.zhub[hub].auth=zchd@123456
-redkale.cluster.zhub[hub].groupid=venue-zhub

conf/config.properties

@@ -1,14 +0,0 @@
-# redis
-redis.host=47.111.150.118
-redis.password=*Zhong9307!
-redis.port=6064
-
-# pulsar
-pulsar.serviceurl=pulsar://47.113.228.247:6650
-
-# zdb
-# zdb.host = 127.0.0.1
-# zdb.port = 1216
-
-zhub.host = 127.0.0.1
-zhub.port = 1216

conf/logging.properties

@@ -1,18 +0,0 @@
-handlers=java.util.logging.ConsoleHandler
-# handlers = java.util.logging.FileHandler
-############################################################
-.level=FINEST
-java.level=INFO
-javax.level=INFO
-com.sun.level=INFO
-sun.level=INFO
-jdk.level=INFO
-java.util.logging.FileHandler.level=FINER
-#10M
-java.util.logging.FileHandler.limit=10M
-java.util.logging.FileHandler.count=20
-java.util.logging.FileHandler.encoding=UTF-8
-java.util.logging.FileHandler.pattern=${APP_HOME}/logs-%tY%tm/log-%tY%tm%td.log
-java.util.logging.FileHandler.unusual=${APP_HOME}/logs-%tY%tm/log-warnerr-%tY%tm%td.log
-java.util.logging.FileHandler.append=true
-java.util.logging.ConsoleHandler.level=FINEST

conf/source.properties

@@ -1,5 +0,0 @@
-############ ClusterSource   @Resource(name="hub") ############
-# redkale.cluster.zhub[hub].addr = 47.111.150.118:6066
-# redkale.cluster.zhub[hub].auth = zchd@123456
-# redkale.cluster.zhub[hub].groupid = venue-zhub
-

pom.xml

@@ -4,40 +4,67 @@
          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>
-    <artifactId>zhub-client-redkale</artifactId>
-    <version>0.1.2-dev</version>
+    <groupId>dev.zhub</groupId>
+    <artifactId>zhub-client-spring</artifactId>
+    <version>17.0.0423.dev</version>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.1.10</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>org.redkale</groupId>
-            <artifactId>redkale</artifactId>
-            <version>2.8.0-dev</version>
-            <scope>compile</scope>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <!--<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>http://47.106.237.198:8081/repository/maven-public/</url>
+            <url>https://nexus.1216.top/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>
+            <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,9 +1,10 @@
-package net.tccn;
+package dev.zhub;
 
-import org.redkale.convert.json.JsonConvert;
-import org.redkale.util.Resourcable;
-import org.redkale.util.TypeToken;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import dev.zhub.client.Rpc;
 
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -13,24 +14,29 @@ import java.util.function.Consumer;
  * @author Liang
  * @data 2020-09-05 23:18
  */
-public abstract class AbstractConsumer extends ZhubAgentProvider implements IConsumer, Resourcable {
+public abstract class AbstractConsumer implements IConsumer {
 
-    protected JsonConvert convert = JsonConvert.root();
+    public Gson gson = Rpc.gson;
 
-    protected static String APP_NAME = "";
-
-    private Map<String, EventType> eventMap = new ConcurrentHashMap<>();
+    protected Map<String, EventType<?>> eventMap = new ConcurrentHashMap<>();
 
     protected abstract String getGroupid();
 
+    protected boolean preInit() {
+        return true;
+    }
+
     protected final Set<String> getTopics() {
         if (!eventMap.isEmpty()) {
             return eventMap.keySet();
         }
+        HashSet<String> set = new HashSet<>();
+        set.add("-");
 
-        return Set.of("-");
+        return set;
     }
 
+    // topic 消息消费前处理
     protected void accept(String topic, String value) {
         EventType eventType = eventMap.get(topic);
 
@@ -38,12 +44,25 @@ public abstract class AbstractConsumer extends ZhubAgentProvider implements ICon
         if ("java.lang.String".equals(eventType.typeToken.getType().getTypeName())) {
             data = value;
         } else {
-            data = convert.convertFrom(eventType.typeToken.getType(), value);
+            data = gson.fromJson(value, eventType.typeToken.getType());
         }
 
         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);
     }
@@ -56,7 +75,7 @@ public abstract class AbstractConsumer extends ZhubAgentProvider implements ICon
     protected abstract void subscribe(String topic);
 
     public void subscribe(String topic, Consumer<String> consumer) {
-        subscribe(topic, IType.STRING, consumer);
+        subscribe(topic, TYPE_TOKEN_STRING, consumer);
     }
 
     @Override
@@ -71,10 +90,13 @@ public abstract class AbstractConsumer extends ZhubAgentProvider implements ICon
         }
     }
 
-    // --------------
+    protected String toStr(Object v) {
+        if (v instanceof String) {
+            return (String) v;
+        } else if (v == null) {
+            return null;
+        }
+        return gson.toJson(v);
+    }
 
-    @Override
-    public String resourceName() {
-        return super.getName();
-    }
 }

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

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

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

@@ -1,6 +1,7 @@
-package net.tccn;
+package dev.zhub;
 
-import org.redkale.util.TypeToken;
+
+import com.google.gson.reflect.TypeToken;
 
 import java.util.function.Consumer;
 
@@ -9,7 +10,7 @@ public class EventType<T> {
     public final TypeToken<T> typeToken;
     private final Consumer<T> consumer;
 
-    private final static TypeToken<String> stringToken = new TypeToken<>() {
+    private final static TypeToken<String> stringToken = new TypeToken<String>() {
     };
 
     private EventType(String topic, TypeToken<T> typeToken, Consumer<T> consumer) {

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

@@ -1,10 +1,14 @@
-package net.tccn;
+package dev.zhub;
 
-import org.redkale.util.TypeToken;
+import com.google.gson.reflect.TypeToken;
 
 import java.util.function.Consumer;
 
 public interface IConsumer {
+    TypeToken<String> TYPE_TOKEN_STRING = new TypeToken<String>() {
+    };
+    TypeToken<Integer> TYPE_TOKEN_INT = new TypeToken<Integer>() {
+    };
 
     /**
      * 取消订阅

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

@@ -0,0 +1,27 @@
+package dev.zhub;
+
+import com.google.gson.reflect.TypeToken;
+
+import java.util.List;
+import java.util.Map;
+
+public interface IType {
+
+    TypeToken<String> STRING = new TypeToken<>() {
+    };
+
+    TypeToken<Short> SHORT = new TypeToken<>() {
+    };
+    TypeToken<Integer> INT = new TypeToken<>() {
+    };
+    TypeToken<Long> LONG = new TypeToken<>() {
+    };
+    TypeToken<Double> DOUBLE = new TypeToken<>() {
+    };
+
+    TypeToken<Map<String, String>> MAP = new TypeToken<>() {
+    };
+
+    TypeToken<List<Map<String, String>>> LMAP = new TypeToken<List<Map<String, String>>>() {
+    };
+}

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

@@ -1,11 +1,12 @@
-package net.tccn.zhub;
+package dev.zhub.client;
 
 // ================================================== lock ==================================================
 public class Lock {
-    private String name;
-    private String uuid;
-    private int duration;
-    private ZHubClient hubClient;
+    protected String name;
+    protected String uuid;
+    protected int duration;
+    protected boolean success;
+    protected ZHubClient hubClient;
 
     protected Lock(String name, String uuid, int duration, ZHubClient hubClient) {
         this.name = name;
@@ -17,4 +18,8 @@ public class Lock {
     public void unLock() {
         hubClient.send("unlock", name, uuid);
     }
+
+    public boolean success() {
+        return success;
+    }
 }

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

@@ -0,0 +1,70 @@
+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()
+            .create();*/
+    public final static Gson gson = new Gson();
+
+    private String ruk;     // request unique key:
+    private String topic;   // call topic
+    private T value;        // call paras
+
+    @Expose(deserialize = false, serialize = false)
+    private RpcResult rpcResult;
+
+    @Expose(deserialize = false, serialize = false)
+    private TypeToken typeToken;
+
+    /*public Rpc() {
+    }*/
+
+    protected Rpc(String appname, String topic, T value) {
+        this.ruk = appname + "::" + UUID.randomUUID().toString().replaceAll("-", "");
+        this.topic = topic;
+        this.value = value;
+    }
+
+    public String getBackTopic() {
+        return ruk.split("::")[0];
+    }
+
+    public <R> RpcResult<R> render() {
+        RpcResult<R> response = new RpcResult<>();
+        response.setRuk(ruk);
+        return response;
+    }
+
+    public <R> RpcResult<R> render(R result) {
+        RpcResult<R> response = new RpcResult<>();
+        response.setRuk(ruk);
+        response.setResult(result);
+        return response;
+    }
+
+    public <R> RpcResult<R> retError(String retinfo) {
+        RpcResult<R> response = new RpcResult<>();
+        response.setRuk(ruk);
+        response.setRetcode(100);
+        response.setRetinfo(retinfo);
+        return response;
+    }
+
+    public <R> RpcResult<R> retError(int retcode, String retinfo) {
+        RpcResult<R> response = new RpcResult<>();
+        response.setRuk(ruk);
+        response.setRetcode(retcode);
+        response.setRetinfo(retinfo);
+        return response;
+    }
+}

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,15 +1,12 @@
-package net.tccn.zhub;
+package dev.zhub.client;
 
-import net.tccn.*;
-import net.tccn.timer.Timers;
-import org.redkale.annotation.AutoLoad;
-import org.redkale.annotation.ResourceType;
-import org.redkale.service.Local;
-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 com.google.gson.reflect.TypeToken;
+import dev.zhub.*;
+import jakarta.annotation.PostConstruct;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import dev.zhub.timer.Timers;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -18,89 +15,69 @@ import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-@Local
-@AutoLoad(false)
-@ResourceType(ZHubClient.class)
-public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer, Service {
+@Component
+public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer {
 
     public Logger logger = Logger.getLogger(ZHubClient.class.getSimpleName());
+    @Setter
+    @Value("${zhub.addr}")
     private String addr = "127.0.0.1:1216";
-    private String auth = "";
+    @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 ReentrantLock lock = new ReentrantLock();
     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<String>> rpcCallQueue = new LinkedBlockingQueue<>(); // RPC CALL MSG
+    private final LinkedBlockingQueue<Event<Object>> rpcBackQueue = new LinkedBlockingQueue<>(); // RPC BACK MSG [=> Object]
+    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() {
 
     }
 
-    public ZHubClient(String name, Map<String, String> attr) {
-        this.APP_NAME = name;
-        this.addr = attr.get("addr");
-        this.groupid = attr.get("groupid");
-        this.auth = attr.get("auth");
-
-        this.initClient(null);
+    public ZHubClient(String addr, String groupid, String appid, String auth) {
+        this.addr = addr;
+        this.groupid = groupid;
+        this.appid = appid;
+        this.auth = auth;
+        init(null);
     }
 
-    @Override
-    public void init(AnyValue config) {
-        APP_NAME = application.getName();
-        /*if (!preInit()) {
+    public void init(Map<String, String> config) {
+        if (!preInit()) {
             return;
-        }*/
-
-        if (config == null) {
-            initClient(null);
-        } else {
-            Map<String, AnyValue> nodes = getNodes(config);
-            for (String rsName : nodes.keySet()) {
-                ZHubClient client = new ZHubClient().initClient(nodes.get(rsName));
-                application.getResourceFactory().register(rsName, client);
-            }
-        }
         }
 
-    private ZHubClient initClient(AnyValue config) {
         // 自动注入
         if (config != null) {
-            addr = config.getValue("addr", addr);
-
-            // 合并 addr = host:port, 做历史兼容
-            int port = config.getIntValue("port", 0);
-            if (port != 0 && !addr.contains(":")) {
-                addr = addr + ":" + port;
-            }
-
-            auth = config.getOrDefault("auth", auth);
-            groupid = config.getValue("groupid", groupid);
+            addr = config.getOrDefault("addr", addr);
+            groupid = config.getOrDefault("groupid", groupid);
+            appid = config.getOrDefault("appname", appid);
         }
 
         // 设置第一个启动的 实例为主实例
@@ -109,12 +86,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();
@@ -148,7 +124,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();
@@ -162,13 +138,26 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                                 Lock lock = lockTag.get(value);
                                 if (lock != null) {
                                     synchronized (lock) {
+                                        lock.success = true;
                                         lock.notifyAll();
                                     }
                                 }
                                 continue;
                             }
+                            // trylock msg
+                            if ("trylock".equals(topic)) {
+                                Lock lock = lockTag.get(value);
+                                if (lock != null) {
+                                    synchronized (lock) {
+                                        lock.success = false;
+                                        lock.notifyAll();
+                                    }
+                                }
+                                continue;
+                            }
+
                             // rpc back msg
-                            if (APP_NAME.equals(topic)) {
+                            if (appid.equals(topic)) {
                                 rpcBackQueue.add(Event.of(topic, value));
                                 continue;
                             }
@@ -215,9 +204,8 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                 while (true) {
                     Timer timer = null;
                     try {
-                        if ((timer = timerQueue.take()) == null) {
-                            return;
-                        }
+                        timer = timerQueue.take();
+
                         long start = System.currentTimeMillis();
                         pool.submit(timer.runnable).get(5, TimeUnit.SECONDS);
                         long end = System.currentTimeMillis();
@@ -239,9 +227,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                 while (true) {
                     Event<String> event = null;
                     try {
-                        if ((event = topicQueue.take()) == null) {
-                            continue;
-                        }
+                        event = topicQueue.take();
 
                         String topic = event.topic;
                         String value = event.value;
@@ -249,10 +235,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();
@@ -260,18 +246,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) {
-                            continue;
-                        }
+                        event = rpcBackQueue.take();
                         //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();
@@ -280,22 +264,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) {
-                            continue;
-                        }
-                        logger.finest(String.format("rpc-call:[%s] %s", event.topic, event.value));
+                        event = rpcCallQueue.take();
+
+                        logger.finest(String.format("rpc-call:[%s] %s", event.topic, toStr(event.value)));
                         String topic = event.topic;
-                        String value = event.value;
-                        pool.submit(() -> accept(topic, value)).get(5, TimeUnit.SECONDS);
+                        Object value = event.value;
+                        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();
@@ -305,9 +288,8 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                 while (true) {
                     String msg = null;
                     try {
-                        if ((msg = sendMsgQueue.take()) == null) {
-                            continue;
-                        }
+                        msg = sendMsgQueue.take();
+
                         // logger.log(Level.FINEST, "send-msg: [" + msg + "]");
                         writer.write(msg.getBytes());
                         writer.flush();
@@ -319,33 +301,6 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                 }
             }).start();
         });
-
-        return this;
-    }
-
-    public boolean acceptsConf(AnyValue config) {
-        if (config == null) {
-            return false;
-        }
-
-        if (!getNodes(config).isEmpty()) {
-            return true;
-        }
-        return false;
-    }
-
-    private HashMap<String, AnyValue> getNodes(AnyValue config) {
-        AnyValue[] zhubs = config.getAnyValues("zhub");
-        HashMap<String, AnyValue> confMap = new HashMap<>();
-
-        for (AnyValue zhub : zhubs) {
-            String[] names = zhub.getNames();
-            for (String name : names) {
-                confMap.put(name, zhub.getAnyValue(name));
-            }
-        }
-
-        return confMap;
     }
 
     // ---------------------
@@ -354,7 +309,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
         if (data.length == 1) {
             sendMsgQueue.add(data[0] + "\r\n");
         } else if (data.length > 1) {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("*" + data.length + "\r\n");
             for (String d : data) {
                 buf.append("$" + strLength(d) + "\r\n");
@@ -392,15 +347,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 {
@@ -422,9 +368,9 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                 send("auth", auth);
                 send("groupid " + groupid);
 
-                StringBuffer buf = new StringBuffer("subscribe lock");
+                StringBuilder buf = new StringBuilder("subscribe lock trylock");
                 if (mainHub.containsValue(this)) {
-                    buf.append(" " + APP_NAME);
+                    buf.append(" ").append(appid);
                 }
                 for (String topic : getTopics()) {
                     buf.append(" ").append(topic);
@@ -432,13 +378,11 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                 send(buf.toString());
 
                 // 重连 timer 订阅
-                timerMap.forEach((name, timer) -> {
-                    send("timer", name);
-                });
+                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) {
@@ -469,11 +413,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 相同，将会做延时重置
@@ -527,32 +475,35 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
     // ================================================== lock ==================================================
     private Map<String, Lock> lockTag = new ConcurrentHashMap<>();
 
+    /**
+     * 尝试加锁，立即返回，
+     *
+     * @param key
+     * @param duration
+     * @return Lock: lock.success 锁定是否成功标识
+     */
     public Lock tryLock(String key, int duration) {
-        String uuid = Utility.uuid();
-        Lock lock = new Lock(key, uuid, duration, this);
-        lockTag.put(uuid, lock);
-
-        try {
-            // c.send("lock", key, uuid, strconv.Itoa(duration))
-            send("lock", key, uuid, String.valueOf(duration));
-            synchronized (lock) {
-                lock.wait();
-            }
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        return lock;
+        return lock("trylock", key, duration);
     }
 
-    // 为替换 tryLock 方法做过度准确
     public Lock lock(String key, int duration) {
-        String uuid = Utility.uuid();
+        return lock("lock", key, duration);
+    }
+
+    /**
+     * @param cmd      lock|trylock
+     * @param key      加锁 key
+     * @param duration 锁定时长
+     * @return
+     */
+    private Lock lock(String cmd, String key, int duration) {
+        String uuid = UUID.randomUUID().toString().replaceAll("-", "");
         Lock lock = new Lock(key, uuid, duration, this);
         lockTag.put(uuid, lock);
 
         try {
             // c.send("lock", key, uuid, strconv.Itoa(duration))
-            send("lock", key, uuid, String.valueOf(duration));
+            send(cmd, key, uuid, String.valueOf(duration));
             synchronized (lock) {
                 lock.wait();
             }
@@ -598,29 +549,33 @@ 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<>();
+    private static final Map<String, Rpc> rpcMap = new ConcurrentHashMap<>();
+    // private static final Map<String, TypeToken> rpcRetType = new ConcurrentHashMap<>();
 
-    @Comment("rpc call")
+    // rpc call
     public RpcResult<Void> rpc(String topic, Object v) {
         return rpc(topic, v, null);
     }
 
-    @Comment("rpc call")
+    // rpc call
     public <T, R> RpcResult<R> rpc(String topic, T v, TypeToken<R> typeToken) {
         return rpc(topic, v, typeToken, 0);
     }
 
-    @Comment("rpc call")
+    // 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<>(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;
@@ -633,9 +588,9 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                             return;
                         }
 
-                        RpcResult rpcResult = rpc.render(505, "请求超时");
+                        RpcResult rpcResult = rpc.retError(505, "请求超时");
                         rpc.setRpcResult(rpcResult);
-                        logger.warning("rpc timeout: " + convert.convertTo(rpc));
+                        logger.warning("rpc timeout: " + gson.toJson(rpc));
                         rpc.notify();
                     }
                 }, timeout);
@@ -646,7 +601,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
         } catch (InterruptedException e) {
             e.printStackTrace();
             // call error
-            RpcResult rpcResult = rpc.render(501, "请求失败");
+            RpcResult rpcResult = rpc.retError(501, "请求失败");
             rpc.setRpcResult(rpcResult);
         }
         return rpc.getRpcResult();
@@ -669,21 +624,43 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
     }
 
     // RpcResult: {ruk:xxx-xxxx, retcode:0}
-    @Comment("rpc call back consumer")
-    private void rpcAccept(String value) {
-        RpcResult resp = convert.convertFrom(new TypeToken<RpcResult<String>>() {
-        }.getType(), value);
+    // rpc call back consumer
+    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;
+            }
+
+            // 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();
         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())) {
-            result = convert.convertFrom(typeToken.getType(), (String) resp.getResult());
+            result = gson.fromJson((String) resp.getResult(), typeToken.getType());
         }
 
         resp.setResult(result);
@@ -696,25 +673,36 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
     // -- 订阅端 --
     private Set<String> rpcTopics = new HashSet();
 
-    @Comment("rpc call consumer")
+    // rpc call consumer
     public <R> void rpcSubscribe(String topic, Function<Rpc<String>, RpcResult<R>> fun) {
         rpcSubscribe(topic, IType.STRING, fun);
     }
 
-    @Comment("rpc call consumer")
+    // 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 = convert.convertFrom(new TypeToken<Rpc<String>>() {
-                }.getType(), v);
+                if (v instanceof String) {
+                    rpc = gson.fromJson((String) v, new TypeToken<Rpc<String>>() {
+                    }.getType());
+                } else {
+                    rpc = (Rpc<T>) v;
+                }
 
                 // 参数转换
-                T paras = convert.convertFrom(typeToken.getType(), (String) rpc.getValue());
+                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("服务调用失败！"));
@@ -723,6 +711,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 net.tccn.timer;
+package dev.zhub.timer;
 
-import net.tccn.timer.queue.TimerQueue;
-import net.tccn.timer.task.Task;
+import dev.zhub.timer.queue.TimerQueue;
+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 net.tccn.timer.task.Job;
-import net.tccn.timer.task.Task;
+import dev.zhub.timer.scheduled.Scheduled;
+import dev.zhub.timer.task.Job;
+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();
-            logger.finest(String.format("task [%s] : not complete -> %s, time: %s ms, exec count: %s.", getName(), isComplete ? "had complete" : "not complete", end - start, count));
+            // 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));
 
             if (!isComplete) {
                 timerExecutor.add(this, true);

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

@@ -1,22 +1,19 @@
-package net.tccn.timer;
+package dev.zhub.timer;
 
-import net.tccn.timer.scheduled.ScheduledCycle;
-import org.redkale.util.Utility;
+import dev.zhub.timer.scheduled.ScheduledCycle;
 
+import java.util.UUID;
 import java.util.function.Supplier;
 
 public class Timers {
 
-    private static TimerExecutor timerExecutor = new TimerExecutor(1);
+    private static final TimerExecutor timerExecutor = new TimerExecutor(1);
 
     /**
      * 本地延时重试
-     * @param supplier
-     * @param millis
-     * @param maxCount
      */
     public static void tryDelay(Supplier<Boolean> supplier, long millis, int maxCount) {
-        timerExecutor.add(TimerTask.by("try-delay-task-" + Utility.uuid(), ScheduledCycle.of(0), task -> {
+        timerExecutor.add(TimerTask.by("try-delay-task-" + UUID.randomUUID().toString().replaceAll("-", ""), ScheduledCycle.of(0), task -> {
             if (supplier.get() || task.getExecCount() == maxCount) {
                 task.setComplete(true);
             }
@@ -31,11 +28,9 @@ public class Timers {
 
     /**
      * 本地延时：延时时间极短的场景下使用 （如：1分钟内）
-     * @param runnable
-     * @param millis
      */
     public static void delay(Runnable runnable, long millis) {
-        timerExecutor.add(TimerTask.by("delay-task-" + Utility.uuid(), ScheduledCycle.of(millis), task -> {
+        timerExecutor.add(TimerTask.by("delay-task-" + UUID.randomUUID().toString().replaceAll("-", ""), ScheduledCycle.of(millis), task -> {
             runnable.run();
             task.setComplete(true);
         }));

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 net.tccn.timer.scheduled.Scheduled;
+import dev.zhub.timer.TimerExecutor;
+import dev.zhub.timer.scheduled.Scheduled;
 
 /**
  * @author: liangxianyou at 2018/8/5 19:32.
@@ -63,6 +63,7 @@ public interface Task extends Runnable {
 
     /**
      * 得到总执行次数
+     *
      * @return
      */
     int getExecCount();

src/main/java/net/tccn/IType.java

@@ -1,33 +0,0 @@
-package net.tccn;
-
-import org.redkale.util.TypeToken;
-
-import java.util.List;
-import java.util.Map;
-
-public interface IType {
-
-    TypeToken<String> STRING = new TypeToken<String>() {
-    };
-
-    TypeToken<Integer> INT = new TypeToken<Integer>() {
-    };
-
-    TypeToken<Short> SHORT = new TypeToken<Short>() {
-    };
-
-    TypeToken<Long> LONG = new TypeToken<Long>() {
-    };
-
-    TypeToken<Map<String, String>> MAP = new TypeToken<Map<String, String>>() {
-    };
-
-    TypeToken<List<Map<String, String>>> LMAP = new TypeToken<List<Map<String, String>>>() {
-    };
-
-    TypeToken<List<String>> LSTRING = new TypeToken<List<String>>() {
-    };
-
-    TypeToken<List<Integer>> LINT = new TypeToken<List<Integer>>() {
-    };
-}

src/main/java/net/tccn/RedisTest.java

@@ -1,403 +0,0 @@
-package net.tccn;
-
-import org.redkale.net.AsyncIOGroup;
-import org.redkale.util.AnyValue;
-import org.redkale.util.ResourceFactory;
-import org.redkalex.cache.redis.MyRedisCacheSource;
-
-import static org.redkale.boot.Application.RESNAME_APP_CLIENT_ASYNCGROUP;
-import static org.redkale.source.AbstractCacheSource.*;
-
-public class RedisTest {
-
-    static MyRedisCacheSource source = new MyRedisCacheSource();
-
-    static { // redis://:*Zhong9307!@47.111.150.118:6064?db=2
-        AnyValue.DefaultAnyValue conf = new AnyValue.DefaultAnyValue().addValue(CACHE_SOURCE_MAXCONNS, "1");
-        conf.addValue(CACHE_SOURCE_NODE, new AnyValue.DefaultAnyValue().addValue(CACHE_SOURCE_URL, "redis://:123456@127.0.0.1:6379?db=0"));
-        final ResourceFactory factory = ResourceFactory.create();
-        final AsyncIOGroup asyncGroup = new AsyncIOGroup(8192, 16);
-        asyncGroup.start();
-        factory.register(RESNAME_APP_CLIENT_ASYNCGROUP, asyncGroup);
-        factory.inject(source);
-        //source.defaultConvert = JsonFactory.root().getConvert();
-        source.init(conf);
-
-        System.out.println(source.get("a"));
-
-        //--------------------- bit ------------------------------
-        /*boolean ax = source.getBit("ax", 6);
-        System.out.println("ax:"+ ax);
-        source.setBit("ax", 6, true);
-
-        ax = source.getBit("ax", 6);
-        System.out.println("ax:"+ ax);
-
-        source.setBit("ax", 6, false);
-        ax = source.getBit("ax", 6);
-        System.out.println("ax:"+ ax);*/
-        //--------------------- bit ------------------------------
-
-        //--------------------- bit ------------------------------
-
-        /*
-        source.lock("lockx", 5000);
-        */
-
-
-        source.keysStartsWith("more-hot").forEach(x -> {
-            System.out.println(x);
-            source.del(x);
-
-            int i = (short) 3;
-        });
-
-        source.keysStartsWith("districtbeans").forEach(x -> {
-            System.out.println(x);
-            source.del(x);
-        });
-        source.keysStartsWith("oss-blind-users").forEach(x -> {
-            System.out.println(x);
-            source.del(x);
-        });
-        source.keysStartsWith("venue:drama-product-schedule-fee:rt-lbeuai84:20221217").forEach(x -> {
-            System.out.println(x);
-            source.del(x);
-        });
-        source.keysStartsWith("venue:site-hour-fee:54f6e9b74cd7416db8d605366c1f49c2:20220729").forEach(x -> {
-            System.out.println(x);
-            source.del(x);
-        });
-        source.keysStartsWith("rainbow").forEach(x -> {
-            System.out.println(x);
-            source.del(x);
-        });
-        source.keysStartsWith("run").forEach(x -> {
-            System.out.println(x);
-            source.del(x);
-        });
-        source.keysStartsWith("today").forEach(x -> {
-            System.out.println(x);
-            source.del(x);
-        });
-        source.keysStartsWith("user").forEach(x -> {
-            System.out.println(x);
-            source.del(x);
-        });
-        source.keysStartsWith("im:").forEach(x -> {
-            System.out.println(x);
-            source.del(x);
-        });
-        source.keysStartsWith("ios-").forEach(x -> {
-            System.out.println(x);
-            source.del(x);
-        });
-
-
-        //--------------------- set ------------------------------
-        /*source.del("setx");
-         *//*
-        int[] ints = {1, 2, 3};
-        source.sadd("setx", ints);
-        *//*
-
-        //source.sadd("setx", list.toArray(Integer[]::new));
-        List<Integer> list = List.of(2, 3, 5);
-        // source.sadd("setx", list.toArray(Integer[]::new));
-        source.sadd("setx", list.toArray(Integer[]::new));
-        source.sadd("setx", 12, 2312, 213);
-        source.sadd("setx", List.of(1011, 10222));
-
-        source.keys("setx*").forEach(x -> {
-            System.out.println(x);
-        });
-
-        source.srem("setx", 213, 2312);
-
-
-        Collection<String> setx1 = source.getCollection("setx", String.class);
-
-        System.out.println(setx1);
-
-
-        //source.getexLong()
-
-        source.setHms("hmx", Map.of("a", "5", "b", "51", "c", "ads"));
-
-        List<Serializable> hmget = source.hmget("hmx", int.class, "a");
-
-        System.out.println(hmget);
-
-        Integer hm = source.getHm("hmx", int.class, "ads");
-        System.out.println(hm);
-
-        Map<String, String> hms = source.getHms("hmx", "a", "b");
-        System.out.println("hmx:" + hms);
-
-        *//*System.out.println("======================================================");
-        System.out.println(source.incrHm("hmx", "a", -6.0));
-        hms = source.getHms("hmx", "a", "b");
-        System.out.println("hmx：a+1后的结果 " + hms);*//*
-        System.out.println("======================================================");
-        source.setHm("hmx", "c", 12);
-        hms = source.getHms("hmx", "a", "b", "c", "d", "a");
-        System.out.println("hmx：设置 c=12 后的结果 " + hms);
-        System.out.println("======================================================");
-        Double c = source.getHm("hmx", double.class, "c");
-        System.out.println("hmx 中 c 值：" + c);*/
-
-        /*Map<String, Object> hmx = source.getHmall("hmx");
-        System.out.println("Hmall：" + hmx);*/
-
-
-
-
-        /*AnyValue.DefaultAnyValue conf = new AnyValue.DefaultAnyValue();
-        conf.addValue("node", new AnyValue.DefaultAnyValue().addValue("addr", "47.111.150.118").addValue("port", "6064").addValue("password", "*Zhong9307!").addValue("db", 2));
-
-        source.defaultConvert = JsonFactory.root().getConvert();
-        source.initValueType(String.class); //value用String类型
-        source.init(conf);*/
-    }
-
-    public static void main(String[] args) {
-
-
-        //source.setLong("a", 125);
-
-        /*long a = source.getLong("a", 0);
-        System.out.println(a);
-
-        List<String> keys = source.keys("farm*");
-        keys.forEach(x -> System.out.println(x));
-
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }*/
-
-
-        // ===========================================
-        //System.out.println(source.remove("a", "b"));
-
-        // bit
-        /*source.initValueType(Integer.class);
-        source.remove("a");
-        boolean a = source.getBit("a", 1);
-        System.out.println(a);
-
-        source.setBit("a", 1, true);
-        a = source.getBit("a", 1);
-        System.out.println("bit-a-1: " + a);
-
-        source.setBit("a", 1, false);
-        a = source.getBit("a", 1);
-        System.out.println("bit-a-1: " + a);*/
-
-        /*source.remove("a");
-
-        // setnx
-        System.out.println(source.setnx("a", 1));
-        source.remove("a");
-        System.out.println(source.setnx("a", 1));
-
-        // set
-        source.remove("abx1");
-        source.appendSetItems("abx1", "a", "b", "c");
-        List<String> list = source.srandomItems("abx1", 2);
-        String str = source.srandomItem("abx1"); //r
-        System.out.println(list);//[r1, r2]  */
-
-        /*int[] arr = {0};
-        ExecutorService executor = Executors.newFixedThreadPool(10);
-        CountDownLatch latch = new CountDownLatch(10_0000);
-        for (int i = 0; i < 10_0000; i++) {
-            executor.submit(() -> {
-                try {
-                    source.lock("a", 50000);
-                    arr[0]++;
-                    System.out.println("Thread: " + Thread.currentThread().getName());
-                    Thread.sleep(2000);
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-                } finally {
-                    source.unlock("a");
-                    latch.countDown();
-                }
-            });
-        }
-        try {
-            latch.await();
-            System.out.println("n=" + arr[0]);
-            executor.shutdown();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }*/
-
-
-        /*List<String> list = (List) source.getCollection("gamerank-comment-stat");
-        System.out.println(list);*/
-
-        /*for (int i = 0; i < 10; i++) {
-            String brpop = source.brpop("z", 2);
-            System.out.println(brpop);
-        }*/
-
-        // key 测试
-        /*source.set("a", "123321");
-        System.out.println(source.get("a")); // 123321
-        System.out.println(source.getTtl("a")); // -1
-        System.out.println(source.getPttl("a")); // -1
-        System.out.println(source.getPttl("x")); // -2*/
-
-        // hashmap 测试
-        /*source.remove("sk");
-        source.setHm("sk", "a", "1");
-        source.setHm("sk", "b", "2");
-        System.out.println(source.getHm("sk", "a")); // 1
-        source.remove("sk");
-
-        source.setHms("sk", Map.of("b", "5", "c", "3", "a", "1"));
-        source.hdel("sk", "a");
-
-        Map map = source.getHms("sk", "a", "x", "b", "c", "f"); //  {b=5, c=3}
-        System.out.println(map);
-        System.out.println(source.getHmall("sk")); //{b=5, c=3}
-        System.out.println(source.incrHm("sk", "b", 1.1d)); // b = 6.1
-        System.out.println(source.incrHm("sk", "c", 1)); // c = 4
-        System.out.println(source.getHmall("sk")); //{b=6.1, c=4}
-
-        System.out.println("--------------");
-        System.out.println(source.hexists("sk", "b")); // true
-        System.out.println(source.getCollectionSize("sk")); // 2*/
-
-
-        /*Map<String, String> hms = source.getHms("supportusers", "5-kfeu0f", "xxxx", "3-0kbt7u8t", "95q- ");
-        hms.forEach((k, v) -> {
-            System.out.println(k + " : " + v);
-        });*/
-
-
-        /*MyRedisCacheSource<String> source2 = new MyRedisCacheSource();
-        source2.defaultConvert = JsonFactory.root().getConvert();
-        source2.initValueType(String.class); //value用String类型
-        source2.init(conf);*/
-
-        /*Map<String, String> gcMap = source.getHmall("hot-gamecomment");
-        gcMap.forEach((k,v) -> {
-            System.out.println(k + " : " + v);
-        });*/
-
-
-        //Map<String, String> gameinfo = source.getHms("gameinfo", "22759", "22838", "10097", "22751", "22632", "22711", "22195", "15821", "10099", "16313", "11345", "10534", "22768", "22647", "22924", "18461", "15871", "17099", "22640", "22644", "10744", "10264", "18032", "22815", "13584", "10031", "22818", "22452", "22810", "10513", "10557", "15848", "11923", "15920", "22808", "20073", "22809", "15840", "12332", "15803", "10597", "22624", "17113", "19578", "22664", "22621", "20722", "16226", "10523", "12304", "10597","11923","10031");
-        //Map<String, String> gameinfo = source.getHms("gameinfo", "22759","22838","10097","22751","22632","22711","22195","15821","10099","16313","11345","10534","22768","22647","22924","18461","15871","17099","22363","22640","22644","10744","10264","18032","22815","13584","22818","22452","22810","10513","10557","15848","15920","22808","20073","22809","15840","12332","15803","10597","22624","17113","19578","22627","22664","22621","20722","16226","10523","12304");
-
-        /*gameinfo.forEach((k,v ) -> {
-            System.out.println(v);
-        });*/
-
-
-        /*source.queryKeysStartsWith("articlebean:").forEach(x -> {
-            System.out.println(x);
-            //source.remove(x);
-            //System.out.println(source.getHmall(x));
-        });*/
-
-        // list 测试
-        /*MyRedisCacheSource<Integer> sourceInt = new MyRedisCacheSource();
-        sourceInt.defaultConvert = JsonFactory.root().getConvert();
-        sourceInt.initValueType(Integer.class); //value用String类型
-        sourceInt.init(conf);
-        sourceInt.remove("list");
-        Collection<Integer> list = sourceInt.getCollection("list");
-        System.out.println(list);
-        for (int i = 1; i <= 10; i++) {
-            sourceInt.appendListItem("list", i);
-        }
-        System.out.println(sourceInt.getCollection("list")); // [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-
-        sourceInt.appendListItems("list", 11, 12, 13);
-        System.out.println(sourceInt.getCollection("list")); // [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
-        System.out.println(sourceInt.getCollection("list", 0, 5)); // [1, 2, 3, 4, 5]
-        System.out.println(sourceInt.getCollectionSize("list")); // 13
-
-        List<Integer> ids = new ArrayList<>(100);
-        for (int i = 0; i < 5000; i++) {
-            ids.add(i);
-        }
-        sourceInt.remove("abx");
-        sourceInt.appendListItems("abx", ids.toArray(Integer[]::new));
-        System.out.println(sourceInt.getCollection("abx"));*/
-
-        /*System.out.println(sourceInt.getCollectionSize("recommend-user-quality"));
-        Collection<Integer> uid = sourceInt.getCollection("recommend-user-quality");
-        System.out.println(uid);*/
-
-        // zset 测试
-        /*source.initValueType(String.class); //value用Integer类型
-        source.remove("zx");
-        source.zadd("zx", Map.of("a", 1, "b", 2));
-
-        source.zadd("zx", Map.of("a", 1, "c", 5L));
-        source.zadd("zx", Map.of("x", 20, "j", 3.5));
-        source.zadd("zx", Map.of("f", System.currentTimeMillis(), "c", 5L));
-        source.zadd("zx", Map.of("a", 1, "c", 5L));
-
-        System.out.println(source.zincr("zx", "a", 1.34)); // 2.34
-        System.out.println(source.getZsetDoubleScore("zx")); // {f=1592924555704, x=20, c=5, j=3, b=2.34, a=1}
-        source.zrem("zx", "b", "c", "e", "x");
-        System.out.println(source.getZsetLongScore("zx")); // {f=1592924555704, j=3, a=2}
-
-        System.out.println("--------------");
-        System.out.println(source.getZsetLongScore("zx", "f"));
-
-        System.out.println(source.getZrevrank("zx", "f")); // 0
-        System.out.println(source.getZrank("zx", "f")); // 2
-        System.out.println(source.getZrank("zx", "Y")); // -1
-        System.out.println(source.getCollectionSize("zx")); // 3
-
-        System.out.println(source.getZset("zx"));
-        System.out.println(source.zexists("zx", "f", "x", "a"));*/
-
-        /*LocalDate date = LocalDate.of(2019, 12, 31);
-        for (int i = 0; i < 60; i++) {
-            LocalDate localDate = date.plusDays(-i);
-            String day = localDate.format(DateTimeFormatter.ISO_LOCAL_DATE);
-            System.out.println(String.format("mkdir %s; mv *%s*.zip %s", day, day, day));
-        }*/
-
-
-        /*MyRedisCacheSource<UserDetail> source = new MyRedisCacheSource();
-        source.defaultConvert = JsonFactory.root().getConvert();
-        source.initValueType(UserDetail.class);
-        source.init(conf);
-
-
-        Map<String, UserDetail> map = source.getHmall("user-detail");
-
-        Integer[] array = map.values().stream().map(x -> x.getUserid()).toArray(Integer[]::new);
-
-        System.out.println(JsonConvert.root().convertTo(array));
-
-        Map<Integer, UserDetail> hms = source.getHms("user-detail", 11746, 11988, 11504, 11987, 11745, 11503, 11748, 11506, 11747, 11989, 11505, 11508, 11507, 11509, 11980, 11740, 11982, 11981, 11984, 11742, 11500, 11983, 11741, 11502, 11744, 11986, 11985, 11501, 11743, 11999, 11757, 11515, 1, 11514, 11998, 11756, 2, 11517, 11516, 11758, 3, 11519, 4, 5, 11518, 6, 7, 11991, 8, 11990, 9, 11993, 11751, 11750, 11992, 11753, 11511, 11995, 11994, 11510, 11752, 11755, 11513, 11997, 11512, 11996, 11754, 11724, 11966, 11965, 11723, 11968, 11726, 11967, 11725, 11728, 11969, 11727, 11729, 11960, 11720, 11962, 11961, 11722, 11964, 11721);
-
-        System.out.println(hms.size());*/
-
-        /*source.getCollection("article-comment-list", 19, 1).forEach(x -> System.out.println(x));
-
-
-        while (true) {
-            System.out.println("---" + Utility.now() + "---");
-            source.getHmall("ck").forEach((k, v) -> {
-                System.out.println(k + ":" + v);
-            });
-            try {
-                Thread.sleep(60 * 1000);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }*/
-    }
-}

src/main/java/net/tccn/ZhubAgentProvider.java

@@ -1,69 +0,0 @@
-package net.tccn;
-
-import org.redkale.boot.Application;
-import org.redkale.boot.NodeServer;
-import org.redkale.cluster.CacheClusterAgent;
-import org.redkale.cluster.ClusterAgent;
-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;
-
-public abstract class ZhubAgentProvider extends ClusterAgent {
-
-    @Override
-    public void onResourceChange(ResourceEvent[] events) {
-
-    }
-
-    @Override
-    public void register(Application application) {
-
-    }
-
-    @Override
-    public void deregister(Application application) {
-
-    }
-
-    @Override
-    public CompletableFuture<Map<String, Set<InetSocketAddress>>> queryMqtpAddress(String protocol, String module, String resname) {
-        return null;
-    }
-
-    @Override
-    public CompletableFuture<Set<InetSocketAddress>> queryHttpAddress(String protocol, String module, String resname) {
-        return null;
-    }
-
-    @Override
-    public CompletableFuture<Set<InetSocketAddress>> querySncpAddress(String protocol, String restype, String resname) {
-        return null;
-    }
-
-    @Override
-    protected CompletableFuture<Set<InetSocketAddress>> queryAddress(ClusterEntry entry) {
-        return null;
-    }
-
-    @Override
-    protected ClusterEntry register(NodeServer ns, String protocol, Service service) {
-        deregister(ns, protocol, service);
-        ClusterEntry clusterEntry = new ClusterEntry(ns, protocol, service);
-        CacheClusterAgent.AddressEntry entry = new CacheClusterAgent.AddressEntry();
-        entry.addr = clusterEntry.address;
-        entry.resname = clusterEntry.resourceName;
-        entry.nodeid = this.nodeid;
-        entry.time = System.currentTimeMillis();
-        //source.hset(clusterEntry.serviceName, clusterEntry.serviceid, CacheClusterAgent.AddressEntry.class, entry);
-        return clusterEntry;
-    }
-
-    @Override
-    protected void deregister(NodeServer ns, String protocol, Service service) {
-
-    }
-}

src/main/java/net/tccn/ZhubProvider.java

@@ -1,21 +0,0 @@
-package net.tccn;
-
-import net.tccn.zhub.ZHubClient;
-import org.redkale.annotation.Priority;
-import org.redkale.cluster.ClusterAgent;
-import org.redkale.cluster.ClusterAgentProvider;
-import org.redkale.util.AnyValue;
-
-@Priority(1)
-public class ZhubProvider implements ClusterAgentProvider {
-
-    @Override
-    public boolean acceptsConf(AnyValue config) {
-        return new ZHubClient().acceptsConf(config);
-    }
-
-    @Override
-    public ClusterAgent createInstance() {
-        return new ZHubClient();
-    }
-}

src/main/java/net/tccn/zhub/Rpc.java

@@ -1,107 +0,0 @@
-package net.tccn.zhub;
-
-import org.redkale.convert.ConvertColumn;
-import org.redkale.convert.json.JsonConvert;
-import org.redkale.service.RetResult;
-
-public class Rpc<T> {
-    private String ruk;     // request unique key:
-    private String topic;   // call topic
-    private T value;        // call paras
-
-    private RpcResult rpcResult;
-
-    public Rpc() {
-    }
-
-    protected Rpc(String appname, String ruk, String topic, Object value) {
-        this.ruk = appname + "::" + ruk;
-        this.topic = topic;
-        this.value = (T) JsonConvert.root().convertTo(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;
-    }
-
-    @ConvertColumn(ignore = true)
-    public RpcResult getRpcResult() {
-        return rpcResult;
-    }
-
-    public void setRpcResult(RpcResult rpcResult) {
-        this.rpcResult = rpcResult;
-    }
-
-    @ConvertColumn(ignore = true)
-    public String getBackTopic() {
-        return ruk.split("::")[0];
-    }
-
-    public <R> RpcResult<R> render(int retcode, String retinfo) {
-        RpcResult<R> response = new RpcResult<>();
-        response.setRuk(ruk);
-        response.setRetcode(retcode);
-        response.setRetinfo(retinfo);
-        return response;
-    }
-
-    public <R> RpcResult<R> render() {
-        RpcResult<R> response = new RpcResult<>();
-        response.setRuk(ruk);
-        return response;
-    }
-
-    public RpcResult render(RetResult result) {
-        RpcResult resp = new RpcResult<>();
-        resp.setRuk(ruk);
-        resp.setRetcode(result.getRetcode());
-        resp.setRetinfo(result.getRetinfo());
-        resp.setResult(result.getResult());
-        return resp;
-    }
-
-    public <R> RpcResult<R> render(R result) {
-        RpcResult<R> response = new RpcResult<>();
-        response.setRuk(ruk);
-        response.setResult(result);
-        return response;
-    }
-
-    public <R> RpcResult<R> retError(String retinfo) {
-        RpcResult<R> response = new RpcResult<>();
-        response.setRuk(ruk);
-        response.setRetcode(100);
-        response.setRetinfo(retinfo);
-        return response;
-    }
-
-    public <R> RpcResult<R> retError(int retcode, String retinfo) {
-        RpcResult<R> response = new RpcResult<>();
-        response.setRuk(ruk);
-        response.setRetcode(retcode);
-        response.setRetinfo(retinfo);
-        return response;
-    }
-
-}

src/main/java/org/redkalex/cache/redis/AbstractRedisSource.java

@@ -1,131 +0,0 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
-package org.redkalex.cache.redis;
-
-import org.redkale.annotation.Resource;
-import org.redkale.convert.Convert;
-import org.redkale.convert.json.JsonConvert;
-import org.redkale.source.AbstractCacheSource;
-import org.redkale.util.AnyValue;
-import org.redkale.util.RedkaleClassLoader;
-import org.redkale.util.RedkaleException;
-import org.redkale.util.ResourceFactory;
-
-import java.lang.reflect.Type;
-import java.nio.charset.StandardCharsets;
-
-/**
- * @author zhangjx
- * @since 2.8.0
- */
-public abstract class AbstractRedisSource extends AbstractCacheSource {
-
-    public static final String CACHE_SOURCE_CRYPTOR = "cryptor";
-
-    protected String name;
-
-    @Resource(required = false)
-    protected ResourceFactory resourceFactory;
-
-    @Resource(required = false)
-    protected JsonConvert defaultConvert;
-
-    @Resource(name = "$_convert", required = false)
-    protected JsonConvert convert;
-
-    protected int db;
-
-    protected RedisCryptor cryptor;
-
-    protected AnyValue config;
-
-    @Override
-    public void init(AnyValue conf) {
-        this.config = conf;
-        super.init(conf);
-        this.name = conf.getValue("name", "");
-        if (this.convert == null) this.convert = this.defaultConvert;
-        if (conf != null) {
-            String cryptStr = conf.getValue(CACHE_SOURCE_CRYPTOR, "").trim();
-            if (!cryptStr.isEmpty()) {
-                try {
-                    Class<RedisCryptor> cryptClass = (Class) getClass().getClassLoader().loadClass(cryptStr);
-                    RedkaleClassLoader.putReflectionPublicConstructors(cryptClass, cryptClass.getName());
-                    this.cryptor = cryptClass.getConstructor().newInstance();
-                } catch (ReflectiveOperationException e) {
-                    throw new RedkaleException(e);
-                }
-            }
-        }
-        if (cryptor != null) {
-            if (resourceFactory != null) {
-                resourceFactory.inject(cryptor);
-            }
-            cryptor.init(conf);
-        }
-    }
-
-    @Override
-    public void destroy(AnyValue conf) {
-        super.destroy(conf);
-        if (cryptor != null) {
-            cryptor.destroy(conf);
-        }
-    }
-
-    @Override
-    public void close() throws Exception {  //在 Application 关闭时调用
-        destroy(null);
-    }
-
-    @Override
-    public String resourceName() {
-        return name;
-    }
-
-    protected String decryptValue(String key, RedisCryptor cryptor, String value) {
-        return cryptor != null ? cryptor.decrypt(key, value) : value;
-    }
-
-    protected <T> T decryptValue(String key, RedisCryptor cryptor, Type type, byte[] bs) {
-        return decryptValue(key, cryptor, convert, type, bs);
-    }
-
-    protected <T> T decryptValue(String key, RedisCryptor cryptor, Convert c, Type type, byte[] bs) {
-        if (bs == null) return null;
-        if (type == byte[].class) return (T) bs;
-        if (cryptor == null || (type instanceof Class && (((Class) type).isPrimitive() || Number.class.isAssignableFrom((Class) type)))) {
-            return (T) (c == null ? this.convert : c).convertFrom(type, bs);
-        }
-        String deval = cryptor.decrypt(key, new String(bs, StandardCharsets.UTF_8));
-        return deval == null ? null : (T) (c == null ? this.convert : c).convertFrom(type, deval.getBytes(StandardCharsets.UTF_8));
-    }
-
-    protected String encryptValue(String key, RedisCryptor cryptor, String value) {
-        return cryptor != null ? cryptor.encrypt(key, value) : value;
-    }
-
-    protected <T> byte[] encryptValue(String key, RedisCryptor cryptor, Convert c, T value) {
-        return encryptValue(key, cryptor, null, c, value);
-    }
-
-    protected <T> byte[] encryptValue(String key, RedisCryptor cryptor, Type type, Convert c, T value) {
-        if (value == null) return null;
-        Type t = type == null ? value.getClass() : type;
-        if (cryptor == null && type == String.class) {
-            return value.toString().getBytes(StandardCharsets.UTF_8);
-        }
-        return encryptValue(key, cryptor, t, (c == null ? this.convert : c).convertToBytes(t, value));
-    }
-
-    protected byte[] encryptValue(String key, RedisCryptor cryptor, Type type, byte[] bs) {
-        if (bs == null) return null;
-        if (cryptor == null || (type instanceof Class && (((Class) type).isPrimitive() || Number.class.isAssignableFrom((Class) type)))) {
-            return bs;
-        }
-        String enval = cryptor.encrypt(key, new String(bs, StandardCharsets.UTF_8));
-        return enval == null ? null : enval.getBytes(StandardCharsets.UTF_8);
-    }
-}

src/main/java/org/redkalex/cache/redis/MyRedisCacheSource.java

@@ -1,343 +0,0 @@
-package org.redkalex.cache.redis;
-
-import org.redkale.annotation.AutoLoad;
-import org.redkale.annotation.ResourceType;
-import org.redkale.service.Local;
-import org.redkale.source.CacheSource;
-import org.redkale.util.AnyValue;
-
-import java.io.Serializable;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-
-@Local
-@AutoLoad(false)
-@ResourceType(CacheSource.class)
-public class MyRedisCacheSource extends RedisCacheSource {
-
-    @Override
-    public void init(AnyValue conf) {
-        super.init(conf);
-    }
-/*
-//--------------------- zset ------------------------------
-
-    public int getZrank(String key, V v) {
-        byte[][] bytes = Stream.of(key, v).map(x -> String.valueOf(x).getBytes(StandardCharsets.UTF_8)).toArray(byte[][]::new);
-        Long t = (Long) send("ZRANK", CacheEntryType.OBJECT, (Type) null, key, bytes).join();
-
-        return t == null ? -1 : (int) (long) t;
-    }
-
-    public int getZrevrank(String key, V v) {
-        byte[][] bytes = Stream.of(key, v).map(x -> String.valueOf(x).getBytes(StandardCharsets.UTF_8)).toArray(byte[][]::new);
-        Long t = (Long) send("ZREVRANK", CacheEntryType.OBJECT, (Type) null, key, bytes).join();
-
-        return t == null ? -1 : (int) (long) t;
-    }
-
-    //ZRANGE/ZREVRANGE key start stop
-    public List<V> getZset(String key) {
-        byte[][] bytes = Stream.of(key, 0, -1).map(x -> String.valueOf(x).getBytes(StandardCharsets.UTF_8)).toArray(byte[][]::new);
-        List<V> vs = (List<V>) send("ZREVRANGE", CacheEntryType.OBJECT, (Type) null, key, bytes).join();
-        List<V> vs2 = new ArrayList(vs.size());
-
-        for (int i = 0; i < vs.size(); ++i) {
-            if (i % 2 == 1) {
-                vs2.add(this.convert.convertFrom(this.objValueType, String.valueOf(vs.get(i))));
-            } else {
-                vs2.add(vs.get(i));
-            }
-        }
-
-        return vs2;
-    }
-
-    public List<V> getZset(String key, int offset, int limit) {
-        byte[][] bytes = Stream.of(key, offset, offset + limit - 1).map(x -> String.valueOf(x).getBytes(StandardCharsets.UTF_8)).toArray(byte[][]::new);
-        List<V> vs = (List<V>) send("ZREVRANGE", CacheEntryType.OBJECT, (Type) null, key, bytes).join();
-        List<V> vs2 = new ArrayList(vs.size());
-
-        for (int i = 0; i < vs.size(); ++i) {
-            if (i % 2 == 1) {
-                vs2.add(this.convert.convertFrom(this.objValueType, String.valueOf(vs.get(i))));
-            } else {
-                vs2.add(vs.get(i));
-            }
-        }
-
-        return vs2;
-    }
-
-    public LinkedHashMap<V, Long> getZsetLongScore(String key) {
-        LinkedHashMap<V, Double> map = getZsetDoubleScore(key);
-        if (map.isEmpty()) {
-            return new LinkedHashMap<>();
-        }
-
-        LinkedHashMap<V, Long> map2 = new LinkedHashMap<>(map.size());
-        map.forEach((k, v) -> map2.put(k, (long) (double) v));
-        return map2;
-    }
-
-    public LinkedHashMap<V, Long> getZsetItemsLongScore(String key) {
-        byte[][] bytes = Stream.of(key, 0, -1, "WITHSCORES").map(x -> String.valueOf(x).getBytes(StandardCharsets.UTF_8)).toArray(byte[][]::new);
-        List vs = (List) send("ZRANGE", CacheEntryType.OBJECT, (Type) null, key, bytes).join();
-
-        LinkedHashMap<V, Long> map = new LinkedHashMap<>();
-        for (int i = 0; i < vs.size(); i += 2) {
-            map.put((V) vs.get(i), (long) Double.parseDouble((String) vs.get(i + 1)));
-        }
-        return map;
-    }
-
-    public Long getZsetLongScore(String key, V v) {
-        Double score = getZsetDoubleScore(key, v);
-        if (score == null) {
-            return null;
-        }
-        return (long) (double) score;
-    }
-
-    public LinkedHashMap<V, Double> getZsetDoubleScore(String key) {
-        byte[][] bytes = Stream.of(key, 0, -1, "WITHSCORES").map(x -> String.valueOf(x).getBytes(StandardCharsets.UTF_8)).toArray(byte[][]::new);
-        List vs = (List) send("ZREVRANGE", CacheEntryType.OBJECT, (Type) null, key, bytes).join();
-
-        LinkedHashMap<V, Double> map = new LinkedHashMap<>();
-        for (int i = 0; i < vs.size(); i += 2) {
-            map.put((V) vs.get(i), Double.parseDouble((String) vs.get(i + 1)));
-        }
-        return map;
-    }
-
-    public Double getZsetDoubleScore(String key, V v) {
-        byte[][] bytes = Stream.of(key, v).map(x -> String.valueOf(x).getBytes(StandardCharsets.UTF_8)).toArray(byte[][]::new);
-        Serializable zscore = send("ZSCORE", CacheEntryType.OBJECT, (Type) null, key, bytes).join();
-        if (zscore == null) {
-            return null;
-        }
-
-        return Double.parseDouble(String.valueOf(zscore));
-    }
-
-    public LinkedHashMap<V, Long> getZsetLongScore(String key, int offset, int limit) {
-        byte[][] bytes = Stream.of(key, offset, offset + limit - 1, "WITHSCORES").map(x -> String.valueOf(x).getBytes(StandardCharsets.UTF_8)).toArray(byte[][]::new);
-        List vs = (List) send("ZREVRANGE", CacheEntryType.OBJECT, (Type) null, key, bytes).join();
-
-        LinkedHashMap<V, Long> map = new LinkedHashMap<>();
-        for (int i = 0; i < vs.size(); i += 2) {
-            map.put((V) vs.get(i), (long) Double.parseDouble((String) vs.get(i + 1)));
-        }
-        return map;
-    }
-
-    public LinkedHashMap<V, Double> getZsetDoubleScore(String key, int offset, int limit) {
-        byte[][] bytes = Stream.of(key, offset, offset + limit - 1, "WITHSCORES").map(x -> String.valueOf(x).getBytes(StandardCharsets.UTF_8)).toArray(byte[][]::new);
-        List vs = (List) send("ZREVRANGE", CacheEntryType.OBJECT, (Type) null, key, bytes).join();
-
-        LinkedHashMap<V, Double> map = new LinkedHashMap<>();
-        for (int i = 0; i < vs.size(); i += 2) {
-            map.put((V) vs.get(i), Double.parseDouble(vs.get(i + 1) + ""));
-        }
-        return map;
-    }
-* */
-
-    // --------------------
-    public <N extends Number> void zadd(String key, Map<Serializable, N> kv) {
-        if (kv == null || kv.isEmpty()) {
-            return;
-        }
-        List<Serializable> args = new ArrayList();
-        kv.forEach((k, v) -> {
-            args.add(k);
-            args.add(v);
-        });
-
-        sendAsync("ZADD", key, args.toArray(Serializable[]::new)).join();
-    }
-
-    public <N extends Number> double zincr(String key, Serializable number, N n) {
-        return sendAsync("ZINCRBY", key, number, n).thenApply(x -> x.getDoubleValue(0d)).join();
-    }
-
-    public void zrem(String key, Serializable... vs) {
-        sendAsync("ZREM", key, vs).join();
-    }
-
-    /*public <T> List<T> zexists(String key, T... fields) {
-        if (fields == null || fields.length == 0) {
-            return new ArrayList<>();
-        }
-        List<String> para = new ArrayList<>();
-        para.add("" +
-                "   local key = KEYS[1];" +
-                "    local args = ARGV;" +
-                "    local result = {};" +
-                "    for i,v in ipairs(args) do" +
-                "        local inx = redis.call('ZREVRANK', key, v);" +
-                "        if(inx) then" +
-                "             table.insert(result,1,v);" +
-                "        end" +
-                "    end" +
-                "    return result;");
-        para.add("1");
-        para.add(key);
-        for (Object field : fields) {
-            para.add(String.valueOf(field));
-        }
-
-        // todo:
-        //sendAsync("EVAL", null, para.toArray(Serializable[]::new)).thenApply(x -> x.).join();
-
-        return null;
-    }*/
-
-    //--------------------- bit ------------------------------
-    public boolean getBit(String key, int offset) {
-        return sendAsync("GETBIT", key, key.getBytes(StandardCharsets.UTF_8), String.valueOf(offset).getBytes(StandardCharsets.UTF_8)).thenApply(v -> v.getIntValue(0) > 0).join();
-    }
-
-    public void setBit(String key, int offset, boolean bool) {
-        sendAsync("SETBIT", key, offset, bool ? 1 : 0).join();
-    }
-    //--------------------- bit ------------------------------
-
-    //--------------------- lock ------------------------------
-    // 尝试加锁，成功返回0，否则返回上一锁剩余毫秒值
-    public long tryLock(String key, int millis) {
-        Serializable[] obj = {"" +
-                "if (redis.call('EXISTS',KEYS[1]) == 0) then " +
-                "redis.call('PSETEX',KEYS[1],ARGV[1],1); " +
-                "return 0; " +
-                "else " +
-                "return redis.call('PTTL',KEYS[1]); " +
-                "end;", 1, key, millis
-        };
-
-        return sendAsync("EVAL", null, obj).thenApply(v -> v.getIntValue(1)).join();
-    }
-
-    // 加锁
-    public void lock(String key, int millis) {
-        long i;
-        do {
-            i = tryLock(key, millis);
-            try {
-                Thread.sleep(10);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        } while (i > 0);
-    }
-
-    // 解锁
-    public void unlock(String key) {
-        remove(key);
-    }
-
-    //--------------------- key ------------------------------
-
-    public String get(String key) {
-        return get(key, String.class);
-    }
-
-    public void set(String key, Serializable value) {
-        sendAsync("SET", key, value).join();
-    }
-
-    //--------------------- set ------------------------------
-    public <T> void sadd(String key, Collection<T> args) {
-        saddAsync(key, args.toArray(Serializable[]::new)).join();
-    }
-
-    public void sadd(String key, Serializable... args) {
-        saddAsync(key, Arrays.stream(args).toArray(Serializable[]::new)).join();
-    }
-
-    public void srem(String key, Serializable... args) {
-        sremAsync(key, args).join();
-    }
-
-    public CompletableFuture<RedisCacheResult> saddAsync(String key, Serializable... args) {
-        return sendAsync("SADD", key, args);
-    }
-
-    public CompletableFuture<RedisCacheResult> sremAsync(String key, Serializable... args) {
-        return sendAsync("SREM", key, args);
-    }
-
-    //--------------------- hm ------------------------------
-
-    /*public Long incrHm(String key, String field, int value) {
-        return sendAsync("HINCRBY", key, field, value).thenApply(x -> x.getLongValue(0l)).join();
-    }
-
-    public Double incrHm(String key, String field, double value) {
-        return sendAsync("HINCRBYFLOAT", key, field, value).thenApply(x -> x.getDoubleValue(0d)).join();
-    }*/
-
-    public void setHm(String key, String field, Serializable value) {
-        setHmsAsync(key, Map.of(field, value)).join();
-    }
-
-    public void setHms(String key, Map kv) {
-        setHmsAsync(key, kv).join();
-    }
-
-    public CompletableFuture<RedisCacheResult> setHmsAsync(String key, Map<Serializable, Serializable> kv) {
-        List<Serializable> args = new ArrayList();
-        kv.forEach((k, v) -> {
-            args.add(k);
-            args.add(v);
-        });
-
-        return sendAsync("HMSET", key, args.toArray(Serializable[]::new));
-    }
-
-    public String getHm(String key, String field) {
-        return getHm(key, String.class, field);
-    }
-
-    public <T extends Serializable> T getHm(String key, Class<T> type, String field) {
-        List<Serializable> list = super.hmget(key, type, field);
-        if (list == null && list.isEmpty()) {
-            return null;
-        }
-        return (T) list.get(0);
-    }
-
-    public Map<String, String> getHms(String key, String... field) {
-        return getHms(key, String.class, field);
-    }
-
-    public <T extends Serializable> Map<String, T> getHms(String key, Class<T> type, String... field) {
-        List<Serializable> list = super.hmget(key, type, field);
-        if (list == null && list.isEmpty()) {
-            return null;
-        }
-        Map<String, T> map = new HashMap<>(field.length);
-
-        for (int i = 0; i < field.length; i++) {
-            if (list.get(i) == null) {
-                continue;
-            }
-            map.put(field[i], (T) list.get(i));
-        }
-        return map;
-    }
-
-    /*public Map<String, Object> getHmall(String key) {
-        List<String> list = null;  // TODO:
-        Map<String, Object> map = new HashMap<>();
-        if (list.isEmpty()) {
-            return map;
-        }
-
-        for (int i = 0; i + 1 < list.size(); i += 2) {
-            map.put((String) list.get(i), list.get(i + 1));
-        }
-        return map;
-    }*/
-}

src/main/java/org/redkalex/cache/redis/RedisCRC16.java

@@ -1,78 +0,0 @@
-/*
- *
- */
-package org.redkalex.cache.redis;
-
-import org.redkale.util.Utility;
-
-import java.util.Arrays;
-
-/**
- * @author zhangjx
- */
-public class RedisCRC16 {
-
-    private static final int[] LOOKUP_TABLE = {0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6,
-            0x70E7, 0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF, 0x1231, 0x0210, 0x3273,
-            0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6, 0x9339, 0x8318, 0xB37B, 0xA35A, 0xD3BD, 0xC39C, 0xF3FF,
-            0xE3DE, 0x2462, 0x3443, 0x0420, 0x1401, 0x64E6, 0x74C7, 0x44A4, 0x5485, 0xA56A, 0xB54B, 0x8528,
-            0x9509, 0xE5EE, 0xF5CF, 0xC5AC, 0xD58D, 0x3653, 0x2672, 0x1611, 0x0630, 0x76D7, 0x66F6, 0x5695,
-            0x46B4, 0xB75B, 0xA77A, 0x9719, 0x8738, 0xF7DF, 0xE7FE, 0xD79D, 0xC7BC, 0x48C4, 0x58E5, 0x6886,
-            0x78A7, 0x0840, 0x1861, 0x2802, 0x3823, 0xC9CC, 0xD9ED, 0xE98E, 0xF9AF, 0x8948, 0x9969, 0xA90A,
-            0xB92B, 0x5AF5, 0x4AD4, 0x7AB7, 0x6A96, 0x1A71, 0x0A50, 0x3A33, 0x2A12, 0xDBFD, 0xCBDC, 0xFBBF,
-            0xEB9E, 0x9B79, 0x8B58, 0xBB3B, 0xAB1A, 0x6CA6, 0x7C87, 0x4CE4, 0x5CC5, 0x2C22, 0x3C03, 0x0C60,
-            0x1C41, 0xEDAE, 0xFD8F, 0xCDEC, 0xDDCD, 0xAD2A, 0xBD0B, 0x8D68, 0x9D49, 0x7E97, 0x6EB6, 0x5ED5,
-            0x4EF4, 0x3E13, 0x2E32, 0x1E51, 0x0E70, 0xFF9F, 0xEFBE, 0xDFDD, 0xCFFC, 0xBF1B, 0xAF3A, 0x9F59,
-            0x8F78, 0x9188, 0x81A9, 0xB1CA, 0xA1EB, 0xD10C, 0xC12D, 0xF14E, 0xE16F, 0x1080, 0x00A1, 0x30C2,
-            0x20E3, 0x5004, 0x4025, 0x7046, 0x6067, 0x83B9, 0x9398, 0xA3FB, 0xB3DA, 0xC33D, 0xD31C, 0xE37F,
-            0xF35E, 0x02B1, 0x1290, 0x22F3, 0x32D2, 0x4235, 0x5214, 0x6277, 0x7256, 0xB5EA, 0xA5CB, 0x95A8,
-            0x8589, 0xF56E, 0xE54F, 0xD52C, 0xC50D, 0x34E2, 0x24C3, 0x14A0, 0x0481, 0x7466, 0x6447, 0x5424,
-            0x4405, 0xA7DB, 0xB7FA, 0x8799, 0x97B8, 0xE75F, 0xF77E, 0xC71D, 0xD73C, 0x26D3, 0x36F2, 0x0691,
-            0x16B0, 0x6657, 0x7676, 0x4615, 0x5634, 0xD94C, 0xC96D, 0xF90E, 0xE92F, 0x99C8, 0x89E9, 0xB98A,
-            0xA9AB, 0x5844, 0x4865, 0x7806, 0x6827, 0x18C0, 0x08E1, 0x3882, 0x28A3, 0xCB7D, 0xDB5C, 0xEB3F,
-            0xFB1E, 0x8BF9, 0x9BD8, 0xABBB, 0xBB9A, 0x4A75, 0x5A54, 0x6A37, 0x7A16, 0x0AF1, 0x1AD0, 0x2AB3,
-            0x3A92, 0xFD2E, 0xED0F, 0xDD6C, 0xCD4D, 0xBDAA, 0xAD8B, 0x9DE8, 0x8DC9, 0x7C26, 0x6C07, 0x5C64,
-            0x4C45, 0x3CA2, 0x2C83, 0x1CE0, 0x0CC1, 0xEF1F, 0xFF3E, 0xCF5D, 0xDF7C, 0xAF9B, 0xBFBA, 0x8FD9,
-            0x9FF8, 0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0};
-
-    private RedisCRC16() {
-    }
-
-    public static int crc16(byte[] bytes) {
-        int crc = 0x0000;
-        for (byte b : bytes) {
-            crc = (crc << 8) ^ LOOKUP_TABLE[((crc >>> 8) ^ (b & 0xFF)) & 0xFF];
-        }
-        return crc & 0xFFFF;
-    }
-
-    public static int calcSlot(int maxSlot, byte[] key) {
-        if (key == null) {
-            return 0;
-        }
-        int start = Utility.indexOf(key, (byte) '{');
-        if (start != -1) {
-            int end = Utility.indexOf(key, start + 1, (byte) '}');
-            if (end != -1) {
-                key = Arrays.copyOfRange(key, start + 1, end);
-            }
-        }
-        int result = crc16(key) % maxSlot;
-        return result;
-    }
-
-    public static int calcSlot(int maxSlot, String key) {
-        if (key == null) {
-            return 0;
-        }
-        int start = key.indexOf('{');
-        if (start != -1) {
-            int end = key.indexOf('}');
-            if (end != -1 && start + 1 < end) {
-                key = key.substring(start + 1, end);
-            }
-        }
-        int result = crc16(key.getBytes()) % maxSlot;
-        return result;
-    }
-}

src/main/java/org/redkalex/cache/redis/RedisCacheClient.java

@@ -1,36 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.redkalex.cache.redis;
-
-import org.redkale.net.AsyncConnection;
-import org.redkale.net.AsyncGroup;
-import org.redkale.net.client.Client;
-import org.redkale.net.client.ClientAddress;
-
-/**
- * @author zhangjx
- */
-public class RedisCacheClient extends Client<RedisCacheConnection, RedisCacheRequest, RedisCacheResult> {
-
-    public RedisCacheClient(String name, AsyncGroup group, String key, ClientAddress address, int maxConns, int maxPipelines, RedisCacheReqAuth authReq, RedisCacheReqDB dbReq) {
-        super(name, group, true, address, maxConns, maxPipelines, () -> new RedisCacheReqPing(), () -> new RedisCacheReqClose(), null); //maxConns
-        if (authReq != null || dbReq != null) {
-            if (authReq != null && dbReq != null) {
-                this.authenticate = conn -> writeChannel(conn, authReq).thenCompose(v -> writeChannel(conn, dbReq)).thenApply(v -> conn);
-            } else if (authReq != null) {
-                this.authenticate = conn -> writeChannel(conn, authReq).thenApply(v -> conn);
-            } else {
-                this.authenticate = conn -> writeChannel(conn, dbReq).thenApply(v -> conn);
-            }
-        }
-    }
-
-    @Override
-    protected RedisCacheConnection createClientConnection(final int index, AsyncConnection channel) {
-        return new RedisCacheConnection(this, index, channel);
-    }
-
-}

src/main/java/org/redkalex/cache/redis/RedisCacheCodec.java

@@ -1,249 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.redkalex.cache.redis;
-
-import org.redkale.net.client.ClientCodec;
-import org.redkale.net.client.ClientConnection;
-import org.redkale.util.ByteArray;
-
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-/**
- * @author zhangjx
- */
-public class RedisCacheCodec extends ClientCodec<RedisCacheRequest, RedisCacheResult> {
-
-    protected static final byte TYPE_STRING = '+';  //简单字符串(不包含CRLF)类型
-
-    protected static final byte TYPE_ERROR = '-'; //错误(不包含CRLF)类型
-
-    protected static final byte TYPE_NUMBER = ':'; //整型
-
-    protected static final byte TYPE_BULK = '$';  //块字符串
-
-    protected static final byte TYPE_ARRAY = '*'; //数组
-
-    protected static final Logger logger = Logger.getLogger(RedisCacheCodec.class.getSimpleName());
-
-    protected byte halfFrameCmd;
-
-    protected int halfFrameBulkLength = -10;
-
-    protected int halfFrameArraySize = -10;
-
-    protected int halfFrameArrayIndex; //从0开始
-
-    protected int halfFrameArrayItemLength = -10;
-
-    protected ByteArray halfFrameBytes;
-
-    protected byte frameType;
-
-    protected byte[] frameValue;  //(不包含CRLF)
-
-    protected List<byte[]> frameList;  //(不包含CRLF)
-
-    private ByteArray recyclableArray;
-
-    public RedisCacheCodec(ClientConnection connection) {
-        super(connection);
-    }
-
-    protected ByteArray pollArray(ByteArray array) {
-        if (recyclableArray == null) {
-            recyclableArray = new ByteArray();
-        } else {
-            recyclableArray.clear();
-        }
-        recyclableArray.clear();
-        if (array != null) {
-            recyclableArray.put(array, 0, array.length());
-        }
-        return recyclableArray;
-    }
-
-    private boolean checkBytesFrame(RedisCacheConnection conn, ByteBuffer buffer, ByteArray array) {
-//        byte[] dbs = new byte[buffer.remaining()];
-//        for (int i = 0; i < dbs.length; i++) {
-//            dbs[i] = buffer.get(buffer.position() + i);
-//        }
-//        ArrayDeque<ClientFuture> deque = (ArrayDeque) responseQueue(conn);
-//        logger.log(Level.FINEST, "[" + Utility.nowMillis() + "] [" + Thread.currentThread().getName() + "]: " + conn + ", 原始数据: " + new String(dbs).replace("\r\n", "  ") + ", req=" + deque.getFirst().getRequest());
-
-        array.clear();
-        byte type = halfFrameCmd == 0 ? buffer.get() : halfFrameCmd;
-        if (halfFrameBytes != null) {
-            array.put(halfFrameBytes, 0, halfFrameBytes.length());
-        }
-        frameType = type;
-        if (type == TYPE_STRING || type == TYPE_ERROR || type == TYPE_NUMBER) {
-            if (readComplete(buffer, array)) {
-                frameValue = array.getBytes();
-            } else {
-                halfFrameCmd = type;
-                halfFrameBytes = pollArray(array);
-                return false;
-            }
-        } else if (type == TYPE_BULK) {
-            int bulkLength = halfFrameBulkLength;
-            if (bulkLength < -2) {
-                if (!readComplete(buffer, array)) { //没有读到bulkLength
-                    halfFrameCmd = type;
-                    halfFrameBulkLength = -10;
-                    halfFrameBytes = pollArray(array);
-                    return false;
-                }
-                bulkLength = Integer.parseInt(array.toString(StandardCharsets.UTF_8));
-                array.clear();
-            }
-            if (bulkLength == -1) {
-                frameValue = null;
-            } else if (readComplete(buffer, array)) {
-                frameValue = array.getBytes();
-            } else {
-                halfFrameCmd = type;
-                halfFrameBulkLength = bulkLength;
-                halfFrameBytes = pollArray(array);
-                return false;
-            }
-        } else if (type == TYPE_ARRAY) {
-            int arraySize = halfFrameArraySize;
-            if (arraySize < -2) {
-                if (!readComplete(buffer, array)) { //没有读到arraySize
-                    halfFrameCmd = type;
-                    halfFrameArraySize = -10;
-                    halfFrameArrayIndex = 0;
-                    halfFrameArrayItemLength = -10;
-                    halfFrameBytes = pollArray(array);
-                    return false;
-                }
-                arraySize = Integer.parseInt(array.toString(StandardCharsets.UTF_8));
-                array.clear();
-            }
-            int arrayIndex = halfFrameArrayIndex;
-            for (int i = arrayIndex; i < arraySize; i++) {
-                int itemLength = halfFrameArrayItemLength;
-                halfFrameArrayItemLength = -10;
-                if (itemLength < -2) {
-                    if (!readComplete(buffer, array)) { //没有读到bulkLength
-                        halfFrameCmd = type;
-                        halfFrameArraySize = arraySize;
-                        halfFrameArrayIndex = i;
-                        halfFrameArrayItemLength = -10;
-                        halfFrameBytes = pollArray(array);
-                        return false;
-                    }
-                    byte sign = array.get(0);
-                    itemLength = Integer.parseInt(array.toString(1, StandardCharsets.UTF_8));
-                    array.clear();
-                    if (sign == TYPE_ARRAY) { //数组中嵌套数组，目前有 HSCAN
-                        frameValue = null;
-                        if (frameList != null) {
-                            frameList.clear();
-                        }
-                        clearHalfFrame();
-                        if (itemLength == 0) {
-                            return true;
-                        }
-                        halfFrameCmd = sign;
-                        halfFrameArraySize = itemLength;
-                        if (!buffer.hasRemaining()) {
-                            return false;
-                        }
-                        return checkBytesFrame(conn, buffer, array);
-                    }
-                }
-                int cha = itemLength - array.length();
-                if (itemLength == -1) {
-                    if (frameList == null) {
-                        frameList = new ArrayList<>();
-                    }
-                    frameList.add(null);
-                    array.clear();
-                } else if (buffer.remaining() >= cha + 2) {
-                    for (int j = 0; j < cha; j++) array.put(buffer.get());
-                    buffer.get(); //\r
-                    buffer.get(); //\n
-                    if (frameList == null) {
-                        frameList = new ArrayList<>();
-                    }
-                    frameList.add(array.getBytes());
-                    array.clear();
-                } else {
-                    while (buffer.hasRemaining()) array.put(buffer.get());
-                    halfFrameCmd = type;
-                    halfFrameArraySize = arraySize;
-                    halfFrameArrayIndex = i;
-                    halfFrameArrayItemLength = itemLength;
-                    halfFrameBytes = pollArray(array);
-                    return false;
-                }
-            }
-        }
-        clearHalfFrame();
-        return true;
-    }
-
-    protected void clearHalfFrame() {
-        halfFrameCmd = 0;
-        halfFrameBulkLength = -10;
-        halfFrameArraySize = -10;
-        halfFrameArrayIndex = 0;
-        halfFrameArrayItemLength = -10;
-        halfFrameBytes = null;
-    }
-
-    @Override
-    public void decodeMessages(ByteBuffer realbuf, ByteArray array) {
-        RedisCacheConnection conn = (RedisCacheConnection) connection;
-        if (!realbuf.hasRemaining()) {
-            return;
-        }
-        ByteBuffer buffer = realbuf;
-        if (!checkBytesFrame(conn, buffer, array)) {
-            return;
-        }
-        //buffer必然包含一个完整的frame数据
-        boolean first = true;
-        RedisCacheRequest request = null;
-        while (first || buffer.hasRemaining()) {
-            if (request == null) {
-                request = nextRequest();
-            }
-            if (!first && !checkBytesFrame(conn, buffer, array)) {
-                break;
-            }
-            if (frameType == TYPE_ERROR) {
-                addMessage(request, new RuntimeException(new String(frameValue, StandardCharsets.UTF_8)));
-            } else {
-                addMessage(request, conn.pollResultSet(request).prepare(frameType, frameValue, frameList));
-            }
-            frameType = 0;
-            frameValue = null;
-            frameList = null;
-            halfFrameCmd = 0;
-            halfFrameBytes = null;
-            first = false;
-            buffer = realbuf;
-        }
-    }
-
-    protected boolean readComplete(ByteBuffer buffer, ByteArray array) {
-        while (buffer.hasRemaining()) {
-            byte b = buffer.get();
-            if (b == '\n') {
-                array.removeLastByte(); //移除 \r
-                return true;
-            }
-            array.put(b);
-        }
-        return false;
-    }
-}

src/main/java/org/redkalex/cache/redis/RedisCacheConnection.java

@@ -1,49 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.redkalex.cache.redis;
-
-import org.redkale.net.AsyncConnection;
-import org.redkale.net.WorkThread;
-import org.redkale.net.client.Client;
-import org.redkale.net.client.ClientCodec;
-import org.redkale.net.client.ClientConnection;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-
-/**
- * @author zhangjx
- */
-public class RedisCacheConnection extends ClientConnection<RedisCacheRequest, RedisCacheResult> {
-
-    public RedisCacheConnection(Client client, int index, AsyncConnection channel) {
-        super(client, index, channel);
-    }
-
-    @Override
-    protected ClientCodec createCodec() {
-        return new RedisCacheCodec(this);
-    }
-
-    protected CompletableFuture<RedisCacheResult> writeRequest(RedisCacheRequest request) {
-        return super.writeChannel(request);
-    }
-
-    protected <T> CompletableFuture<T> writeRequest(RedisCacheRequest request, Function<RedisCacheResult, T> respTransfer) {
-        return super.writeChannel(request, respTransfer);
-    }
-
-    public RedisCacheResult pollResultSet(RedisCacheRequest request) {
-        RedisCacheResult rs = new RedisCacheResult();
-        return rs;
-    }
-
-    public RedisCacheRequest pollRequest(WorkThread workThread) {
-        RedisCacheRequest rs = new RedisCacheRequest().currThread(workThread);
-        return rs;
-    }
-
-}

src/main/java/org/redkalex/cache/redis/RedisCacheReqAuth.java

@@ -1,45 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.redkalex.cache.redis;
-
-import org.redkale.net.client.ClientConnection;
-import org.redkale.util.ByteArray;
-
-import java.nio.charset.StandardCharsets;
-
-/**
- * @author zhangjx
- */
-public class RedisCacheReqAuth extends RedisCacheRequest {
-
-    private static final byte[] PS = "AUTH".getBytes(StandardCharsets.UTF_8);
-
-    protected String password;
-
-    public RedisCacheReqAuth(String password) {
-        this.password = password;
-    }
-
-    @Override
-    public void writeTo(ClientConnection conn, ByteArray writer) {
-        byte[] pwd = password.getBytes();
-        writer.put((byte) '*');
-        writer.put((byte) '2');
-        writer.put((byte) '\r', (byte) '\n');
-        writer.put((byte) '$');
-        writer.put((byte) '4');
-        writer.put((byte) '\r', (byte) '\n');
-        writer.put(PS);
-        writer.put((byte) '\r', (byte) '\n');
-
-        writer.put((byte) '$');
-        writer.put(String.valueOf(pwd.length).getBytes(StandardCharsets.UTF_8));
-        writer.put((byte) '\r', (byte) '\n');
-        writer.put(pwd);
-        writer.put((byte) '\r', (byte) '\n');
-
-    }
-}

src/main/java/org/redkalex/cache/redis/RedisCacheReqClose.java

@@ -1,36 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.redkalex.cache.redis;
-
-import org.redkale.net.client.ClientConnection;
-import org.redkale.util.ByteArray;
-
-import java.nio.charset.StandardCharsets;
-
-/**
- * @author zhangjx
- */
-public class RedisCacheReqClose extends RedisCacheRequest {
-
-    private static final byte[] PS = "QUIT".getBytes(StandardCharsets.UTF_8);
-
-    @Override
-    public final boolean isCloseType() {
-        return true;
-    }
-
-    @Override
-    public void writeTo(ClientConnection conn, ByteArray writer) {
-        writer.put((byte) '*');
-        writer.put((byte) '1');
-        writer.put((byte) '\r', (byte) '\n');
-        writer.put((byte) '$');
-        writer.put((byte) '4');
-        writer.put((byte) '\r', (byte) '\n');
-        writer.put(PS);
-        writer.put((byte) '\r', (byte) '\n');
-    }
-}

src/main/java/org/redkalex/cache/redis/RedisCacheReqDB.java

@@ -1,43 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.redkalex.cache.redis;
-
-import org.redkale.net.client.ClientConnection;
-import org.redkale.util.ByteArray;
-
-import java.nio.charset.StandardCharsets;
-
-/**
- * @author zhangjx
- */
-public class RedisCacheReqDB extends RedisCacheRequest {
-
-    protected int db;
-
-    public RedisCacheReqDB(int db) {
-        this.db = db;
-    }
-
-    @Override
-    public void writeTo(ClientConnection conn, ByteArray writer) {
-        writer.put((byte) '*');
-        writer.put((byte) '2');
-        writer.put((byte) '\r', (byte) '\n');
-        writer.put((byte) '$');
-        writer.put((byte) '6');
-        writer.put((byte) '\r', (byte) '\n');
-        writer.put("SELECT".getBytes(StandardCharsets.UTF_8));
-        writer.put((byte) '\r', (byte) '\n');
-
-        byte[] dbs = String.valueOf(db).getBytes(StandardCharsets.UTF_8);
-        writer.put((byte) '$');
-        writer.put(String.valueOf(dbs.length).getBytes(StandardCharsets.UTF_8));
-        writer.put((byte) '\r', (byte) '\n');
-        writer.put(dbs);
-        writer.put((byte) '\r', (byte) '\n');
-
-    }
-}

src/main/java/org/redkalex/cache/redis/RedisCacheReqPing.java

@@ -1,31 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.redkalex.cache.redis;
-
-import org.redkale.net.client.ClientConnection;
-import org.redkale.util.ByteArray;
-
-import java.nio.charset.StandardCharsets;
-
-/**
- * @author zhangjx
- */
-public class RedisCacheReqPing extends RedisCacheRequest {
-
-    private static final byte[] PS = "PING".getBytes(StandardCharsets.UTF_8);
-
-    @Override
-    public void writeTo(ClientConnection conn, ByteArray writer) {
-        writer.put((byte) '*');
-        writer.put((byte) '1');
-        writer.put((byte) '\r', (byte) '\n');
-        writer.put((byte) '$');
-        writer.put((byte) '4');
-        writer.put((byte) '\r', (byte) '\n');
-        writer.put(PS);
-        writer.put((byte) '\r', (byte) '\n');
-    }
-}

src/main/java/org/redkalex/cache/redis/RedisCacheRequest.java

@@ -1,61 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.redkalex.cache.redis;
-
-import org.redkale.net.client.ClientConnection;
-import org.redkale.net.client.ClientRequest;
-import org.redkale.util.ByteArray;
-
-import java.nio.charset.StandardCharsets;
-
-/**
- * @author zhangjx
- */
-public class RedisCacheRequest extends ClientRequest {
-
-    static final byte[] TRUE = new byte[]{'t'};
-
-    static final byte[] FALSE = new byte[]{'f'};
-
-    protected String key;
-
-    protected String command;
-
-    protected byte[][] args;
-
-    public <T> RedisCacheRequest prepare(String command, String key, byte[]... args) {
-        super.prepare();
-        this.command = command;
-        this.key = key;
-        this.args = args;
-        return this;
-    }
-
-    @Override
-    public void writeTo(ClientConnection conn, ByteArray writer) {
-        writer.put((byte) '*');
-        writer.put(String.valueOf(args.length + 1).getBytes(StandardCharsets.UTF_8));
-        writer.put((byte) '\r', (byte) '\n');
-        writer.put((byte) '$');
-        writer.put(String.valueOf(command.length()).getBytes(StandardCharsets.UTF_8));
-        writer.put((byte) '\r', (byte) '\n');
-        writer.put(command.getBytes(StandardCharsets.UTF_8));
-        writer.put((byte) '\r', (byte) '\n');
-
-        for (final byte[] arg : args) {
-            writer.put((byte) '$');
-            writer.put(String.valueOf(arg.length).getBytes(StandardCharsets.UTF_8));
-            writer.put((byte) '\r', (byte) '\n');
-            writer.put(arg);
-            writer.put((byte) '\r', (byte) '\n');
-        }
-    }
-
-    @Override
-    public String toString() {
-        return getClass().getSimpleName() + "{command=" + command + ", key=" + key + "}";
-    }
-}

src/main/java/org/redkalex/cache/redis/RedisCacheResult.java

@@ -1,151 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.redkalex.cache.redis;
-
-import org.redkale.convert.json.JsonConvert;
-
-import java.lang.reflect.Type;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-
-/**
- * @author zhangjx
- */
-public class RedisCacheResult {
-
-    //+   简单字符串类型 (不包含CRLF)
-    //-   错误类型 (不包含CRLF)
-    //':  整型
-    //$   块字符串 
-    //*   数组
-    protected byte frameType;
-
-    protected byte[] frameValue;  //(不包含CRLF)
-
-    protected List<byte[]> frameList;  //(不包含CRLF)
-
-    public RedisCacheResult prepare(byte byteType, byte[] val, List<byte[]> bytesList) {
-        this.frameType = byteType;
-        this.frameValue = val;
-        this.frameList = bytesList;
-        return this;
-    }
-
-    public Void getVoidValue() {
-        return null;
-    }
-
-    public byte[] getFrameValue() {
-        return frameValue;
-    }
-
-    public Boolean getBoolValue() {
-        if (frameValue == null) {
-            return false;
-        }
-        String val = new String(frameValue, StandardCharsets.UTF_8);
-        if ("OK".equals(val)) {
-            return true;
-        }
-        return Integer.parseInt(val) > 0;
-    }
-
-    public String getStringValue(String key, RedisCryptor cryptor) {
-        if (frameValue == null) {
-            return null;
-        }
-        String val = new String(frameValue, StandardCharsets.UTF_8);
-        if (cryptor != null) {
-            val = cryptor.decrypt(key, val);
-        }
-        return val;
-    }
-
-    public Double getDoubleValue(Double defvalue) {
-        return frameValue == null ? defvalue : Double.parseDouble(new String(frameValue, StandardCharsets.UTF_8));
-    }
-
-    public Long getLongValue(Long defvalue) {
-        return frameValue == null ? defvalue : Long.parseLong(new String(frameValue, StandardCharsets.UTF_8));
-    }
-
-    public Integer getIntValue(Integer defvalue) {
-        return frameValue == null ? defvalue : Integer.parseInt(new String(frameValue, StandardCharsets.UTF_8));
-    }
-
-    public <T> T getObjectValue(String key, RedisCryptor cryptor, Type type) {
-        return formatValue(key, cryptor, frameValue, type);
-    }
-
-    protected <T> Set<T> getSetValue(String key, RedisCryptor cryptor, Type type) {
-        if (frameList == null || frameList.isEmpty()) {
-            return new LinkedHashSet<>();
-        }
-        Set<T> set = new LinkedHashSet<>();
-        for (byte[] bs : frameList) {
-            set.add(formatValue(key, cryptor, bs, type));
-        }
-        return set;
-    }
-
-    protected <T> List<T> getListValue(String key, RedisCryptor cryptor, Type type) {
-        if (frameList == null || frameList.isEmpty()) {
-            return new ArrayList<>();
-        }
-        List<T> list = new ArrayList<>();
-        for (byte[] bs : frameList) {
-            list.add(formatValue(key, cryptor, bs, type));
-        }
-        return list;
-    }
-
-    protected <T> Map<String, T> getMapValue(String key, RedisCryptor cryptor, Type type) {
-        if (frameList == null || frameList.isEmpty()) {
-            return new LinkedHashMap<>();
-        }
-        Map<String, T> map = new LinkedHashMap<>();
-        for (int i = 0; i < frameList.size(); i += 2) {
-            byte[] bs1 = frameList.get(i);
-            byte[] bs2 = frameList.get(i + 1);
-            T val = formatValue(key, cryptor, bs2, type);
-            if (val != null) {
-                map.put(formatValue(key, cryptor, bs1, String.class).toString(), val);
-            }
-        }
-        return map;
-    }
-
-    protected static <T> T formatValue(String key, RedisCryptor cryptor, byte[] frames, Type type) {
-        if (frames == null) {
-            return null;
-        }
-        if (type == byte[].class) {
-            return (T) frames;
-        }
-        if (type == String.class) {
-            String val = new String(frames, StandardCharsets.UTF_8);
-            if (cryptor != null) {
-                val = cryptor.decrypt(key, val);
-            }
-            return (T) val;
-        }
-        if (type == boolean.class || type == Boolean.class) {
-            return (T) (Boolean) "t".equalsIgnoreCase(new String(frames, StandardCharsets.UTF_8));
-        }
-        if (type == long.class || type == Long.class) {
-            return (T) (Long) Long.parseLong(new String(frames, StandardCharsets.UTF_8));
-        }
-        if (type == double.class || type == Double.class) {
-            return (T) (Double) Double.parseDouble(new String(frames, StandardCharsets.UTF_8));
-        }
-        if (cryptor != null) {
-            String val = cryptor.decrypt(key, new String(frames, StandardCharsets.UTF_8));
-            return (T) JsonConvert.root().convertFrom(type, val);
-        }
-        return (T) JsonConvert.root().convertFrom(type, frames);
-    }
-
-}

src/main/java/org/redkalex/cache/redis/RedisCacheSourceProvider.java

@@ -1,29 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.redkalex.cache.redis;
-
-import org.redkale.annotation.Priority;
-import org.redkale.source.CacheSource;
-import org.redkale.source.CacheSourceProvider;
-import org.redkale.util.AnyValue;
-
-/**
- * @author zhangjx
- */
-@Priority(1)
-public class RedisCacheSourceProvider implements CacheSourceProvider {
-
-    @Override
-    public boolean acceptsConf(AnyValue config) {
-        return new MyRedisCacheSource().acceptsConf(config);
-    }
-
-    @Override
-    public CacheSource createInstance() {
-        return new MyRedisCacheSource();
-    }
-
-}

src/main/java/org/redkalex/cache/redis/RedisCryptor.java

@@ -1,46 +0,0 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
-package org.redkalex.cache.redis;
-
-import org.redkale.util.AnyValue;
-
-/**
- * @author zhangjx
- */
-public interface RedisCryptor {
-
-    /**
-     * 初始化
-     *
-     * @param conf 配置
-     */
-    public void init(AnyValue conf);
-
-    /**
-     * 加密, 无需加密的key对应的值需要直接返回value
-     *
-     * @param key   key
-     * @param value 明文
-     * @return 密文
-     */
-    public String encrypt(String key, String value);
-
-    /**
-     * 解密, 无需解密的key对应的值需要直接返回value
-     *
-     * @param key   key
-     * @param value 密文
-     * @return 明文
-     */
-    public String decrypt(String key, String value);
-
-    /**
-     * 销毁
-     *
-     * @param conf 配置
-     */
-    public void destroy(AnyValue conf);
-
-}

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

@@ -1 +0,0 @@
-net.tccn.ZhubProvider

src/main/resources/META-INF/services/org.redkale.source.CacheSourceProvider

@@ -1 +0,0 @@
-org.redkalex.cache.redis.RedisCacheSourceProvider

src/main/resources/application.yml

@@ -0,0 +1,7 @@
+
+# zhub 配置
+zhub:
+  appid: local_api
+  addr: 127.0.0.1:1216
+  groupid: hub-api
+  auth: token-12345

test/HelloService.java

@@ -0,0 +1,108 @@
+import org.junit.Before;
+import org.junit.Test;
+import net.tccn.IType;
+import net.tccn.zhub.Lock;
+import net.tccn.zhub.ZHubClient;
+
+// @RestService(automapping = true)
+public class HelloService {
+
+    // @Resource(name = "zhub")
+    private ZHubClient zhub;
+
+    @Before
+    public void init() {
+
+
+
+        //zhub = new ZHubClient("127.0.0.1:1216", "g-dev", "DEV-LOCAL", "zchd@123456");
+        zhub = new ZHubClient("127.0.0.1:1216", "g-dev", "DEV-LOCAL", "token-12345");
+
+        zhub.subscribe("tv:test", x -> {
+            System.out.println(x);
+        });
+
+        Lock lock = zhub.tryLock("lock-a", 5);
+        System.out.println("lock-1: " + lock.success());
+
+        //zhub.init(Kv.of("host", "47.111.150.118", "port", "6066", "groupid", "g-dev", "appname", "DEV-LOCAL"));
+
+        // Function<Rpc<T>, RpcResult<R>> fun
+        /*zhub.rpcSubscribe("x", new TypeToken<String>() {
+        }, r -> {
+            return r.buildResp(Map.of("v", r.getValue().toUpperCase() + ": Ok"));
+        });
+
+        zhub.subscribe("sport:reqtime", x -> {
+            //System.out.println(x);
+        });
+        zhub.subscribe("abx", x -> {
+            System.out.println(x);
+        });
+
+        try {
+            Thread.sleep(010);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+        zhub.delay("sport:reqtime", "别✈人家的✦女娃子❤🤞🏻", 0);
+        zhub.delay("sport:reqtime", "别人家的女娃子➾🤞🏻", 0);
+        zhub.delay("sport:reqtime", "❤别人家✉<EFBFBD>的女娃子❤🤞🏻", 0);*/
+        /*zhub.delay("sport:reqtime", "中文特殊符号：『』 ＄ ￡ ♀ ‖ 「」\n" +
+                "英文：# + = & ﹉ .. ^ \"\" ·{ } % – ' €\n" +
+                "数学：＋× ＝ － ° ± ＜ ＞ ℃ ㎡ ∑ ≥ ∫ ㏄ ⊥ ≯ ∠ ∴ ∈ ∧ ∵ ≮ ∪ ㎝ ㏑ ≌ ㎞ № § ℉ ÷ ％ ‰ ㎎ ㎏ ㎜ ㏒ ⊙ ∮ ∝ ∞ º ¹ ² ³ ½ ¾ ¼ ≈ ≡ ≠ ≤ ≦ ≧ ∽ ∷ ／ ∨ ∏ ∩ ⌒ √Ψ ¤ ‖ ¶\n" +
+                "特殊：♤ ♧ ♡ ♢ ♪ ♬ ♭ ✔ ✘ ♞ ♟ ↪ ↣ ♚ ♛ ♝ ☞ ☜ ⇔ ☆ ★ □ ■ ○ ● △ ▲ ▽ ▼ ◇ ◆ ♀ ♂ ※ ↓ ↑ ↔ ↖ ↙ ↗ ↘ ← → ♣ ♠ ♥ ◎ ◣ ◢ ◤ ◥ 卍 ℡ ⊙ ㊣ ® © ™ ㈱ 囍\n" +
+                "序号：①②③④⑤⑥⑦⑧⑨⑩㈠㈡㈢㈣㈤㈥㈦㈧㈨㈩⑴ ⑵ ⑶ ⑷ ⑸ ⑹ ⑺ ⑻ ⑼ ⑽ ⒈ ⒉ ⒊ ⒋ ⒌ ⒍ ⒎ ⒏ ⒐ ⒑ Ⅰ Ⅱ Ⅲ Ⅳ Ⅴ Ⅵ Ⅶ Ⅷ ⅨⅩ\n" +
+                "日文：アイウエオァィゥェォカキクケコガギグゲゴサシスセソザジズゼゾタチツテトダヂヅデドッナニヌネノハヒフヘホバビブベボパピプペポマミムメモャヤュユョラリヨルレロワヰヱヲンヴヵヶヽヾ゛゜ー、。「「あいうえおぁぃぅぇぉかきくけこがぎぐげごさしすせそざじずぜぞたちつてでどっなにぬねのはひふへ」」ほばびぶべぼぱぴぷぺぽまみむめもやゆよゃゅょらりるれろわをんゎ゛゜ー、。「」\n" +
+                "部首：犭 凵 巛 冖 氵 廴 讠 亻 钅 宀 亠 忄 辶 弋 饣 刂 阝 冫 卩 疒 艹 疋 豸 冂 匸 扌 丬 屮衤 礻 勹 彳 彡", 0);*/
+
+    }
+
+    @Test
+    public void rpcTest() {
+        //RpcResult<String> rpc = zhub.rpc("wx:users", Map.of("appId", "wxa554ec3ab3bf1fc7"), IConsumer.TYPE_TOKEN_STRING);
+        //RpcResult<String> rpc = zhub.rpc("a", "fa", IConsumer.TYPE_TOKEN_STRING);
+        zhub.publish("tv:test", "hello ym!");
+
+        zhub.subscribe("tv:abx", x -> {
+            System.out.println(x);
+        });
+
+        zhub.rpcSubscribe("rpc-x", IType.STRING, x -> {
+            return x.render(x.getValue().toUpperCase());
+        });
+
+        Lock lock = zhub.tryLock("lock-a", 5);
+        System.out.println("lock-2: " + lock.success());
+
+        try {
+            Thread.sleep(5 * 1000);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+
+        Lock lock2 = zhub.tryLock("lock-a", 5);
+        System.out.println("lock-3: " + lock2.success());
+        /*try {
+            Thread.sleep(100);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }*/
+        Lock lock3 = zhub.tryLock("lock-a", 5);
+        System.out.println("lock-4: " + lock3.success());
+
+        try {
+            Thread.sleep(3000 * 30000);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public void lockTest() {
+
+    }
+
+    /*RpcResult<FileToken> x = zhub.rpc("rpc:file:up-token", Map.of(), new TypeToken<>() {
+            });*/
+}

test/net.tccn/mq/AppTest.java

@@ -1,412 +0,0 @@
-package net.tccn.mq;
-
-import net.tccn.Event;
-import net.tccn.timer.Timers;
-import org.junit.Test;
-import org.redkale.convert.json.JsonConvert;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.DelayQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * 消息发布订阅测试
- */
-public class AppTest {
-    Logger logger = Logger.getLogger("");
-
-    @Test
-    public void runConsumer() {
-        try {
-            // String str = ", response = {\"success\":true,\"retcode\":0,\"result\":{\"age\":0,\"explevel\":1,\"face\":\"https://aimg.woaihaoyouxi.com/haogame/202106/pic/20210629095545FmGt-v9NYqyNZ_Q6_y3zM_RMrDgd.jpg\",\"followed\":0,\"gender\":0,\"idenstatus\":0,\"matchcatelist\":[{\"catename\":\"足球\",\"catepic\":\"https://aimg.woaihaoyouxi.com/haogame/202107/pic/20210714103556FoG5ICf_7BFx6Idyo3TYpJQ7tmfG.png\",\"matchcateid\":1},{\"catename\":\"篮球\",\"catepic\":\"https://aimg.woaihaoyouxi.com/haogame/202107/pic/20210714103636FklsXTn1f6Jlsam8Jk-yFB7Upo3C.png\",\"matchcateid\":2}],\"matchcates\":\"2,1\",\"mobile\":\"18515190967\",\"regtime\":1624931714781,\"sessionid\":\"d1fc447753bd4700ad29674a753030fa\",\"status\":10,\"userid\":100463,\"username\":\"绝尘\",\"userno\":100463}}";
-            String str = "hello你好";
-
-            System.out.println(str.length());
-
-            /*consumer.timer("a", () -> {
-                System.out.println(Utility.now() + " timer a 执行了");
-                try {
-                    Thread.sleep(3000);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            });
-
-            consumer.timer("b", () -> {
-                System.out.println(Utility.now() + " ----------------- timer b 执行了");
-            });
-            //consumer.delay("a", "1", 200);
-            consumer.delay("a", "1", "2000");*/
-
-            /*Consumer<String> con = x -> {
-                logger.info("--->开始申请锁:" + System.currentTimeMillis());
-                Lock lock = consumer.tryLock("a", 20);
-                logger.info("===>成功申请锁:" + System.currentTimeMillis());
-                for (int i = 0; i < 20; i++) {
-                    try {
-                        Thread.sleep(500);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                    System.out.println(x + ":" + i);
-                }
-                lock.unLock();
-            };
-
-            new Thread(() -> con.accept("x")).start();
-            new Thread(() -> con.accept("y")).start();
-            new Thread(() -> con.accept("z")).start();*/
-
-
-            Thread.sleep(60_000 * 60);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    public void runProducer() {
-
-    }
-
-    private static LinkedBlockingQueue<String> queue = new LinkedBlockingQueue();
-
-    @Test
-    public void t() {
-        List<String> list = new ArrayList<>();
-        list.toArray(String[]::new);
-
-        new Thread(() -> {
-            while (true) {
-                System.out.println("accept:");
-                String peek = null;
-                try {
-                    System.out.println(!queue.isEmpty());
-                    peek = queue.poll(100, TimeUnit.MILLISECONDS);
-
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-                System.out.println(peek);
-            }
-        }).start();
-
-        for (int i = 0; i < 10; i++) {
-            try {
-                queue.put(i + "");
-                Thread.sleep(1000);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-
-
-        try {
-            System.out.println("---");
-            Thread.sleep(1000 * 5);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    public void xx() {
-        Function<String, String> fun = x -> {
-            return x.toUpperCase();
-        };
-
-        System.out.println(fun.toString());
-    }
-
-
-    // (27+5*23)/(63-59)
-    // [27+5*23] [/] [63-59]
-    // [27] + [5*23] [/] [63-59]
-
-
-    /**
-     * 1. 按照优先级逐一拆解运算
-     * 括号, 乘除，加减
-     * 2. 逐一进行计算
-     */
-    class C {
-        C A;
-        C B;
-
-        int c1; // 如果 A 只剩数字，将c1 转为整数存放到 c1
-        int c2;
-        String x; // + - * /
-    }
-
-    @Test
-    public void x() {
-        // (27+5*23)/(63-59)
-
-        String str = "(27+5*23)/(63-59)";
-        str = "27+5*23";
-        str = "258/((35+17)/(5*3+18-29)+3)(138-134)*41-6+10+24";
-        str = "5*3+18-29";
-
-        //System.out.println("258/((35+17)/(5*3+18-29)+3)(138-134)*41-6+10+24".replaceAll("\\)\\(", ")*("));
-        List<String> parse = parse(str.replaceAll("\\)\\(", ")\\*("));
-
-
-        System.out.println(c(str));
-    }
-
-    // 因式分解：括号 -> 乘除 -> 加减
-    public List<String> parse(String str) {
-        // 找到一对
-        /*
-
-        258/()()
-        [258, /, (35+17)/(5*3+18-29)+3, 138-134, *, 41, -, 6, +, 10, +, 24]
-
-         */
-        // 258/((35+17)/(5*3+18-29)+3)(138-134)*41-6+10+24
-        //str = "258    /   (35+17)/(5*3+18-29)+3   138-134,   *   41-6+10+24";
-        String[] strArr = str.split("");
-
-        // 一级括号、加、减、乘、除分解
-        List<String> arr = new ArrayList<>();
-        String tmp = "";
-        int n1 = 0; // 括号层级开始
-        int m1 = 0; // 括号层级结尾
-        for (String s : strArr) {
-            if (n1 > 0) { // 一级括号分解
-                if (")".equals(s) && (++m1) == n1) { // 一级括号结束
-                    arr.add(tmp);
-                    tmp = "";
-                    n1 = 0;
-                    m1 = 0;
-                } else {
-                    if ("(".equals(s)) {
-                        n1++;
-                    }
-                    tmp += s;
-                }
-            } else { // 无括号
-                if ("+".equals(s) || "-".equals(s) || "*".equals(s) || "/".equals(s)) {
-                    if (!"".equals(tmp)) {
-                        arr.add(tmp);
-                    }
-                    arr.add(s);
-                    tmp = "";
-                } else if ("(".equals(s)) {
-                    n1 = 1;
-                } else {
-                    tmp += s;
-                }
-            }
-        }
-        if (!"".equals(tmp)) {
-            arr.add(tmp);
-        }
-        return arr;
-    }
-
-    public int c(String str) {
-        List<String> arr = parse(str); // 预期 length >= 3 基数的基数，如：[27+5*23, /, 63-59], [60, /, 2, *, 164-23*7]
-        System.out.println(arr);
-        if (arr == null || arr.size() < 3) {
-            return -1; // 错误码-1：错误的计算式
-        }
-
-        List<String> _arr = new ArrayList<>();
-        // 按照优先级做合并计算 乘除优先
-
-        // 乘除
-        for (int i = 1; i < arr.size() - 1; i += 2) {
-            /*if ("*".equals(arr.get(i)) || "/".equals(arr.get(i))) {
-                if (_arr.size() > 0) {
-                    _arr.remove(_arr.size() - 1);
-                }
-                int c = c(arr.get(i - 1), arr.get(i + 1), arr.get(i));
-                if (c < 0) {
-                    return -1;
-                }
-                _arr.add(c + "");
-            } else {
-                _arr.add(arr.get(i - 1));
-                _arr.add(arr.get(i));
-                _arr.add(arr.get(i + 1));
-            }*/
-
-            if ("*".equals(arr.get(i)) || "/".equals(arr.get(i))) {
-                int c = c(arr.get(i - 1), arr.get(i + 1), arr.get(i));
-                if (c < 0) {
-                    return c;
-                }
-                _arr.add(c + "");
-            } else {
-
-
-            }
-        }
-
-        if (_arr.size() == 1) { // 通过第一轮的 乘除计算，完成结果合并
-            return Integer.parseInt(_arr.get(0));
-        }
-        int c = 0;
-        for (int i = 1; i < _arr.size(); i += 2) {
-            int _c = c(_arr.get(i - 1), _arr.get(i + 1), _arr.get(i));
-            if (_c < 0) {
-                return _c;
-            }
-            c += _c;
-        }
-        return c;
-    }
-
-    public int c(String a, String b, String x) {
-        int _a = 0;
-        if (a.contains("(") || a.contains("+") || a.contains("-") || a.contains("*") || a.contains("/")) {
-            _a = c(a);
-        } else { // 预期 无 ( + - * / 的结果为标准数字
-            _a = Integer.parseInt(a);
-        }
-        int _b = 0;
-        if (b.contains("(") || b.contains("+") || b.contains("-") || b.contains("*") || b.contains("/")) {
-            _b = c(b);
-        } else { // 预期 无 ( + - * / 的结果为标准数字
-            _b = Integer.parseInt(b);
-        }
-
-        // 如果出现负数（错误码）直接返回对应的负数
-        if (_a < 0) {
-            return _a;
-        }
-        if (_b < 0) {
-            return _b;
-        }
-
-        // 定义错误标识: -1错误的计算式，-2除不尽，-3除数为0，-4大于200,
-        if ("+".equals(x)) {
-            return _a + _b;
-        } else if ("-".equals(x)) {
-            return _a - _b;
-        } else if ("*".equals(x)) {
-            return _a * _b;
-        } else if ("/".equals(x)) {
-            return _a % _b > 0 ? -2 : _a / _b; // 除不尽
-        }
-        return 0;
-    }
-
-    @Test
-    public void testxx() {
-        Event of = Event.of("A", Map.of("b", 1));
-
-        System.out.println(JsonConvert.root().convertTo(of));
-
-        String str = "❦别人家的女娃子🤞🏻ꚢ";
-
-        /*
-        System.out.println("别人家的女娃子🤞🏻".length());*/
-        System.out.println(strLength(str));
-        System.out.println(getWordCount(str));
-        /*try {
-            System.out.println("别人家的女娃子🤞🏻".getBytes("UTF-8").length);
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        System.out.println("系统默认编码方式：" + System.getProperty("file.encoding"));*/
-    }
-
-
-    public static int strLength(String value) {
-        int valueLength = 0;
-        String chinese = "[\u4e00-\u9fa5]";
-        for (int i = 0; i < value.length(); i++) {
-            String temp = value.substring(i, i + 1);
-            if (temp.matches(chinese)) {
-                valueLength += 2;
-            } else {
-                valueLength += 1;
-            }
-        }
-        return valueLength;
-    }
-
-    public int getWordCount(String str) {
-        str = str.replaceAll("[^\\x00-\\xff]", "*");
-        return str.length();
-    }
-
-    @Test
-    public void delay() {
-        DelayQueue<com.zdemo.zhub.Delays> delayQueue = new DelayQueue<>();
-
-        logger.info("加入延时任务1");
-        delayQueue.add(new com.zdemo.zhub.Delays(5000, () -> {
-            logger.info("任务1 延时任务执行了!");
-        }));
-
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        logger.info("加入延时任务2");
-        delayQueue.add(new com.zdemo.zhub.Delays(5000, () -> {
-            logger.info("任务2 延时任务执行了!");
-        }));
-
-        try {
-            while (true) {
-                com.zdemo.zhub.Delays delay = delayQueue.take();
-
-                delay.run();
-            }
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    public void regTest() {
-        // 按指定模式在字符串查找
-        String line = "This order was placed for QT3000! OK?";
-        String pattern = "(\\D*)(\\d+)(.*)";
-
-        // 创建 Pattern 对象
-        Pattern r = Pattern.compile(pattern);
-
-        // 现在创建 matcher 对象
-        Matcher m = r.matcher(line);
-        if (m.find()) {
-            System.out.println("Found value: " + m.group(0));
-            System.out.println("Found value: " + m.group(1));
-            System.out.println("Found value: " + m.group(2));
-            System.out.println("Found value: " + m.group(3));
-        } else {
-            System.out.println("NO MATCH");
-        }
-    }
-
-    @Test
-    public void timersTest() {
-        Timers.tryDelay(() -> {
-            logger.info("xx:" + System.currentTimeMillis());
-            return true;
-        }, 1000, 5);
-
-        Timers.delay(() -> {
-            System.out.println("11");
-        }, 3000);
-
-        try {
-            Thread.sleep(100000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-}

test/net.tccn/mq/Delays.java

@@ -1,72 +0,0 @@
-package com.zdemo.zhub;
-
-import java.util.concurrent.DelayQueue;
-import java.util.concurrent.Delayed;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
-import java.util.logging.Logger;
-
-public class Delays implements Delayed, Runnable {
-    public Logger logger = Logger.getLogger(Delays.class.getSimpleName());
-
-    private long time;          // 执行时间
-    private Runnable runnable;  // 任务到时间执行 runnable
-
-    public Delays(long timeout, Runnable runnable) {
-        this.time = System.currentTimeMillis() + timeout;
-        this.runnable = runnable;
-    }
-
-    @Override
-    public long getDelay(TimeUnit unit) {
-        return unit.convert(time - System.currentTimeMillis(), TimeUnit.MILLISECONDS);
-    }
-
-    @Override
-    public int compareTo(Delayed other) {
-        if (other == this) { // compare zero ONLY if same object
-            return 0;
-        }
-        if (other instanceof Delays) {
-            Delays x = (Delays) other;
-            long diff = time - x.time;
-            if (diff < 0) {
-                return -1;
-            } else if (diff > 0) {
-                return 1;
-            }
-        }
-        long d = (getDelay(TimeUnit.NANOSECONDS) -
-                other.getDelay(TimeUnit.NANOSECONDS));
-        return (d == 0) ? 0 : ((d < 0) ? -1 : 1);
-    }
-
-    @Override
-    public void run() {
-        runnable.run();
-    }
-
-    // ===========
-    public static DelayQueue<Delays> delayQueue = new DelayQueue<>();
-
-    public static void addDelay(long timeout, Runnable runnable) {
-        delayQueue.add(new Delays(timeout, runnable));
-    }
-
-    public static void tryDelay(Supplier<Boolean> supplier, long delayMillis, int maxCount) {
-
-    }
-
-    static {
-        new Thread(() -> {
-            try {
-                while (true) {
-                    Delays delay = delayQueue.take();
-                    delay.run(); //异常会导致延时队列失败
-                }
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }).start();
-    }
-}

test/net.tccn/mq/HelloService.java

@@ -1,244 +0,0 @@
-package net.tccn.mq;
-
-import net.tccn.IType;
-import net.tccn.zhub.RpcResult;
-import net.tccn.zhub.ZHubClient;
-import org.redkale.net.http.RestMapping;
-import org.redkale.net.http.RestService;
-import org.redkale.service.Service;
-import org.redkale.util.AnyValue;
-import org.redkale.util.TypeToken;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-
-@RestService(automapping = true, name = "hello")
-public class HelloService implements Service {
-
-    @Resource(name = "hub")
-    private ZHubClient zhub;
-
-    /*@Resource(name = "hubx")
-    private ZHubClient zhubx;
-
-    @Resource(name = "vvvvhub2")
-    private ZHubClient zhub2;*/
-
-    //private net.tccn.zhub.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 net.tccn.zhub.ZHubClient("47.111.150.118", 6066, "g-dev", "DEV-LOCAL");
-        });*/
-
-        // Function<Rpc<T>, RpcResult<R>> fun
-        /*zhub.rpcSubscribe("x", new TypeToken<String>() {
-        }, r -> {
-
-            return r.buildResp(Map.of("v", r.getValue().toUpperCase() + ": Ok"));
-        });*/
-        zhub.rpcSubscribe("y", new TypeToken<String>() {
-        }, r -> {
-
-            return r.render(Map.of("v", r.getValue().toUpperCase() + ": Ok"));
-        });
-
-        zhub.subscribe("sport:reqtime", x -> {
-            System.out.println(x);
-        });
-        zhub.subscribe("abx1", x -> {
-            System.out.println(x);
-        });
-
-        try {
-            Thread.sleep(010);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        /*zhub.delay("sport:reqtime", "别✈人家的✦女娃子❤🤞🏻", 0);
-        zhub.delay("sport:reqtime", "别人家的女娃子➾🤞🏻", 0);
-        zhub.delay("sport:reqtime", "❤别人家✉<EFBFBD>的女娃子❤🤞🏻", 0);
-        zhub.delay("sport:reqtime", "中文特殊符号：『』 ＄ ￡ ♀ ‖ 「」\n" +
-                "英文：# + = & ﹉ .. ^ \"\" ·{ } % – ' €\n" +
-                "数学：＋× ＝ － ° ± ＜ ＞ ℃ ㎡ ∑ ≥ ∫ ㏄ ⊥ ≯ ∠ ∴ ∈ ∧ ∵ ≮ ∪ ㎝ ㏑ ≌ ㎞ № § ℉ ÷ ％ ‰ ㎎ ㎏ ㎜ ㏒ ⊙ ∮ ∝ ∞ º ¹ ² ³ ½ ¾ ¼ ≈ ≡ ≠ ≤ ≦ ≧ ∽ ∷ ／ ∨ ∏ ∩ ⌒ √Ψ ¤ ‖ ¶\n" +
-                "特殊：♤ ♧ ♡ ♢ ♪ ♬ ♭ ✔ ✘ ♞ ♟ ↪ ↣ ♚ ♛ ♝ ☞ ☜ ⇔ ☆ ★ □ ■ ○ ● △ ▲ ▽ ▼ ◇ ◆ ♀ ♂ ※ ↓ ↑ ↔ ↖ ↙ ↗ ↘ ← → ♣ ♠ ♥ ◎ ◣ ◢ ◤ ◥ 卍 ℡ ⊙ ㊣ ® © ™ ㈱ 囍\n" +
-                "序号：①②③④⑤⑥⑦⑧⑨⑩㈠㈡㈢㈣㈤㈥㈦㈧㈨㈩⑴ ⑵ ⑶ ⑷ ⑸ ⑹ ⑺ ⑻ ⑼ ⑽ ⒈ ⒉ ⒊ ⒋ ⒌ ⒍ ⒎ ⒏ ⒐ ⒑ Ⅰ Ⅱ Ⅲ Ⅳ Ⅴ Ⅵ Ⅶ Ⅷ ⅨⅩ\n" +
-                "日文：アイウエオァィゥェォカキクケコガギグゲゴサシスセソザジズゼゾタチツテトダヂヅデドッナニヌネノハヒフヘホバビブベボパピプペポマミムメモャヤュユョラリヨルレロワヰヱヲンヴヵヶヽヾ゛゜ー、。「「あいうえおぁぃぅぇぉかきくけこがぎぐげごさしすせそざじずぜぞたちつてでどっなにぬねのはひふへ」」ほばびぶべぼぱぴぷぺぽまみむめもやゆよゃゅょらりるれろわをんゎ゛゜ー、。「」\n" +
-                "部首：犭 凵 巛 冖 氵 廴 讠 亻 钅 宀 亠 忄 辶 弋 饣 刂 阝 冫 卩 疒 艹 疋 豸 冂 匸 扌 丬 屮衤 礻 勹 彳 彡", 0);
-*/
-    }
-
-    @RestMapping
-    public RpcResult x(String v) {
-        if (v == null) {
-            v = "";
-        }
-
-        List<CompletableFuture> list = new ArrayList();
-
-        for (int i = 0; i < 100; i++) {
-            long start = System.currentTimeMillis();
-            /*RpcResult<FileToken> x = zhub.rpc("rpc:file:up-token", Map.of(), new TypeToken<>() {
-            });*/
-
-            /*list.add(zhub.rpcAsync("x", v + i, new TypeToken<>() {
-            }));*/
-            zhub.publish("x", v + i);
-
-            System.out.println("time: " + (System.currentTimeMillis() - start) + " ms");
-            //System.out.println(x.getResult().get("v"));
-        }
-
-        return zhub.rpc("x", v, IType.STRING);
-    }
-
-    @RestMapping
-    public RpcResult<String> d(String v) {
-        RpcResult<String> rpc = zhub.rpc("x", v, IType.STRING);
-        return rpc;
-    }
-
-    @RestMapping
-    public String y(String v) {
-        if (v == null) {
-            v = "";
-        }
-
-        for (int i = 0; i < 100; i++) {
-            long start = System.currentTimeMillis();
-            /*RpcResult<FileToken> x = zhub.rpc("rpc:file:up-token", Map.of(), new TypeToken<>() {
-            });*/
-
-            /*RpcResult<Object> x = zhubx.rpc("y", v + i, new com.google.gson.reflect.TypeToken<>() {
-            });*/
-
-            System.out.println("time: " + (System.currentTimeMillis() - start) + " ms");
-
-            //System.out.println(x.getResult());
-        }
-
-        return "ok";
-    }
-
-    @RestMapping(name = "send")
-    public String send() {
-        zhub.publish("abx1", 1);
-        return "ok";
-    }
-
-
-    public static void main(String[] args) {
-        // "\"别人家的女娃子\uD83E\uDD1E\uD83C\uDFFB\""
-        /*String s = "别人家的女娃子\uD83E\uDD1E\uD83C\uDFFB";
-        System.out.println("别人家的女娃子🤞🏻".length());
-
-        byte[] bytes = "别人家的女娃子🤞🏻".getBytes();
-        System.out.println(bytes.length);
-
-        System.out.println(unicodeToUtf8(s));
-        System.out.println(utf8ToUnicode("别人家的女娃子🤞🏻"));
-        */
-
-        //ExecutorService pool = Executors.newFixedThreadPool(5);
-
-
-    }
-
-
-    public static String utf8ToUnicode(String inStr) {
-        char[] myBuffer = inStr.toCharArray();
-
-        StringBuffer sb = new StringBuffer();
-        for (int i = 0; i < inStr.length(); i++) {
-            Character.UnicodeBlock ub = Character.UnicodeBlock.of(myBuffer[i]);
-            if (ub == Character.UnicodeBlock.BASIC_LATIN) {
-                //英文及数字等
-                sb.append(myBuffer[i]);
-            } else if (ub == Character.UnicodeBlock.HALFWIDTH_AND_FULLWIDTH_FORMS) {
-                //全角半角字符
-                int j = (int) myBuffer[i] - 65248;
-                sb.append((char) j);
-            } else {
-                //汉字
-                short s = (short) myBuffer[i];
-                String hexS = Integer.toHexString(s);
-                String unicode = "\\u" + hexS;
-                sb.append(unicode.toLowerCase());
-            }
-        }
-        return sb.toString();
-    }
-
-    public static String unicodeToUtf8(String theString) {
-        char aChar;
-        int len = theString.length();
-        StringBuffer outBuffer = new StringBuffer(len);
-        for (int x = 0; x < len; ) {
-            aChar = theString.charAt(x++);
-            if (aChar == '\\') {
-                aChar = theString.charAt(x++);
-                if (aChar == 'u') {
-                    // Read the xxxx
-                    int value = 0;
-                    for (int i = 0; i < 4; i++) {
-                        aChar = theString.charAt(x++);
-                        switch (aChar) {
-                            case '0':
-                            case '1':
-                            case '2':
-                            case '3':
-                            case '4':
-                            case '5':
-                            case '6':
-                            case '7':
-                            case '8':
-                            case '9':
-                                value = (value << 4) + aChar - '0';
-                                break;
-                            case 'a':
-                            case 'b':
-                            case 'c':
-                            case 'd':
-                            case 'e':
-                            case 'f':
-                                value = (value << 4) + 10 + aChar - 'a';
-                                break;
-                            case 'A':
-                            case 'B':
-                            case 'C':
-                            case 'D':
-                            case 'E':
-                            case 'F':
-                                value = (value << 4) + 10 + aChar - 'A';
-                                break;
-                            default:
-                                throw new IllegalArgumentException(
-                                        "Malformed   \\uxxxx   encoding.");
-                        }
-                    }
-                    outBuffer.append((char) value);
-                } else {
-                    if (aChar == 't')
-                        aChar = '\t';
-                    else if (aChar == 'r')
-                        aChar = '\r';
-                    else if (aChar == 'n')
-                        aChar = '\n';
-                    else if (aChar == 'f')
-                        aChar = '\f';
-                    outBuffer.append(aChar);
-                }
-            } else
-                outBuffer.append(aChar);
-        }
-        return outBuffer.toString();
-    }
-}