pom.xml

@@ -14,12 +14,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <version>2.5.4</version>
-        </dependency>
-
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
@@ -33,7 +27,7 @@
         </dependency>
     </dependencies>
 
-    <!--<repositories>
+    <repositories>
         <repository>
             <id>maven-nexus</id>
             <name>maven-nexus</name>
@@ -48,6 +42,6 @@
             <name>mvn-release</name>
             <url>http://47.106.237.198:8081/repository/maven-releases/</url>
         </repository>
-    </distributionManagement>-->
+    </distributionManagement>
 
 </project>

src/main/java/tccn/AbstractConsumer.java

@@ -18,6 +18,9 @@ public abstract class AbstractConsumer implements IConsumer {
 
     public Gson gson = Rpc.gson;
 
+    // @Resource(name = "APP_NAME")
+    protected String APP_ID = "";
+
     private Map<String, EventType> eventMap = new HashMap<>();
 
     protected abstract String getGroupid();

src/main/java/tccn/zhub/Lock.java

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

src/main/java/tccn/zhub/ZHubClient.java

@@ -1,15 +1,12 @@
 package tccn.zhub;
 
 import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import tccn.AbstractConsumer;
 import tccn.Event;
 import tccn.IConsumer;
 import tccn.IProducer;
 import tccn.timer.Timers;
 
-import javax.annotation.PostConstruct;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -30,27 +27,15 @@ import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-@Component
+
 public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer {
 
     public Logger logger = Logger.getLogger(ZHubClient.class.getSimpleName());
-    @Value("${zhub.addr}")
     private String addr = "127.0.0.1:1216";
-
+    //private String password = "";
-    @Value("${zhub.groupid}")
     private String groupid = "";
-
-    @Value("${zhub.auth}")
     private String auth = "";
 
-    @Value("${zhub.appid}")
-    protected String appid = "";
-
-    @PostConstruct
-    public void init() {
-        init(null);
-    }
-
     private OutputStream writer;
     private BufferedReader reader;
 
@@ -73,7 +58,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
     public ZHubClient(String addr, String groupid, String appid, String auth) {
         this.addr = addr;
         this.groupid = groupid;
-        this.appid = appid;
+        this.APP_ID = appid;
         this.auth = auth;
         init(null);
     }
@@ -87,7 +72,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
         if (config != null) {
             addr = config.getOrDefault("addr", addr);
             groupid = config.getOrDefault("groupid", groupid);
-            appid = config.getOrDefault("appname", appid);
+            APP_ID = config.getOrDefault("appname", APP_ID);
         }
 
         // 设置第一个启动的 实例为主实例
@@ -151,26 +136,13 @@ 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 (appid.equals(topic)) {
+                        if (APP_ID.equals(topic)) {
                             rpcBackQueue.add(Event.of(topic, value));
                             continue;
                         }
@@ -383,11 +355,11 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
                 send("auth", auth);
                 send("groupid " + groupid);
 
-                StringBuffer buf = new StringBuffer("subscribe lock trylock");
+                StringBuffer buf = new StringBuffer("subscribe lock");
                 /*if (isMain) {
                 }*/
                 if (mainHub.containsValue(this)) {
-                    buf.append(" ").append(appid);
+                    buf.append(" ").append(APP_ID);
                 }
                 for (String topic : getTopics()) {
                     buf.append(" ").append(topic);
@@ -494,35 +466,14 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
     // ================================================== lock ==================================================
     private final Map<String, Lock> lockTag = new ConcurrentHashMap<>();
 
-    /**
-     * 尝试加锁，立即返回，
-     *
-     * @param key
-     * @param duration
-     * @return Lock: lock.success 锁定是否成功标识
-     */
     public Lock tryLock(String key, int duration) {
-        return lock("trylock", key, duration);
-    }
-
-    public Lock lock(String key, int duration) {
-        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(cmd, key, uuid, String.valueOf(duration));
+            send("lock", key, uuid, String.valueOf(duration));
             synchronized (lock) {
                 lock.wait();
             }
@@ -582,7 +533,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
 
     // rpc call
     public <T, R> RpcResult<R> rpc(String topic, T v, TypeToken<R> typeToken, long timeout) {
-        Rpc rpc = new Rpc<>(appid, UUID.randomUUID().toString().replaceAll("-", ""), topic, v);
+        Rpc rpc = new Rpc<>(APP_ID, UUID.randomUUID().toString().replaceAll("-", ""), topic, v);
         String ruk = rpc.getRuk();
         rpcMap.put(ruk, rpc);
         if (typeToken != null) {

src/main/resources/application.yml

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

test/HelloService.java

@@ -1,7 +1,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import tccn.IType;
-import tccn.zhub.Lock;
 import tccn.zhub.ZHubClient;
 
 // @RestService(automapping = true)
@@ -16,15 +15,11 @@ public class HelloService {
 
 
         //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 = new ZHubClient("47.111.150.118:6066", "g-dev", "DEV-LOCAL", "zchd@123456");
 
         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
@@ -70,28 +65,9 @@ public class HelloService {
         });
 
         zhub.rpcSubscribe("rpc-x", IType.STRING, x -> {
-            return x.render(x.getValue().toUpperCase());
+            return x.buildResp(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) {
@@ -99,10 +75,6 @@ public class HelloService {
         }
     }
 
-    public void lockTest() {
-
-    }
-
     /*RpcResult<FileToken> x = zhub.rpc("rpc:file:up-token", Map.of(), new TypeToken<>() {
             });*/
 }