diff --git a/Server/application/api/controller/WebSocketController.php b/Server/application/api/controller/WebSocketController.php index 5b714997..b9b8a860 100644 --- a/Server/application/api/controller/WebSocketController.php +++ b/Server/application/api/controller/WebSocketController.php @@ -463,16 +463,10 @@ class WebSocketController extends BaseController "wechatAccountId" => $data['wechatAccountId'], "seq" => time(), ]; - // 记录请求日志 Log::info('获取朋友圈资源链接请求:' . json_encode($params, 256)); - // 发送请求 - $this->client->send(json_encode($params)); - - // 接收响应 - $response = $this->client->receive(); - $message = json_decode($response, true); + $message = $this->sendMessage($params); if (empty($message)) { return json_encode(['code' => 500, 'msg' => '获取朋友圈资源链接失败']); @@ -558,8 +552,10 @@ class WebSocketController extends BaseController $dataToSave['create_time'] = time(); $res = WechatMoments::create($dataToSave); } + + // 获取资源链接 - if(empty($momentEntity['resUrls']) && !empty($momentEntity['urls'])){ + if(empty($momentEntity['resUrls']) && !empty($momentEntity['urls']) && $moment['type'] == 1) { $snsData = [ 'snsId' => $moment['snsId'], 'snsUrls' => $momentEntity['urls'], diff --git a/Server/application/cunkebao/controller/ContentLibraryController.php b/Server/application/cunkebao/controller/ContentLibraryController.php index e4a2f639..69291123 100644 --- a/Server/application/cunkebao/controller/ContentLibraryController.php +++ b/Server/application/cunkebao/controller/ContentLibraryController.php @@ -1070,7 +1070,7 @@ class ContentLibraryController extends Controller ->select()->toArray(); if (empty($libraries)) { - return json(['code' => 200, 'msg' => '没有可用的内容库配置']); + return json_encode(['code' => 200, 'msg' => '没有可用的内容库配置'],256); } $successCount = 0; @@ -1159,7 +1159,7 @@ class ContentLibraryController extends Controller } // 返回采集结果 - return json([ + return json_encode([ 'code' => 200, 'msg' => '采集任务执行完成', 'data' => [ @@ -1169,7 +1169,7 @@ class ContentLibraryController extends Controller 'skipped' => $totalLibraries - $successCount - $failCount, 'results' => $results ] - ]); + ],256); } /** @@ -1206,7 +1206,7 @@ class ContentLibraryController extends Controller ->whereIn('id', $friendIds) ->where('isDeleted', 0) ->select(); - + if (empty($friends)) { return [ 'status' => 'failed',