From 53f029052b22406e18d5aa9ef53baca56a0d3fcd Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Mon, 11 Dec 2023 20:15:49 +0800
Subject: [PATCH] support

---
 src/main/java/module-info.java                             | 7 +++++--
 src/main/java/org/redkale/boot/Application.java            | 2 +-
 .../java/org/redkale/{caching => cache}/CacheManager.java  | 2 +-
 .../java/org/redkale/{annotation => cache}/Caching.java    | 2 +-
 .../redkale/{caching => cache/support}/CacheExpire.java    | 2 +-
 .../{caching => cache/support}/CacheManagerService.java    | 3 ++-
 .../org/redkale/{caching => cache/support}/CacheValue.java | 2 +-
 .../java/org/redkale/{annotation => lock}/Locking.java     | 2 +-
 src/main/java/org/redkale/net/sncp/Sncp.java               | 1 +
 .../redkale/{scheduling => schedule}/ScheduleManager.java  | 2 +-
 .../org/redkale/{annotation => schedule}/Scheduling.java   | 2 +-
 .../{scheduling => schedule/support}/CronExpression.java   | 2 +-
 .../support}/ScheduleManagerService.java                   | 5 +++--
 src/main/java/org/redkale/util/RedkaleClassLoader.java     | 7 +++++--
 .../org/redkale/test/{caching => cache}/CachingTest.java   | 4 ++--
 .../test/{scheduling => schedule}/ScheduleService.java     | 4 ++--
 .../test/{scheduling => schedule}/ScheduleTest.java        | 4 ++--
 17 files changed, 31 insertions(+), 22 deletions(-)
 rename src/main/java/org/redkale/{caching => cache}/CacheManager.java (99%)
 rename src/main/java/org/redkale/{annotation => cache}/Caching.java (98%)
 rename src/main/java/org/redkale/{caching => cache/support}/CacheExpire.java (95%)
 rename src/main/java/org/redkale/{caching => cache/support}/CacheManagerService.java (99%)
 rename src/main/java/org/redkale/{caching => cache/support}/CacheValue.java (97%)
 rename src/main/java/org/redkale/{annotation => lock}/Locking.java (95%)
 rename src/main/java/org/redkale/{scheduling => schedule}/ScheduleManager.java (93%)
 rename src/main/java/org/redkale/{annotation => schedule}/Scheduling.java (98%)
 rename src/main/java/org/redkale/{scheduling => schedule/support}/CronExpression.java (99%)
 rename src/main/java/org/redkale/{scheduling => schedule/support}/ScheduleManagerService.java (99%)
 rename src/test/java/org/redkale/test/{caching => cache}/CachingTest.java (96%)
 rename src/test/java/org/redkale/test/{scheduling => schedule}/ScheduleService.java (88%)
 rename src/test/java/org/redkale/test/{scheduling => schedule}/ScheduleTest.java (86%)

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 1d9ea23a6..01dae9a8a 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -17,20 +17,23 @@ module org.redkale {
     exports org.redkale.asm;
     exports org.redkale.boot;
     exports org.redkale.boot.watch;
-    exports org.redkale.caching;
+    exports org.redkale.cache;
+    exports org.redkale.cache.support;
     exports org.redkale.cluster;
     exports org.redkale.convert;
     exports org.redkale.convert.bson;
     exports org.redkale.convert.ext;
     exports org.redkale.convert.json;
     exports org.redkale.convert.protobuf;
+    exports org.redkale.lock;
     exports org.redkale.mq;
     exports org.redkale.net;
     exports org.redkale.net.client;
     exports org.redkale.net.http;
     exports org.redkale.net.sncp;
     exports org.redkale.persistence;
-    exports org.redkale.scheduling;
+    exports org.redkale.schedule;
+    exports org.redkale.schedule.support;
     exports org.redkale.service;
     exports org.redkale.source;
     exports org.redkale.util;
diff --git a/src/main/java/org/redkale/boot/Application.java b/src/main/java/org/redkale/boot/Application.java
index b7e8d9ff4..43e436ce3 100644
--- a/src/main/java/org/redkale/boot/Application.java
+++ b/src/main/java/org/redkale/boot/Application.java
@@ -31,7 +31,7 @@ import org.redkale.mq.*;
 import org.redkale.net.*;
 import org.redkale.net.http.*;
 import org.redkale.net.sncp.*;
-import org.redkale.scheduling.ScheduleManagerService;
+import org.redkale.schedule.support.ScheduleManagerService;
 import org.redkale.service.Service;
 import org.redkale.source.*;
 import org.redkale.util.*;
diff --git a/src/main/java/org/redkale/caching/CacheManager.java b/src/main/java/org/redkale/cache/CacheManager.java
similarity index 99%
rename from src/main/java/org/redkale/caching/CacheManager.java
rename to src/main/java/org/redkale/cache/CacheManager.java
index 102aa878a..c4418c0b9 100644
--- a/src/main/java/org/redkale/caching/CacheManager.java
+++ b/src/main/java/org/redkale/cache/CacheManager.java
@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.caching;
+package org.redkale.cache;
 
 import java.lang.reflect.Type;
 import java.time.Duration;
diff --git a/src/main/java/org/redkale/annotation/Caching.java b/src/main/java/org/redkale/cache/Caching.java
similarity index 98%
rename from src/main/java/org/redkale/annotation/Caching.java
rename to src/main/java/org/redkale/cache/Caching.java
index 473c5ecd1..359e70ef7 100644
--- a/src/main/java/org/redkale/annotation/Caching.java
+++ b/src/main/java/org/redkale/cache/Caching.java
@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.annotation;
+package org.redkale.cache;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/src/main/java/org/redkale/caching/CacheExpire.java b/src/main/java/org/redkale/cache/support/CacheExpire.java
similarity index 95%
rename from src/main/java/org/redkale/caching/CacheExpire.java
rename to src/main/java/org/redkale/cache/support/CacheExpire.java
index fd548038a..2ffaab9bc 100644
--- a/src/main/java/org/redkale/caching/CacheExpire.java
+++ b/src/main/java/org/redkale/cache/support/CacheExpire.java
@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.caching;
+package org.redkale.cache.support;
 
 import org.redkale.convert.ConvertColumn;
 import org.redkale.convert.ConvertDisabled;
diff --git a/src/main/java/org/redkale/caching/CacheManagerService.java b/src/main/java/org/redkale/cache/support/CacheManagerService.java
similarity index 99%
rename from src/main/java/org/redkale/caching/CacheManagerService.java
rename to src/main/java/org/redkale/cache/support/CacheManagerService.java
index 998674adf..a7056a439 100644
--- a/src/main/java/org/redkale/caching/CacheManagerService.java
+++ b/src/main/java/org/redkale/cache/support/CacheManagerService.java
@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.caching;
+package org.redkale.cache.support;
 
 import java.lang.reflect.Type;
 import java.time.Duration;
@@ -12,6 +12,7 @@ import org.redkale.annotation.AutoLoad;
 import org.redkale.annotation.Component;
 import org.redkale.annotation.Nullable;
 import org.redkale.annotation.ResourceType;
+import org.redkale.cache.CacheManager;
 import org.redkale.service.Local;
 import org.redkale.service.Service;
 import org.redkale.source.CacheMemorySource;
diff --git a/src/main/java/org/redkale/caching/CacheValue.java b/src/main/java/org/redkale/cache/support/CacheValue.java
similarity index 97%
rename from src/main/java/org/redkale/caching/CacheValue.java
rename to src/main/java/org/redkale/cache/support/CacheValue.java
index 3d9b4a59d..599c26c11 100644
--- a/src/main/java/org/redkale/caching/CacheValue.java
+++ b/src/main/java/org/redkale/cache/support/CacheValue.java
@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.caching;
+package org.redkale.cache.support;
 
 import java.time.Duration;
 import org.redkale.convert.ConvertColumn;
diff --git a/src/main/java/org/redkale/annotation/Locking.java b/src/main/java/org/redkale/lock/Locking.java
similarity index 95%
rename from src/main/java/org/redkale/annotation/Locking.java
rename to src/main/java/org/redkale/lock/Locking.java
index 96256c09c..71408af59 100644
--- a/src/main/java/org/redkale/annotation/Locking.java
+++ b/src/main/java/org/redkale/lock/Locking.java
@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.annotation;
+package org.redkale.lock;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/src/main/java/org/redkale/net/sncp/Sncp.java b/src/main/java/org/redkale/net/sncp/Sncp.java
index e94626b6f..efb1bde9a 100644
--- a/src/main/java/org/redkale/net/sncp/Sncp.java
+++ b/src/main/java/org/redkale/net/sncp/Sncp.java
@@ -22,6 +22,7 @@ import org.redkale.convert.bson.BsonConvert;
 import org.redkale.mq.MessageAgent;
 import org.redkale.net.http.WebSocketNode;
 import org.redkale.net.sncp.SncpRemoteInfo.SncpRemoteAction;
+import org.redkale.schedule.Scheduling;
 import org.redkale.service.*;
 import org.redkale.util.AnyValue;
 import org.redkale.util.RedkaleClassLoader;
diff --git a/src/main/java/org/redkale/scheduling/ScheduleManager.java b/src/main/java/org/redkale/schedule/ScheduleManager.java
similarity index 93%
rename from src/main/java/org/redkale/scheduling/ScheduleManager.java
rename to src/main/java/org/redkale/schedule/ScheduleManager.java
index ba0fec95a..f678de980 100644
--- a/src/main/java/org/redkale/scheduling/ScheduleManager.java
+++ b/src/main/java/org/redkale/schedule/ScheduleManager.java
@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.scheduling;
+package org.redkale.schedule;
 
 /**
  * 定时管理器
diff --git a/src/main/java/org/redkale/annotation/Scheduling.java b/src/main/java/org/redkale/schedule/Scheduling.java
similarity index 98%
rename from src/main/java/org/redkale/annotation/Scheduling.java
rename to src/main/java/org/redkale/schedule/Scheduling.java
index b6f7c6c45..a4d6049af 100644
--- a/src/main/java/org/redkale/annotation/Scheduling.java
+++ b/src/main/java/org/redkale/schedule/Scheduling.java
@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.annotation;
+package org.redkale.schedule;
 
 import java.lang.annotation.*;
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/org/redkale/scheduling/CronExpression.java b/src/main/java/org/redkale/schedule/support/CronExpression.java
similarity index 99%
rename from src/main/java/org/redkale/scheduling/CronExpression.java
rename to src/main/java/org/redkale/schedule/support/CronExpression.java
index fd395533b..f6c6ef298 100644
--- a/src/main/java/org/redkale/scheduling/CronExpression.java
+++ b/src/main/java/org/redkale/schedule/support/CronExpression.java
@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.scheduling;
+package org.redkale.schedule.support;
 
 import java.time.DateTimeException;
 import java.time.temporal.ChronoField;
diff --git a/src/main/java/org/redkale/scheduling/ScheduleManagerService.java b/src/main/java/org/redkale/schedule/support/ScheduleManagerService.java
similarity index 99%
rename from src/main/java/org/redkale/scheduling/ScheduleManagerService.java
rename to src/main/java/org/redkale/schedule/support/ScheduleManagerService.java
index 6648c9b38..845348334 100644
--- a/src/main/java/org/redkale/scheduling/ScheduleManagerService.java
+++ b/src/main/java/org/redkale/schedule/support/ScheduleManagerService.java
@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.scheduling;
+package org.redkale.schedule.support;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -29,7 +29,8 @@ import org.redkale.annotation.AutoLoad;
 import org.redkale.annotation.Component;
 import org.redkale.annotation.Nullable;
 import org.redkale.annotation.ResourceType;
-import org.redkale.annotation.Scheduling;
+import org.redkale.schedule.ScheduleManager;
+import org.redkale.schedule.Scheduling;
 import org.redkale.service.Local;
 import org.redkale.service.Service;
 import org.redkale.util.RedkaleClassLoader;
diff --git a/src/main/java/org/redkale/util/RedkaleClassLoader.java b/src/main/java/org/redkale/util/RedkaleClassLoader.java
index fd34910dd..79d551b35 100644
--- a/src/main/java/org/redkale/util/RedkaleClassLoader.java
+++ b/src/main/java/org/redkale/util/RedkaleClassLoader.java
@@ -47,20 +47,23 @@ public class RedkaleClassLoader extends URLClassLoader {
         "org.redkale.asm",
         "org.redkale.boot",
         "org.redkale.boot.watch",
-        "org.redkale.caching",
+        "org.redkale.cache",
+        "org.redkale.cache.support",
         "org.redkale.cluster",
         "org.redkale.convert",
         "org.redkale.convert.bson",
         "org.redkale.convert.ext",
         "org.redkale.convert.json",
         "org.redkale.convert.protobuf",
+        "org.redkale.lock",
         "org.redkale.mq",
         "org.redkale.net",
         "org.redkale.net.client",
         "org.redkale.net.http",
         "org.redkale.net.sncp",
         "org.redkale.persistence",
-        "org.redkale.scheduling",
+        "org.redkale.schedule",
+        "org.redkale.schedule.support",
         "org.redkale.service",
         "org.redkale.source",
         "org.redkale.util",
diff --git a/src/test/java/org/redkale/test/caching/CachingTest.java b/src/test/java/org/redkale/test/cache/CachingTest.java
similarity index 96%
rename from src/test/java/org/redkale/test/caching/CachingTest.java
rename to src/test/java/org/redkale/test/cache/CachingTest.java
index 656f4aeff..7b7745f45 100644
--- a/src/test/java/org/redkale/test/caching/CachingTest.java
+++ b/src/test/java/org/redkale/test/cache/CachingTest.java
@@ -1,12 +1,12 @@
 /*
  *
  */
-package org.redkale.test.caching;
+package org.redkale.test.cache;
 
 import java.time.Duration;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.redkale.caching.CacheManagerService;
+import org.redkale.cache.support.CacheManagerService;
 import org.redkale.convert.json.JsonConvert;
 import org.redkale.source.CacheMemorySource;
 import org.redkale.util.Utility;
diff --git a/src/test/java/org/redkale/test/scheduling/ScheduleService.java b/src/test/java/org/redkale/test/schedule/ScheduleService.java
similarity index 88%
rename from src/test/java/org/redkale/test/scheduling/ScheduleService.java
rename to src/test/java/org/redkale/test/schedule/ScheduleService.java
index 1a95301e4..2b356b5c1 100644
--- a/src/test/java/org/redkale/test/scheduling/ScheduleService.java
+++ b/src/test/java/org/redkale/test/schedule/ScheduleService.java
@@ -1,11 +1,11 @@
 /*
  *
  */
-package org.redkale.test.scheduling;
+package org.redkale.test.schedule;
 
+import org.redkale.schedule.Scheduling;
 import org.redkale.service.Service;
 import org.redkale.util.Times;
-import org.redkale.annotation.Scheduling;
 
 /**
  *
diff --git a/src/test/java/org/redkale/test/scheduling/ScheduleTest.java b/src/test/java/org/redkale/test/schedule/ScheduleTest.java
similarity index 86%
rename from src/test/java/org/redkale/test/scheduling/ScheduleTest.java
rename to src/test/java/org/redkale/test/schedule/ScheduleTest.java
index 7308e6126..2f878825c 100644
--- a/src/test/java/org/redkale/test/scheduling/ScheduleTest.java
+++ b/src/test/java/org/redkale/test/schedule/ScheduleTest.java
@@ -1,10 +1,10 @@
 /*
  *
  */
-package org.redkale.test.scheduling;
+package org.redkale.test.schedule;
 
 import org.junit.jupiter.api.Test;
-import org.redkale.scheduling.ScheduleManagerService;
+import org.redkale.schedule.support.ScheduleManagerService;
 import org.redkale.util.Utility;
 
 /**