From 9a3314e0e63e17e7352fe3eb5537670079facb7d 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, 25 Jun 2023 02:27:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E5=8F=98=E6=9B=B4=E4=B8=BA=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=20maven=20=E5=B7=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 14 -------------- src/{net => main/java}/tccn/AbstractConsumer.java | 4 ++-- src/{net => main/java}/tccn/Event.java | 2 +- src/{net => main/java}/tccn/EventType.java | 2 +- src/{net => main/java}/tccn/IConsumer.java | 2 +- src/{net => main/java}/tccn/IProducer.java | 2 +- src/{net => main/java}/tccn/IType.java | 2 +- .../java}/tccn/timer/TimerExecutor.java | 6 +++--- src/{net => main/java}/tccn/timer/TimerTask.java | 8 ++++---- src/{net => main/java}/tccn/timer/Timers.java | 4 ++-- .../java}/tccn/timer/queue/TimerQueue.java | 4 ++-- .../java}/tccn/timer/scheduled/Scheduled.java | 2 +- .../java}/tccn/timer/scheduled/ScheduledCycle.java | 2 +- .../tccn/timer/scheduled/ScheduledExpres.java | 2 +- src/{net => main/java}/tccn/timer/task/Job.java | 2 +- src/{net => main/java}/tccn/timer/task/Task.java | 6 +++--- src/{net => main/java}/tccn/zhub/Lock.java | 2 +- src/{net => main/java}/tccn/zhub/Rpc.java | 2 +- src/{net => main/java}/tccn/zhub/RpcResult.java | 2 +- src/{net => main/java}/tccn/zhub/ZHubClient.java | 12 ++++++------ test/HelloService.java | 6 ++---- 21 files changed, 36 insertions(+), 52 deletions(-) rename src/{net => main/java}/tccn/AbstractConsumer.java (97%) rename src/{net => main/java}/tccn/Event.java (95%) rename src/{net => main/java}/tccn/EventType.java (97%) rename src/{net => main/java}/tccn/IConsumer.java (97%) rename src/{net => main/java}/tccn/IProducer.java (91%) rename src/{net => main/java}/tccn/IType.java (96%) rename src/{net => main/java}/tccn/timer/TimerExecutor.java (94%) rename src/{net => main/java}/tccn/timer/TimerTask.java (95%) rename src/{net => main/java}/tccn/timer/Timers.java (93%) rename src/{net => main/java}/tccn/timer/queue/TimerQueue.java (97%) rename src/{net => main/java}/tccn/timer/scheduled/Scheduled.java (90%) rename src/{net => main/java}/tccn/timer/scheduled/ScheduledCycle.java (98%) rename src/{net => main/java}/tccn/timer/scheduled/ScheduledExpres.java (99%) rename src/{net => main/java}/tccn/timer/task/Job.java (85%) rename src/{net => main/java}/tccn/timer/task/Task.java (90%) rename src/{net => main/java}/tccn/zhub/Lock.java (95%) rename src/{net => main/java}/tccn/zhub/Rpc.java (98%) rename src/{net => main/java}/tccn/zhub/RpcResult.java (96%) rename src/{net => main/java}/tccn/zhub/ZHubClient.java (99%) diff --git a/pom.xml b/pom.xml index 04f0c70..a2c8703 100644 --- a/pom.xml +++ b/pom.xml @@ -27,18 +27,4 @@ - - - - src - - - - - test - - - - - \ No newline at end of file diff --git a/src/net/tccn/AbstractConsumer.java b/src/main/java/tccn/AbstractConsumer.java similarity index 97% rename from src/net/tccn/AbstractConsumer.java rename to src/main/java/tccn/AbstractConsumer.java index 314afa8..fe5340b 100644 --- a/src/net/tccn/AbstractConsumer.java +++ b/src/main/java/tccn/AbstractConsumer.java @@ -1,8 +1,8 @@ -package net.tccn; +package tccn; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import net.tccn.zhub.Rpc; +import tccn.zhub.Rpc; import java.util.HashMap; import java.util.HashSet; diff --git a/src/net/tccn/Event.java b/src/main/java/tccn/Event.java similarity index 95% rename from src/net/tccn/Event.java rename to src/main/java/tccn/Event.java index cc957c6..4ab7a72 100644 --- a/src/net/tccn/Event.java +++ b/src/main/java/tccn/Event.java @@ -1,4 +1,4 @@ -package net.tccn; +package tccn; /** * 发布订阅 事件 diff --git a/src/net/tccn/EventType.java b/src/main/java/tccn/EventType.java similarity index 97% rename from src/net/tccn/EventType.java rename to src/main/java/tccn/EventType.java index 9ff202c..0e994c4 100644 --- a/src/net/tccn/EventType.java +++ b/src/main/java/tccn/EventType.java @@ -1,4 +1,4 @@ -package net.tccn; +package tccn; import com.google.gson.reflect.TypeToken; diff --git a/src/net/tccn/IConsumer.java b/src/main/java/tccn/IConsumer.java similarity index 97% rename from src/net/tccn/IConsumer.java rename to src/main/java/tccn/IConsumer.java index 5a49b51..8bd86ec 100644 --- a/src/net/tccn/IConsumer.java +++ b/src/main/java/tccn/IConsumer.java @@ -1,4 +1,4 @@ -package net.tccn; +package tccn; import com.google.gson.reflect.TypeToken; diff --git a/src/net/tccn/IProducer.java b/src/main/java/tccn/IProducer.java similarity index 91% rename from src/net/tccn/IProducer.java rename to src/main/java/tccn/IProducer.java index 1ff3bd8..201b410 100644 --- a/src/net/tccn/IProducer.java +++ b/src/main/java/tccn/IProducer.java @@ -1,4 +1,4 @@ -package net.tccn; +package tccn; import java.util.logging.Logger; diff --git a/src/net/tccn/IType.java b/src/main/java/tccn/IType.java similarity index 96% rename from src/net/tccn/IType.java rename to src/main/java/tccn/IType.java index 518537a..24bc349 100644 --- a/src/net/tccn/IType.java +++ b/src/main/java/tccn/IType.java @@ -1,4 +1,4 @@ -package net.tccn; +package tccn; import com.google.gson.reflect.TypeToken; diff --git a/src/net/tccn/timer/TimerExecutor.java b/src/main/java/tccn/timer/TimerExecutor.java similarity index 94% rename from src/net/tccn/timer/TimerExecutor.java rename to src/main/java/tccn/timer/TimerExecutor.java index 720ddf5..59986fd 100644 --- a/src/net/tccn/timer/TimerExecutor.java +++ b/src/main/java/tccn/timer/TimerExecutor.java @@ -1,7 +1,7 @@ -package net.tccn.timer; +package tccn.timer; -import net.tccn.timer.queue.TimerQueue; -import net.tccn.timer.task.Task; +import tccn.timer.queue.TimerQueue; +import tccn.timer.task.Task; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/src/net/tccn/timer/TimerTask.java b/src/main/java/tccn/timer/TimerTask.java similarity index 95% rename from src/net/tccn/timer/TimerTask.java rename to src/main/java/tccn/timer/TimerTask.java index e1993b4..6b2c956 100644 --- a/src/net/tccn/timer/TimerTask.java +++ b/src/main/java/tccn/timer/TimerTask.java @@ -1,8 +1,8 @@ -package net.tccn.timer; +package tccn.timer; -import net.tccn.timer.scheduled.Scheduled; -import net.tccn.timer.task.Job; -import net.tccn.timer.task.Task; +import tccn.timer.scheduled.Scheduled; +import tccn.timer.task.Job; +import tccn.timer.task.Task; import java.time.LocalDateTime; import java.time.ZoneId; diff --git a/src/net/tccn/timer/Timers.java b/src/main/java/tccn/timer/Timers.java similarity index 93% rename from src/net/tccn/timer/Timers.java rename to src/main/java/tccn/timer/Timers.java index b52cb45..c06c641 100644 --- a/src/net/tccn/timer/Timers.java +++ b/src/main/java/tccn/timer/Timers.java @@ -1,6 +1,6 @@ -package net.tccn.timer; +package tccn.timer; -import net.tccn.timer.scheduled.ScheduledCycle; +import tccn.timer.scheduled.ScheduledCycle; import java.util.UUID; import java.util.function.Supplier; diff --git a/src/net/tccn/timer/queue/TimerQueue.java b/src/main/java/tccn/timer/queue/TimerQueue.java similarity index 97% rename from src/net/tccn/timer/queue/TimerQueue.java rename to src/main/java/tccn/timer/queue/TimerQueue.java index 5a0e8c8..aac04f9 100644 --- a/src/net/tccn/timer/queue/TimerQueue.java +++ b/src/main/java/tccn/timer/queue/TimerQueue.java @@ -1,6 +1,6 @@ -package net.tccn.timer.queue; +package tccn.timer.queue; -import net.tccn.timer.task.Task; +import tccn.timer.task.Task; import java.util.LinkedList; import java.util.concurrent.TimeUnit; diff --git a/src/net/tccn/timer/scheduled/Scheduled.java b/src/main/java/tccn/timer/scheduled/Scheduled.java similarity index 90% rename from src/net/tccn/timer/scheduled/Scheduled.java rename to src/main/java/tccn/timer/scheduled/Scheduled.java index 31eb3ba..dfad853 100644 --- a/src/net/tccn/timer/scheduled/Scheduled.java +++ b/src/main/java/tccn/timer/scheduled/Scheduled.java @@ -1,4 +1,4 @@ -package net.tccn.timer.scheduled; +package tccn.timer.scheduled; import java.time.LocalDateTime; diff --git a/src/net/tccn/timer/scheduled/ScheduledCycle.java b/src/main/java/tccn/timer/scheduled/ScheduledCycle.java similarity index 98% rename from src/net/tccn/timer/scheduled/ScheduledCycle.java rename to src/main/java/tccn/timer/scheduled/ScheduledCycle.java index c43796e..79d6e64 100644 --- a/src/net/tccn/timer/scheduled/ScheduledCycle.java +++ b/src/main/java/tccn/timer/scheduled/ScheduledCycle.java @@ -1,4 +1,4 @@ -package net.tccn.timer.scheduled; +package tccn.timer.scheduled; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; diff --git a/src/net/tccn/timer/scheduled/ScheduledExpres.java b/src/main/java/tccn/timer/scheduled/ScheduledExpres.java similarity index 99% rename from src/net/tccn/timer/scheduled/ScheduledExpres.java rename to src/main/java/tccn/timer/scheduled/ScheduledExpres.java index 509b342..b62c79c 100644 --- a/src/net/tccn/timer/scheduled/ScheduledExpres.java +++ b/src/main/java/tccn/timer/scheduled/ScheduledExpres.java @@ -1,4 +1,4 @@ -package net.tccn.timer.scheduled; +package tccn.timer.scheduled; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/src/net/tccn/timer/task/Job.java b/src/main/java/tccn/timer/task/Job.java similarity index 85% rename from src/net/tccn/timer/task/Job.java rename to src/main/java/tccn/timer/task/Job.java index ddfd6f7..049fde3 100644 --- a/src/net/tccn/timer/task/Job.java +++ b/src/main/java/tccn/timer/task/Job.java @@ -1,4 +1,4 @@ -package net.tccn.timer.task; +package tccn.timer.task; /** * @author: liangxianyou at 2018/12/8 17:24. diff --git a/src/net/tccn/timer/task/Task.java b/src/main/java/tccn/timer/task/Task.java similarity index 90% rename from src/net/tccn/timer/task/Task.java rename to src/main/java/tccn/timer/task/Task.java index 342e075..228b9e5 100644 --- a/src/net/tccn/timer/task/Task.java +++ b/src/main/java/tccn/timer/task/Task.java @@ -1,7 +1,7 @@ -package net.tccn.timer.task; +package tccn.timer.task; -import net.tccn.timer.TimerExecutor; -import net.tccn.timer.scheduled.Scheduled; +import tccn.timer.TimerExecutor; +import tccn.timer.scheduled.Scheduled; /** * @author: liangxianyou at 2018/8/5 19:32. diff --git a/src/net/tccn/zhub/Lock.java b/src/main/java/tccn/zhub/Lock.java similarity index 95% rename from src/net/tccn/zhub/Lock.java rename to src/main/java/tccn/zhub/Lock.java index 516a670..abc66a3 100644 --- a/src/net/tccn/zhub/Lock.java +++ b/src/main/java/tccn/zhub/Lock.java @@ -1,4 +1,4 @@ -package net.tccn.zhub; +package tccn.zhub; // ================================================== lock ================================================== public class Lock { diff --git a/src/net/tccn/zhub/Rpc.java b/src/main/java/tccn/zhub/Rpc.java similarity index 98% rename from src/net/tccn/zhub/Rpc.java rename to src/main/java/tccn/zhub/Rpc.java index 374fa37..11b5885 100644 --- a/src/net/tccn/zhub/Rpc.java +++ b/src/main/java/tccn/zhub/Rpc.java @@ -1,4 +1,4 @@ -package net.tccn.zhub; +package tccn.zhub; import com.google.gson.Gson; import com.google.gson.annotations.Expose; diff --git a/src/net/tccn/zhub/RpcResult.java b/src/main/java/tccn/zhub/RpcResult.java similarity index 96% rename from src/net/tccn/zhub/RpcResult.java rename to src/main/java/tccn/zhub/RpcResult.java index 6f5bf87..8d3858b 100644 --- a/src/net/tccn/zhub/RpcResult.java +++ b/src/main/java/tccn/zhub/RpcResult.java @@ -1,4 +1,4 @@ -package net.tccn.zhub; +package tccn.zhub; public class RpcResult { private String ruk; diff --git a/src/net/tccn/zhub/ZHubClient.java b/src/main/java/tccn/zhub/ZHubClient.java similarity index 99% rename from src/net/tccn/zhub/ZHubClient.java rename to src/main/java/tccn/zhub/ZHubClient.java index 4e24661..bf6a9e3 100644 --- a/src/net/tccn/zhub/ZHubClient.java +++ b/src/main/java/tccn/zhub/ZHubClient.java @@ -1,11 +1,11 @@ -package net.tccn.zhub; +package tccn.zhub; import com.google.gson.reflect.TypeToken; -import net.tccn.AbstractConsumer; -import net.tccn.Event; -import net.tccn.IConsumer; -import net.tccn.IProducer; -import net.tccn.timer.Timers; +import tccn.AbstractConsumer; +import tccn.Event; +import tccn.IConsumer; +import tccn.IProducer; +import tccn.timer.Timers; import java.io.BufferedReader; import java.io.IOException; diff --git a/test/HelloService.java b/test/HelloService.java index 8dbac4b..a5befed 100644 --- a/test/HelloService.java +++ b/test/HelloService.java @@ -1,9 +1,7 @@ -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; +import tccn.IType; +import tccn.zhub.ZHubClient; // @RestService(automapping = true) public class HelloService {