Merge commit '6230bf94c5abfa7e67c6226e0b0dc088d80ff055' into pro

This commit is contained in:
kuaifan
2024-03-02 14:12:45 +08:00
4 changed files with 26 additions and 21 deletions

View File

@@ -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' => 20,
'server_url' => $serverUrl,
];
if (empty($extras['gemini_key'])) {
@@ -470,7 +471,7 @@ class BotReceiveMsgTask extends AbstractTask
}
//
try {
$res = Ihttp::ihttp_post($webhookUrl, [
$data = [
'text' => $command,
'token' => User::generateToken($botUser),
'dialog_id' => $dialog->id,
@@ -481,7 +482,8 @@ class BotReceiveMsgTask extends AbstractTask
'bot_uid' => $botUser->userid,
'version' => Base::getVersion(),
'extras' => Base::array2json($extras)
], 10);
];
$res = Ihttp::ihttp_post($webhookUrl, $data, 10);
if ($userBot) {
$userBot->webhook_num++;
$userBot->save();