|
@@ -1,6 +1,7 @@
|
|
|
<?php
|
|
<?php
|
|
|
|
|
|
|
|
-declare (strict_types = 1);
|
|
|
|
|
|
|
+declare(strict_types=1);
|
|
|
|
|
+
|
|
|
namespace App\Controller;
|
|
namespace App\Controller;
|
|
|
|
|
|
|
|
use App\JsonRpc\ChatServiceInterface;
|
|
use App\JsonRpc\ChatServiceInterface;
|
|
@@ -87,7 +88,7 @@ class ChatController extends AbstractController
|
|
|
$type = array();
|
|
$type = array();
|
|
|
foreach ($typeArr as $value) {
|
|
foreach ($typeArr as $value) {
|
|
|
// var_dump($value['id'], '=-===2222222222');
|
|
// var_dump($value['id'], '=-===2222222222');
|
|
|
- $type[$value['id']] = (string) $value['topicname'];
|
|
|
|
|
|
|
+ $type[$value['id']] = (string) $value['topicname'];
|
|
|
}
|
|
}
|
|
|
// var_dump($type);
|
|
// var_dump($type);
|
|
|
// exit;
|
|
// exit;
|
|
@@ -168,7 +169,6 @@ class ChatController extends AbstractController
|
|
|
$requireData['user_id'] = Context::get("UserId");
|
|
$requireData['user_id'] = Context::get("UserId");
|
|
|
$result = $this->chatServiceClient->getFriendInfo($requireData);
|
|
$result = $this->chatServiceClient->getFriendInfo($requireData);
|
|
|
return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
|
|
return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -480,8 +480,7 @@ class ChatController extends AbstractController
|
|
|
'group_desc' => 'required',
|
|
'group_desc' => 'required',
|
|
|
// 'group_avatar' => 'required',
|
|
// 'group_avatar' => 'required',
|
|
|
// 'group_member' => 'required',
|
|
// 'group_member' => 'required',
|
|
|
- ]
|
|
|
|
|
- ,
|
|
|
|
|
|
|
+ ],
|
|
|
[
|
|
[
|
|
|
'group_name.required' => '群名称不能为空',
|
|
'group_name.required' => '群名称不能为空',
|
|
|
'group_desc.required' => '群描述不能为空',
|
|
'group_desc.required' => '群描述不能为空',
|
|
@@ -652,7 +651,7 @@ class ChatController extends AbstractController
|
|
|
$requireData['token'] = Context::get("Token");
|
|
$requireData['token'] = Context::get("Token");
|
|
|
|
|
|
|
|
$result = $this->chatServiceClient->joinGroup($requireData);
|
|
$result = $this->chatServiceClient->joinGroup($requireData);
|
|
|
-// var_dump($result, '-----------1--------');
|
|
|
|
|
|
|
+ // var_dump($result, '-----------1--------');
|
|
|
return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
|
|
return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -741,22 +740,22 @@ class ChatController extends AbstractController
|
|
|
}
|
|
}
|
|
|
$requireData['user_id'] = Context::get("UserId");
|
|
$requireData['user_id'] = Context::get("UserId");
|
|
|
$requireData['type_id'] = Context::get("TypeId");
|
|
$requireData['type_id'] = Context::get("TypeId");
|
|
|
- if($requireData['type_id']==10000 && $requireData['is_group']==1){
|
|
|
|
|
- $url = env('IM_URL').'/api/v1/group/create';
|
|
|
|
|
- $data = [
|
|
|
|
|
- 'avatar' => '',
|
|
|
|
|
- 'name' => $requireData['group_name'],
|
|
|
|
|
- 'profile'=>'',
|
|
|
|
|
- 'ids' => '',
|
|
|
|
|
- ];
|
|
|
|
|
- $options = [
|
|
|
|
|
- 'authorization'=>Context::get('Token')
|
|
|
|
|
- ];
|
|
|
|
|
- $res = PublicData::im_post($url,$data,$options);
|
|
|
|
|
- if($res['code']==200){
|
|
|
|
|
- $requireData['group_id'] = $res['data']['group_id'];
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // if($requireData['type_id']==10000 && $requireData['is_group']==1){
|
|
|
|
|
+ // $url = env('IM_URL').'/api/v1/group/create';
|
|
|
|
|
+ // $data = [
|
|
|
|
|
+ // 'avatar' => '',
|
|
|
|
|
+ // 'name' => $requireData['group_name'],
|
|
|
|
|
+ // 'profile'=>'',
|
|
|
|
|
+ // 'ids' => '',
|
|
|
|
|
+ // ];
|
|
|
|
|
+ // $options = [
|
|
|
|
|
+ // 'authorization'=>Context::get('Token')
|
|
|
|
|
+ // ];
|
|
|
|
|
+ // $res = PublicData::im_post($url,$data,$options);
|
|
|
|
|
+ // if($res['code']==200){
|
|
|
|
|
+ // $requireData['group_id'] = $res['data']['group_id'];
|
|
|
|
|
+ // }
|
|
|
|
|
+ // }
|
|
|
$result = $this->chatServiceClient->addTopic($requireData);
|
|
$result = $this->chatServiceClient->addTopic($requireData);
|
|
|
return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
|
|
return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|
|
}
|
|
@@ -1152,8 +1151,7 @@ class ChatController extends AbstractController
|
|
|
'status.required' => '状态不能为空',
|
|
'status.required' => '状态不能为空',
|
|
|
'status.in' => '状态值不合法,2或者3',
|
|
'status.in' => '状态值不合法,2或者3',
|
|
|
]
|
|
]
|
|
|
- )
|
|
|
|
|
- ;
|
|
|
|
|
|
|
+ );
|
|
|
if ($validator->fails()) {
|
|
if ($validator->fails()) {
|
|
|
$errorMessage = $validator->errors()->first();
|
|
$errorMessage = $validator->errors()->first();
|
|
|
return Result::error($errorMessage);
|
|
return Result::error($errorMessage);
|
|
@@ -1180,8 +1178,7 @@ class ChatController extends AbstractController
|
|
|
[
|
|
[
|
|
|
'id.required' => 'TopicID不能为空',
|
|
'id.required' => 'TopicID不能为空',
|
|
|
]
|
|
]
|
|
|
- )
|
|
|
|
|
- ;
|
|
|
|
|
|
|
+ );
|
|
|
if ($validator->fails()) {
|
|
if ($validator->fails()) {
|
|
|
$errorMessage = $validator->errors()->first();
|
|
$errorMessage = $validator->errors()->first();
|
|
|
return Result::error($errorMessage);
|
|
return Result::error($errorMessage);
|
|
@@ -1201,8 +1198,7 @@ class ChatController extends AbstractController
|
|
|
[
|
|
[
|
|
|
'topicname.required' => '名称不能为空',
|
|
'topicname.required' => '名称不能为空',
|
|
|
]
|
|
]
|
|
|
- )
|
|
|
|
|
- ;
|
|
|
|
|
|
|
+ );
|
|
|
if ($validator->fails()) {
|
|
if ($validator->fails()) {
|
|
|
$errorMessage = $validator->errors()->first();
|
|
$errorMessage = $validator->errors()->first();
|
|
|
return Result::error($errorMessage);
|
|
return Result::error($errorMessage);
|