From aa17a330937d6ad90e3fd5decb26ddc91aff8898 Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Wed, 8 Jan 2025 10:50:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BE=AE=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=20Dalle=20=E7=BB=98=E5=9B=BE=E7=9A=84=20API?=
 =?UTF-8?q?=20KEY?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                         | 1 +
 api/handler/admin/api_key_handler.go | 7 +++++--
 web/src/views/admin/ChatModel.vue    | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50356463..b050ecd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - 功能优化：登录，注册页面允许替换用户自己的 Logo 和 Title
 - Bug 修复：修复 OpenAI 实时语音通话没有检测用户算力不足的 Bug
 - 功能新增：管理后台增加算力日志查询功能，支持按用户，按模型，按日期，按类型查询算力日志
+- 功能优化：支持为模型绑定 Dalle 和 chat 类型的 API KEY
 
 ## v4.1.8
 
diff --git a/api/handler/admin/api_key_handler.go b/api/handler/admin/api_key_handler.go
index b6454252..8daa0990 100644
--- a/api/handler/admin/api_key_handler.go
+++ b/api/handler/admin/api_key_handler.go
@@ -16,6 +16,7 @@ import (
 	"geekai/store/vo"
 	"geekai/utils"
 	"geekai/utils/resp"
+	"strings"
 
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
@@ -71,16 +72,18 @@ func (h *ApiKeyHandler) Save(c *gin.Context) {
 	resp.SUCCESS(c, keyVo)
 }
 
+// List 获取 API KEY 列表
 func (h *ApiKeyHandler) List(c *gin.Context) {
 	status := h.GetBool(c, "status")
-	t := h.GetTrim(c, "type")
+	t := c.Query("type")
 
 	session := h.DB.Session(&gorm.Session{})
 	if status {
 		session = session.Where("enabled", true)
 	}
 	if t != "" {
-		session = session.Where("type", t)
+		types := strings.Split(t, "|")
+		session = session.Where("type IN ?", types)
 	}
 
 	var items []model.ApiKey
diff --git a/web/src/views/admin/ChatModel.vue b/web/src/views/admin/ChatModel.vue
index 1bcfd601..2ee0bbee 100644
--- a/web/src/views/admin/ChatModel.vue
+++ b/web/src/views/admin/ChatModel.vue
@@ -130,6 +130,7 @@
           <el-select v-model="item.key_id" placeholder="请选择 API KEY" filterable clearable>
             <el-option v-for="v in apiKeys" :value="v.id" :label="v.name" :key="v.id">
               {{ v.name }}
+              <el-tag type="primary" size="small" class="ml-1 mr-1">{{ v.type }}</el-tag>
               <el-text type="info" size="small">{{ substr(v.api_url, 50) }}</el-text>
             </el-option>
           </el-select>
@@ -194,7 +195,7 @@ const type = ref([
 
 // 获取 API KEY
 const apiKeys = ref([]);
-httpGet("/api/admin/apikey/list?type=chat")
+httpGet("/api/admin/apikey/list?type=chat|dalle")
   .then((res) => {
     apiKeys.value = res.data;
   })