From efdf42c4f298cdfcd348ee8d524b1fe54c6df055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=9D=E5=B0=98?= <237809796@qq.com> Date: Wed, 24 Apr 2024 20:05:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=8C=85=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- .../java/{net/tccn => dev/zhub}/AbstractConsumer.java | 2 +- src/main/java/{net/tccn => dev/zhub}/Event.java | 2 +- src/main/java/{net/tccn => dev/zhub}/EventType.java | 2 +- src/main/java/{net/tccn => dev/zhub}/IConsumer.java | 2 +- src/main/java/{net/tccn => dev/zhub}/IProducer.java | 2 +- src/main/java/{net/tccn => dev/zhub}/IType.java | 2 +- src/main/java/{net/tccn => dev/zhub}/RedisTest.java | 2 +- .../java/{net/tccn => dev/zhub}/ZhubAgentProvider.java | 3 +-- src/main/java/{net/tccn => dev/zhub}/ZhubProvider.java | 4 ++-- .../java/{net/tccn/zhub => dev/zhub/client}/Lock.java | 2 +- src/main/java/{net/tccn/zhub => dev/zhub/client}/Rpc.java | 2 +- .../{net/tccn/zhub => dev/zhub/client}/RpcResult.java | 2 +- .../{net/tccn/zhub => dev/zhub/client}/ZHubClient.java | 6 +++--- .../java/{net/tccn => dev/zhub}/timer/TimerExecutor.java | 6 +++--- src/main/java/{net/tccn => dev/zhub}/timer/TimerTask.java | 8 ++++---- src/main/java/{net/tccn => dev/zhub}/timer/Timers.java | 4 ++-- .../{net/tccn => dev/zhub}/timer/queue/TimerQueue.java | 4 ++-- .../{net/tccn => dev/zhub}/timer/scheduled/Scheduled.java | 2 +- .../tccn => dev/zhub}/timer/scheduled/ScheduledCycle.java | 2 +- .../zhub}/timer/scheduled/ScheduledExpres.java | 2 +- src/main/java/{net/tccn => dev/zhub}/timer/task/Job.java | 2 +- src/main/java/{net/tccn => dev/zhub}/timer/task/Task.java | 6 +++--- .../services/org.redkale.cluster.ClusterAgentProvider | 2 +- test/net.tccn/mq/AppTest.java | 2 +- test/net.tccn/mq/HelloService.java | 6 +++--- 26 files changed, 41 insertions(+), 42 deletions(-) rename src/main/java/{net/tccn => dev/zhub}/AbstractConsumer.java (99%) rename src/main/java/{net/tccn => dev/zhub}/Event.java (95%) rename src/main/java/{net/tccn => dev/zhub}/EventType.java (97%) rename src/main/java/{net/tccn => dev/zhub}/IConsumer.java (97%) rename src/main/java/{net/tccn => dev/zhub}/IProducer.java (91%) rename src/main/java/{net/tccn => dev/zhub}/IType.java (97%) rename src/main/java/{net/tccn => dev/zhub}/RedisTest.java (99%) rename src/main/java/{net/tccn => dev/zhub}/ZhubAgentProvider.java (97%) rename src/main/java/{net/tccn => dev/zhub}/ZhubProvider.java (89%) rename src/main/java/{net/tccn/zhub => dev/zhub/client}/Lock.java (96%) rename src/main/java/{net/tccn/zhub => dev/zhub/client}/Rpc.java (99%) rename src/main/java/{net/tccn/zhub => dev/zhub/client}/RpcResult.java (96%) rename src/main/java/{net/tccn/zhub => dev/zhub/client}/ZHubClient.java (99%) rename src/main/java/{net/tccn => dev/zhub}/timer/TimerExecutor.java (94%) rename src/main/java/{net/tccn => dev/zhub}/timer/TimerTask.java (95%) rename src/main/java/{net/tccn => dev/zhub}/timer/Timers.java (94%) rename src/main/java/{net/tccn => dev/zhub}/timer/queue/TimerQueue.java (97%) rename src/main/java/{net/tccn => dev/zhub}/timer/scheduled/Scheduled.java (90%) rename src/main/java/{net/tccn => dev/zhub}/timer/scheduled/ScheduledCycle.java (98%) rename src/main/java/{net/tccn => dev/zhub}/timer/scheduled/ScheduledExpres.java (99%) rename src/main/java/{net/tccn => dev/zhub}/timer/task/Job.java (85%) rename src/main/java/{net/tccn => dev/zhub}/timer/task/Task.java (90%) diff --git a/pom.xml b/pom.xml index df9e7fd..ecde36d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - net.tccn + dev.zhub zhub-client-redkale - 0.1.3.dev + x.1.1.dev 17 diff --git a/src/main/java/net/tccn/AbstractConsumer.java b/src/main/java/dev/zhub/AbstractConsumer.java similarity index 99% rename from src/main/java/net/tccn/AbstractConsumer.java rename to src/main/java/dev/zhub/AbstractConsumer.java index c2dbb9c..bc793cf 100644 --- a/src/main/java/net/tccn/AbstractConsumer.java +++ b/src/main/java/dev/zhub/AbstractConsumer.java @@ -1,4 +1,4 @@ -package net.tccn; +package dev.zhub; import org.redkale.convert.json.JsonConvert; import org.redkale.util.Resourcable; diff --git a/src/main/java/net/tccn/Event.java b/src/main/java/dev/zhub/Event.java similarity index 95% rename from src/main/java/net/tccn/Event.java rename to src/main/java/dev/zhub/Event.java index fcc8b65..eedacb0 100644 --- a/src/main/java/net/tccn/Event.java +++ b/src/main/java/dev/zhub/Event.java @@ -1,4 +1,4 @@ -package net.tccn; +package dev.zhub; /** * 发布订阅 事件 diff --git a/src/main/java/net/tccn/EventType.java b/src/main/java/dev/zhub/EventType.java similarity index 97% rename from src/main/java/net/tccn/EventType.java rename to src/main/java/dev/zhub/EventType.java index 4c24d9a..b851744 100644 --- a/src/main/java/net/tccn/EventType.java +++ b/src/main/java/dev/zhub/EventType.java @@ -1,4 +1,4 @@ -package net.tccn; +package dev.zhub; import org.redkale.util.TypeToken; diff --git a/src/main/java/net/tccn/IConsumer.java b/src/main/java/dev/zhub/IConsumer.java similarity index 97% rename from src/main/java/net/tccn/IConsumer.java rename to src/main/java/dev/zhub/IConsumer.java index 963803e..19ec8c3 100644 --- a/src/main/java/net/tccn/IConsumer.java +++ b/src/main/java/dev/zhub/IConsumer.java @@ -1,4 +1,4 @@ -package net.tccn; +package dev.zhub; import org.redkale.util.TypeToken; diff --git a/src/main/java/net/tccn/IProducer.java b/src/main/java/dev/zhub/IProducer.java similarity index 91% rename from src/main/java/net/tccn/IProducer.java rename to src/main/java/dev/zhub/IProducer.java index 1ff3bd8..44ac1c1 100644 --- a/src/main/java/net/tccn/IProducer.java +++ b/src/main/java/dev/zhub/IProducer.java @@ -1,4 +1,4 @@ -package net.tccn; +package dev.zhub; import java.util.logging.Logger; diff --git a/src/main/java/net/tccn/IType.java b/src/main/java/dev/zhub/IType.java similarity index 97% rename from src/main/java/net/tccn/IType.java rename to src/main/java/dev/zhub/IType.java index 7943153..b645570 100644 --- a/src/main/java/net/tccn/IType.java +++ b/src/main/java/dev/zhub/IType.java @@ -1,4 +1,4 @@ -package net.tccn; +package dev.zhub; import org.redkale.util.TypeToken; diff --git a/src/main/java/net/tccn/RedisTest.java b/src/main/java/dev/zhub/RedisTest.java similarity index 99% rename from src/main/java/net/tccn/RedisTest.java rename to src/main/java/dev/zhub/RedisTest.java index 09894b9..c2a3151 100644 --- a/src/main/java/net/tccn/RedisTest.java +++ b/src/main/java/dev/zhub/RedisTest.java @@ -1,4 +1,4 @@ -package net.tccn; +package dev.zhub; import org.junit.Test; import org.redkale.net.AsyncIOGroup; diff --git a/src/main/java/net/tccn/ZhubAgentProvider.java b/src/main/java/dev/zhub/ZhubAgentProvider.java similarity index 97% rename from src/main/java/net/tccn/ZhubAgentProvider.java rename to src/main/java/dev/zhub/ZhubAgentProvider.java index 5eff32b..c7c0344 100644 --- a/src/main/java/net/tccn/ZhubAgentProvider.java +++ b/src/main/java/dev/zhub/ZhubAgentProvider.java @@ -1,4 +1,4 @@ -package net.tccn; +package dev.zhub; import org.redkale.boot.Application; import org.redkale.boot.NodeServer; @@ -8,7 +8,6 @@ import org.redkale.service.Service; import org.redkale.util.ResourceEvent; import java.net.InetSocketAddress; -import java.util.Map; import java.util.Set; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/net/tccn/ZhubProvider.java b/src/main/java/dev/zhub/ZhubProvider.java similarity index 89% rename from src/main/java/net/tccn/ZhubProvider.java rename to src/main/java/dev/zhub/ZhubProvider.java index 737f557..20a4823 100644 --- a/src/main/java/net/tccn/ZhubProvider.java +++ b/src/main/java/dev/zhub/ZhubProvider.java @@ -1,6 +1,6 @@ -package net.tccn; +package dev.zhub; -import net.tccn.zhub.ZHubClient; +import dev.zhub.client.ZHubClient; import org.redkale.annotation.Priority; import org.redkale.cluster.ClusterAgent; import org.redkale.cluster.ClusterAgentProvider; diff --git a/src/main/java/net/tccn/zhub/Lock.java b/src/main/java/dev/zhub/client/Lock.java similarity index 96% rename from src/main/java/net/tccn/zhub/Lock.java rename to src/main/java/dev/zhub/client/Lock.java index 8d05535..c5ca7d9 100644 --- a/src/main/java/net/tccn/zhub/Lock.java +++ b/src/main/java/dev/zhub/client/Lock.java @@ -1,4 +1,4 @@ -package net.tccn.zhub; +package dev.zhub.client; // ================================================== lock ================================================== public class Lock { diff --git a/src/main/java/net/tccn/zhub/Rpc.java b/src/main/java/dev/zhub/client/Rpc.java similarity index 99% rename from src/main/java/net/tccn/zhub/Rpc.java rename to src/main/java/dev/zhub/client/Rpc.java index e83be3b..d699e9b 100644 --- a/src/main/java/net/tccn/zhub/Rpc.java +++ b/src/main/java/dev/zhub/client/Rpc.java @@ -1,4 +1,4 @@ -package net.tccn.zhub; +package dev.zhub.client; import org.redkale.convert.ConvertColumn; import org.redkale.service.RetResult; diff --git a/src/main/java/net/tccn/zhub/RpcResult.java b/src/main/java/dev/zhub/client/RpcResult.java similarity index 96% rename from src/main/java/net/tccn/zhub/RpcResult.java rename to src/main/java/dev/zhub/client/RpcResult.java index 6f5bf87..aa5d818 100644 --- a/src/main/java/net/tccn/zhub/RpcResult.java +++ b/src/main/java/dev/zhub/client/RpcResult.java @@ -1,4 +1,4 @@ -package net.tccn.zhub; +package dev.zhub.client; public class RpcResult { private String ruk; diff --git a/src/main/java/net/tccn/zhub/ZHubClient.java b/src/main/java/dev/zhub/client/ZHubClient.java similarity index 99% rename from src/main/java/net/tccn/zhub/ZHubClient.java rename to src/main/java/dev/zhub/client/ZHubClient.java index 5e6412c..cc8d58b 100644 --- a/src/main/java/net/tccn/zhub/ZHubClient.java +++ b/src/main/java/dev/zhub/client/ZHubClient.java @@ -1,7 +1,7 @@ -package net.tccn.zhub; +package dev.zhub.client; -import net.tccn.*; -import net.tccn.timer.Timers; +import dev.zhub.*; +import dev.zhub.timer.Timers; import org.redkale.annotation.AutoLoad; import org.redkale.annotation.ResourceType; import org.redkale.service.Local; diff --git a/src/main/java/net/tccn/timer/TimerExecutor.java b/src/main/java/dev/zhub/timer/TimerExecutor.java similarity index 94% rename from src/main/java/net/tccn/timer/TimerExecutor.java rename to src/main/java/dev/zhub/timer/TimerExecutor.java index 355788e..9bc1775 100644 --- a/src/main/java/net/tccn/timer/TimerExecutor.java +++ b/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; diff --git a/src/main/java/net/tccn/timer/TimerTask.java b/src/main/java/dev/zhub/timer/TimerTask.java similarity index 95% rename from src/main/java/net/tccn/timer/TimerTask.java rename to src/main/java/dev/zhub/timer/TimerTask.java index 95865aa..f52e0c1 100644 --- a/src/main/java/net/tccn/timer/TimerTask.java +++ b/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; diff --git a/src/main/java/net/tccn/timer/Timers.java b/src/main/java/dev/zhub/timer/Timers.java similarity index 94% rename from src/main/java/net/tccn/timer/Timers.java rename to src/main/java/dev/zhub/timer/Timers.java index c84480a..62541e4 100644 --- a/src/main/java/net/tccn/timer/Timers.java +++ b/src/main/java/dev/zhub/timer/Timers.java @@ -1,6 +1,6 @@ -package net.tccn.timer; +package dev.zhub.timer; -import net.tccn.timer.scheduled.ScheduledCycle; +import dev.zhub.timer.scheduled.ScheduledCycle; import org.redkale.util.Utility; import java.util.function.Supplier; diff --git a/src/main/java/net/tccn/timer/queue/TimerQueue.java b/src/main/java/dev/zhub/timer/queue/TimerQueue.java similarity index 97% rename from src/main/java/net/tccn/timer/queue/TimerQueue.java rename to src/main/java/dev/zhub/timer/queue/TimerQueue.java index 5a0e8c8..19e88a7 100644 --- a/src/main/java/net/tccn/timer/queue/TimerQueue.java +++ b/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; diff --git a/src/main/java/net/tccn/timer/scheduled/Scheduled.java b/src/main/java/dev/zhub/timer/scheduled/Scheduled.java similarity index 90% rename from src/main/java/net/tccn/timer/scheduled/Scheduled.java rename to src/main/java/dev/zhub/timer/scheduled/Scheduled.java index 31eb3ba..ac0de4e 100644 --- a/src/main/java/net/tccn/timer/scheduled/Scheduled.java +++ b/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; diff --git a/src/main/java/net/tccn/timer/scheduled/ScheduledCycle.java b/src/main/java/dev/zhub/timer/scheduled/ScheduledCycle.java similarity index 98% rename from src/main/java/net/tccn/timer/scheduled/ScheduledCycle.java rename to src/main/java/dev/zhub/timer/scheduled/ScheduledCycle.java index c43796e..39fd5e7 100644 --- a/src/main/java/net/tccn/timer/scheduled/ScheduledCycle.java +++ b/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; diff --git a/src/main/java/net/tccn/timer/scheduled/ScheduledExpres.java b/src/main/java/dev/zhub/timer/scheduled/ScheduledExpres.java similarity index 99% rename from src/main/java/net/tccn/timer/scheduled/ScheduledExpres.java rename to src/main/java/dev/zhub/timer/scheduled/ScheduledExpres.java index 509b342..e5e3903 100644 --- a/src/main/java/net/tccn/timer/scheduled/ScheduledExpres.java +++ b/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; diff --git a/src/main/java/net/tccn/timer/task/Job.java b/src/main/java/dev/zhub/timer/task/Job.java similarity index 85% rename from src/main/java/net/tccn/timer/task/Job.java rename to src/main/java/dev/zhub/timer/task/Job.java index ddfd6f7..2b2c6f2 100644 --- a/src/main/java/net/tccn/timer/task/Job.java +++ b/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. diff --git a/src/main/java/net/tccn/timer/task/Task.java b/src/main/java/dev/zhub/timer/task/Task.java similarity index 90% rename from src/main/java/net/tccn/timer/task/Task.java rename to src/main/java/dev/zhub/timer/task/Task.java index c488dab..a131651 100644 --- a/src/main/java/net/tccn/timer/task/Task.java +++ b/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. diff --git a/src/main/resources/META-INF/services/org.redkale.cluster.ClusterAgentProvider b/src/main/resources/META-INF/services/org.redkale.cluster.ClusterAgentProvider index ecd69d4..cfe0d6a 100644 --- a/src/main/resources/META-INF/services/org.redkale.cluster.ClusterAgentProvider +++ b/src/main/resources/META-INF/services/org.redkale.cluster.ClusterAgentProvider @@ -1 +1 @@ -net.tccn.ZhubProvider \ No newline at end of file +dev.zhub.ZhubProvider \ No newline at end of file diff --git a/test/net.tccn/mq/AppTest.java b/test/net.tccn/mq/AppTest.java index 640f3d3..4c300b6 100644 --- a/test/net.tccn/mq/AppTest.java +++ b/test/net.tccn/mq/AppTest.java @@ -1,7 +1,7 @@ package net.tccn.mq; import net.tccn.Event; -import net.tccn.timer.Timers; +import dev.zhub.timer.Timers; import org.junit.Test; import org.redkale.convert.json.JsonConvert; diff --git a/test/net.tccn/mq/HelloService.java b/test/net.tccn/mq/HelloService.java index c5d0171..fb9df49 100644 --- a/test/net.tccn/mq/HelloService.java +++ b/test/net.tccn/mq/HelloService.java @@ -27,15 +27,15 @@ public class HelloService implements Service { @Resource(name = "vvvvhub2") private ZHubClient zhub2;*/ - //private net.tccn.zhub.ZHubClient zhubx = null; + //private dev.zhub.client.ZHubClient zhubx = null; @Override public void init(AnyValue config) { /*CompletableFuture.runAsync(() -> { - zhubx = new net.tccn.zhub.ZHubClient("127.0.0.1", 1216, "g-dev", "DEV-LOCAL"); - //zhubx = new net.tccn.zhub.ZHubClient("47.111.150.118", 6066, "g-dev", "DEV-LOCAL"); + zhubx = new dev.zhub.client.ZHubClient("127.0.0.1", 1216, "g-dev", "DEV-LOCAL"); + //zhubx = new dev.zhub.client.ZHubClient("47.111.150.118", 6066, "g-dev", "DEV-LOCAL"); });*/ // Function, RpcResult> fun