From 6230bf94c5abfa7e67c6226e0b0dc088d80ff055 Mon Sep 17 00:00:00 2001
From: zzw <2318266924@qq.com>
Date: Fri, 1 Mar 2024 17:47:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4gemini=E6=9C=BA=E5=99=A8?=
 =?UTF-8?q?=E4=BA=BA=E8=AE=BE=E7=BD=AE=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/SystemController.php                 | 2 ++
 app/Tasks/BotReceiveMsgTask.php                               | 1 +
 .../assets/js/pages/manage/setting/components/SystemAibot.vue | 4 +++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php
index 2e2033b20..9fd3eac47 100755
--- a/app/Http/Controllers/Api/SystemController.php
+++ b/app/Http/Controllers/Api/SystemController.php
@@ -275,6 +275,7 @@ class SystemController extends AbstractController
             'gemini_key',
             'gemini_model',
             'gemini_agency',
+            'gemini_timeout'
         ];
 
         if ($type == 'save') {
@@ -326,6 +327,7 @@ class SystemController extends AbstractController
         $setting['wenxin_model'] = $setting['wenxin_model'] ?: 'eb-instant';
         $setting['qianwen_model'] = $setting['qianwen_model'] ?: 'qwen-v1';
         $setting['gemini_model'] = $setting['gemini_model'] ?: 'gemini-1.0-pro';
+        $setting['gemini_timeout'] = $setting['gemini_timeout'] ?: 20;
         if (env("SYSTEM_SETTING") == 'disabled') {
             foreach ($keys as $item) {
                 if (strlen($setting[$item]) > 12) {
diff --git a/app/Tasks/BotReceiveMsgTask.php b/app/Tasks/BotReceiveMsgTask.php
index be49abf66..7d8753d9e 100644
--- a/app/Tasks/BotReceiveMsgTask.php
+++ b/app/Tasks/BotReceiveMsgTask.php
@@ -446,6 +446,7 @@ class BotReceiveMsgTask extends AbstractTask
                     'gemini_key' => $setting['gemini_key'],
                     'gemini_model' => $setting['gemini_model'],
                     'gemini_agency' => $setting['gemini_agency'],
+                    'gemini_timeout' => $setting['gemini_timeout'],
                     'server_url' => $serverUrl,
                 ];
                 if (empty($extras['gemini_key'])) {
diff --git a/resources/assets/js/pages/manage/setting/components/SystemAibot.vue b/resources/assets/js/pages/manage/setting/components/SystemAibot.vue
index 33f013763..cc1f9d7b2 100644
--- a/resources/assets/js/pages/manage/setting/components/SystemAibot.vue
+++ b/resources/assets/js/pages/manage/setting/components/SystemAibot.vue
@@ -83,10 +83,12 @@
                     <FormItem :label="$L('模型')" prop="gemini_model">
                         <Select v-model="formData.gemini_model" placement="top">
                             <Option value="gemini-1.0-pro">gemini-1.0-pro</Option>
-                            <!-- <Option value="gemini-pro-vision">gemini-pro-vision</Option> -->
                         </Select>
                         <div class="form-tip">{{$L('查看说明')}} <a href="https://ai.google.dev/models?hl=zh-cn" target="_blank">https://ai.google.dev/models?hl=zh-cn</a></div>
                     </FormItem>
+                    <FormItem label="Timeout" prop="gemini_timeout">
+                        <Input :maxlength="255" v-model="formData.gemini_timeout" type="text" placeholder="Timeout"/>
+                    </FormItem>
                     <FormItem :label="$L('使用代理')" prop="gemini_agency">
                         <Input :maxlength="500" v-model="formData.gemini_agency" :placeholder="$L('支持 http 或 socks 代理')"/>
                         <div class="form-tip">{{$L('例如：http://proxy.com 或 socks5://proxy.com')}}</div>