diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php index 0a33b51ed..fa1abf592 100755 --- a/app/Http/Controllers/Api/SystemController.php +++ b/app/Http/Controllers/Api/SystemController.php @@ -254,6 +254,7 @@ class SystemController extends AbstractController $keys = [ 'openai_key', 'openai_agency', + 'openai_model', 'claude_token', 'claude_agency', 'wenxin_key', @@ -302,6 +303,7 @@ class SystemController extends AbstractController } } // + $setting['openai_model'] = $setting['openai_model'] ?: 'gpt-3.5-turbo'; $setting['wenxin_model'] = $setting['wenxin_model'] ?: 'ERNIE-Bot-turbo'; $setting['qianwen_model'] = $setting['qianwen_model'] ?: 'qwen-v1'; if (env("SYSTEM_SETTING") == 'disabled') { diff --git a/app/Tasks/BotReceiveMsgTask.php b/app/Tasks/BotReceiveMsgTask.php index 0c5020185..a51ddbad8 100644 --- a/app/Tasks/BotReceiveMsgTask.php +++ b/app/Tasks/BotReceiveMsgTask.php @@ -375,6 +375,7 @@ class BotReceiveMsgTask extends AbstractTask $extras = [ 'openai_key' => $setting['openai_key'], 'openai_agency' => $setting['openai_agency'], + 'openai_model' => $setting['openai_model'], 'server_url' => $serverUrl, ]; if (empty($extras['openai_key'])) { diff --git a/docker-compose.yml b/docker-compose.yml index 364d69612..164d780ed 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -168,7 +168,7 @@ services: ai: container_name: "dootask-ai-${APP_ID}" - image: "kuaifan/dooai:0.0.5" + image: "kuaifan/dooai:0.0.6" networks: extnetwork: ipv4_address: "${APP_IPPR}.12" diff --git a/resources/assets/js/pages/manage/setting/components/SystemAibot.vue b/resources/assets/js/pages/manage/setting/components/SystemAibot.vue index 51efe81c1..778aa6523 100644 --- a/resources/assets/js/pages/manage/setting/components/SystemAibot.vue +++ b/resources/assets/js/pages/manage/setting/components/SystemAibot.vue @@ -8,6 +8,13 @@
{{$L('访问OpenAI网站查看:')}}https://platform.openai.com/account/api-keys
+ + +
{{$L('查看说明')}} https://platform.openai.com/docs/models
+
{{$L('例如:http://proxy.com 或 socks5://proxy.com')}}
@@ -38,8 +45,8 @@
{{$L('获取方式')}} https://ai.baidu.com/ai-doc/REFERENCE/Ck3dwjgn3
- - @@ -54,8 +61,8 @@
{{$L('获取方式')}} https://help.aliyun.com/document_detail/611472.html
- -