From 2155c58989c40a639b0e36882afa630a6a8c859f Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Tue, 17 Oct 2023 10:20:06 +0800
Subject: [PATCH] =?UTF-8?q?MessageAgent=E5=A2=9E=E5=8A=A0rpcFirst=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/META-INF/application-template.xml |  3 ++-
 src/main/java/org/redkale/boot/Application.java | 13 ++++++++-----
 src/main/java/org/redkale/mq/MessageAgent.java  |  7 +++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/main/java/META-INF/application-template.xml b/src/main/java/META-INF/application-template.xml
index 7dfabafd8..46c0a3a8a 100644
--- a/src/main/java/META-INF/application-template.xml
+++ b/src/main/java/META-INF/application-template.xml
@@ -70,11 +70,12 @@
         name:    服务的名称，用于监控识别，多个mq节点时只能有一个name为空的节点，mq.name不能重复,命名规则: 字母、数字、下划线
         type：   实现类名，必须是org.redkale.mq.MessageAgent的子类
         threads：线程数，为0表示使用workExecutor。默认: CPU核数, 核数=1的情况下默认值为2，JDK 21以上版本默认使用虚拟线程池
+        rpcfirst：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" threads="4">
+    <mq name="" type="org.redkalex.mq.kafka.KafkaMessageAgent" rpcfirst="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 692de8771..778bf8070 100644
--- a/src/main/java/org/redkale/boot/Application.java
+++ b/src/main/java/org/redkale/boot/Application.java
@@ -1212,11 +1212,14 @@ public final class Application {
                 if (this.messageAgents != null) {
                     MessageAgent messageAgent = this.resourceFactory.find(resourceName, MessageAgent.class);
                     if (messageAgent != null) {
-                        HttpRpcClient rpcClient = messageAgent.getHttpRpcClient();
-                        field.set(srcObj, rpcClient);
-                        rf.inject(resourceName, rpcClient, null); // 给其可能包含@Resource的字段赋值;
-                        rf.register(resourceName, HttpRpcClient.class, rpcClient);
-                        return rpcClient;
+                        if (clusterAgent == null || !Objects.equals(clusterAgent.getName(), resourceName)
+                            || messageAgent.isRpcFirst()) {
+                            HttpRpcClient rpcClient = messageAgent.getHttpRpcClient();
+                            field.set(srcObj, rpcClient);
+                            rf.inject(resourceName, rpcClient, null); // 给其可能包含@Resource的字段赋值;
+                            rf.register(resourceName, HttpRpcClient.class, rpcClient);
+                            return rpcClient;
+                        }
                     }
                 }
                 if (clusterAgent == null) {
diff --git a/src/main/java/org/redkale/mq/MessageAgent.java b/src/main/java/org/redkale/mq/MessageAgent.java
index 5945aee34..5f8b11a5e 100644
--- a/src/main/java/org/redkale/mq/MessageAgent.java
+++ b/src/main/java/org/redkale/mq/MessageAgent.java
@@ -78,6 +78,8 @@ public abstract class MessageAgent implements Resourcable {
     protected final Map<String, Map<String, MessageConsumerWrapper>> messageConsumerMap = new HashMap<>();
 
     //-------------------------- HttpRpcClient、SncpMessageClient --------------------------
+    private boolean rpcFirst;
+
     private HttpRpcMessageClient httpRpcClient;
 
     private String httpAppRespTopic;
@@ -100,6 +102,7 @@ public abstract class MessageAgent implements Resourcable {
 
     public void init(AnyValue config) {
         this.name = checkName(config.getValue("name", ""));
+        this.rpcFirst = config.getBoolValue("rpcfirst", false);
         this.httpAppRespTopic = generateHttpAppRespTopic();
         this.sncpAppRespTopic = generateSncpAppRespTopic();
         int threads = config.getIntValue("threads", application.isVirtualWorkExecutor() ? 0 : -1);
@@ -344,6 +347,10 @@ public abstract class MessageAgent implements Resourcable {
         return sncpMessageClient;
     }
 
+    public boolean isRpcFirst() {
+        return rpcFirst;
+    }
+
     protected String checkName(String name) {  //不能含特殊字符
         if (name.isEmpty()) {
             return name;