From 58b6cd23407930e8bc1c1b2a9df7d11c23a0274c Mon Sep 17 00:00:00 2001
From: wong <106998207@qq.com>
Date: Fri, 16 Jan 2026 11:55:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AE=9A=E6=97=B6=E9=87=87?=
 =?UTF-8?q?=E9=9B=86=E6=89=80=E6=9C=89=E6=9C=8B=E5=8F=8B=E5=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Server/application/api/controller/WebSocketController.php | 5 +++--
 Server/application/job/OwnMomentsCollectJob.php           | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Server/application/api/controller/WebSocketController.php b/Server/application/api/controller/WebSocketController.php
index 73d6bf32..2c642450 100644
--- a/Server/application/api/controller/WebSocketController.php
+++ b/Server/application/api/controller/WebSocketController.php
@@ -239,7 +239,8 @@ class WebSocketController extends BaseController
         $wechatAccountId = !empty($data['wechatAccountId']) ? $data['wechatAccountId'] : '';
         $wechatFriendId = !empty($data['wechatFriendId']) ? $data['wechatFriendId'] : 0;
         $prevSnsId = !empty($data['prevSnsId']) ? $data['prevSnsId'] : 0;
-        $maxPages = 1; // 最大页数限制为20
+        $isTimeline = !empty($data['isTimeline']) ? $data['isTimeline'] : false;
+        $maxPages = !empty($data['maxPages']) ? $data['maxPages'] : 1; // 最大页数限制为20
         $currentPage = 1; // 当前页码
         $allMoments = []; // 存储所有朋友圈数据
 
@@ -254,7 +255,7 @@ class WebSocketController extends BaseController
                     "cmdType" => "CmdFetchMoment",
                     "count" => $count,
                     "createTimeSec" => time(),
-                    "isTimeline" => false,
+                    "isTimeline" => $isTimeline,
                     "prevSnsId" => $prevSnsId,
                     "wechatAccountId" => $wechatAccountId,
                     "wechatFriendId" => $wechatFriendId,
diff --git a/Server/application/job/OwnMomentsCollectJob.php b/Server/application/job/OwnMomentsCollectJob.php
index 9b8987c1..71e6d74a 100644
--- a/Server/application/job/OwnMomentsCollectJob.php
+++ b/Server/application/job/OwnMomentsCollectJob.php
@@ -97,7 +97,9 @@ class OwnMomentsCollectJob
                     // 采集自己的朋友圈（wechatFriendId传0或空，表示采集自己的朋友圈）
                     $result = $webSocket->getMoments([
                         'wechatAccountId' => $wechatAccountId,
-                        'wechatFriendId' => 0, // 0表示采集自己的朋友圈
+                        'wechatFriendId' => 0,
+                        'isTimeline' => true,
+                        'maxPages' => 3,
                         'count' => 10 // 每次采集10条
                     ]);