From 5139947643cebf10f404ee83bc80cc2ce51edeb6 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Sat, 26 Jul 2025 14:24:58 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=20AI=20=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/DialogController.php | 38 +- app/Http/Controllers/Api/SystemController.php | 36 -- app/Models/UserBot.php | 28 +- app/Module/Extranet.php | 518 ++++++++---------- app/Tasks/JokeSoupTask.php | 32 +- app/Tasks/UpdateSessionTitleViaAiTask.php | 9 +- ..._07_26_112113_create_ai_settings_table.php | 1 + 7 files changed, 280 insertions(+), 382 deletions(-) diff --git a/app/Http/Controllers/Api/DialogController.php b/app/Http/Controllers/Api/DialogController.php index 33431124f..88125a208 100755 --- a/app/Http/Controllers/Api/DialogController.php +++ b/app/Http/Controllers/Api/DialogController.php @@ -1359,18 +1359,19 @@ class DialogController extends AbstractController if (Base::isError($result)) { return $result; } - if (strlen($result['data']) < 1) { + if (strlen($result['data']['text']) < 1) { return Base::retError('转文字失败'); } - // 翻译 - if ($translate) { - $result = Extranet::openAItranslations($result['data'], Doo::getLanguages($translate)); - if (Base::isError($result)) { - return $result; - } + // 不翻译 + if (!$translate) { + return Base::retSuccess('success', $result['data']['text']); } - // 返回 - return $result; + // 需要翻译 + $result = Extranet::openAItranslations($result['data']['text'], Doo::getLanguages($translate)); + if (Base::isError($result)) { + return $result; + } + return Base::retSuccess('success', $result['data']['translated_text']); } /** @@ -1939,13 +1940,16 @@ class DialogController extends AbstractController } WebSocketDialog::checkDialog($msg->dialog_id); // - $res = Extranet::openAItranscriptions(public_path($msgData['path'])); - if (Base::isError($res)) { - return $res; + $result = Extranet::openAItranscriptions(public_path($msgData['path'])); + if (Base::isError($result)) { + return $result; } // $msg->updateInstance([ - 'msg' => array_merge($msgData, ['text' => $res['data'], 'text_userid' => [$user->userid]]), + 'msg' => array_merge($msgData, [ + 'text' => $result['data']['text'], + 'text_userid' => [$user->userid] + ]), ]); $msg->save(); return Base::retSuccess("success", $msg); @@ -2005,15 +2009,15 @@ class DialogController extends AbstractController if ($msg->type === 'text' && $msgData['type'] === 'md') { $msgData['text'] = preg_replace('/:::\s*reasoning.*?:::/s', '', $msgData['text']); } - $res = Extranet::openAItranslations($msgData['text'], $targetLanguage); - if (Base::isError($res)) { - return $res; + $result = Extranet::openAItranslations($msgData['text'], $targetLanguage); + if (Base::isError($result)) { + return $result; } $row = WebSocketDialogMsgTranslate::createInstance([ 'dialog_id' => $msg->dialog_id, 'msg_id' => $msg_id, 'language' => $language, - 'content' => $res['data'], + 'content' => $result['data']['translated_text'], ]); $row->save(); // diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php index a1c779ae6..8c1253841 100755 --- a/app/Http/Controllers/Api/SystemController.php +++ b/app/Http/Controllers/Api/SystemController.php @@ -921,8 +921,6 @@ class SystemController extends AbstractController } return Base::retSuccess('success', [ 'ip' => Base::getIp(), - 'ip-info' => Extranet::getIpInfo(Base::getIp()), - 'ip-gcj02' => Extranet::getIpGcj02(Base::getIp()), 'ip-iscn' => Base::isCnIp(Base::getIp()), 'header' => Request::header(), 'token' => Doo::userToken(), @@ -962,40 +960,6 @@ class SystemController extends AbstractController return Base::isCnIp(Request::input('ip')); } - /** - * @api {get} api/system/get/ipgcj02 18. 获取IP地址经纬度 - * - * @apiVersion 1.0.0 - * @apiGroup system - * @apiName get__ipgcj02 - * - * @apiParam {String} ip IP值 - * - * @apiSuccess {Number} ret 返回状态码（1正确、0错误） - * @apiSuccess {String} msg 返回信息（错误描述） - * @apiSuccess {Object} data 返回数据 - */ - public function get__ipgcj02() { - return Extranet::getIpGcj02(Request::input("ip")); - } - - /** - * @api {get} api/system/get/ipinfo 19. 获取IP地址详细信息 - * - * @apiVersion 1.0.0 - * @apiGroup system - * @apiName get__ipinfo - * - * @apiParam {String} ip IP值 - * - * @apiSuccess {Number} ret 返回状态码（1正确、0错误） - * @apiSuccess {String} msg 返回信息（错误描述） - * @apiSuccess {Object} data 返回数据 - */ - public function get__ipinfo() { - return Extranet::getIpInfo(Request::input("ip")); - } - /** * @api {post} api/system/imgupload 20. 上传图片 * diff --git a/app/Models/UserBot.php b/app/Models/UserBot.php index 5cb77887c..cbd4ff42a 100644 --- a/app/Models/UserBot.php +++ b/app/Models/UserBot.php @@ -97,24 +97,7 @@ class UserBot extends AbstractModel { switch ($email) { case 'check-in@bot.system': - $menu = [ - /*[ - 'key' => 'it', - 'label' => Doo::translate('IT资讯') - ], [ - 'key' => '36ke', - 'label' => Doo::translate('36氪') - ], [ - 'key' => '60s', - 'label' => Doo::translate('60s读世界') - ], [ - 'key' => 'joke', - 'label' => Doo::translate('开心笑话') - ], [ - 'key' => 'soup', - 'label' => Doo::translate('心灵鸡汤') - ]*/ - ]; + $menu = []; $setting = Base::setting('checkinSetting'); if ($setting['open'] !== 'open') { return $menu; @@ -193,8 +176,8 @@ class UserBot extends AbstractModel ]; if ($match[1] === "ai-") { $aibotSetting = Base::setting('aibotSetting'); - $aibotModel = $aibotSetting[$match[1] . '_model']; - $aibotModels = Setting::AIBotModels2Array($aibotSetting[$match[1] . '_models']); + $aibotModel = $aibotSetting[$match[2] . '_model']; + $aibotModels = Setting::AIBotModels2Array($aibotSetting[$match[2] . '_models']); if ($aibotModels) { $menus = array_merge( [ @@ -240,7 +223,6 @@ class UserBot extends AbstractModel return '暂未开放手动签到。'; } UserBot::checkinBotCheckin('manual-' . $userid, Timer::time(), true); - return null; } elseif ($command === 'locat-checkin') { $setting = Base::setting('checkinSetting'); if ($setting['open'] !== 'open') { @@ -258,10 +240,8 @@ class UserBot extends AbstractModel return '错误的定位签到。'; } UserBot::checkinBotCheckin('locat-' . $userid, Timer::time(), true); - return null; - } else { - return Extranet::checkinBotQuickMsg($command); } + return null; } /** diff --git a/app/Module/Extranet.php b/app/Module/Extranet.php index eea8aa6a2..035025c53 100644 --- a/app/Module/Extranet.php +++ b/app/Module/Extranet.php @@ -5,8 +5,6 @@ namespace App\Module; use App\Models\Setting; use Cache; use Carbon\Carbon; -use Illuminate\Support\Arr; -use Illuminate\Support\Facades\Config; /** * 外网资源请求 @@ -29,6 +27,7 @@ class Extranet if ($systemSetting['voice2text'] !== 'open' || !Setting::AIOpen()) { return Base::retError("语音转文字功能未开启"); } + $extra = [ 'Content-Type' => 'multipart/form-data', 'Authorization' => 'Bearer ' . $aiSetting['ai_api_key'], @@ -37,12 +36,14 @@ class Extranet $extra['CURLOPT_PROXY'] = $aiSetting['ai_proxy']; $extra['CURLOPT_PROXYTYPE'] = str_contains($aiSetting['ai_proxy'], 'socks') ? CURLPROXY_SOCKS5 : CURLPROXY_HTTP; } - $post = array_merge($extParams, [ - 'file' => new \CURLFile($filePath), - 'model' => 'whisper-1', - ]); + $cacheKey = "openAItranscriptions::" . md5($filePath . '_' . Base::array2json($extra) . '_' . Base::array2json($extParams)); - $result = Cache::remember($cacheKey, Carbon::now()->addDays(), function() use ($aiSetting, $extra, $post) { + $result = Cache::remember($cacheKey, Carbon::now()->addDays(), function () use ($aiSetting, $extra, $extParams, $filePath) { + $post = array_merge($extParams, [ + 'file' => new \CURLFile($filePath), + 'model' => 'whisper-1', + ]); + $res = Ihttp::ihttp_request(($aiSetting['ai_api_url'] ?: 'https://api.openai.com/v1') . '/audio/transcriptions', $post, $extra, 15); if (Base::isError($res)) { return Base::retError("语音转文字失败", $res); @@ -51,7 +52,11 @@ class Extranet if (empty($resData['text'])) { return Base::retError("语音转文字失败", $resData); } - return Base::retSuccess("success", $resData['text']); + + return Base::retSuccess("success", [ + 'file' => $filePath, + 'text' => $resData['text'], + ]); }); if (Base::isError($result)) { Cache::forget($cacheKey); @@ -61,8 +66,8 @@ class Extranet /** * 通过 openAI 翻译 - * @param $text - * @param $targetLanguage + * @param string $text 需要翻译的文本内容 + * @param string $targetLanguage 目标语言（如：English, 简体中文, 日本語等） * @return array */ public static function openAItranslations($text, $targetLanguage) @@ -72,6 +77,7 @@ class Extranet if ($systemSetting['translation'] !== 'open' || !Setting::AIOpen()) { return Base::retError("翻译功能未开启"); } + $extra = [ 'Content-Type' => 'application/json', 'Authorization' => 'Bearer ' . $aiSetting['ai_api_key'], @@ -80,45 +86,66 @@ class Extranet $extra['CURLOPT_PROXY'] = $aiSetting['ai_proxy']; $extra['CURLOPT_PROXYTYPE'] = str_contains($aiSetting['ai_proxy'], 'socks') ? CURLPROXY_SOCKS5 : CURLPROXY_HTTP; } - $post = json_encode([ - "model" => "gpt-4o-mini", - "messages" => [ - [ - "role" => "system", - "content" => << 标签内的内容翻译为{$targetLanguage}。 - 翻译要求： - - 翻译结果需符合“项目任务管理系统”的专业术语和使用场景。 - - 保持原文格式、结构和排版不变。 - - 语言表达准确、简洁，符合项目管理领域的行业规范。 - - 注意专业术语的一致性和连贯性。 - EOF + $cacheKey = "openAItranslations::" . md5($text . '_' . $targetLanguage . '_' . ($aiSetting['ai_api_key'] ?? '')); + $result = Cache::remember($cacheKey, Carbon::now()->addDays(7), function () use ($aiSetting, $extra, $text, $targetLanguage) { + $post = json_encode([ + "model" => "gpt-4.1-nano", + "messages" => [ + [ + "role" => "system", + "content" => << "user", + "content" => "请将以下内容翻译为 {$targetLanguage}：\n\n{$text}" + ] ], - [ - "role" => "user", - "content" => "{$text}" - ] - ] - ]); - $cacheKey = "openAItranslations::" . md5(Base::array2json($extra) . '_' . Base::array2json($post)); - $result = Cache::remember($cacheKey, Carbon::now()->addDays(), function() use ($aiSetting, $extra, $post) { - $res = Ihttp::ihttp_request(($aiSetting['ai_api_url'] ?: 'https://api.openai.com/v1') . '/chat/completions', $post, $extra, 15); + "temperature" => 0.2, + "max_tokens" => max(1000, intval(mb_strlen($text) * 1.5)) + ]); + + $res = Ihttp::ihttp_request(($aiSetting['ai_api_url'] ?: 'https://api.openai.com/v1') . '/chat/completions', $post, $extra, 60); if (Base::isError($res)) { - return Base::retError("翻译失败", $res); + return Base::retError("翻译请求失败", $res); } $resData = Base::json2array($res['data']); if (empty($resData['choices'])) { - return Base::retError("翻译失败", $resData); + return Base::retError("翻译响应格式错误", $resData); } - $result = $resData['choices'][0]['message']['content']; - $result = preg_replace('/^\"|\"$/', '', trim($result)); - $result = preg_replace('/<\/*translation_original_text>/', '', trim($result)); - if (empty($result)) { - return Base::retError("翻译失败", $result); + $translatedText = $resData['choices'][0]['message']['content']; + $translatedText = trim($translatedText); + if (empty($translatedText)) { + return Base::retError("翻译结果为空"); } - return Base::retSuccess("success", $result); + + return Base::retSuccess("success", [ + 'translated_text' => $translatedText, + 'target_language' => $targetLanguage, + 'translated_at' => date('Y-m-d H:i:s') + ]); }); + if (Base::isError($result)) { Cache::forget($cacheKey); } @@ -127,7 +154,7 @@ class Extranet /** * 通过 openAI 生成标题 - * @param $text + * @param string $text 需要生成标题的文本内容 * @return array */ public static function openAIGenerateTitle($text) @@ -136,6 +163,7 @@ class Extranet if (!Setting::AIOpen()) { return Base::retError("AI接口未配置"); } + $extra = [ 'Content-Type' => 'application/json', 'Authorization' => 'Bearer ' . $aiSetting['ai_api_key'], @@ -144,32 +172,172 @@ class Extranet $extra['CURLOPT_PROXY'] = $aiSetting['ai_proxy']; $extra['CURLOPT_PROXYTYPE'] = str_contains($aiSetting['ai_proxy'], 'socks') ? CURLPROXY_SOCKS5 : CURLPROXY_HTTP; } - $res = Ihttp::ihttp_request(($aiSetting['ai_api_url'] ?: 'https://api.openai.com/v1') . '/chat/completions', json_encode([ - "model" => "gpt-4o-mini", - "messages" => [ - [ - "role" => "system", - "content" => "你是一个专业的标题生成器，擅长为对话生成简洁的标题，请将提供的文本生成一个标题。" + + $cacheKey = "openAIGenerateTitle::" . md5($text . '_' . Base::array2json($extra)); + $result = Cache::remember($cacheKey, Carbon::now()->addHours(24), function () use ($aiSetting, $extra, $text) { + $post = json_encode([ + "model" => "gpt-4.1-nano", + "messages" => [ + [ + "role" => "system", + "content" => << "user", + "content" => "请为以下内容生成一个合适的标题：\n\n" . $text + ] ], - [ - "role" => "user", - "content" => $text - ] - ] - ]), $extra, 15); - if (Base::isError($res)) { - return Base::retError("生成失败", $res); + "temperature" => 0.3, + "max_tokens" => 100 + ]); + + $res = Ihttp::ihttp_request(($aiSetting['ai_api_url'] ?: 'https://api.openai.com/v1') . '/chat/completions', $post, $extra, 10); + if (Base::isError($res)) { + return Base::retError("标题生成失败", $res); + } + $resData = Base::json2array($res['data']); + if (empty($resData['choices'])) { + return Base::retError("标题生成失败", $resData); + } + $result = $resData['choices'][0]['message']['content']; + $result = trim($result); + if (empty($result)) { + return Base::retError("生成的标题为空"); + } + + return Base::retSuccess("success", [ + 'title' => $result, + 'length' => mb_strlen($result), + 'generated_at' => date('Y-m-d H:i:s') + ]); + }); + + if (Base::isError($result)) { + Cache::forget($cacheKey); } - $resData = Base::json2array($res['data']); - if (empty($resData['choices'])) { - return Base::retError("生成失败", $resData); + + return $result; + } + + /** + * 通过 openAI 生成职场笑话、心灵鸡汤 + * @return array 返回20个笑话和20个心灵鸡汤 + */ + public static function openAIGenJokeAndSoup() + { + $aiSetting = Base::setting('aiSetting'); + if (!Setting::AIOpen()) { + return Base::retError("AI接口未配置"); } - $result = $resData['choices'][0]['message']['content']; - $result = preg_replace('/^\"|\"$/', '', $result); - if (empty($result)) { - return Base::retError("生成失败", $result); + + $extra = [ + 'Content-Type' => 'application/json', + 'Authorization' => 'Bearer ' . $aiSetting['ai_api_key'], + ]; + if ($aiSetting['ai_proxy']) { + $extra['CURLOPT_PROXY'] = $aiSetting['ai_proxy']; + $extra['CURLOPT_PROXYTYPE'] = str_contains($aiSetting['ai_proxy'], 'socks') ? CURLPROXY_SOCKS5 : CURLPROXY_HTTP; } - return Base::retSuccess("success", $result); + + $cacheKey = "openAIJokeAndSoup::" . md5(date('Y-m-d')); + $result = Cache::remember($cacheKey, Carbon::now()->addHours(6), function () use ($aiSetting, $extra) { + $post = json_encode([ + "model" => "gpt-4.1-nano", + "messages" => [ + [ + "role" => "system", + "content" => << "user", + "content" => "请生成20个职场笑话和20个心灵鸡汤" + ] + ], + "temperature" => 0.8 + ]); + + $res = Ihttp::ihttp_request(($aiSetting['ai_api_url'] ?: 'https://api.openai.com/v1') . '/chat/completions', $post, $extra, 120); + if (Base::isError($res)) { + return Base::retError("生成失败", $res); + } + $resData = Base::json2array($res['data']); + if (empty($resData['choices'])) { + return Base::retError("生成失败", $resData); + } + + // 清理可能的markdown代码块标记 + $content = $resData['choices'][0]['message']['content']; + $content = preg_replace('/^\s*```json\s*/', '', $content); + $content = preg_replace('/\s*```\s*$/', '', $content); + $content = trim($content); + + // 解析JSON + $parsedData = Base::json2array($content); + if (!$parsedData || !isset($parsedData['jokes']) || !isset($parsedData['soups'])) { + return Base::retError("生成内容格式错误", $content); + } + + // 验证数据完整性 + if (!is_array($parsedData['jokes']) || !is_array($parsedData['soups'])) { + return Base::retError("生成内容格式错误", $parsedData); + } + + // 过滤空内容并确保有内容 + $jokes = array_filter(array_map('trim', $parsedData['jokes'])); + $soups = array_filter(array_map('trim', $parsedData['soups'])); + + if (empty($jokes) || empty($soups)) { + return Base::retError("生成内容为空", $parsedData); + } + + return Base::retSuccess("success", [ + 'jokes' => array_values($jokes), // 重新索引数组 + 'soups' => array_values($soups), + 'total_jokes' => count($jokes), + 'total_soups' => count($soups), + 'generated_at' => date('Y-m-d H:i:s') + ]); + }); + + if (Base::isError($result)) { + Cache::forget($cacheKey); + } + return $result; } /** @@ -213,111 +381,6 @@ class Extranet ]); } - /** - * 获取IP地址经纬度 - * @param string $ip - * @return array - */ - public static function getIpGcj02(string $ip = ''): array - { - if (empty($ip)) { - $ip = Base::getIp(); - } - $cacheKey = "getIpPoint::" . md5($ip); - $result = Cache::rememberForever($cacheKey, function () use ($ip) { - return Ihttp::ihttp_request("https://www.ifreesite.com/ipaddress/address.php?q=" . $ip, [], [], 12); - }); - if (Base::isError($result)) { - Cache::forget($cacheKey); - return $result; - } - $data = $result['data']; - $lastPos = strrpos($data, ','); - $long = floatval(Base::getMiddle(substr($data, $lastPos + 1), null, ')')); - $lat = floatval(Base::getMiddle(substr($data, strrpos(substr($data, 0, $lastPos), ',') + 1), null, ',')); - return Base::retSuccess("success", [ - 'long' => $long, - 'lat' => $lat, - ]); - } - - /** - * 百度接口：根据ip获取经纬度 - * @param string $ip - * @return array - */ - public static function getIpGcj02ByBaidu(string $ip = ''): array - { - if (empty($ip)) { - $ip = Base::getIp(); - } - - $cacheKey = "getIpPoint::" . md5($ip); - $result = Cache::rememberForever($cacheKey, function () use ($ip) { - $ak = Config::get('app.baidu_app_key'); - $url = 'http://api.map.baidu.com/location/ip?ak=' . $ak . '&ip=' . $ip . '&coor=bd09ll'; - return Ihttp::ihttp_request($url, [], [], 12); - }); - - if (Base::isError($result)) { - Cache::forget($cacheKey); - return $result; - } - $data = json_decode($result['data'], true); - - // x坐标纬度, y坐标经度 - $long = Arr::get($data, 'content.point.x'); - $lat = Arr::get($data, 'content.point.y'); - return Base::retSuccess("success", [ - 'long' => $long, - 'lat' => $lat, - ]); - } - - /** - * 获取IP地址详情 - * @param string $ip - * @return array - */ - public static function getIpInfo(string $ip = ''): array - { - if (empty($ip)) { - $ip = Base::getIp(); - } - $cacheKey = "getIpInfo::" . md5($ip); - $result = Cache::rememberForever($cacheKey, function () use ($ip) { - return Ihttp::ihttp_request("http://ip.taobao.com/service/getIpInfo.php?accessKey=alibaba-inc&ip=" . $ip, [], [], 12); - }); - if (Base::isError($result)) { - Cache::forget($cacheKey); - return $result; - } - $data = json_decode($result['data'], true); - if (!is_array($data) || intval($data['code']) != 0) { - Cache::forget($cacheKey); - return Base::retError("error ip: -1"); - } - $data = $data['data']; - if (!is_array($data) || !isset($data['country'])) { - return Base::retError("error ip: -2"); - } - $data['text'] = $data['country']; - $data['textSmall'] = $data['country']; - if ($data['region'] && $data['region'] != $data['country'] && $data['region'] != "XX") { - $data['text'] .= " " . $data['region']; - $data['textSmall'] = $data['region']; - } - if ($data['city'] && $data['city'] != $data['region'] && $data['city'] != "XX") { - $data['text'] .= " " . $data['city']; - $data['textSmall'] .= " " . $data['city']; - } - if ($data['county'] && $data['county'] != $data['city'] && $data['county'] != "XX") { - $data['text'] .= " " . $data['county']; - $data['textSmall'] .= " " . $data['county']; - } - return Base::retSuccess("success", $data); - } - /** * 判断是否工作日 * @param string $Ymd 年月日（如：20220102） @@ -373,125 +436,6 @@ class Extranet ]; } - /** - * 随机笑话接口 - * @return string - */ - public static function randJoke(): string - { - $data = self::curl("https://hmajax.itheima.net/api/randjoke"); - $data = Base::json2array($data); - if ($data['message'] === '获取成功' && $text = trim($data['data'])) { - return $text; - } - return ""; - } - - /** - * 心灵鸡汤 - * @return string - */ - public static function soups(): string - { - $data = self::curl("https://hmajax.itheima.net/api/ambition"); - $data = Base::json2array($data); - if ($data['message'] === '获取成功' && $text = trim($data['data'])) { - return $text; - } - return ""; - } - - /** - * 签到机器人网络内容 - * @param $type - * @return string - */ - public static function checkinBotQuickMsg($type): string - { - $text = "维护中..."; - switch ($type) { - case "it": - $data = self::curl('http://vvhan.api.hitosea.com/api/hotlist?type=itNews', 3600); - if ($data = Base::json2array($data)) { - $i = 1; - $array = array_map(function ($item) use (&$i) { - if ($item['title'] && $item['desc']) { - return "

" . ($i++) . ". {$item['title']}

{$item['desc']}

"; - } else { - return null; - } - }, $data['data']); - $array = array_values(array_filter($array)); - if ($array) { - array_unshift($array, "

{$data['title']}（{$data['update_time']}）

"); - $text = implode("

 

", $array); - } - } - break; - - case "36ke": - $data = self::curl('http://vvhan.api.hitosea.com/api/hotlist?type=36Ke', 3600); - if ($data = Base::json2array($data)) { - $i = 1; - $array = array_map(function ($item) use (&$i) { - if ($item['title'] && $item['desc']) { - return "

" . ($i++) . ". {$item['title']}

{$item['desc']}

"; - } else { - return null; - } - }, $data['data']); - $array = array_values(array_filter($array)); - if ($array) { - array_unshift($array, "

{$data['title']}（{$data['update_time']}）

"); - $text = implode("

 

", $array); - } - } - break; - - case "60s": - $data = self::curl('http://vvhan.api.hitosea.com/api/60s?type=json', 3600); - if ($data = Base::json2array($data)) { - $i = 1; - $array = array_map(function ($item) use (&$i) { - if ($item) { - return "

" . ($i++) . ". {$item}

"; - } else { - return null; - } - }, $data['data']); - $array = array_values(array_filter($array)); - if ($array) { - array_unshift($array, "

{$data['name']}（{$data['time'][0]}）

"); - $text = implode("

 

", $array); - } - } - break; - - case "joke": - $text = "笑话被掏空"; - $data = self::curl('http://vvhan.api.hitosea.com/api/joke?type=json', 5); - if ($data = Base::json2array($data)) { - if ($data = trim($data['joke'])) { - $text = "开心笑话：{$data}"; - } - } - break; - - case "soup": - $text = "鸡汤分完了"; - $data = self::curl('https://api.ayfre.com/jt/?type=bot', 5); - if ($data) { - $text = "心灵鸡汤：{$data}"; - } - break; - - default: - $text = ""; - break; - } - return $text; - } - /** * 获取搜狗表情包 * @param $keyword diff --git a/app/Tasks/JokeSoupTask.php b/app/Tasks/JokeSoupTask.php index bd7abe3e6..7eca8b06e 100644 --- a/app/Tasks/JokeSoupTask.php +++ b/app/Tasks/JokeSoupTask.php @@ -26,25 +26,27 @@ class JokeSoupTask extends AbstractTask public function start() { - // 判断每分钟执行一次 - if (Cache::get(self::keyName("YmdHi")) == date("YmdHi")) { + // 判断每小时执行一次 + if (Cache::get(self::keyName("YmdH")) == date("YmdH")) { return; } - Cache::put(self::keyName("YmdHi"), date("YmdHi"), Carbon::now()->addDay()); - // - $array = Base::json2array(Cache::get(self::keyName("jokes"))); - $data = Extranet::randJoke(); - if ($data) { - $array[] = $data; + Cache::put(self::keyName("YmdH"), date("YmdH"), Carbon::now()->addDay()); + + // 开始生成笑话和心灵鸡汤 + $result = Extranet::openAIGenJokeAndSoup(); + if (Base::isError($result)) { + Cache::forget(self::keyName("YmdH")); + return; } - Cache::forever(self::keyName("jokes"), Base::array2json(array_slice($array, -200))); - // - $array = Base::json2array(Cache::get(self::keyName("soups"))); - $data = Extranet::soups(); - if ($data) { - $array[] = $data; + + // 笑话和心灵鸡汤的缓存 + foreach (['jokes', 'soups'] as $key) { + if ($result['data'][$key] && is_array($result['data'][$key])) { + $array = Base::json2array(Cache::get(self::keyName($key))); + $array = array_merge($array, $result['data'][$key]); + Cache::forever(self::keyName($key), Base::array2json(array_slice($array, -200))); + } } - Cache::forever(self::keyName("soups"), Base::array2json(array_slice($array, -200))); } public function end() diff --git a/app/Tasks/UpdateSessionTitleViaAiTask.php b/app/Tasks/UpdateSessionTitleViaAiTask.php index c4ec0818c..9cff82321 100644 --- a/app/Tasks/UpdateSessionTitleViaAiTask.php +++ b/app/Tasks/UpdateSessionTitleViaAiTask.php @@ -11,6 +11,9 @@ use App\Module\Extranet; */ class UpdateSessionTitleViaAiTask extends AbstractTask { + protected $sessionId; + protected $msgText; + public function __construct($sessionId, $msgText) { parent::__construct(); @@ -29,12 +32,12 @@ class UpdateSessionTitleViaAiTask extends AbstractTask return; } - $res = Extranet::openAIGenerateTitle($this->msgText); - if (Base::isError($res)) { + $result = Extranet::openAIGenerateTitle($this->msgText); + if (Base::isError($result)) { return; } - $newTitle = $res['data']; + $newTitle = $result['data']['title']; if ($newTitle && $newTitle != $session->title) { $session->title = Base::cutStr($newTitle, 100); $session->save(); diff --git a/database/migrations/2025_07_26_112113_create_ai_settings_table.php b/database/migrations/2025_07_26_112113_create_ai_settings_table.php index 05240a1d9..fa9940007 100644 --- a/database/migrations/2025_07_26_112113_create_ai_settings_table.php +++ b/database/migrations/2025_07_26_112113_create_ai_settings_table.php @@ -1,4 +1,5 @@