|
@@ -10,6 +10,8 @@ use App\Model\ChatTopic;
|
|
|
use App\Model\ChatTopicsReply;
|
|
use App\Model\ChatTopicsReply;
|
|
|
|
|
|
|
|
use App\Model\ChatTopicClass;
|
|
use App\Model\ChatTopicClass;
|
|
|
|
|
+use App\Model\ImGroup;
|
|
|
|
|
+use App\Model\ImGroupMember;
|
|
|
use App\Model\User;
|
|
use App\Model\User;
|
|
|
use App\Tools\PublicData;
|
|
use App\Tools\PublicData;
|
|
|
use App\Tools\Result;
|
|
use App\Tools\Result;
|
|
@@ -776,26 +778,34 @@ class ChatService implements ChatServiceInterface
|
|
|
*/
|
|
*/
|
|
|
public function joinGroup(array $data): array
|
|
public function joinGroup(array $data): array
|
|
|
{
|
|
{
|
|
|
- $group = ChatGroups::where(['id' => $data['group_id']])->first();
|
|
|
|
|
|
|
+ $group = ImGroup::where(['id' => $data['group_id']])->first();
|
|
|
if (empty($group)) {
|
|
if (empty($group)) {
|
|
|
return Result::error("群不存在", 0);
|
|
return Result::error("群不存在", 0);
|
|
|
}
|
|
}
|
|
|
- $groupMember = ChatGroupsMember::where(['user_id' => $data['user_id'], 'group_id' => $data['group_id']])->first();
|
|
|
|
|
|
|
+ $groupMember = ImGroupMember::where(['user_id' => $data['user_id'], 'group_id' => $data['group_id']])->first();
|
|
|
if ($groupMember) {
|
|
if ($groupMember) {
|
|
|
return Result::error("已加入群", 0);
|
|
return Result::error("已加入群", 0);
|
|
|
}
|
|
}
|
|
|
- $info = [
|
|
|
|
|
- 'id' => PublicData::uuid(),
|
|
|
|
|
- 'user_id' => $data['user_id'],
|
|
|
|
|
- 'group_id' => $data['group_id'],
|
|
|
|
|
|
|
+// $info = [
|
|
|
|
|
+// 'id' => PublicData::uuid(),
|
|
|
|
|
+// 'user_id' => $data['user_id'],
|
|
|
|
|
+// 'group_id' => $data['group_id'],
|
|
|
|
|
+// ];
|
|
|
|
|
+// $result = ChatGroupsMember::insert($info);
|
|
|
|
|
+ $url = env('IM_URL').'/api/v1/group/invite';
|
|
|
|
|
+ $dataIM = [
|
|
|
|
|
+ 'group_id' => intval($data['group_id']),
|
|
|
|
|
+ 'ids' => _string($data['user_id']),
|
|
|
|
|
+ ];
|
|
|
|
|
+ $options = [
|
|
|
|
|
+ 'authorization'=>$data['token']
|
|
|
];
|
|
];
|
|
|
- $result = ChatGroupsMember::insert($info);
|
|
|
|
|
- var_dump($result, '--------------------');
|
|
|
|
|
|
|
+ $result = PublicData::im_post($url,$dataIM,$options);
|
|
|
if ($result) {
|
|
if ($result) {
|
|
|
return Result::success($data);
|
|
return Result::success($data);
|
|
|
} else {
|
|
} else {
|
|
|
return Result::error($data);
|
|
return Result::error($data);
|
|
|
- };
|
|
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
/**
|
|
/**
|
|
|
* 话题 - 列表
|
|
* 话题 - 列表
|