From b80f0759a5fd03952453b5c98d39e05ea7f306fb Mon Sep 17 00:00:00 2001
From: Sakurasan <26715255+Sakurasan@users.noreply.github.com>
Date: Sun, 20 Apr 2025 18:33:59 +0800
Subject: [PATCH] fix select key

---
 frontend/src/utils/request.js           |  2 +-
 frontend/src/views/dashboard/KeyNew.vue | 32 +++++++++++++------------
 internal/controller/apikey.go           |  2 +-
 internal/dao/apikey.go                  | 10 ++++----
 internal/utils/fetchKeyModel.go         |  9 +++----
 5 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/frontend/src/utils/request.js b/frontend/src/utils/request.js
index a2672fc..0539e00 100644
--- a/frontend/src/utils/request.js
+++ b/frontend/src/utils/request.js
@@ -11,7 +11,7 @@ if (import.meta.env.DEV) { // Vite 的方式判断开发环境
 
 const service = axios.create({
   baseURL: baseURL, 
-  timeout: 5000,   
+  timeout: 6000,   
   headers: {
     'Content-Type': 'application/json',
   },
diff --git a/frontend/src/views/dashboard/KeyNew.vue b/frontend/src/views/dashboard/KeyNew.vue
index ec8fe0f..62ef014 100644
--- a/frontend/src/views/dashboard/KeyNew.vue
+++ b/frontend/src/views/dashboard/KeyNew.vue
@@ -12,17 +12,6 @@
         </p>
       </div>
 
-      <div v-if="error" role="alert" class="alert shadow-lg bg-rose-100">
-        <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 shrink-0 stroke-current" fill="none" viewBox="0 0 24 24">
-          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-            d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" />
-        </svg>
-        <div>
-          <span>Error! {{ error }}</span>
-        </div>
-        <button class="btn btn-sm" @click="error = null">X</button>
-      </div>
-
       <div class="card border border-base-300/40 shadow-sm">
         <form @submit.prevent="createApiKey" class="card-body space-y-5 p-3 sm:p-8">
           <div class="space-y-4">
@@ -147,7 +136,7 @@
                   <!-- <textarea id="support_models" v-model="newApiKey.support_models_text"
                     placeholder='["model1", "model2"]' class="textarea textarea-sm textarea-bordered w-full"></textarea> -->
                   <el-input-tag v-model="newApiKey.support_models_array" :trigger="'Enter'" clearable
-                    placeholder="Please input" @change="onchange_supportmodel"/>
+                    placeholder="Please input" @change="onchange_supportmodel" />
                 </div>
 
                 <div class="form-control">
@@ -165,10 +154,23 @@
               </div>
             </div>
           </div>
+
+          <div v-if="error" role="alert" class="alert shadow-lg bg-rose-100">
+            <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 shrink-0 stroke-current" fill="none"
+              viewBox="0 0 24 24">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" />
+            </svg>
+            <div>
+              <span>{{ error }}</span>
+            </div>
+            <button class="btn btn-sm" @click="error = null">X</button>
+          </div>
           
           <div class="flex justify-end pt-4 items-center gap-2">
             <button @click="cancel" class="btn btn-sm btn-outline">Cancel</button>
-            <button type="submit" class="btn btn-outline btn-sm px-4 text-sm font-medium btn-success" :disabled="!isFormValid">
+            <button type="submit" class="btn btn-outline btn-sm px-4 text-sm font-medium btn-success"
+              :disabled="!isFormValid">
               Create
             </button>
           </div>
@@ -249,7 +251,7 @@ const apiKeyImageMap = {
   'gemini': '/assets/gemini.svg',
   'azure': '/assets/azure.svg',
   'github': '/assets/github.svg'
-  
+
 };
 
 const apiKeyImageUrl = (keytype) => {
@@ -261,7 +263,7 @@ const createApiKey = async () => {
     setToast('Please fill in all required fields (Name, Type, API Key).', 'error')
     return
   }
-  
+
   try {
     try {
       if (!Array.isArray(newApiKey.value.support_models_array)) {
diff --git a/internal/controller/apikey.go b/internal/controller/apikey.go
index af30019..54a4fac 100644
--- a/internal/controller/apikey.go
+++ b/internal/controller/apikey.go
@@ -28,7 +28,7 @@ func (a Api) CreateApiKey(c *gin.Context) {
 	}
 	if slice.Contain([]string{"openai", "azure", "claude"}, *newkey.ApiType) {
 		sma, err := utils.FetchKeyModel(a.db, newkey)
-		if err == nil {
+		if err == nil && len(sma) > 0 {
 			newkey.SupportModelsArray = sma
 			var buf = new(bytes.Buffer)
 			json.NewEncoder(buf).Encode(sma) //nolint:errcheck
diff --git a/internal/dao/apikey.go b/internal/dao/apikey.go
index 0173d0b..837dc76 100644
--- a/internal/dao/apikey.go
+++ b/internal/dao/apikey.go
@@ -91,11 +91,11 @@ func (dao *ApiKeyDAO) FindApiKeysBySupportModel(db *gorm.DB, modelName string) (
 	case "postgres":
 		return nil, errors.New("not support")
 	}
-	err := db.Model(&model.ApiKey{}).
-		Joins("CROSS JOIN JSON_EACH(apikeys.support_models)").
-		Where("active = true").
-		Where("value = ?", modelName).
-		Find(&apiKeys).Error
+	err := db.Raw(`
+    SELECT a.*
+    FROM apikeys a
+    JOIN json_each(a.support_models) AS je ON je.value = ?
+    WHERE a.active = true`, modelName).Scan(&apiKeys).Error
 	return apiKeys, err
 }
 
diff --git a/internal/utils/fetchKeyModel.go b/internal/utils/fetchKeyModel.go
index f5b3afd..00018f1 100644
--- a/internal/utils/fetchKeyModel.go
+++ b/internal/utils/fetchKeyModel.go
@@ -8,12 +8,13 @@ import (
 	"opencatd-open/internal/model"
 	"os"
 	"strings"
+	"time"
 
 	"github.com/tidwall/gjson"
 	"gorm.io/gorm"
 )
 
-var client = &http.Client{}
+var client = &http.Client{Timeout: 2 * time.Second}
 
 func init() {
 	if os.Getenv("LOCAL_PROXY") != "" {
@@ -29,13 +30,13 @@ func FetchKeyModel(db *gorm.DB, key *model.ApiKey) ([]string, error) {
 	var err error
 	if *key.ApiType == "openai" || *key.ApiType == "azure" {
 		supportModels, err = FetchOpenAISupportModels(db, key)
-		if err != nil {
-			fmt.Println(err)
-		}
 	}
 	if *key.ApiType == "claude" {
 		supportModels, err = FetchClaudeSupportModels(db, key)
 	}
+	if err != nil {
+		fmt.Println(err)
+	}
 	return supportModels, err
 }