From 30b33ec974059ede3ee8f6dcd4fef64ef2f5f994 Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Mon, 24 Nov 2025 11:03:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8B=E5=8F=8B=E5=9C=88=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/WebSocketController.php           | 12 ++++--------
 .../cunkebao/controller/ContentLibraryController.php |  8 ++++----
 2 files changed, 8 insertions(+), 12 deletions(-)

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',