From 96adba4e48fdf998079827bd001f60325224dde5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E6=98=BE=E4=BC=98?= <237809796@qq.com>
Date: Mon, 8 May 2023 16:05:42 +0800
Subject: [PATCH] .

---
 .../org.redkale.cluster.ClusterAgentProvider  |  0
 .../org.redkale.source.CacheSourceProvider    |  0
 src/com/zdemo/ZhubListener.java               | 54 -------------------
 src/com/zdemo/zhub/ZHubClient.java            | 13 +++--
 .../cache/redis/RedisCacheSourceProvider.java |  2 +-
 5 files changed, 7 insertions(+), 62 deletions(-)
 rename src/{resources => }/META-INF/services/org.redkale.cluster.ClusterAgentProvider (100%)
 rename src/{resources => }/META-INF/services/org.redkale.source.CacheSourceProvider (100%)
 delete mode 100644 src/com/zdemo/ZhubListener.java

diff --git a/src/resources/META-INF/services/org.redkale.cluster.ClusterAgentProvider b/src/META-INF/services/org.redkale.cluster.ClusterAgentProvider
similarity index 100%
rename from src/resources/META-INF/services/org.redkale.cluster.ClusterAgentProvider
rename to src/META-INF/services/org.redkale.cluster.ClusterAgentProvider
diff --git a/src/resources/META-INF/services/org.redkale.source.CacheSourceProvider b/src/META-INF/services/org.redkale.source.CacheSourceProvider
similarity index 100%
rename from src/resources/META-INF/services/org.redkale.source.CacheSourceProvider
rename to src/META-INF/services/org.redkale.source.CacheSourceProvider
diff --git a/src/com/zdemo/ZhubListener.java b/src/com/zdemo/ZhubListener.java
deleted file mode 100644
index 8c17ebe..0000000
--- a/src/com/zdemo/ZhubListener.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-package com.zdemo;
-
-import org.redkale.boot.Application;
-import org.redkale.boot.ApplicationListener;
-import org.redkale.service.Service;
-import org.redkale.util.AnyValue;
-import org.redkale.util.RedkaleClassLoader;
-import org.redkale.util.ResourceFactory;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.concurrent.CompletableFuture;
-
-*/
-/**
- * 服务监听
- *
- * @author: liangxy.
- *//*
-
-@Deprecated
-public class ZhubListener implements ApplicationListener {
-
-    @Override
-    public void preStart(Application application) {
-
-        CompletableFuture.runAsync(() -> {
-            ResourceFactory resourceFactory = application.getResourceFactory();
-            RedkaleClassLoader classLoader = application.getClassLoader();
-
-            AnyValue appConfig = application.getAppConfig();
-            AnyValue zhubs = appConfig.getAnyValue("zhubs");
-            AnyValue[] values = zhubs.getAnyValues("zhub");
-            for (AnyValue zhub : values) {
-                String className = zhub.getValue("value", "com.zdemo.zhub.ZHubClient");
-                try {
-                    Class<?> clazz = classLoader.loadClass(className);
-                    Service obj = (Service) clazz.getDeclaredConstructor().newInstance();
-                    application.getResourceFactory().inject(obj);
-                    obj.init(zhub);
-                    resourceFactory.register(zhub.get("name"), clazz, obj);
-                } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | ClassNotFoundException e) {
-                    e.printStackTrace();
-                }
-            }
-        });
-    }
-
-    @Override
-    public void preShutdown(Application application) {
-
-    }
-}
-*/
diff --git a/src/com/zdemo/zhub/ZHubClient.java b/src/com/zdemo/zhub/ZHubClient.java
index 7236e16..b2d871d 100644
--- a/src/com/zdemo/zhub/ZHubClient.java
+++ b/src/com/zdemo/zhub/ZHubClient.java
@@ -65,13 +65,12 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
 
         if (config == null) {
             initClient(null);
-            return;
-        }
-
-        Map<String, AnyValue> nodes = getNodes(config);
-        for (String rsName : nodes.keySet()) {
-            ZHubClient client = new ZHubClient().initClient(nodes.get(rsName));
-            application.getResourceFactory().register(rsName, client);
+        } else {
+            Map<String, AnyValue> nodes = getNodes(config);
+            for (String rsName : nodes.keySet()) {
+                ZHubClient client = new ZHubClient().initClient(nodes.get(rsName));
+                application.getResourceFactory().register(rsName, client);
+            }
         }
     }
 
diff --git a/src/org/redkalex/cache/redis/RedisCacheSourceProvider.java b/src/org/redkalex/cache/redis/RedisCacheSourceProvider.java
index 5b62979..3bf7f92 100644
--- a/src/org/redkalex/cache/redis/RedisCacheSourceProvider.java
+++ b/src/org/redkalex/cache/redis/RedisCacheSourceProvider.java
@@ -13,7 +13,7 @@ import org.redkale.util.AnyValue;
 /**
  * @author zhangjx
  */
-@Priority(10001)
+@Priority(1)
 public class RedisCacheSourceProvider implements CacheSourceProvider {
 
     @Override