diff --git a/Server/application/cunkebao/config/route.php b/Server/application/cunkebao/config/route.php
index 963ef25e..6a14bb07 100644
--- a/Server/application/cunkebao/config/route.php
+++ b/Server/application/cunkebao/config/route.php
@@ -64,6 +64,7 @@ Route::group('v1/', function () {
         Route::post('update', 'app\\cunkebao\\controller\\ContentLibraryController@update'); // 更新内容库
         Route::delete('delete', 'app\\cunkebao\\controller\\ContentLibraryController@delete'); // 删除内容库
         Route::get('detail', 'app\\cunkebao\\controller\\ContentLibraryController@detail'); // 获取内容库详情
+        Route::get('collectMoments', 'app\\cunkebao\\controller\\ContentLibraryController@collectMoments'); // 采集朋友圈
     });
 
     // 好友相关
diff --git a/Server/application/cunkebao/controller/ContentLibraryController.php b/Server/application/cunkebao/controller/ContentLibraryController.php
index 7e0db938..449909c8 100644
--- a/Server/application/cunkebao/controller/ContentLibraryController.php
+++ b/Server/application/cunkebao/controller/ContentLibraryController.php
@@ -6,12 +6,93 @@ use app\cunkebao\model\ContentLibrary;
 use app\cunkebao\model\ContentItem;
 use think\Controller;
 use think\Db;
+use app\api\controller\WebSocketController;
 
 /**
  * 内容库控制器
  */
 class ContentLibraryController extends Controller
 {
+    /************************************
+     * 内容库管理相关功能
+     ************************************/
+    
+    /**
+     * 创建内容库
+     * @return \think\response\Json
+     */
+    public function create()
+    {
+        if (!$this->request->isPost()) {
+            return json(['code' => 400, 'msg' => '请求方式错误']);
+        }
+
+        // 获取请求参数
+        $param = $this->request->post();
+
+        // 验证参数
+        if (empty($param['name'])) {
+            return json(['code' => 400, 'msg' => '内容库名称不能为空']);
+        }
+
+        // 检查内容库名称是否已存在
+        $exists = ContentLibrary::where(['name' => $param['name'],'userId' => $this->request->userInfo['id'],'isDel' => 0])->find();
+        if ($exists) {
+            return json(['code' => 400, 'msg' => '内容库名称已存在']);
+        }
+
+        Db::startTrans();
+        try {
+
+            $keywordInclude = isset($param['keywordInclude']) ? json_encode($param['keywordInclude'],256) : json_encode([]);
+            $keywordExclude = isset($param['keywordExclude']) ? json_encode($param['keywordExclude'],256) : json_encode([]);
+            $sourceType = isset($param['sourceType']) ? $param['sourceType'] : 1;
+
+
+            // 构建数据
+            $data = [
+                'name' => $param['name'],
+                // 数据来源配置
+                'sourceFriends' => $sourceType == 1 ? json_encode($param['friends']) : json_encode([]), // 选择的微信好友
+                'sourceGroups' => $sourceType == 2 ? json_encode($param['groups']) : json_encode([]), // 选择的微信群
+                'groupMembers' =>  $sourceType == 2 ? json_encode($param['groupMembers']) : json_encode([]), // 群组成员
+                // 关键词配置
+                'keywordInclude' => $keywordInclude, // 包含的关键词
+                'keywordExclude' => $keywordExclude, // 排除的关键词
+                // AI配置
+                'aiEnabled' => isset($param['aiEnabled']) ? $param['aiEnabled'] : 0, // 是否启用AI
+                'aiPrompt' => isset($param['aiPrompt']) ? $param['aiPrompt'] : '', // AI提示词
+                // 时间配置
+                'timeEnabled' => isset($param['timeEnabled']) ? $param['timeEnabled'] : 0, // 是否启用时间限制
+                'timeStart' => isset($param['startTime']) ? strtotime($param['startTime']) : 0, // 开始时间（转换为时间戳）
+                'timeEnd' => isset($param['endTime']) ? strtotime($param['endTime']) : 0, // 结束时间（转换为时间戳）
+                // 来源类型
+                'sourceType' => $sourceType, // 1=好友，2=群，3=好友和群
+                // 基础信息
+                'status' => isset($param['status']) ? $param['status'] : 0, // 状态：0=禁用，1=启用
+                'userId' => $this->request->userInfo['id'],
+                'companyId' => $this->request->userInfo['companyId'],
+                'createTime' => time(),
+                'updateTime' => time()
+            ];
+
+            // 创建内容库
+            $library = new ContentLibrary;
+            $result = $library->save($data);
+
+            if (!$result) {
+                Db::rollback();
+                return json(['code' => 500, 'msg' => '创建内容库失败']);
+            }
+
+            Db::commit();
+            return json(['code' => 200, 'msg' => '创建成功', 'data' => ['id' => $library->id]]);
+        } catch (\Exception $e) {
+            Db::rollback();
+            return json(['code' => 500, 'msg' => '创建失败：' . $e->getMessage()]);
+        }
+    }
+    
     /**
      * 获取内容库列表
      * @return \think\response\Json
@@ -33,7 +114,7 @@ class ContentLibraryController extends Controller
             $where[] = ['name', 'like', '%' . $keyword . '%'];
         }
 
-   // 添加名称模糊搜索
+        // 添加名称模糊搜索
         if (!empty($sourceType)) {
             $where[] = ['sourceType', '=', $sourceType];
         }
@@ -141,51 +222,49 @@ class ContentLibraryController extends Controller
         $library['keywordExclude'] = json_decode($library['keywordExclude'] ?: '[]', true);
         $library['groupMembers'] = json_decode($library['groupMembers'] ?: '[]', true);
 
-    // 将时间戳转换为日期格式（精确到日）
-    if (!empty($library['timeStart'])) {
-        $library['timeStart'] = date('Y-m-d', $library['timeStart']);
-    }
-    if (!empty($library['timeEnd'])) {
-        $library['timeEnd'] = date('Y-m-d', $library['timeEnd']);
-    }
-
-    // 获取好友详细信息
-    if (!empty($library['sourceFriends'])) {
-        $friendIds = $library['sourceFriends'];
-        $friendsInfo = [];
-        
-        if (!empty($friendIds)) {
-           // 查询好友信息，使用wechat_friend表
-            $friendsInfo = Db::name('wechat_friend')->alias('wf')
-            ->field('wf.id,wf.wechatId, wa.nickname, wa.avatar')
-            ->join('wechat_account wa', 'wf.wechatId = wa.wechatId')
-            ->whereIn('wf.id', $friendIds)
-            ->select();
+        // 将时间戳转换为日期格式（精确到日）
+        if (!empty($library['timeStart'])) {
+            $library['timeStart'] = date('Y-m-d', $library['timeStart']);
+        }
+        if (!empty($library['timeEnd'])) {
+            $library['timeEnd'] = date('Y-m-d', $library['timeEnd']);
         }
-        
-        // 将好友信息添加到返回数据中
-        $library['selectedFriends'] = $friendsInfo;
-    }
 
-    // 获取群组详细信息
-    if (!empty($library['sourceGroups'])) {
-        $groupIds = $library['sourceGroups'];
-        $groupsInfo = [];
-        
-        if (!empty($groupIds)) {
-            // 查询群组信息
-            $groupsInfo = Db::name('wechat_group')->alias('g')
-                ->field('g.id, g.chatroomId, g.name, g.avatar, g.ownerWechatId,wa.nickname as ownerNickname,wa.avatar as ownerAvatar,wa.alias as ownerAlias')
-                ->join('wechat_account wa', 'g.ownerWechatId = wa.wechatId')
-                ->whereIn('g.id', $groupIds)
+        // 获取好友详细信息
+        if (!empty($library['sourceFriends'])) {
+            $friendIds = $library['sourceFriends'];
+            $friendsInfo = [];
+            
+            if (!empty($friendIds)) {
+               // 查询好友信息，使用wechat_friend表
+                $friendsInfo = Db::name('wechat_friend')->alias('wf')
+                ->field('wf.id,wf.wechatId, wa.nickname, wa.avatar')
+                ->join('wechat_account wa', 'wf.wechatId = wa.wechatId')
+                ->whereIn('wf.id', $friendIds)
                 ->select();
+            }
+            
+            // 将好友信息添加到返回数据中
+            $library['selectedFriends'] = $friendsInfo;
         }
-        
-        // 将群组信息添加到返回数据中
-        $library['selectedGroups'] = $groupsInfo;
-    }
-
 
+        // 获取群组详细信息
+        if (!empty($library['sourceGroups'])) {
+            $groupIds = $library['sourceGroups'];
+            $groupsInfo = [];
+            
+            if (!empty($groupIds)) {
+                // 查询群组信息
+                $groupsInfo = Db::name('wechat_group')->alias('g')
+                    ->field('g.id, g.chatroomId, g.name, g.avatar, g.ownerWechatId,wa.nickname as ownerNickname,wa.avatar as ownerAvatar,wa.alias as ownerAlias')
+                    ->join('wechat_account wa', 'g.ownerWechatId = wa.wechatId')
+                    ->whereIn('g.id', $groupIds)
+                    ->select();
+            }
+            
+            // 将群组信息添加到返回数据中
+            $library['selectedGroups'] = $groupsInfo;
+        }
 
         return json([
             'code' => 200, 
@@ -193,83 +272,7 @@ class ContentLibraryController extends Controller
             'data' => $library
         ]);
     }
-
-    /**
-     * 创建内容库
-     * @return \think\response\Json
-     */
-    public function create()
-    {
-        if (!$this->request->isPost()) {
-            return json(['code' => 400, 'msg' => '请求方式错误']);
-        }
-
-        // 获取请求参数
-        $param = $this->request->post();
-
-        // 验证参数
-        if (empty($param['name'])) {
-            return json(['code' => 400, 'msg' => '内容库名称不能为空']);
-        }
-
-        // 检查内容库名称是否已存在
-        $exists = ContentLibrary::where(['name' => $param['name'],'userId' => $this->request->userInfo['id'],'isDel' => 0])->find();
-        if ($exists) {
-            return json(['code' => 400, 'msg' => '内容库名称已存在']);
-        }
-
-        Db::startTrans();
-        try {
-
-            $keywordInclude = isset($param['keywordInclude']) ? json_encode($param['keywordInclude'],256) : json_encode([]);
-            $keywordExclude = isset($param['keywordExclude']) ? json_encode($param['keywordExclude'],256) : json_encode([]);
-            $sourceType = isset($param['sourceType']) ? $param['sourceType'] : 1;
-
-
-            // 构建数据
-            $data = [
-                'name' => $param['name'],
-                // 数据来源配置
-                'sourceFriends' => $sourceType == 1 ? json_encode($param['friends']) : json_encode([]), // 选择的微信好友
-                'sourceGroups' => $sourceType == 2 ? json_encode($param['groups']) : json_encode([]), // 选择的微信群
-                'groupMembers' =>  $sourceType == 2 ? json_encode($param['groupMembers']) : json_encode([]), // 群组成员
-                // 关键词配置
-                'keywordInclude' => $keywordInclude, // 包含的关键词
-                'keywordExclude' => $keywordExclude, // 排除的关键词
-                // AI配置
-                'aiEnabled' => isset($param['aiEnabled']) ? $param['aiEnabled'] : 0, // 是否启用AI
-                'aiPrompt' => isset($param['aiPrompt']) ? $param['aiPrompt'] : '', // AI提示词
-                // 时间配置
-                'timeEnabled' => isset($param['timeEnabled']) ? $param['timeEnabled'] : 0, // 是否启用时间限制
-                'timeStart' => isset($param['startTime']) ? strtotime($param['startTime']) : 0, // 开始时间（转换为时间戳）
-                'timeEnd' => isset($param['endTime']) ? strtotime($param['endTime']) : 0, // 结束时间（转换为时间戳）
-                // 来源类型
-                'sourceType' => $sourceType, // 1=好友，2=群，3=好友和群
-                // 基础信息
-                'status' => isset($param['status']) ? $param['status'] : 0, // 状态：0=禁用，1=启用
-                'userId' => $this->request->userInfo['id'],
-                'companyId' => $this->request->userInfo['companyId'],
-                'createTime' => time(),
-                'updateTime' => time()
-            ];
-
-            // 创建内容库
-            $library = new ContentLibrary;
-            $result = $library->save($data);
-
-            if (!$result) {
-                Db::rollback();
-                return json(['code' => 500, 'msg' => '创建内容库失败']);
-            }
-
-            Db::commit();
-            return json(['code' => 200, 'msg' => '创建成功', 'data' => ['id' => $library->id]]);
-        } catch (\Exception $e) {
-            Db::rollback();
-            return json(['code' => 500, 'msg' => '创建失败：' . $e->getMessage()]);
-        }
-    }
-
+    
     /**
      * 更新内容库
      * @return \think\response\Json
@@ -369,6 +372,10 @@ class ContentLibraryController extends Controller
         }
     }
 
+    /************************************
+     * 内容项目管理相关功能
+     ************************************/
+    
     /**
      * 添加内容项目
      * @return \think\response\Json
@@ -453,4 +460,772 @@ class ContentLibraryController extends Controller
             return json(['code' => 500, 'msg' => '删除失败：' . $e->getMessage()]);
         }
     }
+
+    /************************************
+     * 数据采集相关功能
+     ************************************/
+    
+    /**
+     * 执行朋友圈采集任务
+     * @return \think\response\Json
+     */
+    public function collectMoments()
+    {
+        
+        // 查询条件：未删除且已开启的内容库
+        $where = [
+            ['isDel', '=', 0],      // 未删除
+            ['status', '=', 1]       // 已开启
+        ];
+        
+        // 查询符合条件的内容库
+        $libraries = ContentLibrary::where($where)
+            ->field('id,name,sourceType,sourceFriends,sourceGroups,keywordInclude,keywordExclude,aiEnabled,aiPrompt,timeEnabled,timeStart,timeEnd,status,userId,companyId,createTime,updateTime,groupMembers')
+            ->order('id', 'desc')
+            ->select()->toArray();
+
+
+        if (empty($libraries)) {
+            return json(['code' => 200, 'msg' => '没有可用的内容库配置']);
+        }
+        
+        $successCount = 0;
+        $failCount = 0;
+        $results = [];
+        
+        // 处理每个内容库的采集任务
+        foreach ($libraries as $library) {
+            try {
+                // 解析JSON字段
+                $library['sourceFriends'] = json_decode($library['sourceFriends'] ?: '[]', true);
+                $library['sourceGroups'] = json_decode($library['sourceGroups'] ?: '[]', true);
+                $library['keywordInclude'] = json_decode($library['keywordInclude'] ?: '[]', true);
+                $library['keywordExclude'] = json_decode($library['keywordExclude'] ?: '[]', true);
+                $library['groupMembers'] = json_decode($library['groupMembers'] ?: '[]', true);
+                
+           
+                // 根据数据来源类型执行不同的采集逻辑
+                $collectResult = [];
+                switch ($library['sourceType']) {
+                    case 1: // 好友类型
+                        if (!empty($library['sourceFriends'])) {
+                            $collectResult = $this->collectFromFriends($library);
+                        }
+                        break;
+                        
+                    case 2: // 群类型
+                        if (!empty($library['sourceGroups'])) {
+                            $collectResult = $this->collectFromGroups($library);
+                        }
+                        break;
+                        
+                    default:
+                        $collectResult = [
+                            'status' => 'failed',
+                            'message' => '不支持的数据来源类型'
+                        ];
+                }
+                
+                if ($collectResult['status'] == 'success') {
+                    $successCount++;
+                } else {
+                    $failCount++;
+                }
+                
+                $results[] = [
+                    'library_id' => $library['id'],
+                    'library_name' => $library['name'],
+                    'status' => $collectResult['status'],
+                    'message' => $collectResult['message'] ?? '',
+                    'data' => $collectResult['data'] ?? []
+                ];
+                
+            } catch (\Exception $e) {
+                $failCount++;
+                $results[] = [
+                    'library_id' => $library['id'],
+                    'library_name' => $library['name'],
+                    'status' => 'error',
+                    'message' => $e->getMessage()
+                ];
+            }
+        }
+        
+        // 返回采集结果
+        return json([
+            'code' => 200,
+            'msg' => '采集任务执行完成',
+            'data' => [
+                'total' => count($libraries),
+                'success' => $successCount,
+                'fail' => $failCount,
+                'results' => $results
+            ]
+        ]);
+    }
+    
+    /**
+     * 从好友采集朋友圈内容
+     * @param array $library 内容库配置
+     * @return array 采集结果
+     */
+    private function collectFromFriends($library)
+    {
+        $friendIds = $library['sourceFriends'];
+        if (empty($friendIds)) {
+            return [
+                'status' => 'failed',
+                'message' => '没有指定要采集的好友'
+            ];
+        }
+        
+        try {
+            // 查询好友信息
+            $friends = Db::table('s2_wechat_friend')
+                ->field('id, wechatAccountId, wechatId')
+                ->whereIn('id', $friendIds)
+                ->where('isDeleted', 0)
+                ->select();
+            
+
+            if (empty($friends)) {
+                return [
+                    'status' => 'failed',
+                    'message' => '未找到有效的好友信息'
+                ];
+            }
+            
+            // 从朋友圈采集内容
+            $collectedData = [];
+            $totalMomentsCount = 0;
+            
+            foreach ($friends as $friend) {
+                // 从s2_wechat_moments表获取朋友圈数据
+                $moments = Db::table('s2_wechat_moments')
+                    ->where([
+                        'wechatFriendId' => $friend['id'],
+                        'wechatAccountId' => $friend['wechatAccountId']
+                    ])
+                    ->order('createTime', 'desc')
+                    ->select();
+                
+                if (empty($moments)) {
+                    continue;
+                }
+                
+                // 获取好友详细信息
+                $friendInfo = Db::table('s2_wechat_friend')
+                    ->where('wechatId', $friend['wechatId'])
+                    ->field('nickname, avatar')
+                    ->find();
+                    
+                $nickname = $friendInfo['nickname'] ?? '未知好友';
+                $friendMomentsCount = 0;
+                
+                // 处理每条朋友圈数据
+                foreach ($moments as $moment) {
+                    // 处理关键词过滤
+                    $content = $moment['content'] ?? '';
+                    
+                    // 如果启用了关键词过滤
+                    $includeKeywords = $library['keywordInclude'];
+                    $excludeKeywords = $library['keywordExclude'];
+                    
+                    // 检查是否包含必须关键词
+                    $includeMatch = empty($includeKeywords);
+                    if (!empty($includeKeywords)) {
+                        foreach ($includeKeywords as $keyword) {
+                            if (strpos($content, $keyword) !== false) {
+                                $includeMatch = true;
+                                break;
+                            }
+                        }
+                    }
+                    
+                    // 如果不满足包含条件，跳过
+                    if (!$includeMatch) {
+                        continue;
+                    }
+                    
+                    // 检查是否包含排除关键词
+                    $excludeMatch = false;
+                    if (!empty($excludeKeywords)) {
+                        foreach ($excludeKeywords as $keyword) {
+                            if (strpos($content, $keyword) !== false) {
+                                $excludeMatch = true;
+                                break;
+                            }
+                        }
+                    }
+                    
+                    // 如果满足排除条件，跳过
+                    if ($excludeMatch) {
+                        continue;
+                    }
+                    
+                    // 保存到内容库的content_item表
+                    $this->saveMomentToContentItem($moment, $library['id'], $friend, $nickname);
+                    
+                    $friendMomentsCount++;
+                }
+                
+                if ($friendMomentsCount > 0) {
+                    // 记录采集结果
+                    $collectedData[$friend['wechatId']] = [
+                        'friendId' => $friend['id'],
+                        'nickname' => $nickname,
+                        'count' => $friendMomentsCount
+                    ];
+                    
+                    $totalMomentsCount += $friendMomentsCount;
+                }
+            }
+            
+            // 如果启用了AI处理
+            if ($library['aiEnabled'] == 1 && !empty($library['aiPrompt']) && $totalMomentsCount > 0) {
+                // 此处实现AI处理逻辑，暂未实现
+            }
+            
+            if (empty($collectedData)) {
+                return [
+                    'status' => 'warning',
+                    'message' => '未采集到任何朋友圈内容'
+                ];
+            }
+            
+            return [
+                'status' => 'success',
+                'message' => '成功采集到' . count($collectedData) . '位好友的' . $totalMomentsCount . '条朋友圈内容',
+                'data' => [
+                    'friend_count' => count($collectedData),
+                    'collected_count' => $totalMomentsCount,
+                    'details' => $collectedData
+                ]
+            ];
+            
+        } catch (\Exception $e) {
+            return [
+                'status' => 'error',
+                'message' => '采集过程发生错误: ' . $e->getMessage()
+            ];
+        }
+    }
+    
+    /**
+     * 保存朋友圈数据到内容项目表
+     * @param array $moment 朋友圈数据
+     * @param int $libraryId 内容库ID
+     * @param array $friend 好友信息
+     * @param string $nickname 好友昵称
+     * @return bool 是否保存成功
+     */
+    private function saveMomentToContentItem($moment, $libraryId, $friend, $nickname)
+    {
+        if (empty($moment) || empty($libraryId)) {
+            return false;
+        }
+
+
+        try {
+            
+            // 检查朋友圈数据是否已存在于内容项目中
+            $exists = ContentItem::where('libraryId', $libraryId)
+                ->where('snsId', $moment['snsId'] ?? '')
+                ->find();
+                
+            if ($exists) {
+                return true;
+            }
+            
+            // 解析资源URL (可能是JSON字符串)
+            $resUrls = $moment['resUrls'];
+            if (is_string($resUrls)) {
+                $resUrls = json_decode($resUrls, true);
+            }
+            
+            // 处理urls字段
+            $urls = $moment['urls'] ?? [];
+            if (is_string($urls)) {
+                $urls = json_decode($urls, true);
+            }
+            
+            // 构建封面图片
+            $coverImage = '';
+            if (!empty($resUrls) && is_array($resUrls) && count($resUrls) > 0) {
+                $coverImage = $resUrls[0];
+            }
+            
+            // 如果不存在，则创建新的内容项目
+            $item = new ContentItem();
+            $item->libraryId = $libraryId;
+            $item->type = 'moment'; // 朋友圈类型
+            $item->title = '来自 ' . $nickname . ' 的朋友圈';
+            $item->contentData = json_encode($moment, JSON_UNESCAPED_UNICODE);
+            $item->snsId = $moment['snsId'] ?? ''; // 存储snsId便于后续查询
+            $item->createTime = time();
+            $item->wechatId = $friend['wechatId'];
+            $item->friendId = $friend['id'];
+            $item->createMomentTime = $moment['createTime'] ?? 0;
+            $item->content = $moment['content'] ?? '';
+            $item->coverImage = $coverImage;
+            
+            // 独立存储resUrls和urls字段
+            $item->resUrls = is_string($moment['resUrls']) ? $moment['resUrls'] : json_encode($resUrls, JSON_UNESCAPED_UNICODE);
+            $item->urls = is_string($moment['urls']) ? $moment['urls'] : json_encode($urls, JSON_UNESCAPED_UNICODE);
+            
+            // 保存地理位置信息
+            $item->location = $moment['location'] ?? '';
+            $item->lat = $moment['lat'] ?? 0;
+            $item->lng = $moment['lng'] ?? 0;
+            $item->save();
+            return true;
+        } catch (\Exception $e) {
+            // 记录错误日志
+            \think\facade\Log::error('保存朋友圈数据失败: ' . $e->getMessage());
+            return false;
+        }
+    }
+    
+    /**
+     * 从群组采集消息内容
+     * @param array $library 内容库配置
+     * @return array 采集结果
+     */
+    private function collectFromGroups($library)
+    {
+        $groupIds = $library['sourceGroups'];
+        if (empty($groupIds)) {
+            return [
+                'status' => 'failed',
+                'message' => '没有指定要采集的群组'
+            ];
+        }
+        
+        try {
+            // 查询群组信息
+            $groups = Db::name('wechat_group')->alias('g')
+                ->field('g.id, g.chatroomId, g.name, g.ownerWechatId')
+                ->whereIn('g.id', $groupIds)
+                ->where('g.deleteTime', 0)
+                ->select();
+            
+            if (empty($groups)) {
+                return [
+                    'status' => 'failed',
+                    'message' => '未找到有效的群组信息'
+                ];
+            }
+            
+            // 获取群成员信息
+            $groupMembers = $library['groupMembers'];
+            if (empty($groupMembers)) {
+                // 如果没有指定群成员，则尝试获取所有群成员
+                return [
+                    'status' => 'failed',
+                    'message' => '未找到有效的群成员信息'
+                ];
+            }
+            
+            // 从群组采集内容
+            $collectedData = [];
+            $totalMessagesCount = 0;
+            $chatroomIds = array_column($groups, 'id');
+            
+            // 获取群消息 - 支持时间范围过滤
+            $messageWhere = [
+                ['wechatChatroomId', 'in', $chatroomIds],
+                ['type', '=', 2]
+            ];
+            
+            // 如果启用时间限制
+            if ($library['timeEnabled'] && $library['timeStart'] > 0 && $library['timeEnd'] > 0) {
+                $messageWhere[] = ['createTime', 'between', [$library['timeStart'], $library['timeEnd']]];
+            }
+            
+            // 查询群消息
+            $groupMessages = Db::table('s2_wechat_message')
+                ->where($messageWhere)
+                ->order('createTime', 'desc')
+                ->limit(500) // 限制最大消息数量
+                ->select();
+            if (empty($groupMessages)) {
+                return [
+                    'status' => 'warning',
+                    'message' => '未找到符合条件的群消息'
+                ];
+            }
+            // 按群组分组处理消息
+            $groupedMessages = [];
+            foreach ($groupMessages as $message) {
+                $chatroomId = $message['wechatChatroomId'];
+                if (!isset($groupedMessages[$chatroomId])) {
+                    $groupedMessages[$chatroomId] = [
+                        'count' => 0,
+                        'messages' => []
+                    ];
+                }
+                
+                // 处理消息内容
+                $content = $message['content'] ?? '';
+                
+                // 如果启用了关键词过滤
+                $includeKeywords = $library['keywordInclude'];
+                $excludeKeywords = $library['keywordExclude'];
+                
+
+                // 检查是否包含必须关键词
+                $includeMatch = empty($includeKeywords);
+                if (!empty($includeKeywords)) {
+                    foreach ($includeKeywords as $keyword) {
+                        if (strpos($content, $keyword) !== false) {
+                            $includeMatch = true;
+                            break;
+                        }
+                    }
+                }
+                
+                // 如果不满足包含条件，跳过
+                if (!$includeMatch) {
+                    continue;
+                }
+                
+                // 检查是否包含排除关键词
+                $excludeMatch = false;
+                if (!empty($excludeKeywords)) {
+                    foreach ($excludeKeywords as $keyword) {
+                        if (strpos($content, $keyword) !== false) {
+                            $excludeMatch = true;
+                            break;
+                        }
+                    }
+                }
+                
+                // 如果满足排除条件，跳过
+                if ($excludeMatch) {
+                    continue;
+                }
+                
+                // 找到对应的群组信息
+                $groupInfo = null;
+                foreach ($groups as $group) {
+                    if ($group['id'] == $chatroomId) {
+                        $groupInfo = $group;
+                        break;
+                    }
+                }
+                
+                if (!$groupInfo) {
+                    continue;
+                }
+
+                // 保存消息到内容库
+                $this->saveMessageToContentItem($message, $library['id'], $groupInfo);
+                
+                // 累计计数
+                $groupedMessages[$chatroomId]['count']++;
+                $groupedMessages[$chatroomId]['messages'][] = [
+                    'id' => $message['id'],
+                    'content' => mb_substr($content, 0, 50) . (mb_strlen($content) > 50 ? '...' : ''),
+                    'sender' => $message['senderNickname'],
+                    'time' => date('Y-m-d H:i:s', $message['createTime'])
+                ];
+                
+                $totalMessagesCount++;
+            }
+            
+            // 构建结果数据
+            foreach ($groups as $group) {
+                $chatroomId = $group['chatroomId'];
+                if (isset($groupedMessages[$chatroomId]) && $groupedMessages[$chatroomId]['count'] > 0) {
+                    $collectedData[$chatroomId] = [
+                        'groupId' => $group['id'],
+                        'groupName' => $group['name'],
+                        'count' => $groupedMessages[$chatroomId]['count'],
+                        'messages' => $groupedMessages[$chatroomId]['messages']
+                    ];
+                }
+            }
+            
+            // 如果启用了AI处理
+            if ($library['aiEnabled'] == 1 && !empty($library['aiPrompt']) && $totalMessagesCount > 0) {
+                // 此处实现AI处理逻辑，暂未实现
+            }
+            
+            if (empty($collectedData)) {
+                return [
+                    'status' => 'warning',
+                    'message' => '未采集到符合条件的群消息内容'
+                ];
+            }
+            
+            return [
+                'status' => 'success',
+                'message' => '成功采集到' . count($collectedData) . '个群的' . $totalMessagesCount . '条消息',
+                'data' => [
+                    'group_count' => count($collectedData),
+                    'collected_count' => $totalMessagesCount,
+                    'details' => $collectedData
+                ]
+            ];
+            
+        } catch (\Exception $e) {
+            return [
+                'status' => 'error',
+                'message' => '采集过程发生错误: ' . $e->getMessage()
+            ];
+        }
+    }
+    
+    /**
+     * 保存群聊消息到内容项目表
+     * @param array $message 消息数据
+     * @param int $libraryId 内容库ID
+     * @param array $group 群组信息
+     * @return bool 是否保存成功
+     */
+    private function saveMessageToContentItem($message, $libraryId, $group)
+    {
+        if (empty($message) || empty($libraryId)) {
+            return false;
+        }
+
+        try {
+            // 检查消息是否已存在于内容项目中
+            $exists = ContentItem::where('libraryId', $libraryId)
+                ->where('msgId', $message['msgSvrId'] ?? '')
+                ->find();
+
+            if ($exists) {
+                return true;
+            }
+            
+            // 提取消息内容中的链接
+            $content = $message['content'] ?? '';
+            $links = [];
+            $pattern = '/https?:\/\/[-A-Za-z0-9+&@#\/%?=~_|!:,.;]+[-A-Za-z0-9+&@#\/%=~_|]/';
+            preg_match_all($pattern, $content, $matches);
+            
+            if (!empty($matches[0])) {
+                $links = $matches[0];
+            }
+            
+            // 创建新的内容项目
+            $item = new ContentItem();
+            $item->libraryId = $libraryId;
+            $item->type = 'group_message'; // 群消息类型
+            $item->title = '来自 ' . ($group['name'] ?? '未知群组') . ' 的消息';
+            $item->contentData = json_encode($message, JSON_UNESCAPED_UNICODE);
+            $item->msgId = $message['msgId'] ?? ''; // 存储msgId便于后续查询
+            $item->createTime = time();
+            $item->content = $content;
+            
+            // 设置发送者信息
+            $item->wechatId = $message['senderWechatId'] ?? '';
+            $item->wechatChatroomId = $message['wechatChatroomId'] ?? '';
+            $item->senderNickname = $message['senderNickname'] ?? '';
+            $item->createMessageTime = $message['createTime'] ?? 0;
+            
+            // 处理链接
+            if (!empty($links)) {
+                $item->resUrls = json_encode($links, JSON_UNESCAPED_UNICODE);
+            }
+            
+            // 设置商品信息（需根据消息内容解析）
+            $this->extractProductInfo($item, $content);
+            
+            $item->save();
+            return true;
+        } catch (\Exception $e) {
+            // 记录错误日志
+            \think\facade\Log::error('保存群消息数据失败: ' . $e->getMessage());
+            return false;
+        }
+    }
+    
+    /**
+     * 从消息内容中提取商品信息
+     * @param ContentItem $item 内容项目对象
+     * @param string $content 消息内容
+     * @return void
+     */
+    private function extractProductInfo($item, $content)
+    {
+        // 尝试提取商品名称
+        $titlePatterns = [
+            '/【(.+?)】/',  // 匹配【】中的内容
+            '/《(.+?)》/',  // 匹配《》中的内容
+            '/商品名称[:：](.+?)[\r\n]/' // 匹配"商品名称:"后的内容
+        ];
+        
+        foreach ($titlePatterns as $pattern) {
+            preg_match($pattern, $content, $matches);
+            if (!empty($matches[1])) {
+                $item->productTitle = trim($matches[1]);
+                break;
+            }
+        }
+        
+        // 如果没有找到商品名称，尝试使用内容的前部分作为标题
+        if (empty($item->productTitle)) {
+            // 获取第一行非空内容作为标题
+            $lines = explode("\n", $content);
+            foreach ($lines as $line) {
+                $line = trim($line);
+                if (!empty($line) && mb_strlen($line) > 2) {
+                    $item->productTitle = mb_substr($line, 0, 30);
+                    break;
+                }
+            }
+        }
+    }
+    
+    /**
+     * 获取朋友圈数据（示例方法，实际实现需要根据具体API）
+     * @param string $wechatId 微信ID
+     * @return array 朋友圈数据
+     */
+    private function getMomentsData($wechatId)
+    {
+        // 这里应该是实际从API或数据库获取朋友圈数据的逻辑
+        // 这里仅作示例返回
+        return [
+            // 示例数据
+            ['id' => 1, 'content' => '今天天气真好！', 'createTime' => time() - 3600],
+            ['id' => 2, 'content' => '分享一个有趣的项目', 'createTime' => time() - 7200],
+        ];
+    }
+    
+    /**
+     * 根据关键词过滤朋友圈内容
+     * @param array $moments 朋友圈内容
+     * @param array $includeKeywords 包含关键词
+     * @param array $excludeKeywords 排除关键词
+     * @return array 过滤后的内容
+     */
+    private function filterMomentsByKeywords($moments, $includeKeywords, $excludeKeywords)
+    {
+        if (empty($moments)) {
+            return [];
+        }
+        
+        $filtered = [];
+        foreach ($moments as $moment) {
+            $content = $moment['content'] ?? '';
+            
+            // 如果内容为空，跳过
+            if (empty($content)) {
+                continue;
+            }
+            
+            // 检查是否包含必须关键词
+            $includeMatch = empty($includeKeywords);
+            if (!empty($includeKeywords)) {
+                foreach ($includeKeywords as $keyword) {
+                    if (strpos($content, $keyword) !== false) {
+                        $includeMatch = true;
+                        break;
+                    }
+                }
+            }
+            
+            // 如果不满足包含条件，跳过
+            if (!$includeMatch) {
+                continue;
+            }
+            
+            // 检查是否包含排除关键词
+            $excludeMatch = false;
+            if (!empty($excludeKeywords)) {
+                foreach ($excludeKeywords as $keyword) {
+                    if (strpos($content, $keyword) !== false) {
+                        $excludeMatch = true;
+                        break;
+                    }
+                }
+            }
+            
+            // 如果满足排除条件，跳过
+            if ($excludeMatch) {
+                continue;
+            }
+            
+            // 通过所有过滤，添加到结果中
+            $filtered[] = $moment;
+        }
+        
+        return $filtered;
+    }
+    
+    /**
+     * 使用AI处理采集的数据
+     * @param array $data 采集的数据
+     * @param string $prompt AI提示词
+     * @return array 处理后的数据
+     */
+    private function processWithAI($data, $prompt)
+    {
+        // 这里应该是调用AI处理数据的逻辑
+        // 实际实现需要根据具体的AI API
+        return $data;
+    }
+    
+    /**
+     * 保存采集的数据到内容项目
+     * @param array $data 采集的数据
+     * @param int $libraryId 内容库ID
+     * @return bool 是否保存成功
+     */
+    private function saveCollectedData($data, $libraryId)
+    {
+        if (empty($data) || empty($libraryId)) {
+            return false;
+        }
+        
+        try {
+            foreach ($data as $wechatId => $userData) {
+                foreach ($userData['moments'] as $moment) {
+                    // 创建内容项目
+                    $item = new ContentItem;
+                    $item->libraryId = $libraryId;
+                    $item->type = 'moment'; // 朋友圈类型
+                    $item->title = '来自 ' . $userData['nickname'] . ' 的朋友圈';
+                    $item->contentData = json_encode($moment);
+                    $item->createTime = time();
+                    $item->save();
+                }
+            }
+            return true;
+        } catch (\Exception $e) {
+            // 记录错误日志
+            \think\facade\Log::error('保存采集数据失败: ' . $e->getMessage());
+            return false;
+        }
+    }
+    
+    /**
+     * 获取所有群成员
+     * @param array $groupIds 群组ID列表
+     * @return array 群成员列表
+     */
+    private function getAllGroupMembers($groupIds)
+    {
+        if (empty($groupIds)) {
+            return [];
+        }
+        
+        try {
+            // 查询群成员信息
+            $members = Db::name('wechat_group_member')->alias('gm')
+                ->field('gm.id, gm.memberId, gm.groupId, wa.nickname')
+                ->join('wechat_account wa', 'gm.memberId = wa.wechatId')
+                ->whereIn('gm.groupId', $groupIds)
+                ->where('gm.isDel', 0)
+                ->select();
+                
+            return $members;
+        } catch (\Exception $e) {
+            \think\facade\Log::error('获取群成员失败: ' . $e->getMessage());
+            return [];
+        }
+    }
 } 
\ No newline at end of file
diff --git a/Server/application/cunkebao/model/ContentItem.php b/Server/application/cunkebao/model/ContentItem.php
index e4c415df..efc92025 100644
--- a/Server/application/cunkebao/model/ContentItem.php
+++ b/Server/application/cunkebao/model/ContentItem.php
@@ -7,46 +7,14 @@ use think\Model;
 class ContentItem extends Model
 {
     protected $pk = 'id';
-    protected $name = 'content_items';
+    protected $name = 'content_item';
+
 
-    // 内容类型
-    const TYPE_TEXT = 1;    // 文本
-    const TYPE_IMAGE = 2;   // 图片
-    const TYPE_VIDEO = 3;   // 视频
-    const TYPE_LINK = 4;    // 链接
 
     // 自动写入时间戳
     protected $autoWriteTimestamp = true;
     protected $createTime = 'createTime';
     protected $updateTime = 'updateTime';
 
-    // 定义关联的内容库
-    public function library()
-    {
-        return $this->belongsTo('ContentLibrary', 'libraryId', 'id');
-    }
 
-    // 内容类型获取器
-    public function getTypeTextAttr($value, $data)
-    {
-        $types = [
-            self::TYPE_TEXT => '文本',
-            self::TYPE_IMAGE => '图片',
-            self::TYPE_VIDEO => '视频',
-            self::TYPE_LINK => '链接'
-        ];
-        return isset($types[$data['type']]) ? $types[$data['type']] : '未知';
-    }
-
-    // 内容数据获取器
-    public function getContentDataAttr($value)
-    {
-        return json_decode($value, true);
-    }
-
-    // 内容数据修改器
-    public function setContentDataAttr($value)
-    {
-        return is_array($value) ? json_encode($value) : $value;
-    }
 } 
\ No newline at end of file