xinyin025/geekai
1
0
Fork 0
mirror of https://github.com/yangjian102621/geekai.git synced 2025-09-19 09:46:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bug for markmap

Browse Source
This commit is contained in:
RockYang 2024-04-23 20:47:06 +08:00
parent 90f5275201
commit 2933c057a2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/handler/markmap_handler.go
View File

@ -190,8 +190,10 @@ func (h *MarkMapHandler) doRequest(req types.ApiRequest, chatModel model.ChatMod
res = h.DB.Where("id", chatModel.KeyId).Find(apiKey) res = h.DB.Where("id", chatModel.KeyId).Find(apiKey)
} }
// use the last unused key // use the last unused key
if res.Error != nil { if apiKey.Id == 0 {
res = h.DB.Where("platform = ?", types.OpenAI).Where("type = ?", "chat").Where("enabled = ?", true).Order("last_used_at ASC").First(apiKey) res = h.DB.Where("platform", types.OpenAI).
Where("type", "chat").
Where("enabled", true).Order("last_used_at ASC").First(apiKey)
} }
if res.Error != nil { if res.Error != nil {
return nil, errors.New("no available key, please import key") return nil, errors.New("no available key, please import key")

1
web/src/views/MarkMap.vue
View File

@ -230,7 +230,6 @@ const connect = (userId) => {
const _socket = new WebSocket(host + `/api/markMap/client?user_id=${userId}&model_id=${modelID.value}`); const _socket = new WebSocket(host + `/api/markMap/client?user_id=${userId}&model_id=${modelID.value}`);
_socket.addEventListener('open', () => { _socket.addEventListener('open', () => {
socket.value = _socket; socket.value = _socket;
// 发送心跳消息 // 发送心跳消息
sendHeartbeat() sendHeartbeat()
}); });