代码提交

This commit is contained in:
wong
2025-08-30 10:58:34 +08:00
parent fb10e43055
commit f6837f7819
2 changed files with 54 additions and 12 deletions

View File

@@ -62,7 +62,15 @@ class ConversationController extends BaseController
try {
$bot_id = input('bot_id','');
if(empty($bot_id)){
return errorJson('智能体ID不能为空');
if($is_internal){
return json_encode([
'code' => 400,
'msg' => '智能体ID不能为空',
'data' => []
]);
}else{
return errorJson('智能体ID不能为空');
}
}
$page = input('page',1);
$limit = input('limit',20);
@@ -78,7 +86,15 @@ class ConversationController extends BaseController
$result = json_decode($result, true);
if ($result['code'] != 0) {
return errorJson($result['msg'], $result['code']);
if($is_internal){
return json_encode([
'code' => $result['code'],
'msg' => $result['msg'],
'data' => []
]);
}else{
return errorJson($result['msg'], $result['code']);
}
}
// 处理返回的数据并存入数据库
@@ -107,7 +123,15 @@ class ConversationController extends BaseController
$companyId = $userInfo['companyId'];
if(empty($bot_id)){
return errorJson('智能体ID不能为空');
if($is_internal){
return json_encode([
'code' => 400,
'msg' => '智能体ID不能为空',
'data' => []
]);
}else{
return errorJson('智能体ID不能为空');
}
}
// 构建元数据和消息
@@ -131,7 +155,15 @@ class ConversationController extends BaseController
$result = $this->httpRequest($url, 'POST', json_encode($params,256), $this->headers);
$result = json_decode($result, true);
if ($result['code'] != 0) {
return errorJson($result['msg'], $result['code']);
if($is_internal){
return json_encode([
'code' => $result['code'],
'msg' => $result['msg'],
'data' => []
]);
}else{
return errorJson($result['msg'], $result['code']);
}
}
// 获取返回的对话数据并保存
@@ -167,7 +199,15 @@ class ConversationController extends BaseController
}
} catch (\Exception $e) {
return errorJson('创建对话失败:' . $e->getMessage());
if($is_internal){
return json_encode([
'code' => 500,
'msg' => '创建对话失败:' . $e->getMessage(),
'data' => []
]);
}else{
return errorJson('创建对话失败:' . $e->getMessage());
}
}
}
@@ -370,4 +410,4 @@ class ConversationController extends BaseController
return successJson($list, '获取成功');
}
}
}

View File

@@ -16,6 +16,7 @@ class MessageController extends BaseController
*/
public function getMessages()
{
return successJson([], '获取成功');
try {
// 获取用户信息
$userInfo = request()->userInfo;
@@ -37,12 +38,11 @@ class MessageController extends BaseController
if (empty($conversation)) {
$conversationController = new ConversationController();
$result = $conversationController->create(true);
$result = json_decode($result, true);
if ($result['code'] != 200) {
return errorJson('创建会话失败:' . $result['msg']);
$resultData = json_decode($result, true);
if ($resultData['code'] != 200) {
return errorJson('创建会话失败:' . $resultData['msg']);
}
$conversation_id = $result['data']['id'];
$conversation_id = $resultData['data']['id'];
} else {
$conversation_id = $conversation['conversation_id'];
}
@@ -59,6 +59,8 @@ class MessageController extends BaseController
}
}
// 分页参数
$page = input('page', 1);
$limit = input('limit', 20);
@@ -114,4 +116,4 @@ class MessageController extends BaseController
return errorJson('获取对话记录失败:' . $e->getMessage());
}
}
}
}