|
@@ -12,6 +12,10 @@ use function Hyperf\Support\env;
|
|
|
use Hyperf\Context\Context;
|
|
|
use Hyperf\Di\Annotation\Inject;
|
|
|
use Hyperf\Validation\Contract\ValidatorFactoryInterface;
|
|
|
+// use App\Controller\WebSocketController as WebSocket;
|
|
|
+use Hyperf\Context\ApplicationContext as ApplicationContext;
|
|
|
+use App\Controller\WebSocketController;
|
|
|
+use Swoole\WebSocket\Frame;
|
|
|
|
|
|
/**
|
|
|
*
|
|
@@ -30,6 +34,8 @@ class ChatController extends AbstractController
|
|
|
private $chatServiceClient;
|
|
|
#[Inject]
|
|
|
private UserServiceInterface $userServiceClient;
|
|
|
+ // #[Inject]
|
|
|
+ // private WebSocket $webSocketController;
|
|
|
|
|
|
/**
|
|
|
* 申请添加好友
|
|
@@ -64,12 +70,7 @@ class ChatController extends AbstractController
|
|
|
return Result::error('好友ID不存在');
|
|
|
}
|
|
|
$result = $this->chatServiceClient->addFriend($requireData);
|
|
|
- //redis 添加好友
|
|
|
- if ($result && $result['code'] != 0) {
|
|
|
- $redisClient = new RedisService();
|
|
|
- $myFriends = $this->chatServiceClient->getFriendsList(['user_id' => $userId, 'status' => 2]);
|
|
|
- $redisClient->setUserFriends($userId, $myFriends['data']);
|
|
|
- }
|
|
|
+
|
|
|
return $result ? Result::success($result['message']) : Result::error($result['message']);
|
|
|
}
|
|
|
/**
|
|
@@ -190,6 +191,8 @@ class ChatController extends AbstractController
|
|
|
public function applyFriend()
|
|
|
{
|
|
|
$requireData = $this->request->all();
|
|
|
+ $frindid =$requireData['apply_id'];
|
|
|
+ unset($requireData['apply_id']);
|
|
|
// 定义验证规则
|
|
|
$validator = $this->validationFactory->make(
|
|
|
$requireData,
|
|
@@ -209,7 +212,16 @@ class ChatController extends AbstractController
|
|
|
return Result::error(implode(', ', $validator->errors()->all()), 0);
|
|
|
}
|
|
|
$requireData['user_id'] = Context::get("UserId");
|
|
|
+ var_dump($requireData,'1111test');
|
|
|
$result = $this->chatServiceClient->applyFriend($requireData);
|
|
|
+ //redis 添加好友
|
|
|
+ if ($result && $result['code'] != 0) {
|
|
|
+ $redisClient = new RedisService();
|
|
|
+ $myFriends = $this->chatServiceClient->getFriendsList(['user_id' => $requireData['user_id'], 'status' => 2]);
|
|
|
+ $redisClient->setUserFriends((string)$requireData['user_id'], $myFriends['data']);
|
|
|
+ $myFriends = $this->chatServiceClient->getFriendsList(['user_id' => $frindid, 'status' => 2]);
|
|
|
+ $redisClient->setUserFriends((string)$frindid, $myFriends['data']);
|
|
|
+ }
|
|
|
return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|
|
|
|
|
@@ -239,7 +251,10 @@ class ChatController extends AbstractController
|
|
|
if ($result && $result['code'] != 0) {
|
|
|
$redisClient = new RedisService();
|
|
|
$myFriends = $this->chatServiceClient->getFriendsList(['user_id' => $requireData['user_id'], 'status' => 2]);
|
|
|
- $redisClient->setUserFriends($requireData['user_id'], $myFriends['data']);
|
|
|
+ $redisClient->setUserFriends((string)$requireData['user_id'], $myFriends['data']);
|
|
|
+
|
|
|
+ $myFriends = $this->chatServiceClient->getFriendsList(['user_id' => $requireData['friend_id'], 'status' => 2]);
|
|
|
+ $redisClient->setUserFriends((string)$requireData['friend_id'], $myFriends['data']);
|
|
|
}
|
|
|
return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|
|
@@ -664,13 +679,16 @@ class ChatController extends AbstractController
|
|
|
$requireData,
|
|
|
[
|
|
|
'title' => 'required|string',
|
|
|
- 'type' => 'required|string',
|
|
|
+ 'type' => 'required|int',
|
|
|
'content' => 'required|string',
|
|
|
],
|
|
|
[
|
|
|
'title.required' => '商圈名称不能为空',
|
|
|
'type.required' => '商圈类型不能为空',
|
|
|
'content.required' => '商圈内容不能为空',
|
|
|
+ 'type.int' => '商圈类型只能是数字',
|
|
|
+ 'content.string' => '商圈内容只能是字符串',
|
|
|
+ 'title.string' => '商圈名称只能是字符串',
|
|
|
]
|
|
|
);
|
|
|
if ($validator->fails()) {
|
|
@@ -809,169 +827,249 @@ class ChatController extends AbstractController
|
|
|
$result = $this->chatServiceClient->getTopicReply($requireData);
|
|
|
return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|
|
|
- /**-=-------------------------------------------------------
|
|
|
- * 获取好友列表
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取 access_token
|
|
|
+ * @return array
|
|
|
+ */
|
|
|
+ public function getAccessToken()
|
|
|
+ {
|
|
|
+ $url = env("WECHAT") . "cgi-bin/token?appid=" . env("APPID") . "&secret=" . env("APP_SECRET") . "&grant_type=client_credential";
|
|
|
+ $result = PublicData::http_get($url);
|
|
|
+ $resultData = json_decode($result, true);
|
|
|
+ var_dump($url, $resultData);
|
|
|
+ if (isset($resultData['errcode'])) {
|
|
|
+ return Result::error($resultData['errmsg']);
|
|
|
+ }
|
|
|
+ return Result::success($resultData);
|
|
|
+ }
|
|
|
+ /**
|
|
|
+ * 删除一条聊天记录
|
|
|
* @return array
|
|
|
*/
|
|
|
- public function getContactList()
|
|
|
+ public function delRecords()
|
|
|
{
|
|
|
$requireData = $this->request->all();
|
|
|
+ $validator = $this->validationFactory->make(
|
|
|
+ $requireData,
|
|
|
+ [
|
|
|
+ 'id' => 'required',
|
|
|
+ ],
|
|
|
+ [
|
|
|
+ 'id.required' => '聊天记录ID不能为空',
|
|
|
+ ]
|
|
|
+ );
|
|
|
+ if ($validator->fails()) {
|
|
|
+ $errorMessage = $validator->errors()->first();
|
|
|
+ }
|
|
|
$requireData['user_id'] = Context::get("UserId");
|
|
|
- $requireData['keyWord'] = $this->request->input('keyWord', '');
|
|
|
- $result = $this->chatServiceClient->getContactList($requireData);
|
|
|
- return $result ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
+ $result = $this->chatServiceClient->delRecords($requireData);
|
|
|
+ return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|
|
|
-
|
|
|
/**
|
|
|
- * 获取会话列表
|
|
|
+ * 删除所有聊天记录
|
|
|
* @return array
|
|
|
*/
|
|
|
- public function getTalkSessionList()
|
|
|
+ public function clearRecords()
|
|
|
{
|
|
|
$requireData = $this->request->all();
|
|
|
- $requireData['user_id'] = Context::get("UserId");
|
|
|
- var_dump("会话列表:", $requireData);
|
|
|
- $result = $this->chatServiceClient->getTalkSessionList($requireData);
|
|
|
- var_dump($result);
|
|
|
- if ($result['data']['row']) {
|
|
|
- foreach ($result['data']['row'] as $k => $v) {
|
|
|
- $result['data']['row'][$k]['messages'] = [];
|
|
|
- }
|
|
|
+ $validator = $this->validationFactory->make(
|
|
|
+ $requireData,
|
|
|
+ [
|
|
|
+ 'friend_id' => 'required',
|
|
|
+ ],
|
|
|
+ [
|
|
|
+ 'friend_id.required' => '聊天记录ID不能为空',
|
|
|
+ ]
|
|
|
+ );
|
|
|
+ if ($validator->fails()) {
|
|
|
+ $errorMessage =$validator->errors()->first();
|
|
|
}
|
|
|
- return $result ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
+ $requireData['user_id'] = Context::get("UserId");
|
|
|
+ $result = $this->chatServiceClient->clearRecords($requireData);
|
|
|
+ return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|
|
|
-
|
|
|
/**
|
|
|
- * 创建用户群
|
|
|
+ * 删除群聊记录
|
|
|
* @return array
|
|
|
*/
|
|
|
- public function addTalkGroup()
|
|
|
+ public function clearGroupRecords()
|
|
|
{
|
|
|
$requireData = $this->request->all();
|
|
|
$validator = $this->validationFactory->make(
|
|
|
$requireData,
|
|
|
[
|
|
|
- 'group_name' => 'required',
|
|
|
- 'user_id_arr' => 'required',
|
|
|
+ 'id' => 'required',
|
|
|
],
|
|
|
[
|
|
|
- 'group_name.required' => '群名称不能为空',
|
|
|
- 'user_id_arr.required' => '好友ID不能为空',
|
|
|
+ 'id.required' => '聊天记录ID不能为空',
|
|
|
]
|
|
|
);
|
|
|
if ($validator->fails()) {
|
|
|
- $errorMessage = $validator->errors()->first();
|
|
|
- return Result::error($errorMessage);
|
|
|
+ $errorMessage= $validator->errors()->first();
|
|
|
}
|
|
|
$requireData['user_id'] = Context::get("UserId");
|
|
|
- $requireData['user_id_arr'] = $requireData['user_id_arr'];
|
|
|
- var_dump($requireData);
|
|
|
- $result = $this->chatServiceClient->addTalkGroup($requireData);
|
|
|
- return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
-
|
|
|
+ $result = $this->chatServiceClient->clearGroupRecords($requireData);
|
|
|
+ return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|
|
|
-
|
|
|
/**
|
|
|
- * 会话详情
|
|
|
- * @return void
|
|
|
+ * 撤回一条聊天记录
|
|
|
+ * @return array
|
|
|
*/
|
|
|
- public function getTalkRecordsList()
|
|
|
- {
|
|
|
+ public function recallRecord()
|
|
|
+ {
|
|
|
+
|
|
|
+ $webSocketController = ApplicationContext::getContainer()->get(WebSocketController::class);
|
|
|
+ $frame = new Frame();
|
|
|
+ $frame->fd = 1; // 替换为实际的客户端 fd
|
|
|
+ $frame->data = json_encode([
|
|
|
+ 'talk_type' => 1,
|
|
|
+ 'receiver_id' => 2, // 接收者 ID
|
|
|
+ 'content' => 'Hello, this is a test message!'
|
|
|
+ ]);
|
|
|
+
|
|
|
+ $webSocketController->send(1, 'Hello, World!');
|
|
|
+ return Result::success('');
|
|
|
+
|
|
|
$requireData = $this->request->all();
|
|
|
$validator = $this->validationFactory->make(
|
|
|
$requireData,
|
|
|
[
|
|
|
- 'session_id' => 'required',
|
|
|
- 'talk_type' => 'required',
|
|
|
+ 'content' => 'required',
|
|
|
],
|
|
|
[
|
|
|
- 'session_id.required' => '会话ID不能为空',
|
|
|
- 'talk_type.required' => '会话类型不能为空',
|
|
|
+ 'content.required' => '聊天记录不能为空',
|
|
|
]
|
|
|
);
|
|
|
+ $requireData['user_id'] = Context::get("UserId");
|
|
|
if ($validator->fails()) {
|
|
|
$errorMessage = $validator->errors()->first();
|
|
|
- return Result::error($errorMessage);
|
|
|
}
|
|
|
- $requireData['page'] = $requireData['page'] ?? 1;
|
|
|
- $requireData['pageSize'] = $requireData['pageSize'] ?? 30;
|
|
|
- $result = $this->chatServiceClient->getTalkRecordsList($requireData);
|
|
|
- return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
+ //接入websocket,发送撤回消息
|
|
|
+ $redisClient = new RedisService();
|
|
|
+ $fd = $redisClient->findFd((int) 32);
|
|
|
+ $maxRetries = 1;
|
|
|
+ $retryCount = 0;
|
|
|
+ $interval = 1; // 秒
|
|
|
+ while ($retryCount < $maxRetries) {
|
|
|
+ $response = $this->chatServiceClient->getRecordByContent($requireData);
|
|
|
+ // 如果成功,返回结果
|
|
|
+ if ($response['code'] === 0) {
|
|
|
+ if(!empty($response['data']['id'])){
|
|
|
+ $records = $response['data'];
|
|
|
+ foreach($records as $record){
|
|
|
+ //判断 created_at 是否大于一分钟
|
|
|
+ $createdAt = strtotime($record['created_at']);
|
|
|
+ $currentTime = time();
|
|
|
+ $timeDifference = $currentTime - $createdAt;
|
|
|
+ if ($timeDifference > 60) {
|
|
|
+ return Result::error('超过一分钟,无法撤回');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $result = $this->chatServiceClient->recallRecord($response['data']);
|
|
|
+ return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
+ }
|
|
|
+ // 如果失败,等待一段时间后重试
|
|
|
+ sleep($interval);
|
|
|
+ $retryCount++;
|
|
|
+ }
|
|
|
+ return Result::error('获取失败');
|
|
|
}
|
|
|
-
|
|
|
/**
|
|
|
- * 添加聊天
|
|
|
- * @return void
|
|
|
+ * 获取一条信息
|
|
|
+ * @return array
|
|
|
*/
|
|
|
- public function addTalkRecords()
|
|
|
+ public function getRecord()
|
|
|
{
|
|
|
$requireData = $this->request->all();
|
|
|
$validator = $this->validationFactory->make(
|
|
|
$requireData,
|
|
|
[
|
|
|
- 'type' => 'required',
|
|
|
- 'content' => 'required',
|
|
|
- 'receiver' => 'required',
|
|
|
-
|
|
|
+ 'id' => 'required',
|
|
|
],
|
|
|
[
|
|
|
- 'type.required' => '消息类型不能为空',
|
|
|
- 'content.required' => '内容不能为空',
|
|
|
- 'receiver.required' => '会话信息不能为空',
|
|
|
+ 'id.required' => '聊天记录ID不能为空',
|
|
|
]
|
|
|
);
|
|
|
if ($validator->fails()) {
|
|
|
- $errorMessage = $validator->errors()->first();
|
|
|
- return Result::error($errorMessage);
|
|
|
+ $errorMessage= $validator->errors()->first();
|
|
|
}
|
|
|
$requireData['user_id'] = Context::get("UserId");
|
|
|
- $result = $this->chatServiceClient->addTalkRecords($requireData);
|
|
|
- return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
+ $result = $this->chatServiceClient->getRecord($requireData);
|
|
|
+ return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|
|
|
-
|
|
|
/**
|
|
|
- * 获取openId
|
|
|
- * @return array|void
|
|
|
+ * 删除一条topicRely
|
|
|
+ * @return array
|
|
|
*/
|
|
|
- public function wechatOpenInfo()
|
|
|
+ public function delReply()
|
|
|
{
|
|
|
$requireData = $this->request->all();
|
|
|
$validator = $this->validationFactory->make(
|
|
|
$requireData,
|
|
|
[
|
|
|
- 'code' => 'required',
|
|
|
+ 'id' => 'required',
|
|
|
],
|
|
|
[
|
|
|
- 'code.required' => 'code不能为空',
|
|
|
+ 'id.required' => '回复ID不能为空',
|
|
|
]
|
|
|
);
|
|
|
if ($validator->fails()) {
|
|
|
$errorMessage = $validator->errors()->first();
|
|
|
- return Result::error($errorMessage);
|
|
|
}
|
|
|
- $url = env("WECHAT") . "sns/jscode2session?appid=" . env("APPID") . "&secret=" . env("APP_SECRET") . "&js_code=" . $requireData['code'] . "&grant_type=authorization_code";
|
|
|
- $result = PublicData::http_get($url);
|
|
|
- $resultData = json_decode($result, true);
|
|
|
- if (isset($resultData['errcode'])) {
|
|
|
- return Result::error($resultData['errmsg']);
|
|
|
+ $requireData['user_id'] = Context::get("UserId");
|
|
|
+ $result = $this->chatServiceClient->delReply($requireData);
|
|
|
+ return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
+ }
|
|
|
+ /**
|
|
|
+ * 删除所有回复
|
|
|
+ * @return array
|
|
|
+ */
|
|
|
+ public function delAllReply()
|
|
|
+ {
|
|
|
+ $requireData = $this->request->all();
|
|
|
+ $validator = $this->validationFactory->make(
|
|
|
+ $requireData,
|
|
|
+ [
|
|
|
+ 'topicid' => 'required',
|
|
|
+ ],
|
|
|
+ [
|
|
|
+ 'topicid.required' => '回复ID不能为空',
|
|
|
+ ]
|
|
|
+ );
|
|
|
+ if ($validator->fails()) {
|
|
|
+ $errorMessage =$validator->errors()->first();
|
|
|
}
|
|
|
- return Result::success($resultData);
|
|
|
+ $requireData['user_id'] = Context::get("UserId");
|
|
|
+ $result = $this->chatServiceClient->delAllReply($requireData);
|
|
|
+ return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|
|
|
-
|
|
|
/**
|
|
|
- * 获取 access_token
|
|
|
+ * 获取所有Topic
|
|
|
* @return array
|
|
|
*/
|
|
|
- public function getAccessToken()
|
|
|
+ public function getTopicsListAdmin()
|
|
|
{
|
|
|
- $url = env("WECHAT") . "cgi-bin/token?appid=" . env("APPID") . "&secret=" . env("APP_SECRET") . "&grant_type=client_credential";
|
|
|
- $result = PublicData::http_get($url);
|
|
|
- $resultData = json_decode($result, true);
|
|
|
- var_dump($url, $resultData);
|
|
|
- if (isset($resultData['errcode'])) {
|
|
|
- return Result::error($resultData['errmsg']);
|
|
|
+ $requireData = $this->request->all();
|
|
|
+ $validator = $this->validationFactory->make(
|
|
|
+ $requireData,
|
|
|
+ [
|
|
|
+ 'page' => 'required',
|
|
|
+ 'limit' => 'required',
|
|
|
+ ],
|
|
|
+ [
|
|
|
+ 'page.required' => '页码不能为空',
|
|
|
+ 'limit.required' => '每页数量不能为空',
|
|
|
+ ]
|
|
|
+ );
|
|
|
+ if ($validator->fails()) {
|
|
|
+ $errorMessage = $validator->errors()->first();
|
|
|
}
|
|
|
- return Result::success($resultData);
|
|
|
+ $requireData['user_id'] = Context::get("UserId");
|
|
|
+ $result = $this->chatServiceClient->getTopicsListAdmin($requireData);
|
|
|
+ return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|