From 3fe08e92a8a8046762b59dcb89fbce7bb7330e43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BB=9D=E5=B0=98?= <237809796@qq.com>
Date: Tue, 23 Apr 2024 19:20:16 +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                                               | 11 +++++++++--
 .../java/{tccn => dev/zhub}/AbstractConsumer.java     |  5 ++---
 src/main/java/{tccn => dev/zhub}/Event.java           |  2 +-
 src/main/java/{tccn => dev/zhub}/EventType.java       |  2 +-
 src/main/java/{tccn => dev/zhub}/IConsumer.java       |  2 +-
 src/main/java/{tccn => dev/zhub}/IProducer.java       |  2 +-
 src/main/java/{tccn => dev/zhub}/IType.java           |  2 +-
 .../java/{tccn/zhub => dev/zhub/client}/Lock.java     |  2 +-
 src/main/java/{tccn/zhub => dev/zhub/client}/Rpc.java |  2 +-
 .../{tccn/zhub => dev/zhub/client}/RpcResult.java     |  2 +-
 .../{tccn/zhub => dev/zhub/client}/ZHubClient.java    |  6 +++---
 .../java/{tccn => dev/zhub}/timer/TimerExecutor.java  |  6 +++---
 src/main/java/{tccn => dev/zhub}/timer/TimerTask.java |  8 ++++----
 src/main/java/{tccn => dev/zhub}/timer/Timers.java    |  4 ++--
 .../{tccn => dev/zhub}/timer/queue/TimerQueue.java    |  4 ++--
 .../{tccn => dev/zhub}/timer/scheduled/Scheduled.java |  2 +-
 .../zhub}/timer/scheduled/ScheduledCycle.java         |  2 +-
 .../zhub}/timer/scheduled/ScheduledExpres.java        |  2 +-
 src/main/java/{tccn => dev/zhub}/timer/task/Job.java  |  2 +-
 src/main/java/{tccn => dev/zhub}/timer/task/Task.java |  6 +++---
 test/HelloService.java                                |  6 +++---
 21 files changed, 43 insertions(+), 37 deletions(-)
 rename src/main/java/{tccn => dev/zhub}/AbstractConsumer.java (97%)
 rename src/main/java/{tccn => dev/zhub}/Event.java (95%)
 rename src/main/java/{tccn => dev/zhub}/EventType.java (97%)
 rename src/main/java/{tccn => dev/zhub}/IConsumer.java (97%)
 rename src/main/java/{tccn => dev/zhub}/IProducer.java (91%)
 rename src/main/java/{tccn => dev/zhub}/IType.java (96%)
 rename src/main/java/{tccn/zhub => dev/zhub/client}/Lock.java (96%)
 rename src/main/java/{tccn/zhub => dev/zhub/client}/Rpc.java (98%)
 rename src/main/java/{tccn/zhub => dev/zhub/client}/RpcResult.java (96%)
 rename src/main/java/{tccn/zhub => dev/zhub/client}/ZHubClient.java (99%)
 rename src/main/java/{tccn => dev/zhub}/timer/TimerExecutor.java (94%)
 rename src/main/java/{tccn => dev/zhub}/timer/TimerTask.java (95%)
 rename src/main/java/{tccn => dev/zhub}/timer/Timers.java (93%)
 rename src/main/java/{tccn => dev/zhub}/timer/queue/TimerQueue.java (97%)
 rename src/main/java/{tccn => dev/zhub}/timer/scheduled/Scheduled.java (90%)
 rename src/main/java/{tccn => dev/zhub}/timer/scheduled/ScheduledCycle.java (98%)
 rename src/main/java/{tccn => dev/zhub}/timer/scheduled/ScheduledExpres.java (99%)
 rename src/main/java/{tccn => dev/zhub}/timer/task/Job.java (85%)
 rename src/main/java/{tccn => dev/zhub}/timer/task/Task.java (90%)

diff --git a/pom.xml b/pom.xml
index da2f4b5..92a6a7c 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">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>net.tccn</groupId>
+    <groupId>dev.zhub</groupId>
     <artifactId>zhub-client-spring</artifactId>
-    <version>17.0.0409.dev</version>
+    <version>17.0.0423.dev</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -59,5 +59,12 @@
             <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>
\ No newline at end of file
diff --git a/src/main/java/tccn/AbstractConsumer.java b/src/main/java/dev/zhub/AbstractConsumer.java
similarity index 97%
rename from src/main/java/tccn/AbstractConsumer.java
rename to src/main/java/dev/zhub/AbstractConsumer.java
index 7da80d5..92b6471 100644
--- a/src/main/java/tccn/AbstractConsumer.java
+++ b/src/main/java/dev/zhub/AbstractConsumer.java
@@ -1,10 +1,9 @@
-package tccn;
+package dev.zhub;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import tccn.zhub.Rpc;
+import dev.zhub.client.Rpc;
 
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
diff --git a/src/main/java/tccn/Event.java b/src/main/java/dev/zhub/Event.java
similarity index 95%
rename from src/main/java/tccn/Event.java
rename to src/main/java/dev/zhub/Event.java
index 5ac02f7..ec3daf6 100644
--- a/src/main/java/tccn/Event.java
+++ b/src/main/java/dev/zhub/Event.java
@@ -1,4 +1,4 @@
-package tccn;
+package dev.zhub;
 
 /**
  * 发布订阅 事件
diff --git a/src/main/java/tccn/EventType.java b/src/main/java/dev/zhub/EventType.java
similarity index 97%
rename from src/main/java/tccn/EventType.java
rename to src/main/java/dev/zhub/EventType.java
index 0e994c4..5313290 100644
--- a/src/main/java/tccn/EventType.java
+++ b/src/main/java/dev/zhub/EventType.java
@@ -1,4 +1,4 @@
-package tccn;
+package dev.zhub;
 
 
 import com.google.gson.reflect.TypeToken;
diff --git a/src/main/java/tccn/IConsumer.java b/src/main/java/dev/zhub/IConsumer.java
similarity index 97%
rename from src/main/java/tccn/IConsumer.java
rename to src/main/java/dev/zhub/IConsumer.java
index 8bd86ec..f6763c2 100644
--- a/src/main/java/tccn/IConsumer.java
+++ b/src/main/java/dev/zhub/IConsumer.java
@@ -1,4 +1,4 @@
-package tccn;
+package dev.zhub;
 
 import com.google.gson.reflect.TypeToken;
 
diff --git a/src/main/java/tccn/IProducer.java b/src/main/java/dev/zhub/IProducer.java
similarity index 91%
rename from src/main/java/tccn/IProducer.java
rename to src/main/java/dev/zhub/IProducer.java
index 201b410..44ac1c1 100644
--- a/src/main/java/tccn/IProducer.java
+++ b/src/main/java/dev/zhub/IProducer.java
@@ -1,4 +1,4 @@
-package tccn;
+package dev.zhub;
 
 import java.util.logging.Logger;
 
diff --git a/src/main/java/tccn/IType.java b/src/main/java/dev/zhub/IType.java
similarity index 96%
rename from src/main/java/tccn/IType.java
rename to src/main/java/dev/zhub/IType.java
index 00476f1..c14fde6 100644
--- a/src/main/java/tccn/IType.java
+++ b/src/main/java/dev/zhub/IType.java
@@ -1,4 +1,4 @@
-package tccn;
+package dev.zhub;
 
 import com.google.gson.reflect.TypeToken;
 
diff --git a/src/main/java/tccn/zhub/Lock.java b/src/main/java/dev/zhub/client/Lock.java
similarity index 96%
rename from src/main/java/tccn/zhub/Lock.java
rename to src/main/java/dev/zhub/client/Lock.java
index dfd914f..c5ca7d9 100644
--- a/src/main/java/tccn/zhub/Lock.java
+++ b/src/main/java/dev/zhub/client/Lock.java
@@ -1,4 +1,4 @@
-package tccn.zhub;
+package dev.zhub.client;
 
 // ================================================== lock ==================================================
 public class Lock {
diff --git a/src/main/java/tccn/zhub/Rpc.java b/src/main/java/dev/zhub/client/Rpc.java
similarity index 98%
rename from src/main/java/tccn/zhub/Rpc.java
rename to src/main/java/dev/zhub/client/Rpc.java
index 6bc63f3..d7a5fd9 100644
--- a/src/main/java/tccn/zhub/Rpc.java
+++ b/src/main/java/dev/zhub/client/Rpc.java
@@ -1,4 +1,4 @@
-package tccn.zhub;
+package dev.zhub.client;
 
 import com.google.gson.Gson;
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/tccn/zhub/RpcResult.java b/src/main/java/dev/zhub/client/RpcResult.java
similarity index 96%
rename from src/main/java/tccn/zhub/RpcResult.java
rename to src/main/java/dev/zhub/client/RpcResult.java
index 8d3858b..aa5d818 100644
--- a/src/main/java/tccn/zhub/RpcResult.java
+++ b/src/main/java/dev/zhub/client/RpcResult.java
@@ -1,4 +1,4 @@
-package tccn.zhub;
+package dev.zhub.client;
 
 public class RpcResult<R> {
     private String ruk;
diff --git a/src/main/java/tccn/zhub/ZHubClient.java b/src/main/java/dev/zhub/client/ZHubClient.java
similarity index 99%
rename from src/main/java/tccn/zhub/ZHubClient.java
rename to src/main/java/dev/zhub/client/ZHubClient.java
index 5f12efc..24c7cc4 100644
--- a/src/main/java/tccn/zhub/ZHubClient.java
+++ b/src/main/java/dev/zhub/client/ZHubClient.java
@@ -1,12 +1,12 @@
-package tccn.zhub;
+package dev.zhub.client;
 
 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 tccn.*;
-import tccn.timer.Timers;
+import dev.zhub.timer.Timers;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/main/java/tccn/timer/TimerExecutor.java b/src/main/java/dev/zhub/timer/TimerExecutor.java
similarity index 94%
rename from src/main/java/tccn/timer/TimerExecutor.java
rename to src/main/java/dev/zhub/timer/TimerExecutor.java
index 2004df0..9bc1775 100644
--- a/src/main/java/tccn/timer/TimerExecutor.java
+++ b/src/main/java/dev/zhub/timer/TimerExecutor.java
@@ -1,7 +1,7 @@
-package tccn.timer;
+package dev.zhub.timer;
 
-import tccn.timer.queue.TimerQueue;
-import 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/tccn/timer/TimerTask.java b/src/main/java/dev/zhub/timer/TimerTask.java
similarity index 95%
rename from src/main/java/tccn/timer/TimerTask.java
rename to src/main/java/dev/zhub/timer/TimerTask.java
index 4072487..f52e0c1 100644
--- a/src/main/java/tccn/timer/TimerTask.java
+++ b/src/main/java/dev/zhub/timer/TimerTask.java
@@ -1,8 +1,8 @@
-package tccn.timer;
+package dev.zhub.timer;
 
-import tccn.timer.scheduled.Scheduled;
-import tccn.timer.task.Job;
-import 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/tccn/timer/Timers.java b/src/main/java/dev/zhub/timer/Timers.java
similarity index 93%
rename from src/main/java/tccn/timer/Timers.java
rename to src/main/java/dev/zhub/timer/Timers.java
index c06c641..47683ad 100644
--- a/src/main/java/tccn/timer/Timers.java
+++ b/src/main/java/dev/zhub/timer/Timers.java
@@ -1,6 +1,6 @@
-package tccn.timer;
+package dev.zhub.timer;
 
-import tccn.timer.scheduled.ScheduledCycle;
+import dev.zhub.timer.scheduled.ScheduledCycle;
 
 import java.util.UUID;
 import java.util.function.Supplier;
diff --git a/src/main/java/tccn/timer/queue/TimerQueue.java b/src/main/java/dev/zhub/timer/queue/TimerQueue.java
similarity index 97%
rename from src/main/java/tccn/timer/queue/TimerQueue.java
rename to src/main/java/dev/zhub/timer/queue/TimerQueue.java
index aac04f9..19e88a7 100644
--- a/src/main/java/tccn/timer/queue/TimerQueue.java
+++ b/src/main/java/dev/zhub/timer/queue/TimerQueue.java
@@ -1,6 +1,6 @@
-package tccn.timer.queue;
+package dev.zhub.timer.queue;
 
-import 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/tccn/timer/scheduled/Scheduled.java b/src/main/java/dev/zhub/timer/scheduled/Scheduled.java
similarity index 90%
rename from src/main/java/tccn/timer/scheduled/Scheduled.java
rename to src/main/java/dev/zhub/timer/scheduled/Scheduled.java
index dfad853..ac0de4e 100644
--- a/src/main/java/tccn/timer/scheduled/Scheduled.java
+++ b/src/main/java/dev/zhub/timer/scheduled/Scheduled.java
@@ -1,4 +1,4 @@
-package tccn.timer.scheduled;
+package dev.zhub.timer.scheduled;
 
 import java.time.LocalDateTime;
 
diff --git a/src/main/java/tccn/timer/scheduled/ScheduledCycle.java b/src/main/java/dev/zhub/timer/scheduled/ScheduledCycle.java
similarity index 98%
rename from src/main/java/tccn/timer/scheduled/ScheduledCycle.java
rename to src/main/java/dev/zhub/timer/scheduled/ScheduledCycle.java
index 79d6e64..39fd5e7 100644
--- a/src/main/java/tccn/timer/scheduled/ScheduledCycle.java
+++ b/src/main/java/dev/zhub/timer/scheduled/ScheduledCycle.java
@@ -1,4 +1,4 @@
-package tccn.timer.scheduled;
+package dev.zhub.timer.scheduled;
 
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
diff --git a/src/main/java/tccn/timer/scheduled/ScheduledExpres.java b/src/main/java/dev/zhub/timer/scheduled/ScheduledExpres.java
similarity index 99%
rename from src/main/java/tccn/timer/scheduled/ScheduledExpres.java
rename to src/main/java/dev/zhub/timer/scheduled/ScheduledExpres.java
index b62c79c..e5e3903 100644
--- a/src/main/java/tccn/timer/scheduled/ScheduledExpres.java
+++ b/src/main/java/dev/zhub/timer/scheduled/ScheduledExpres.java
@@ -1,4 +1,4 @@
-package tccn.timer.scheduled;
+package dev.zhub.timer.scheduled;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
diff --git a/src/main/java/tccn/timer/task/Job.java b/src/main/java/dev/zhub/timer/task/Job.java
similarity index 85%
rename from src/main/java/tccn/timer/task/Job.java
rename to src/main/java/dev/zhub/timer/task/Job.java
index 049fde3..2b2c6f2 100644
--- a/src/main/java/tccn/timer/task/Job.java
+++ b/src/main/java/dev/zhub/timer/task/Job.java
@@ -1,4 +1,4 @@
-package tccn.timer.task;
+package dev.zhub.timer.task;
 
 /**
  * @author: liangxianyou at 2018/12/8 17:24.
diff --git a/src/main/java/tccn/timer/task/Task.java b/src/main/java/dev/zhub/timer/task/Task.java
similarity index 90%
rename from src/main/java/tccn/timer/task/Task.java
rename to src/main/java/dev/zhub/timer/task/Task.java
index 228b9e5..5e565a9 100644
--- a/src/main/java/tccn/timer/task/Task.java
+++ b/src/main/java/dev/zhub/timer/task/Task.java
@@ -1,7 +1,7 @@
-package tccn.timer.task;
+package dev.zhub.timer.task;
 
-import tccn.timer.TimerExecutor;
-import 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/test/HelloService.java b/test/HelloService.java
index 7cd0e4d..14fc72d 100644
--- a/test/HelloService.java
+++ b/test/HelloService.java
@@ -1,8 +1,8 @@
 import org.junit.Before;
 import org.junit.Test;
-import tccn.IType;
-import tccn.zhub.Lock;
-import tccn.zhub.ZHubClient;
+import net.tccn.IType;
+import net.tccn.zhub.Lock;
+import net.tccn.zhub.ZHubClient;
 
 // @RestService(automapping = true)
 public class HelloService {