Merge commit 'a951a719d1518883474f36579b63bb8f9c4f0494' into pro

This commit is contained in:
kuaifan
2023-08-05 18:44:20 +08:00
249 changed files with 1414 additions and 591 deletions

View File

@@ -258,7 +258,9 @@ class SystemController extends AbstractController
'claude_agency',
'wenxin_key',
'wenxin_secret',
'wenxin_model'
'wenxin_model',
'qianwen_key',
'qianwen_model'
];
if ($type == 'save') {
@@ -292,9 +294,16 @@ class SystemController extends AbstractController
WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => "设置成功"], $botUser->userid, true, false, true);
}
}
if ($backup['qianwen_key'] != $setting['qianwen_key']) {
$botUser = User::botGetOrCreate('ai-qianwen');
if ($botUser && $dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid)) {
WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => "设置成功"], $botUser->userid, true, false, true);
}
}
}
//
$setting['wenxin_model'] = $setting['wenxin_model'] ?: 'ERNIE-Bot-turbo';
$setting['qianwen_model'] = $setting['qianwen_model'] ?: 'qwen-v1';
if (env("SYSTEM_SETTING") == 'disabled') {
foreach ($keys as $item) {
if (strlen($setting[$item]) > 12) {