增加全局监听

discovery-plugin-config-center-extension-nacos/src/main/java/com/nepxion/discovery/plugin/configcenter/extension/nacos/adapter/NacosConfigAdapter.java

@@ -39,18 +39,18 @@ public class NacosConfigAdapter extends ConfigAdapter {
 
     @Override
     public String getConfig() throws Exception {
-        String config = getConfig(true);
+        String config = getConfig(false);
         if (StringUtils.isNotEmpty(config)) {
             return config;
         } else {
-            LOG.info("No global config is retrieved from Nacos server");
+            LOG.info("No partial config is retrieved from Nacos server");
         }
 
-        config = getConfig(false);
+        config = getConfig(true);
         if (StringUtils.isNotEmpty(config)) {
             return config;
         } else {
-            LOG.info("No partial config is retrieved from Nacos server");
+            LOG.info("No global config is retrieved from Nacos server");
         }
 
         return null;
@@ -68,8 +68,8 @@ public class NacosConfigAdapter extends ConfigAdapter {
 
     @PostConstruct
     public void subscribeConfig() {
-        subscribeConfig(true);
         subscribeConfig(false);
+        subscribeConfig(true);
     }
 
     private void subscribeConfig(boolean globalConfig) {

discovery-plugin-config-center-extension-redis/src/main/java/com/nepxion/discovery/plugin/configcenter/extension/redis/adapter/RedisConfigAdapter.java

@@ -37,18 +37,18 @@ public class RedisConfigAdapter extends ConfigAdapter {
 
     @Override
     public String getConfig() throws Exception {
-        String config = getConfig(true);
+        String config = getConfig(false);
         if (StringUtils.isNotEmpty(config)) {
             return config;
         } else {
-            LOG.info("No global config is retrieved from Redis server");
+            LOG.info("No partial config is retrieved from Redis server");
         }
 
-        config = getConfig(false);
+        config = getConfig(true);
         if (StringUtils.isNotEmpty(config)) {
             return config;
         } else {
-            LOG.info("No partial config is retrieved from Redis server");
+            LOG.info("No global config is retrieved from Redis server");
         }
 
         return null;
@@ -64,14 +64,14 @@ public class RedisConfigAdapter extends ConfigAdapter {
         return redisOperation.getConfig(group, globalConfig ? group : serviceId);
     }
 
-    public void subscribeGlobalConfig(String config) {
-        subscribeConfig(config, true);
-    }
-
     public void subscribePartialConfig(String config) {
         subscribeConfig(config, false);
     }
 
+    public void subscribeGlobalConfig(String config) {
+        subscribeConfig(config, true);
+    }
+
     private void subscribeConfig(String config, boolean globalConfig) {
         String groupKey = pluginContextAware.getGroupKey();
         String group = pluginAdapter.getGroup();

discovery-plugin-config-center-extension-redis/src/main/java/com/nepxion/discovery/plugin/configcenter/extension/redis/configuration/RedisConfigAutoConfiguration.java

@@ -38,38 +38,38 @@ public class RedisConfigAutoConfiguration {
     private PluginAdapter pluginAdapter;
 
     @Bean
-    public RedisMessageListenerContainer redisMessageListenerContainer(MessageListenerAdapter globalMessageListenerAdapter, MessageListenerAdapter partialMessageListenerAdapter) {
+    public RedisMessageListenerContainer redisMessageListenerContainer(MessageListenerAdapter partialMessageListenerAdapter, MessageListenerAdapter globalMessageListenerAdapter) {
         String group = pluginAdapter.getGroup();
         String serviceId = pluginAdapter.getServiceId();
 
         RedisMessageListenerContainer redisMessageListenerContainer = new RedisMessageListenerContainer();
         redisMessageListenerContainer.setConnectionFactory(redisConnectionFactory);
-        redisMessageListenerContainer.addMessageListener(globalMessageListenerAdapter, new PatternTopic(group + "-" + group));
         redisMessageListenerContainer.addMessageListener(partialMessageListenerAdapter, new PatternTopic(group + "-" + serviceId));
+        redisMessageListenerContainer.addMessageListener(globalMessageListenerAdapter, new PatternTopic(group + "-" + group));
 
         return redisMessageListenerContainer;
     }
 
     @Bean
-    public MessageListenerAdapter globalMessageListenerAdapter(ConfigAdapter configAdapter) {
+    public MessageListenerAdapter partialMessageListenerAdapter(ConfigAdapter configAdapter) {
         String groupKey = pluginContextAware.getGroupKey();
         String group = pluginAdapter.getGroup();
         String serviceId = pluginAdapter.getServiceId();
 
-        LOG.info("Subscribe global config from Redis server, {}={}, serviceId={}", groupKey, group, serviceId);
+        LOG.info("Subscribe partial config from Redis server, {}={}, serviceId={}", groupKey, group, serviceId);
 
-        return new MessageListenerAdapter(configAdapter, "subscribeGlobalConfig");
+        return new MessageListenerAdapter(configAdapter, "subscribePartialConfig");
     }
 
     @Bean
-    public MessageListenerAdapter partialMessageListenerAdapter(ConfigAdapter configAdapter) {
+    public MessageListenerAdapter globalMessageListenerAdapter(ConfigAdapter configAdapter) {
         String groupKey = pluginContextAware.getGroupKey();
         String group = pluginAdapter.getGroup();
         String serviceId = pluginAdapter.getServiceId();
 
-        LOG.info("Subscribe partial config from Redis server, {}={}, serviceId={}", groupKey, group, serviceId);
+        LOG.info("Subscribe global config from Redis server, {}={}, serviceId={}", groupKey, group, serviceId);
 
-        return new MessageListenerAdapter(configAdapter, "subscribePartialConfig");
+        return new MessageListenerAdapter(configAdapter, "subscribeGlobalConfig");
     }
 
     @Bean