From 44e1d1292b75a9906a1718abe1230d314afb50cd Mon Sep 17 00:00:00 2001
From: xuebin <xueb@csxjy.com>
Date: Tue, 2 Sep 2025 11:12:12 +0800
Subject: [PATCH] =?UTF-8?q?//=20=E5=A6=82=E6=9E=9C=20group2model2channels?=
 =?UTF-8?q?=20=E5=92=8C=20channelsIDM=20=E4=B8=AD=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E7=9A=84channel=E7=9A=84=20ChannelInfo=20=E4=B8=AD=E7=9A=84=20?=
 =?UTF-8?q?MultiKeyPollingIndex=20=E9=9C=80=E8=A6=81=E7=BB=A7=E6=89=BF=20?=
 =?UTF-8?q?=09//=20=E5=90=A6=E5=88=99=E4=BC=9A=E5=AF=BC=E8=87=B4=E8=BD=AE?=
 =?UTF-8?q?=E8=AF=A2=E7=B4=A2=E5=BC=95=E9=87=8D=E7=BD=AE=EF=BC=8C=E5=BD=B1?=
 =?UTF-8?q?=E5=93=8D=E5=A4=9Akey=E8=BD=AE=E8=AF=A2=E7=9A=84=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 model/channel_cache.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/model/channel_cache.go b/model/channel_cache.go
index b245124897..cf315ecbd4 100644
--- a/model/channel_cache.go
+++ b/model/channel_cache.go
@@ -65,6 +65,14 @@ func InitChannelCache() {
 	}
 
 	channelSyncLock.Lock()
+	// 如果 group2model2channels 和 channelsIDM 中记录的channel的 ChannelInfo 中的 MultiKeyPollingIndex 需要继承
+	// 否则会导致轮询索引重置，影响多key轮询的正确性
+	for id, channel := range channelsIDM {
+		if newChannel, ok := newChannelId2channel[id]; ok {
+			newChannel.ChannelInfo.MultiKeyPollingIndex = channel.ChannelInfo.MultiKeyPollingIndex
+		}
+	}
+
 	group2model2channels = newGroup2model2channels
 	channelsIDM = newChannelId2channel
 	channelSyncLock.Unlock()