From 144b99c3d28e422e3f64b98c1347bd42c5321212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E6=98=BE=E4=BC=98?= <237809796@qq.com> Date: Sun, 5 Mar 2023 19:36:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=8C=85=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 10 ++++-- .../zdemo => net/tccn}/AbstractConsumer.java | 4 +-- src/{com/zdemo => net/tccn}/Event.java | 2 +- src/{com/zdemo => net/tccn}/EventType.java | 2 +- src/{com/zdemo => net/tccn}/IConsumer.java | 2 +- src/{com/zdemo => net/tccn}/IProducer.java | 2 +- src/{com/zdemo => net/tccn}/IType.java | 2 +- src/{com/zdemo => net/tccn}/zhub/Lock.java | 2 +- src/{com/zdemo => net/tccn}/zhub/Rpc.java | 2 +- .../zdemo => net/tccn}/zhub/RpcResult.java | 2 +- .../zdemo => net/tccn}/zhub/ZHubClient.java | 10 +++--- test/HelloService.java | 35 +++++++++++++++---- 12 files changed, 51 insertions(+), 24 deletions(-) rename src/{com/zdemo => net/tccn}/AbstractConsumer.java (97%) rename src/{com/zdemo => net/tccn}/Event.java (95%) rename src/{com/zdemo => net/tccn}/EventType.java (97%) rename src/{com/zdemo => net/tccn}/IConsumer.java (97%) rename src/{com/zdemo => net/tccn}/IProducer.java (90%) rename src/{com/zdemo => net/tccn}/IType.java (95%) rename src/{com/zdemo => net/tccn}/zhub/Lock.java (95%) rename src/{com/zdemo => net/tccn}/zhub/Rpc.java (98%) rename src/{com/zdemo => net/tccn}/zhub/RpcResult.java (96%) rename src/{com/zdemo => net/tccn}/zhub/ZHubClient.java (99%) diff --git a/pom.xml b/pom.xml index 23c81c1..04f0c70 100644 --- a/pom.xml +++ b/pom.xml @@ -9,8 +9,8 @@ 1.0 - 17 - 17 + 1.8 + 1.8 @@ -19,6 +19,12 @@ gson 2.8.8 + + junit + junit + 4.13.1 + test + diff --git a/src/com/zdemo/AbstractConsumer.java b/src/net/tccn/AbstractConsumer.java similarity index 97% rename from src/com/zdemo/AbstractConsumer.java rename to src/net/tccn/AbstractConsumer.java index b89acc5..314afa8 100644 --- a/src/com/zdemo/AbstractConsumer.java +++ b/src/net/tccn/AbstractConsumer.java @@ -1,8 +1,8 @@ -package com.zdemo; +package net.tccn; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.zdemo.zhub.Rpc; +import net.tccn.zhub.Rpc; import java.util.HashMap; import java.util.HashSet; diff --git a/src/com/zdemo/Event.java b/src/net/tccn/Event.java similarity index 95% rename from src/com/zdemo/Event.java rename to src/net/tccn/Event.java index ce5318b..cc957c6 100644 --- a/src/com/zdemo/Event.java +++ b/src/net/tccn/Event.java @@ -1,4 +1,4 @@ -package com.zdemo; +package net.tccn; /** * 发布订阅 事件 diff --git a/src/com/zdemo/EventType.java b/src/net/tccn/EventType.java similarity index 97% rename from src/com/zdemo/EventType.java rename to src/net/tccn/EventType.java index a97ea08..9ff202c 100644 --- a/src/com/zdemo/EventType.java +++ b/src/net/tccn/EventType.java @@ -1,4 +1,4 @@ -package com.zdemo; +package net.tccn; import com.google.gson.reflect.TypeToken; diff --git a/src/com/zdemo/IConsumer.java b/src/net/tccn/IConsumer.java similarity index 97% rename from src/com/zdemo/IConsumer.java rename to src/net/tccn/IConsumer.java index 8496851..5a49b51 100644 --- a/src/com/zdemo/IConsumer.java +++ b/src/net/tccn/IConsumer.java @@ -1,4 +1,4 @@ -package com.zdemo; +package net.tccn; import com.google.gson.reflect.TypeToken; diff --git a/src/com/zdemo/IProducer.java b/src/net/tccn/IProducer.java similarity index 90% rename from src/com/zdemo/IProducer.java rename to src/net/tccn/IProducer.java index b5c8329..1ff3bd8 100644 --- a/src/com/zdemo/IProducer.java +++ b/src/net/tccn/IProducer.java @@ -1,4 +1,4 @@ -package com.zdemo; +package net.tccn; import java.util.logging.Logger; diff --git a/src/com/zdemo/IType.java b/src/net/tccn/IType.java similarity index 95% rename from src/com/zdemo/IType.java rename to src/net/tccn/IType.java index f9830a5..518537a 100644 --- a/src/com/zdemo/IType.java +++ b/src/net/tccn/IType.java @@ -1,4 +1,4 @@ -package com.zdemo; +package net.tccn; import com.google.gson.reflect.TypeToken; diff --git a/src/com/zdemo/zhub/Lock.java b/src/net/tccn/zhub/Lock.java similarity index 95% rename from src/com/zdemo/zhub/Lock.java rename to src/net/tccn/zhub/Lock.java index 141cc3c..516a670 100644 --- a/src/com/zdemo/zhub/Lock.java +++ b/src/net/tccn/zhub/Lock.java @@ -1,4 +1,4 @@ -package com.zdemo.zhub; +package net.tccn.zhub; // ================================================== lock ================================================== public class Lock { diff --git a/src/com/zdemo/zhub/Rpc.java b/src/net/tccn/zhub/Rpc.java similarity index 98% rename from src/com/zdemo/zhub/Rpc.java rename to src/net/tccn/zhub/Rpc.java index c66f3b7..374fa37 100644 --- a/src/com/zdemo/zhub/Rpc.java +++ b/src/net/tccn/zhub/Rpc.java @@ -1,4 +1,4 @@ -package com.zdemo.zhub; +package net.tccn.zhub; import com.google.gson.Gson; import com.google.gson.annotations.Expose; diff --git a/src/com/zdemo/zhub/RpcResult.java b/src/net/tccn/zhub/RpcResult.java similarity index 96% rename from src/com/zdemo/zhub/RpcResult.java rename to src/net/tccn/zhub/RpcResult.java index 069b185..6f5bf87 100644 --- a/src/com/zdemo/zhub/RpcResult.java +++ b/src/net/tccn/zhub/RpcResult.java @@ -1,4 +1,4 @@ -package com.zdemo.zhub; +package net.tccn.zhub; public class RpcResult { private String ruk; diff --git a/src/com/zdemo/zhub/ZHubClient.java b/src/net/tccn/zhub/ZHubClient.java similarity index 99% rename from src/com/zdemo/zhub/ZHubClient.java rename to src/net/tccn/zhub/ZHubClient.java index 511cabe..981c689 100644 --- a/src/com/zdemo/zhub/ZHubClient.java +++ b/src/net/tccn/zhub/ZHubClient.java @@ -1,10 +1,10 @@ -package com.zdemo.zhub; +package net.tccn.zhub; import com.google.gson.reflect.TypeToken; -import com.zdemo.AbstractConsumer; -import com.zdemo.Event; -import com.zdemo.IConsumer; -import com.zdemo.IProducer; +import net.tccn.AbstractConsumer; +import net.tccn.Event; +import net.tccn.IConsumer; +import net.tccn.IProducer; import net.tccn.timer.Timers; import java.io.BufferedReader; diff --git a/test/HelloService.java b/test/HelloService.java index 2e4dbcc..8dbac4b 100644 --- a/test/HelloService.java +++ b/test/HelloService.java @@ -1,6 +1,7 @@ -import com.zdemo.IConsumer; -import com.zdemo.zhub.RpcResult; -import com.zdemo.zhub.ZHubClient; +import com.google.gson.reflect.TypeToken; +import net.tccn.IType; +import net.tccn.zhub.RpcResult; +import net.tccn.zhub.ZHubClient; import org.junit.Before; import org.junit.Test; @@ -13,8 +14,15 @@ public class HelloService { @Before public void init() { - zhub = new ZHubClient("127.0.0.1:1216", "g-dev", "DEV-LOCAL", "zchd@123456"); - //zhub.init(Map.of("host", "47.111.150.118", "port", "6066", "groupid", "g-dev", "appname", "DEV-LOCAL")); + + + //zhub = new ZHubClient("127.0.0.1:1216", "g-dev", "DEV-LOCAL", "zchd@123456"); + zhub = new ZHubClient("47.111.150.118:6066", "g-dev", "DEV-LOCAL", "zchd@123456"); + + zhub.subscribe("tv:test", x -> { + System.out.println(x); + }); + //zhub.init(Kv.of("host", "47.111.150.118", "port", "6066", "groupid", "g-dev", "appname", "DEV-LOCAL")); // Function, RpcResult> fun /*zhub.rpcSubscribe("x", new TypeToken() { @@ -51,9 +59,22 @@ public class HelloService { @Test public void rpcTest() { //RpcResult rpc = zhub.rpc("wx:users", Map.of("appId", "wxa554ec3ab3bf1fc7"), IConsumer.TYPE_TOKEN_STRING); - RpcResult rpc = zhub.rpc("a", "fa", IConsumer.TYPE_TOKEN_STRING); + //RpcResult rpc = zhub.rpc("a", "fa", IConsumer.TYPE_TOKEN_STRING); + zhub.publish("tv:test", "hello ym!"); - System.out.println(rpc.getResult()); + zhub.subscribe("tv:abx", x -> { + System.out.println(x); + }); + + zhub.rpcSubscribe("rpc-x", IType.STRING, x -> { + return x.buildResp(x.getValue().toUpperCase()); + }); + + try { + Thread.sleep(3000 * 30000); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } } /*RpcResult x = zhub.rpc("rpc:file:up-token", Map.of(), new TypeToken<>() {