From 1feed48e0fe601b344da959e5b60e8f7a53157ca Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 18 Dec 2025 17:17:56 +0800
Subject: [PATCH] 1

---
 src/server/cluster/cluster_func.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/server/cluster/cluster_func.go b/src/server/cluster/cluster_func.go
index 751c0443..d252d431 100644
--- a/src/server/cluster/cluster_func.go
+++ b/src/server/cluster/cluster_func.go
@@ -107,6 +107,9 @@ func connectRemote(RemoteAddr string, ConnType int, ConnLabel string) error {
 }
 
 func SendServerMsg(m *msg.Msg, serverId int) error {
+	if m.UniKey == "" {
+		m.UniKey = GoUtil.UniKey(fmt.Sprintf("%v,Cluster Msg", m))
+	}
 	if v, ok := serverAgent.Load(serverId); ok {
 		data, err := GoUtil.GobMarshal(m)
 		if err != nil {
@@ -120,8 +123,9 @@ func SendServerMsg(m *msg.Msg, serverId int) error {
 }
 
 func CallServerMsg(m *msg.Msg, serverId int) (*msg.Msg, error) {
-	m.UniKey = GoUtil.UniKey(fmt.Sprintf("%v,Cluster Msg", m))
-
+	if m.UniKey == "" {
+		m.UniKey = GoUtil.UniKey(fmt.Sprintf("%v,Cluster Msg", m))
+	}
 	// 先注册回调通道，避免发送出去后对方快速返回导致丢失
 	newChan := make(chan *msg.Msg, 1)
 	registerChanel(m.UniKey, newChan)