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 @@ gemini-1.0-pro - {{$L('查看说明')}} https://ai.google.dev/models?hl=zh-cn + + + {{$L('例如:http://proxy.com 或 socks5://proxy.com')}}