diff --git a/api/handler/markmap_handler.go b/api/handler/markmap_handler.go index e5d149eb..f3fe0897 100644 --- a/api/handler/markmap_handler.go +++ b/api/handler/markmap_handler.go @@ -190,8 +190,10 @@ func (h *MarkMapHandler) doRequest(req types.ApiRequest, chatModel model.ChatMod res = h.DB.Where("id", chatModel.KeyId).Find(apiKey) } // use the last unused key - if res.Error != nil { - res = h.DB.Where("platform = ?", types.OpenAI).Where("type = ?", "chat").Where("enabled = ?", true).Order("last_used_at ASC").First(apiKey) + if apiKey.Id == 0 { + res = h.DB.Where("platform", types.OpenAI). + Where("type", "chat"). + Where("enabled", true).Order("last_used_at ASC").First(apiKey) } if res.Error != nil { return nil, errors.New("no available key, please import key") diff --git a/web/src/views/MarkMap.vue b/web/src/views/MarkMap.vue index 3243d274..73aae93e 100644 --- a/web/src/views/MarkMap.vue +++ b/web/src/views/MarkMap.vue @@ -230,7 +230,6 @@ const connect = (userId) => { const _socket = new WebSocket(host + `/api/markMap/client?user_id=${userId}&model_id=${modelID.value}`); _socket.addEventListener('open', () => { socket.value = _socket; - // 发送心跳消息 sendHeartbeat() });