代码优化

This commit is contained in:
wong
2025-04-12 15:08:21 +08:00
parent 568de908e2
commit 9257716d9b
49 changed files with 1001 additions and 603 deletions

View File

@@ -10,19 +10,23 @@ class WechatFriendController extends BaseController
{
/**
* 获取微信好友列表数据
* @param string $pageIndex 页码
* @param string $pageSize 每页大小
* @param string $preFriendId 上一个好友ID
* @param bool $isJob 是否为任务调用
* @return \think\response\Json
*/
public function getlist($pageIndex = '',$pageSize = '',$preFriendId = '',$isJob = false)
public function getlist($pageIndex = '', $pageSize = '', $preFriendId = '', $isJob = false)
{
// 获取授权token
$authorization = trim($this->request->header('authorization', $this->authorization));
if (empty($authorization)) {
if($isJob){
return json_encode(['code'=>500,'msg'=>'缺少授权信息']);
}else{
return errorJson('缺少授权信息');
// 获取授权token
$authorization = trim($this->request->header('authorization', $this->authorization));
if (empty($authorization)) {
if ($isJob) {
return json_encode(['code' => 500, 'msg' => '缺少授权信息']);
} else {
return errorJson('缺少授权信息');
}
}
}
try {
// 构建请求参数
@@ -37,19 +41,20 @@ class WechatFriendController extends BaseController
'groupId' => null,
'isDeleted' => null,
'isPass' => null,
'keyword' => input('keyword', ''),
'keyword' => input('keyword', ''),
'labels' => '[]',
'pageIndex' => !empty($pageIndex) ? $pageIndex : input('pageIndex', 0),
'pageSize' => !empty($pageSize) ? $pageSize : input('pageSize', 20),
'preFriendId' => !empty($preFriendId) ? $preFriendId : input('preFriendId', ''),
'wechatAccountKeyword' => input('wechatAccountKeyword', '')
];
// 设置请求头
$headerData = ['client:system'];
$header = setHeader($headerData, $authorization);
// 发送请求获取好友列表
$result = requestCurl($this->baseUrl . 'api/WechatFriend/friendlistData', $params, 'POST', $header,'json');
$result = requestCurl($this->baseUrl . 'api/WechatFriend/friendlistData', $params, 'POST', $header, 'json');
$response = handleApiResponse($result);
// 保存数据到数据库
@@ -59,17 +64,16 @@ class WechatFriendController extends BaseController
}
}
if($isJob){
return json_encode(['code'=>200,'msg'=>'success','data'=>$response]);
}else{
if ($isJob) {
return json_encode(['code' => 200, 'msg' => 'success', 'data' => $response]);
} else {
return successJson($response);
}
} catch (\Exception $e) {
if($isJob){
return json_encode(['code'=>500,'msg'=>'获取微信好友列表失败:' . $e->getMessage()]);
}else{
if ($isJob) {
return json_encode(['code' => 500, 'msg' => '获取微信好友列表失败:' . $e->getMessage()]);
} else {
return errorJson('获取微信好友列表失败:' . $e->getMessage());
}
}
@@ -117,12 +121,12 @@ class WechatFriendController extends BaseController
'country' => $item['country'],
'privince' => isset($item['privince']) ? $item['privince'] : '',
'city' => isset($item['city']) ? $item['city'] : '',
'createTime' =>isset($item['createTime']) ? $item['createTime'] : '',
'createTime' => isset($item['createTime']) ? $item['createTime'] : '',
'updateTime' => time()
];
// 使用三个字段的组合作为唯一性判断
$friend = WechatFriendModel::where('id',$item['id'])->find();
// 使用ID作为唯一性判断
$friend = WechatFriendModel::where('id', $item['id'])->find();
if ($friend) {
$friend->save($data);