From f7e3f7d7ecf50ae49e9f828a99472c197e9bf363 Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Mon, 11 Dec 2023 22:18:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/META-INF/application-template.xml      |  9 ++++++++-
 src/main/java/module-info.java                       |  2 +-
 src/main/java/org/redkale/boot/Application.java      |  4 ++--
 .../org/redkale/cache/{Caching.java => Cached.java}  |  2 +-
 .../redkale/cache/support/CacheManagerService.java   |  2 +-
 .../{lock/Locking.java => locking/Locked.java}       |  4 ++--
 src/main/java/org/redkale/net/sncp/Sncp.java         | 12 ++++++------
 .../schedule/{Scheduling.java => Scheduled.java}     |  2 +-
 .../schedule/support/ScheduleManagerService.java     | 10 +++++-----
 .../org/redkale/test/schedule/ScheduleService.java   |  8 ++++----
 10 files changed, 31 insertions(+), 24 deletions(-)
 rename src/main/java/org/redkale/cache/{Caching.java => Cached.java} (98%)
 rename src/main/java/org/redkale/{lock/Locking.java => locking/Locked.java} (92%)
 rename src/main/java/org/redkale/schedule/{Scheduling.java => Scheduled.java} (98%)

diff --git a/src/main/java/META-INF/application-template.xml b/src/main/java/META-INF/application-template.xml
index 1f7c13aca..841780d2b 100644
--- a/src/main/java/META-INF/application-template.xml
+++ b/src/main/java/META-INF/application-template.xml
@@ -41,13 +41,20 @@
     -->
     <executor threads="4"/>
 
+    <!--
+       【节点全局唯一】 @since 2.8.0
+        全局Serivce的定时任务设置，没配置该节点将自动创建一个。
+        enabled： 是否开启缓存功能。默认: true
+    -->
+    <schedule enabled="true"/>
+    
     <!--
        【节点全局唯一】 @since 2.8.0
         全局Serivce的缓存设置，没配置该节点将自动创建一个。
         enabled： 是否开启缓存功能。默认: true
         source: 远程CacheSource的资源名
     -->
-    <caching enabled="true" source="xxx"/>
+    <cache enabled="true" source="xxx"/>
     
     <!--
        【节点全局唯一】
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 01dae9a8a..34d83360b 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -25,7 +25,7 @@ module org.redkale {
     exports org.redkale.convert.ext;
     exports org.redkale.convert.json;
     exports org.redkale.convert.protobuf;
-    exports org.redkale.lock;
+    exports org.redkale.locking;
     exports org.redkale.mq;
     exports org.redkale.net;
     exports org.redkale.net.client;
diff --git a/src/main/java/org/redkale/boot/Application.java b/src/main/java/org/redkale/boot/Application.java
index 6a175410a..5db6e22af 100644
--- a/src/main/java/org/redkale/boot/Application.java
+++ b/src/main/java/org/redkale/boot/Application.java
@@ -1223,7 +1223,7 @@ public final class Application {
         }
 
         { //设置定时管理器
-            final AnyValue scheduleConf = config.getAnyValue("scheduling", true);
+            final AnyValue scheduleConf = config.getAnyValue("schedule", true);
             this.resourceFactory.inject(this.scheduleManager);
             if (!isCompileMode()) {
                 this.scheduleManager.init(scheduleConf);
@@ -1232,7 +1232,7 @@ public final class Application {
         }
 
         { //设置缓存管理器
-            final AnyValue cacheConf = config.getAnyValue("caching");
+            final AnyValue cacheConf = config.getAnyValue("cache");
             this.resourceFactory.inject(this.cacheManager);
             if (!isCompileMode() && cacheConf != null) {
                 this.cacheManager.init(cacheConf);
diff --git a/src/main/java/org/redkale/cache/Caching.java b/src/main/java/org/redkale/cache/Cached.java
similarity index 98%
rename from src/main/java/org/redkale/cache/Caching.java
rename to src/main/java/org/redkale/cache/Cached.java
index 359e70ef7..6606f08d4 100644
--- a/src/main/java/org/redkale/cache/Caching.java
+++ b/src/main/java/org/redkale/cache/Cached.java
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
 @Documented
 @Target(METHOD)
 @Retention(RUNTIME)
-public @interface Caching {
+public @interface Cached {
 
     /**
      * 缓存的key，支持参数动态组合，比如"key_#{id}"
diff --git a/src/main/java/org/redkale/cache/support/CacheManagerService.java b/src/main/java/org/redkale/cache/support/CacheManagerService.java
index 88063f5ba..e0346c806 100644
--- a/src/main/java/org/redkale/cache/support/CacheManagerService.java
+++ b/src/main/java/org/redkale/cache/support/CacheManagerService.java
@@ -87,7 +87,7 @@ public class CacheManagerService implements CacheManager, Service {
         this.enabled = conf.getBoolValue("enabled", true);
         if (this.enabled) {
             this.localSource.init(conf);
-            String remoteSourceName = conf.getValue("remoteSource");
+            String remoteSourceName = conf.getValue("source");
             if (remoteSource == null && application != null && Utility.isNotBlank(remoteSourceName)) {
                 CacheSource source = application.loadCacheSource(remoteSourceName, false);
                 if (source == null) {
diff --git a/src/main/java/org/redkale/lock/Locking.java b/src/main/java/org/redkale/locking/Locked.java
similarity index 92%
rename from src/main/java/org/redkale/lock/Locking.java
rename to src/main/java/org/redkale/locking/Locked.java
index 71408af59..d6d9766c0 100644
--- a/src/main/java/org/redkale/lock/Locking.java
+++ b/src/main/java/org/redkale/locking/Locked.java
@@ -1,7 +1,7 @@
 /*
  *
  */
-package org.redkale.lock;
+package org.redkale.locking;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.METHOD;
@@ -29,6 +29,6 @@ import java.lang.annotation.Target;
 @Documented
 @Target(METHOD)
 @Retention(RUNTIME)
-public @interface Locking {
+public @interface Locked {
 
 }
diff --git a/src/main/java/org/redkale/net/sncp/Sncp.java b/src/main/java/org/redkale/net/sncp/Sncp.java
index efb1bde9a..2447aa26d 100644
--- a/src/main/java/org/redkale/net/sncp/Sncp.java
+++ b/src/main/java/org/redkale/net/sncp/Sncp.java
@@ -22,7 +22,6 @@ 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;
@@ -31,6 +30,7 @@ import org.redkale.util.ResourceFactory;
 import org.redkale.util.TypeToken;
 import org.redkale.util.Uint128;
 import org.redkale.util.Utility;
+import org.redkale.schedule.Scheduled;
 
 /**
  * Service Node Communicate Protocol
@@ -75,11 +75,11 @@ public abstract class Sncp {
 
         private String methodName;
 
-        private Scheduling schedule;
+        private Scheduled schedule;
 
         private Runnable task;
 
-        public SchedulingEntry(Class serviceType, String methodName, Scheduling schedule, Runnable task) {
+        public SchedulingEntry(Class serviceType, String methodName, Scheduled schedule, Runnable task) {
             Objects.requireNonNull(serviceType);
             Objects.requireNonNull(methodName);
             Objects.requireNonNull(schedule);
@@ -98,7 +98,7 @@ public abstract class Sncp {
             return methodName;
         }
 
-        public Scheduling getSchedule() {
+        public Scheduled getSchedule() {
             return schedule;
         }
 
@@ -134,10 +134,10 @@ public abstract class Sncp {
             if (method.isSynthetic()) {
                 continue;
             }
-            if (method.getAnnotation(Scheduling.class) != null) {
+            if (method.getAnnotation(Scheduled.class) != null) {
                 if (Modifier.isStatic(method.getModifiers())
                     || method.getParameterCount() > 0) {
-                    throw new SncpException(Scheduling.class.getSimpleName() + " must be on protected and non-parameter method, but on " + method);
+                    throw new SncpException(Scheduled.class.getSimpleName() + " must be on protected and non-parameter method, but on " + method);
                 }
                 RedkaleClassLoader.putReflectionMethod(serviceTypeOrImplClass.getName(), method);
                 continue;
diff --git a/src/main/java/org/redkale/schedule/Scheduling.java b/src/main/java/org/redkale/schedule/Scheduled.java
similarity index 98%
rename from src/main/java/org/redkale/schedule/Scheduling.java
rename to src/main/java/org/redkale/schedule/Scheduled.java
index a4d6049af..2f67835c4 100644
--- a/src/main/java/org/redkale/schedule/Scheduling.java
+++ b/src/main/java/org/redkale/schedule/Scheduled.java
@@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit;
  */
 @Target({ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
-public @interface Scheduling {
+public @interface Scheduled {
 
     /**
      * 名称
diff --git a/src/main/java/org/redkale/schedule/support/ScheduleManagerService.java b/src/main/java/org/redkale/schedule/support/ScheduleManagerService.java
index 34c61763b..370a182c8 100644
--- a/src/main/java/org/redkale/schedule/support/ScheduleManagerService.java
+++ b/src/main/java/org/redkale/schedule/support/ScheduleManagerService.java
@@ -31,14 +31,14 @@ import org.redkale.annotation.Nullable;
 import org.redkale.annotation.Resource;
 import org.redkale.annotation.ResourceType;
 import org.redkale.boot.Application;
-import org.redkale.schedule.ScheduleManager;
-import org.redkale.schedule.Scheduling;
 import org.redkale.service.Local;
 import org.redkale.service.Service;
 import org.redkale.util.AnyValue;
 import org.redkale.util.RedkaleClassLoader;
 import org.redkale.util.RedkaleException;
 import org.redkale.util.Utility;
+import org.redkale.schedule.Scheduled;
+import org.redkale.schedule.ScheduleManager;
 
 /**
  * 定时任务管理器
@@ -157,14 +157,14 @@ public class ScheduleManagerService implements ScheduleManager, Service {
             WeakReference ref = new WeakReference(service);
             do {
                 for (final Method method : clazz.getDeclaredMethods()) {
-                    if (method.getAnnotation(Scheduling.class) == null) {
+                    if (method.getAnnotation(Scheduled.class) == null) {
                         continue;
                     }
                     if (tasks.containsKey(method.getName())) {
                         continue;
                     }
                     if (method.getParameterCount() > 0) {
-                        throw new RedkaleException("@" + Scheduling.class.getSimpleName() + " must be on non-parameter method, but on " + method);
+                        throw new RedkaleException("@" + Scheduled.class.getSimpleName() + " must be on non-parameter method, but on " + method);
                     }
                     ScheduledTask task = schedule(ref, method);
                     if (task == null) {
@@ -185,7 +185,7 @@ public class ScheduleManagerService implements ScheduleManager, Service {
     }
 
     protected ScheduledTask schedule(WeakReference ref, Method method) {
-        Scheduling ann = method.getAnnotation(Scheduling.class);
+        Scheduled ann = method.getAnnotation(Scheduled.class);
         String name = getProperty(ann.name());
         String cron = getProperty(ann.cron());
         String fixedDelay = getProperty(ann.fixedDelay());
diff --git a/src/test/java/org/redkale/test/schedule/ScheduleService.java b/src/test/java/org/redkale/test/schedule/ScheduleService.java
index 2b356b5c1..2a8aecd87 100644
--- a/src/test/java/org/redkale/test/schedule/ScheduleService.java
+++ b/src/test/java/org/redkale/test/schedule/ScheduleService.java
@@ -3,9 +3,9 @@
  */
 package org.redkale.test.schedule;
 
-import org.redkale.schedule.Scheduling;
 import org.redkale.service.Service;
 import org.redkale.util.Times;
+import org.redkale.schedule.Scheduled;
 
 /**
  *
@@ -13,18 +13,18 @@ import org.redkale.util.Times;
  */
 public class ScheduleService implements Service {
 
-    @Scheduling(cron = "0/1 * * * * ?")
+    @Scheduled(cron = "0/1 * * * * ?")
     public void task1() {
         System.out.println(Times.nowMillis() + "每秒-----------执行task1");
     }
 
-    @Scheduling(cron = "0/1 * * * * ?")
+    @Scheduled(cron = "0/1 * * * * ?")
     public String task2() {
         System.out.println(Times.nowMillis() + "每秒*****执行task2");
         return "";
     }
 
-    @Scheduling(cron = "0/1 * * * * ?")
+    @Scheduled(cron = "0/1 * * * * ?")
     private void task3() {
         System.out.println(Times.nowMillis() + "每秒执行task3");
     }