From 7bbf05af21db9f4dc87d378d31cb28a8dbf1b3c9 Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Wed, 3 Jul 2024 16:12:27 +0800
Subject: [PATCH] =?UTF-8?q?MessageAgent=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    | 4 ++--
 src/main/java/org/redkale/boot/Application.java    | 2 +-
 src/main/java/org/redkale/mq/spi/MessageAgent.java | 9 +++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/META-INF/application-template.xml b/src/main/java/META-INF/application-template.xml
index 0b3f9502a..0852e7245 100644
--- a/src/main/java/META-INF/application-template.xml
+++ b/src/main/java/META-INF/application-template.xml
@@ -74,12 +74,12 @@ serviceid1_name1  serviceid1_name2   serviceid2_name1  serviceid2_name2
         name:    服务的名称，用于监控识别，多个mq节点时只能有一个name为空的节点，mq.name不能重复,命名规则: 字母、数字、下划线
         type：   实现类名，必须是org.redkale.mq.MessageAgent的子类
         threads：线程数，为0表示使用workExecutor。默认: CPU核数, 核数=1的情况下默认值为2，JDK 21以上版本默认使用虚拟线程池
-        rpcfirst：cluster和mq同名组件时，HttpRpcClient优先使用MQ，默认不优先走MQ。
+        rpc：cluster和mq同名组件时，HttpRpcClient优先使用MQ，默认不优先走MQ。
         coder:   MessageRecord的解析器类，必须是org.redkale.mq.MessageCoder<MessageRecord>的实现类,
             可对数据包进行加密解密，默认值：org.redkale.mq.MessageRecordCoder
         MQ节点下的子节点配置没有固定格式, 根据MessageAgent实现方的定义来配置
     -->
-    <mq name="" type="org.redkalex.mq.kafka.KafkaMessageAgent" rpcfirst="false" threads="4">
+    <mq name="" type="org.redkalex.mq.kafka.KafkaMessageAgent" rpc="false" threads="4">
         <servers value="127.0.0.1:9101"/>
         <!--
         加载所有的MessageConsumer实例;
diff --git a/src/main/java/org/redkale/boot/Application.java b/src/main/java/org/redkale/boot/Application.java
index 372775583..0295532fb 100644
--- a/src/main/java/org/redkale/boot/Application.java
+++ b/src/main/java/org/redkale/boot/Application.java
@@ -663,7 +663,7 @@ public final class Application {
                     if (messageAgent != null) {
                         if (clusterAgent == null
                                 || !Objects.equals(clusterAgent.getName(), resourceName)
-                                || messageAgent.isRpcFirst()) {
+                                || messageAgent.isRpc()) {
                             HttpRpcClient rpcClient = messageAgent.getHttpRpcClient();
                             if (field != null) {
                                 field.set(srcObj, rpcClient);
diff --git a/src/main/java/org/redkale/mq/spi/MessageAgent.java b/src/main/java/org/redkale/mq/spi/MessageAgent.java
index 29a15126a..3ace4b48a 100644
--- a/src/main/java/org/redkale/mq/spi/MessageAgent.java
+++ b/src/main/java/org/redkale/mq/spi/MessageAgent.java
@@ -85,7 +85,8 @@ public abstract class MessageAgent implements MessageManager {
     protected final Map<String, Map<String, MessageConsumerWrapper>> messageConsumerMap = new HashMap<>();
 
     // -------------------------- HttpRpcClient、SncpMessageClient --------------------------
-    private boolean rpcFirst;
+    // cluster和mq同名组件时，HttpRpcClient优先使用MQ，默认不优先走MQ。
+    private boolean rpc;
 
     private HttpRpcMessageClient httpRpcClient;
 
@@ -109,7 +110,7 @@ public abstract class MessageAgent implements MessageManager {
 
     public void init(AnyValue config) {
         this.name = checkName(config.getValue("name", ""));
-        this.rpcFirst = config.getBoolValue("rpcfirst", false);
+        this.rpc = config.getBoolValue("rpc", false);
         this.httpAppRespTopic = generateHttpAppRespTopic();
         this.sncpAppRespTopic = generateSncpAppRespTopic();
         int threads = config.getIntValue("threads", application.isVirtualWorkExecutor() ? 0 : -1);
@@ -363,8 +364,8 @@ public abstract class MessageAgent implements MessageManager {
         return sncpMessageClient;
     }
 
-    public boolean isRpcFirst() {
-        return rpcFirst;
+    public boolean isRpc() {
+        return rpc;
     }
 
     protected String checkName(String name) { // 不能含特殊字符