From 820af60c195bbf0451c41b468977f5bb45e22427 Mon Sep 17 00:00:00 2001
From: Redkale <8730487+redkale@users.noreply.github.com>
Date: Thu, 28 May 2020 10:03:13 +0800
Subject: [PATCH]

---
 src/META-INF/application-template.xml         | 10 +++++-----
 src/org/redkale/boot/Application.java         |  1 +
 src/org/redkale/boot/NodeServer.java          |  1 +
 .../{boot => cluster}/ClusterAgent.java       |  3 ++-
 src/org/redkale/mq/MessageAgent.java          | 19 -------------------
 5 files changed, 9 insertions(+), 25 deletions(-)
 rename src/org/redkale/{boot => cluster}/ClusterAgent.java (96%)

diff --git a/src/META-INF/application-template.xml b/src/META-INF/application-template.xml
index 87006468c..2d8867575 100644
--- a/src/META-INF/application-template.xml
+++ b/src/META-INF/application-template.xml
@@ -46,25 +46,25 @@
         <transport bufferCapacity="32K" bufferPoolSize="32" threads="32" readTimeoutSeconds="6" writeTimeoutSeconds="6"/>
         
         <!--
-            【节点全局唯一】
+           【节点全局唯一】
             第三方服务发现管理接口
-            value：    类名，必须是org.redkale.boot.ClusterAgent的子类
+            value：    类名，必须是org.redkale.cluster.ClusterAgent的子类
             protocols: 服务发现可以处理的协议， 默认值为: SNCP, 多个协议用分号;隔开
             ports:     服务发现可以处理的端口， 多个端口用分号;隔开
         -->
         <!--
-        <cluster value="org.redkalex.cluster.ConsulClusterAgent" protocols="SNCP" ports="7070;7071">
+        <cluster value="org.redkalex.cluster.consul.ConsulClusterAgent" protocols="SNCP" ports="7070;7071">
             <property name="xxxxxx" value="XXXXXXXX"/>
         </cluster>
         -->
         <!--
+           【节点全局唯一】
             MQ管理接口配置
-            name:         MQ名称，长度不能超过11个字节. 默认为空字符串。 注意: name不能包含$符号。
             value：    实现类名，必须是org.redkale.mq.MessageAgent的子类
             MQ节点下的子节点配置没有固定格式, 根据MessageAgent实现方的定义来配置
         -->
         <!--
-        <mq name="kafka" value="org.redkalex.mq.kafka.KafkaMessageAgent">
+        <mq value="org.redkalex.mq.kafka.KafkaMessageAgent">
             <servers value="127.0.0.1:9101"/>
             <consumer>
                 <property name="xxxxxx" value="XXXXXXXX"/>
diff --git a/src/org/redkale/boot/Application.java b/src/org/redkale/boot/Application.java
index f039808d6..ed4f5a374 100644
--- a/src/org/redkale/boot/Application.java
+++ b/src/org/redkale/boot/Application.java
@@ -5,6 +5,7 @@
  */
 package org.redkale.boot;
 
+import org.redkale.cluster.ClusterAgent;
 import org.redkale.util.RedkaleClassLoader;
 import org.redkale.net.TransportGroupInfo;
 import java.io.*;
diff --git a/src/org/redkale/boot/NodeServer.java b/src/org/redkale/boot/NodeServer.java
index 1405e0299..aad5ecf82 100644
--- a/src/org/redkale/boot/NodeServer.java
+++ b/src/org/redkale/boot/NodeServer.java
@@ -5,6 +5,7 @@
  */
 package org.redkale.boot;
 
+import org.redkale.cluster.ClusterAgent;
 import org.redkale.mq.MessageAgent;
 import org.redkale.util.RedkaleClassLoader;
 import java.io.*;
diff --git a/src/org/redkale/boot/ClusterAgent.java b/src/org/redkale/cluster/ClusterAgent.java
similarity index 96%
rename from src/org/redkale/boot/ClusterAgent.java
rename to src/org/redkale/cluster/ClusterAgent.java
index 88c99382e..f7b9388c6 100644
--- a/src/org/redkale/boot/ClusterAgent.java
+++ b/src/org/redkale/cluster/ClusterAgent.java
@@ -3,13 +3,14 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.redkale.boot;
+package org.redkale.cluster;
 
 import java.lang.ref.WeakReference;
 import java.net.InetSocketAddress;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
+import org.redkale.boot.NodeServer;
 import org.redkale.convert.json.JsonConvert;
 import org.redkale.net.*;
 import org.redkale.net.sncp.*;
diff --git a/src/org/redkale/mq/MessageAgent.java b/src/org/redkale/mq/MessageAgent.java
index 6904ffd83..9b880cdc6 100644
--- a/src/org/redkale/mq/MessageAgent.java
+++ b/src/org/redkale/mq/MessageAgent.java
@@ -7,7 +7,6 @@ package org.redkale.mq;
 
 import java.util.*;
 import java.util.logging.Logger;
-import org.redkale.boot.MessageAgentRoot;
 import org.redkale.service.Service;
 import org.redkale.util.AnyValue;
 
@@ -23,12 +22,6 @@ public abstract class MessageAgent {
 
     protected final Logger logger = Logger.getLogger(this.getClass().getSimpleName());
 
-    //MQ管理器名称
-    protected String name;
-
-    //application根MQ管理器
-    protected MessageAgentRoot root;
-
     //本地Service消息接收处理器， key:topic
     protected Map<String, Service> localConsumers;
 
@@ -40,18 +33,6 @@ public abstract class MessageAgent {
 
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public MessageAgentRoot getRoot() {
-        return root;
-    }
-
-    public void setRoot(MessageAgentRoot root) {
-        this.root = root;
-    }
-
     protected String checkName(String name) {  //不能含特殊字符
         if (name.isEmpty()) throw new RuntimeException("name only 0-9 a-z A-Z _ cannot begin 0-9");
         if (name.charAt(0) >= '0' && name.charAt(0) <= '9') throw new RuntimeException("name only 0-9 a-z A-Z _ cannot begin 0-9");