support

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;

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.*;

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;

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;

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;

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;

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;

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;

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;

src/main/java/org/redkale/schedule/ScheduleManager.java

@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.scheduling;
+package org.redkale.schedule;
 
 /**
  * 定时管理器

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;

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;

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;

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",

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;

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;
 
 /**
  *

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;
 
 /**