diff --git a/.gitignore b/.gitignore
index df8964e0..fca0d36b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,9 +5,11 @@ Store_vue/node_modules/
 Cunkebao/.specstory/
 *.cursorindexingignore
 Server/.specstory/
+Server/thinkphp/
 Store_vue/.specstory/
 Store_vue/unpackage/
 Store_vue/.vscode/
 SuperAdmin/.specstory/
 Cunkebao/dist
 Touchkebao/.specstory/
+Serverruntime/
diff --git a/Cunkebao/src/pages/mobile/mine/content/materials/list/api.ts b/Cunkebao/src/pages/mobile/mine/content/materials/list/api.ts
index 6037391f..e1d6edea 100644
--- a/Cunkebao/src/pages/mobile/mine/content/materials/list/api.ts
+++ b/Cunkebao/src/pages/mobile/mine/content/materials/list/api.ts
@@ -3,6 +3,8 @@ import {
   GetContentItemListParams,
   CreateContentItemParams,
   UpdateContentItemParams,
+  AIRewriteParams,
+  ReplaceContentParams,
 } from "./data";
 
 // 获取素材列表
@@ -35,3 +37,13 @@ export function deleteContentItem(id: string) {
 export function getContentLibraryDetail(id: string) {
   return request("/v1/content/library/detail", { id }, "GET");
 }
+
+// AI改写内容
+export function aiRewriteContent(params: AIRewriteParams) {
+  return request("/v1/content/library/aiEditContent", params, "GET");
+}
+
+// 替换原内容
+export function replaceContent(params: ReplaceContentParams) {
+  return request("/v1/content/library/aiEditContent", params, "POST");
+}
diff --git a/Cunkebao/src/pages/mobile/mine/content/materials/list/data.ts b/Cunkebao/src/pages/mobile/mine/content/materials/list/data.ts
index b2bc51ab..3be3872f 100644
--- a/Cunkebao/src/pages/mobile/mine/content/materials/list/data.ts
+++ b/Cunkebao/src/pages/mobile/mine/content/materials/list/data.ts
@@ -26,6 +26,7 @@ export interface ContentItem {
   delTime: number;
   wechatChatroomId?: string | null;
   senderNickname: string;
+  senderAvatar?: string | null;
   createMessageTime?: string | null;
   comment: string;
   sendTime: number;
@@ -104,3 +105,15 @@ export interface UpdateContentItemParams
   extends Partial<CreateContentItemParams> {
   id: string;
 }
+
+// AI改写参数
+export interface AIRewriteParams {
+  id: string;
+  aiPrompt: string;
+}
+
+// 替换内容参数
+export interface ReplaceContentParams {
+  id: string;
+  content: string;
+}
diff --git a/Cunkebao/src/pages/mobile/mine/content/materials/list/index.module.scss b/Cunkebao/src/pages/mobile/mine/content/materials/list/index.module.scss
index 666b75ad..29c91883 100644
--- a/Cunkebao/src/pages/mobile/mine/content/materials/list/index.module.scss
+++ b/Cunkebao/src/pages/mobile/mine/content/materials/list/index.module.scss
@@ -131,6 +131,25 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  overflow: hidden;
+  position: relative;
+}
+
+.avatar-img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+
+.avatar-icon-wrapper {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: absolute;
+  top: 0;
+  left: 0;
 }
 
 .avatar-icon {
@@ -613,3 +632,147 @@
     line-height: 1.6;
   }
 }
+
+// AI改写弹框样式
+.ai-popup-content {
+  padding: 20px;
+  max-height: 100vh;
+  overflow-y: auto;
+  background: #f9fbfd;
+
+  .ai-popup-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 20px;
+    padding-bottom: 12px;
+    border-bottom: 1px solid #e8f4ff;
+
+    h3 {
+      font-size: 18px;
+      font-weight: 600;
+      color: #1677ff;
+      margin: 0;
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: '';
+        display: inline-block;
+        width: 4px;
+        height: 18px;
+        background: #1677ff;
+        margin-right: 8px;
+        border-radius: 2px;
+      }
+    }
+  }
+
+  .ai-form {
+    .ai-form-item {
+      margin-bottom: 20px;
+
+      .ai-form-label {
+        font-size: 15px;
+        font-weight: 500;
+        color: #333;
+        margin-bottom: 6px;
+        display: flex;
+        align-items: center;
+
+        &::before {
+          content: '';
+          display: inline-block;
+          width: 3px;
+          height: 14px;
+          background: #1677ff;
+          margin-right: 6px;
+          border-radius: 2px;
+        }
+      }
+
+      .ai-result-description {
+        font-size: 12px;
+        color: #999;
+        margin-bottom: 10px;
+      }
+    }
+
+    .ai-submit {
+      margin: 24px 0;
+
+      button {
+        height: 44px;
+        font-size: 16px;
+        border-radius: 8px;
+        box-shadow: 0 2px 6px rgba(22, 119, 255, 0.2);
+      }
+    }
+
+    .ai-result-box {
+      background: #ffffff;
+      border: 1px solid #e0f0ff;
+      border-radius: 8px;
+      padding: 16px;
+      min-height: 100px;
+      max-height: 200px;
+      overflow-y: auto;
+      box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+
+      .ai-loading {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        height: 120px;
+      }
+
+      .ai-result-content {
+        font-size: 15px;
+        line-height: 1.8;
+        color: #333;
+        white-space: pre-wrap;
+        padding: 4px;
+      }
+
+      .ai-result-placeholder {
+        color: #999;
+        text-align: center;
+        padding: 30px 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+
+        .placeholder-icon {
+          font-size: 28px;
+          margin-bottom: 10px;
+        }
+
+        .placeholder-text {
+          font-size: 14px;
+          color: #999;
+        }
+      }
+    }
+
+    .ai-replace-action {
+      margin-top: 20px;
+
+      button {
+        height: 44px;
+        font-size: 16px;
+        border-radius: 8px;
+        background: #1677ff;
+        border-color: #1677ff;
+        box-shadow: 0 2px 6px rgba(22, 119, 255, 0.2);
+        color: #ffffff;
+
+        &:hover, &:focus {
+          background: #4096ff;
+          border-color: #4096ff;
+          color: #ffffff;
+        }
+      }
+    }
+  }
+}
diff --git a/Cunkebao/src/pages/mobile/mine/content/materials/list/index.tsx b/Cunkebao/src/pages/mobile/mine/content/materials/list/index.tsx
index db963f0b..aef8c2a8 100644
--- a/Cunkebao/src/pages/mobile/mine/content/materials/list/index.tsx
+++ b/Cunkebao/src/pages/mobile/mine/content/materials/list/index.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useCallback } from "react";
 import { useNavigate, useParams } from "react-router-dom";
-import { Toast, SpinLoading, Dialog, Card } from "antd-mobile";
-import { Input, Pagination, Button } from "antd";
+import { Toast, SpinLoading, Dialog, Card, Popup, TextArea } from "antd-mobile";
+import { Input, Pagination, Button, Spin } from "antd";
 import {
   PlusOutlined,
   SearchOutlined,
@@ -18,7 +18,7 @@ import {
 } from "@ant-design/icons";
 import Layout from "@/components/Layout/Layout";
 import NavCommon from "@/components/NavCommon";
-import { getContentItemList, deleteContentItem } from "./api";
+import { getContentItemList, deleteContentItem, aiRewriteContent, replaceContent } from "./api";
 import { ContentItem } from "./data";
 import style from "./index.module.scss";
 
@@ -42,6 +42,14 @@ const MaterialsList: React.FC = () => {
   const [total, setTotal] = useState(0);
   const pageSize = 20;
 
+  // AI改写相关状态
+  const [showAIRewritePopup, setShowAIRewritePopup] = useState(false);
+  const [currentMaterial, setCurrentMaterial] = useState<ContentItem | null>(null);
+  const [aiPrompt, setAiPrompt] = useState("");
+  const [aiResult, setAiResult] = useState("");
+  const [aiLoading, setAiLoading] = useState(false);
+  const [replaceLoading, setReplaceLoading] = useState(false);
+
   // 获取素材列表
   const fetchMaterials = useCallback(async () => {
     if (!id) return;
@@ -104,9 +112,75 @@ const MaterialsList: React.FC = () => {
     }
   };
 
-  const handleView = (materialId: number) => {
-    // 可以跳转到素材详情页面或显示弹窗
-    console.log("查看素材:", materialId);
+  const handleAIRewrite = (material: ContentItem) => {
+    setCurrentMaterial(material);
+    setAiPrompt("重写这条朋友圈 要求：  1、原本的字数和意思不要修改超过10%  2、出现品牌名或个人名字就去除  3、适当的换行及加些表情点缀");
+    setAiResult("");
+    setShowAIRewritePopup(true);
+  };
+
+  const handleSubmitAIRewrite = async () => {
+    if (!currentMaterial) return;
+
+    try {
+      setAiLoading(true);
+      const response = await aiRewriteContent({
+        id: currentMaterial.id.toString(),
+        aiPrompt: aiPrompt
+      });
+
+      setAiResult(response.contentAfter || "暂无改写结果");
+
+      // 可以在这里显示原内容和改写后内容的对比
+      console.log("原内容:", response.contentFront);
+      console.log("改写后内容:", response.contentAfter);
+    } catch (error) {
+      console.error("AI改写失败:", error);
+      Toast.show({
+        content: "AI改写失败，请重试",
+        position: "top",
+      });
+    } finally {
+      setAiLoading(false);
+    }
+  };
+
+  const handleReplaceContent = async () => {
+    if (!currentMaterial || !aiResult) return;
+
+    try {
+      setReplaceLoading(true);
+      await replaceContent({
+        id: currentMaterial.id.toString(),
+        content: aiResult
+      });
+
+      Toast.show({
+        content: "内容已成功替换",
+        position: "top",
+      });
+
+      // 刷新素材列表
+      fetchMaterials();
+
+      // 关闭弹窗
+      closeAIRewritePopup();
+    } catch (error) {
+      console.error("替换内容失败:", error);
+      Toast.show({
+        content: "替换内容失败，请重试",
+        position: "top",
+      });
+    } finally {
+      setReplaceLoading(false);
+    }
+  };
+
+  const closeAIRewritePopup = () => {
+    setShowAIRewritePopup(false);
+    setCurrentMaterial(null);
+    setAiPrompt("");
+    setAiResult("");
   };
 
   const handleRefresh = () => {
@@ -348,7 +422,23 @@ const MaterialsList: React.FC = () => {
                   <div className={style["card-header"]}>
                     <div className={style["avatar-section"]}>
                       <div className={style["avatar"]}>
-                        <UserOutlined className={style["avatar-icon"]} />
+                        {material.senderAvatar ? (
+                          <img
+                            src={material.senderAvatar}
+                            alt="头像"
+                            className={style["avatar-img"]}
+                            onError={(e) => {
+                              e.currentTarget.style.display = 'none';
+                              const nextElement = e.currentTarget.nextSibling as HTMLElement;
+                              if (nextElement) {
+                                nextElement.style.display = 'flex';
+                              }
+                            }}
+                          />
+                        ) : null}
+                        <div className={style["avatar-icon-wrapper"]} style={{display: material.senderAvatar ? 'none' : 'flex'}}>
+                          <UserOutlined className={style["avatar-icon"]}/>
+                        </div>
                       </div>
                       <div className={style["header-info"]}>
                         <span className={style["creator-name"]}>
@@ -381,7 +471,7 @@ const MaterialsList: React.FC = () => {
                         编辑
                       </Button>
                       <Button
-                        onClick={() => handleView(material.id)}
+                        onClick={() => handleAIRewrite(material)}
                         className={style["action-btn"]}
                       >
                         <BarChartOutlined />
@@ -402,6 +492,100 @@ const MaterialsList: React.FC = () => {
           )}
         </div>
       </div>
+      {/* AI改写弹框 */}
+      <Popup
+        visible={showAIRewritePopup}
+        onMaskClick={closeAIRewritePopup}
+        bodyStyle={{
+          borderRadius: "16px 16px 0 0",
+          maxHeight: "90vh",
+          boxShadow: "0 -4px 12px rgba(0, 0, 0, 0.1)"
+        }}
+      >
+        <div className={style["ai-popup-content"]}>
+          <div className={style["ai-popup-header"]}>
+            <h3>AI内容改写</h3>
+            <Button
+              size="small"
+              onClick={closeAIRewritePopup}
+            >
+              关闭
+            </Button>
+          </div>
+
+          <div className={style["ai-form"]}>
+            {/* 提示词输入区 */}
+            <div className={style["ai-form-item"]}>
+              <div className={style["ai-form-label"]}>提示词</div>
+              <div className={style["ai-form-control"]}>
+                <TextArea
+                  placeholder="请输入提示词指导AI如何改写内容"
+                  value={aiPrompt}
+                  onChange={val => setAiPrompt(val)}
+                  rows={4}
+                  showCount
+                  maxLength={500}
+                  style={{
+                    border: "1px solid #d9e8ff",
+                    borderRadius: "8px",
+                    padding: "12px",
+                    fontSize: "14px"
+                  }}
+                />
+              </div>
+            </div>
+
+            <div className={style["ai-submit"]}>
+              <Button
+                block
+                color="primary"
+                onClick={handleSubmitAIRewrite}
+                loading={aiLoading}
+                disabled={aiLoading || !aiPrompt.trim()}
+              >
+                {aiLoading ? "生成中..." : "生成内容"}
+              </Button>
+            </div>
+
+            {/* 改写结果区 */}
+            <div className={style["ai-form-item"]}>
+              <div className={style["ai-form-label"]}>改写结果</div>
+              <div className={style["ai-result-description"]}>AI生成的内容将显示在下方区域</div>
+              <div className={style["ai-result-box"]}>
+                {aiLoading ? (
+                  <div className={style["ai-loading"]}>
+                    <Spin tip="AI正在思考中..." />
+                  </div>
+                ) : aiResult ? (
+                  <div className={style["ai-result-content"]}>
+                    {aiResult}
+                  </div>
+                ) : (
+                  <div className={style["ai-result-placeholder"]}>
+                    <div className={style["placeholder-icon"]}>✨</div>
+                    <div className={style["placeholder-text"]}>点击"生成内容"按钮获取AI改写结果</div>
+                  </div>
+                )}
+              </div>
+
+              {/* 替换按钮 */}
+              {aiResult && (
+                <div className={style["ai-replace-action"]}>
+                  <Button
+                    block
+                    color="primary"
+                    onClick={handleReplaceContent}
+                    loading={replaceLoading}
+                    disabled={replaceLoading || !aiResult}
+                  >
+                    {replaceLoading ? "替换中..." : "替换原内容"}
+                  </Button>
+                </div>
+              )}
+            </div>
+          </div>
+        </div>
+      </Popup>
     </Layout>
   );
 };
diff --git a/Server/application/common.php b/Server/application/common.php
index 37a12739..8785f12c 100644
--- a/Server/application/common.php
+++ b/Server/application/common.php
@@ -75,7 +75,18 @@ if (!function_exists('requestCurl')) {
 if (!function_exists('dataBuild')) {
     function dataBuild($array)
     {
-        return is_array($array) ? http_build_query($array) : $array;
+        if (!is_array($array)) {
+            return $array;
+        }
+        
+        // 处理嵌套数组
+        foreach ($array as $key => $value) {
+            if (is_array($value)) {
+                $array[$key] = json_encode($value);
+            }
+        }
+        
+        return http_build_query($array);
     }
 }
 
@@ -550,14 +561,15 @@ if (!function_exists('exit_data')) {
             exit();
     }
 }
-
-/**
- * 调试打印变量但不终止程序
- * @return void
- */
-function dump()
-{
-    call_user_func_array(['app\\common\\helper\\Debug', 'dump'], func_get_args());
+if (!function_exists('dump')) {
+    /**
+     * 调试打印变量但不终止程序
+     * @return void
+     */
+    function dump()
+    {
+        call_user_func_array(['app\\common\\helper\\Debug', 'dump'], func_get_args());
+    }
 }
 
 if (!function_exists('artificialAllotWechatFriend')) {
diff --git a/Server/application/cunkebao/controller/ContentLibraryController.php b/Server/application/cunkebao/controller/ContentLibraryController.php
index c527021c..e4a2f639 100644
--- a/Server/application/cunkebao/controller/ContentLibraryController.php
+++ b/Server/application/cunkebao/controller/ContentLibraryController.php
@@ -40,8 +40,21 @@ class ContentLibraryController extends Controller
             return json(['code' => 400, 'msg' => '内容库名称不能为空']);
         }
 
+
         // 检查内容库名称是否已存在
-        $exists = ContentLibrary::where(['name' => $param['name'], 'userId' => $this->request->userInfo['id'], 'isDel' => 0])->find();
+        $where = [
+            ['name', '=', $param['name']],
+            ['companyId', '=', $this->request->userInfo['companyId']],
+            ['isDel', '=', 0]
+        ];
+        if (empty($this->request->userInfo['isAdmin'])) {
+            $where[] = ['userId', '=', $this->request->userInfo['id']];
+        }
+
+        // 查询内容库是否存在
+        $exists = ContentLibrary::where($where)->find();
+
+
         if ($exists) {
             return json(['code' => 400, 'msg' => '内容库名称已存在']);
         }
@@ -108,30 +121,36 @@ class ContentLibraryController extends Controller
         $page = $this->request->param('page', 1);
         $limit = $this->request->param('limit', 10);
         $keyword = $this->request->param('keyword', '');
-        $sourceType = $this->request->param('sourceType', ''); // 新增：来源类型，1=好友，2=群
+        $sourceType = $this->request->param('sourceType', ''); // 来源类型，1=好友，2=群
+        $companyId = $this->request->userInfo['companyId'];
+        $userId = $this->request->userInfo['id'];
+        $isAdmin = !empty($this->request->userInfo['isAdmin']);
 
+        // 构建基础查询条件
         $where = [
-            ['companyId' , '=', $this->request->userInfo['companyId']],
+            ['companyId', '=', $companyId],
             ['isDel', '=', 0]  // 只查询未删除的记录
         ];
 
-        if(empty($this->request->userInfo['isAdmin'])){
-            $where[] =  ['userId', '=', $this->request->userInfo['id']];
+        // 非管理员只能查看自己的内容库
+        if (!$isAdmin) {
+            $where[] = ['userId', '=', $userId];
         }
 
-
-
         // 添加名称模糊搜索
         if ($keyword !== '') {
             $where[] = ['name', 'like', '%' . $keyword . '%'];
         }
 
-        // 添加名称模糊搜索
+        // 添加来源类型筛选
         if (!empty($sourceType)) {
             $where[] = ['sourceType', '=', $sourceType];
         }
 
+        // 获取总记录数
+        $total = ContentLibrary::where($where)->count();
 
+        // 获取分页数据
         $list = ContentLibrary::where($where)
             ->field('id,name,sourceFriends,sourceGroups,keywordInclude,keywordExclude,aiEnabled,aiPrompt,timeEnabled,timeStart,timeEnd,status,sourceType,userId,createTime,updateTime')
             ->with(['user' => function ($query) {
@@ -141,56 +160,120 @@ class ContentLibraryController extends Controller
             ->page($page, $limit)
             ->select();
 
-        // 处理JSON字段
-        foreach ($list as &$item) {
+        // 收集所有需要查询的ID
+        $libraryIds = [];
+        $friendIdsByLibrary = [];
+        $groupIdsByLibrary = [];
+
+        foreach ($list as $item) {
+            $libraryIds[] = $item['id'];
+            
+            // 解析JSON字段
             $item['sourceFriends'] = json_decode($item['sourceFriends'] ?: '[]', true);
             $item['sourceGroups'] = json_decode($item['sourceGroups'] ?: '[]', true);
             $item['keywordInclude'] = json_decode($item['keywordInclude'] ?: '[]', true);
             $item['keywordExclude'] = json_decode($item['keywordExclude'] ?: '[]', true);
+            
+            // 收集好友和群组ID
+            if (!empty($item['sourceFriends']) && $item['sourceType'] == 1) {
+                $friendIdsByLibrary[$item['id']] = $item['sourceFriends'];
+            }
+            
+            if (!empty($item['sourceGroups']) && $item['sourceType'] == 2) {
+                $groupIdsByLibrary[$item['id']] = $item['sourceGroups'];
+            }
+        }
+
+        // 批量查询内容项数量
+        $itemCounts = [];
+        if (!empty($libraryIds)) {
+            $counts = Db::name('content_item')
+                ->field('libraryId, COUNT(*) as count')
+                ->whereIn('libraryId', $libraryIds)
+                ->where('isDel', 0)
+                ->group('libraryId')
+                ->select();
+                
+            foreach ($counts as $count) {
+                $itemCounts[$count['libraryId']] = $count['count'];
+            }
+        }
+        
+        // 批量查询好友信息
+        $friendsInfoMap = [];
+        $allFriendIds = [];
+        foreach ($friendIdsByLibrary as $libraryId => $friendIds) {
+            if (!empty($friendIds)) {
+                $allFriendIds = array_merge($allFriendIds, $friendIds);
+            }
+        }
+        
+        if (!empty($allFriendIds)) {
+            $allFriendIds = array_unique($allFriendIds);
+            $friendsInfo = Db::name('wechat_friendship')->alias('wf')
+                ->field('wf.id,wf.wechatId, wa.nickname, wa.avatar')
+                ->join('wechat_account wa', 'wf.wechatId = wa.wechatId')
+                ->whereIn('wf.id', $allFriendIds)
+                ->select();
+                
+            foreach ($friendsInfo as $friend) {
+                $friendsInfoMap[$friend['id']] = $friend;
+            }
+        }
+        
+        // 批量查询群组信息
+        $groupsInfoMap = [];
+        $allGroupIds = [];
+        foreach ($groupIdsByLibrary as $libraryId => $groupIds) {
+            if (!empty($groupIds)) {
+                $allGroupIds = array_merge($allGroupIds, $groupIds);
+            }
+        }
+        
+        if (!empty($allGroupIds)) {
+            $allGroupIds = array_unique($allGroupIds);
+            $groupsInfo = Db::name('wechat_group')->alias('g')
+                ->field('g.id, g.chatroomId, g.name, g.avatar, g.ownerWechatId')
+                ->whereIn('g.id', $allGroupIds)
+                ->select();
+                
+            foreach ($groupsInfo as $group) {
+                $groupsInfoMap[$group['id']] = $group;
+            }
+        }
+
+        // 处理每个内容库的数据
+        foreach ($list as &$item) {
             // 添加创建人名称
             $item['creatorName'] = $item['user']['username'] ?? '';
-            $item['itemCount'] = Db::name('content_item')->where('libraryId', $item['id'])->count();
-
-            // 获取好友详细信息
-            if (!empty($item['sourceFriends'] && $item['sourceType'] == 1)) {
-                $friendIds = $item['sourceFriends'];
-                $friendsInfo = [];
-
-                if (!empty($friendIds)) {
-                    // 查询好友信息，使用wechat_friendship表
-                    $friendsInfo = Db::name('wechat_friendship')->alias('wf')
-                        ->field('wf.id,wf.wechatId, wa.nickname, wa.avatar')
-                        ->join('wechat_account wa', 'wf.wechatId = wa.wechatId')
-                        ->whereIn('wf.id', $friendIds)
-                        ->select();
+            
+            // 添加内容项数量
+            $item['itemCount'] = $itemCounts[$item['id']] ?? 0;
+            
+            // 处理好友信息
+            if (!empty($friendIdsByLibrary[$item['id']])) {
+                $selectedFriends = [];
+                foreach ($friendIdsByLibrary[$item['id']] as $friendId) {
+                    if (isset($friendsInfoMap[$friendId])) {
+                        $selectedFriends[] = $friendsInfoMap[$friendId];
+                    }
                 }
-
-                // 将好友信息添加到返回数据中
-                $item['selectedFriends'] = $friendsInfo;
+                $item['selectedFriends'] = $selectedFriends;
             }
-
-
-            if (!empty($item['sourceGroups']) && $item['sourceType'] == 2) {
-                $groupIds = $item['sourceGroups'];
-                $groupsInfo = [];
-
-                if (!empty($groupIds)) {
-                    // 查询群组信息
-                    $groupsInfo = Db::name('wechat_group')->alias('g')
-                        ->field('g.id, g.chatroomId, g.name, g.avatar, g.ownerWechatId')
-                        ->whereIn('g.id', $groupIds)
-                        ->select();
+            
+            // 处理群组信息
+            if (!empty($groupIdsByLibrary[$item['id']])) {
+                $selectedGroups = [];
+                foreach ($groupIdsByLibrary[$item['id']] as $groupId) {
+                    if (isset($groupsInfoMap[$groupId])) {
+                        $selectedGroups[] = $groupsInfoMap[$groupId];
+                    }
                 }
-
-                // 将群组信息添加到返回数据中
-                $item['selectedGroups'] = $groupsInfo;
+                $item['selectedGroups'] = $selectedGroups;
             }
-
+            
             unset($item['user']); // 移除关联数据
         }
-        unset($item);
-
-        $total = ContentLibrary::where($where)->count();
 
         return json([
             'code' => 200,
@@ -210,15 +293,27 @@ class ContentLibraryController extends Controller
     public function detail()
     {
         $id = $this->request->param('id', 0);
+        $companyId = $this->request->userInfo['companyId'];
+        $userId = $this->request->userInfo['id'];
+        $isAdmin = !empty($this->request->userInfo['isAdmin']);
+        
         if (empty($id)) {
             return json(['code' => 400, 'msg' => '参数错误']);
         }
 
-        $library = ContentLibrary::where([
+        // 构建查询条件
+        $where = [
             ['id', '=', $id],
-            ['userId', '=', $this->request->userInfo['id']],
+            ['companyId', '=', $companyId],
             ['isDel', '=', 0]  // 只查询未删除的记录
-        ])
+        ];
+
+        if (!$isAdmin) {
+            $where[] = ['userId', '=', $userId];
+        }
+
+        // 查询内容库信息
+        $library = ContentLibrary::where($where)
             ->field('id,name,sourceType,sourceFriends,sourceGroups,keywordInclude,keywordExclude,aiEnabled,aiPrompt,timeEnabled,timeStart,timeEnd,status,userId,companyId,createTime,updateTime,groupMembers,catchType')
             ->find();
 
@@ -233,7 +328,7 @@ class ContentLibraryController extends Controller
         $library['keywordExclude'] = json_decode($library['keywordExclude'] ?: '[]', true);
         $library['groupMembers'] = json_decode($library['groupMembers'] ?: '[]', true);
         $library['catchType'] = json_decode($library['catchType'] ?: '[]', true);
-        unset($library['sourceFriends'],$library['sourceGroups']);
+        unset($library['sourceFriends'], $library['sourceGroups']);
 
         // 将时间戳转换为日期格式（精确到日）
         if (!empty($library['timeStart'])) {
@@ -243,45 +338,35 @@ class ContentLibraryController extends Controller
             $library['timeEnd'] = date('Y-m-d', $library['timeEnd']);
         }
 
-        // 获取好友详细信息
+        // 初始化选项数组
+        $library['friendsGroupsOptions'] = [];
+        $library['wechatGroupsOptions'] = [];
+        
+        // 批量查询好友信息
         if (!empty($library['friendsGroups'])) {
             $friendIds = $library['friendsGroups'];
-            $friendsInfo = [];
-
             if (!empty($friendIds)) {
                 // 查询好友信息，使用wechat_friendship表
-                $friendsInfo = Db::name('wechat_friendship')->alias('wf')
+                $library['friendsGroupsOptions'] = Db::name('wechat_friendship')->alias('wf')
                     ->field('wf.id,wf.wechatId, wa.nickname, wa.avatar')
                     ->join('wechat_account wa', 'wf.wechatId = wa.wechatId')
                     ->order('wa.id DESC')
                     ->whereIn('wf.id', $friendIds)
                     ->select();
             }
-
-            // 将好友信息添加到返回数据中
-            $library['friendsGroupsOptions'] = $friendsInfo;
-        }else{
-            $library['friendsGroupsOptions'] = [];
         }
 
-        // 获取群组详细信息
+        // 批量查询群组信息
         if (!empty($library['wechatGroups'])) {
             $groupIds = $library['wechatGroups'];
-            $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')
+                $library['wechatGroupsOptions'] = 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', 'LEFT') // 使用LEFT JOIN避免因群主不存在导致查询失败
                     ->whereIn('g.id', $groupIds)
                     ->select();
             }
-
-            // 将群组信息添加到返回数据中
-            $library['wechatGroupsOptions'] = $groupsInfo;
-        }else{
-            $library['wechatGroupsOptions'] = [];
         }
 
         return json([
@@ -315,12 +400,12 @@ class ContentLibraryController extends Controller
 
 
         $where = [
-            ['companyId' , '=', $this->request->userInfo['companyId']],
+            ['companyId', '=', $this->request->userInfo['companyId']],
             ['isDel', '=', 0]  // 只查询未删除的记录
         ];
 
-        if(empty($this->request->userInfo['isAdmin'])){
-            $where[] =  ['userId', '=', $this->request->userInfo['id']];
+        if (empty($this->request->userInfo['isAdmin'])) {
+            $where[] = ['userId', '=', $this->request->userInfo['id']];
         }
 
         // 查询内容库是否存在
@@ -375,11 +460,16 @@ class ContentLibraryController extends Controller
             return json(['code' => 400, 'msg' => '参数错误']);
         }
 
-        $library = ContentLibrary::where([
+
+        $where = [
             ['id', '=', $id],
-            ['userId', '=', $this->request->userInfo['id']],
-            ['isDel', '=', 0]  // 只删除未删除的记录
-        ])->find();
+            ['companyId', '=', $this->request->userInfo['companyId']],
+            ['isDel', '=', 0]
+        ];
+        if (empty($this->request->userInfo['isAdmin'])) {
+            $where[] = ['userId', '=', $this->request->userInfo['id']];
+        }
+        $library = ContentLibrary::where($where)->find();
 
         if (empty($library)) {
             return json(['code' => 500, 'msg' => '内容库不存在']);
@@ -411,17 +501,26 @@ class ContentLibraryController extends Controller
         $limit = $this->request->param('limit', 10);
         $libraryId = $this->request->param('libraryId', 0);
         $keyword = $this->request->param('keyword', ''); // 搜索关键词
+        $companyId = $this->request->userInfo['companyId'];
+        $userId = $this->request->userInfo['id'];
+        $isAdmin = !empty($this->request->userInfo['isAdmin']);
 
         if (empty($libraryId)) {
             return json(['code' => 400, 'msg' => '内容库ID不能为空']);
         }
 
         // 验证内容库权限
-        $library = ContentLibrary::where([
+        $libraryWhere = [
             ['id', '=', $libraryId],
-            ['userId', '=', $this->request->userInfo['id']],
+            ['companyId', '=', $companyId],
             ['isDel', '=', 0]
-        ])->find();
+        ];
+        
+        if (!$isAdmin) {
+            $libraryWhere[] = ['userId', '=', $userId];
+        }
+
+        $library = ContentLibrary::where($libraryWhere)->find();
 
         if (empty($library)) {
             return json(['code' => 500, 'msg' => '内容库不存在或无权限访问']);
@@ -433,56 +532,106 @@ class ContentLibraryController extends Controller
             ['isDel', '=', 0]
         ];
 
-
         // 关键词搜索
         if (!empty($keyword)) {
             $where[] = ['content|title', 'like', '%' . $keyword . '%'];
         }
 
+        // 获取总数
+        $total = ContentItem::where($where)->count();
+
         // 查询数据
         $list = ContentItem::where($where)
+            ->field('id,libraryId,type,title,content,contentAi,contentType,resUrls,urls,friendId,wechatId,wechatChatroomId,createTime,createMomentTime,createMessageTime,coverImage')
             ->order('createMomentTime DESC,createTime DESC')
             ->page($page, $limit)
             ->select();
 
+        // 收集需要查询的ID
+        $friendIds = [];
+        $chatroomIds = [];
+        $wechatIds = [];
+        
+        foreach ($list as $item) {
+            if ($item['type'] == 'moment' && !empty($item['friendId'])) {
+                $friendIds[] = $item['friendId'];
+            } else if ($item['type'] == 'group_message' && !empty($item['wechatChatroomId'])) {
+                $chatroomIds[] = $item['wechatChatroomId'];
+                if (!empty($item['wechatId'])) {
+                    $wechatIds[] = $item['wechatId'];
+                }
+            }
+        }
+        
+        // 批量查询好友信息
+        $friendInfoMap = [];
+        if (!empty($friendIds)) {
+            $friendIds = array_unique($friendIds);
+            $friendInfos = Db::table('s2_wechat_friend')
+                ->whereIn('id', $friendIds)
+                ->field('id, nickname, avatar')
+                ->select();
+                
+            foreach ($friendInfos as $info) {
+                $friendInfoMap[$info['id']] = $info;
+            }
+        }
+        
+        // 批量查询群成员信息
+        $memberInfoMap = [];
+        if (!empty($wechatIds)) {
+            $wechatIds = array_unique($wechatIds);
+            $memberInfos = Db::table('s2_wechat_chatroom_member')
+                ->whereIn('wechatId', $wechatIds)
+                ->field('wechatId, nickname, avatar')
+                ->select();
+                
+            foreach ($memberInfos as $info) {
+                $memberInfoMap[$info['wechatId']] = $info;
+            }
+        }
+
         // 处理数据
         foreach ($list as &$item) {
-            // 处理资源URL
+            // 使用AI内容（如果有）
+            $item['content'] = !empty($item['contentAi']) ? $item['contentAi'] : $item['content'];
+            
+            // 处理JSON字段
             $item['resUrls'] = json_decode($item['resUrls'] ?: '[]', true);
             $item['urls'] = json_decode($item['urls'] ?: '[]', true);
 
             // 格式化时间
-            //$item['createTime'] = date('Y-m-d H:i:s', $item['createTime']);
-            if ($item['createMomentTime']) {
-                $item['time'] = date('Y-m-d H:i:s', $item['createMomentTime']);
-            }
-            if ($item['createMessageTime']) {
-                $item['time'] = date('Y-m-d H:i:s', $item['createMessageTime']);
+            if (!empty($item['createMomentTime']) && is_numeric($item['createMomentTime'])) {
+                $item['time'] = date('Y-m-d H:i:s', (int)$item['createMomentTime']);
+            } elseif (!empty($item['createMessageTime']) && is_numeric($item['createMessageTime'])) {
+                $item['time'] = date('Y-m-d H:i:s', (int)$item['createMessageTime']);
+            } elseif (!empty($item['createTime']) && is_numeric($item['createTime'])) {
+                $item['time'] = date('Y-m-d H:i:s', (int)$item['createTime']);
+            } else {
+                $item['time'] = date('Y-m-d H:i:s'); // 如果没有有效的时间戳，使用当前时间
             }
 
-            // 获取发送者信息
+            // 设置发送者信息
+            $item['senderNickname'] = '';
+            $item['senderAvatar'] = '';
+            
+            // 从映射表获取发送者信息
             if ($item['type'] == 'moment' && !empty($item['friendId'])) {
-                $friendInfo = Db::name('wechat_friendship')
-                    ->alias('wf')
-                    ->join('wechat_account wa', 'wf.wechatId = wa.wechatId')
-                    ->where('wf.id', $item['friendId'])
-                    ->field('wa.nickname, wa.avatar')
-                    ->find();
-                $item['senderNickname'] = !empty($friendInfo['nickname']) ? $friendInfo['nickname'] : '';
-                $item['senderAvatar'] = !empty($friendInfo['avatar']) ? $friendInfo['avatar'] : '';
-            } else if ($item['type'] == 'group_message' && !empty($item['wechatChatroomId'])) {
-                $friendInfo = Db::table('s2_wechat_chatroom_member')
-                    ->field('nickname, avatar')
-                    ->where('wechatId', $item['wechatId'])
-                    ->find();
-                $item['senderNickname'] = !empty($friendInfo['nickname']) ? $friendInfo['nickname'] : '';
-                $item['senderAvatar'] = !empty($friendInfo['avatar']) ? $friendInfo['avatar'] : '';
+                if (isset($friendInfoMap[$item['friendId']])) {
+                    $friendInfo = $friendInfoMap[$item['friendId']];
+                    $item['senderNickname'] = $friendInfo['nickname'] ?? '';
+                    $item['senderAvatar'] = $friendInfo['avatar'] ?? '';
+                }
+            } else if ($item['type'] == 'group_message' && !empty($item['wechatId'])) {
+                if (isset($memberInfoMap[$item['wechatId']])) {
+                    $memberInfo = $memberInfoMap[$item['wechatId']];
+                    $item['senderNickname'] = $memberInfo['nickname'] ?? '';
+                    $item['senderAvatar'] = $memberInfo['avatar'] ?? '';
+                }
             }
-        }
-        unset($item);
 
-        // 获取总数
-        $total = ContentItem::where($where)->count();
+            unset($item['contentAi']);
+        }
 
         return json([
             'code' => 200,
@@ -534,11 +683,17 @@ class ContentLibraryController extends Controller
             }
         }
 
-        // 查询内容库是否存在
-        $library = ContentLibrary::where([
+        $where = [
             ['id', '=', $param['libraryId']],
-            ['userId', '=', $this->request->userInfo['id']]
-        ])->find();
+            ['companyId', '=', $this->request->userInfo['companyId']],
+            ['isDel', '=', 0]
+        ];
+        if (empty($this->request->userInfo['isAdmin'])) {
+            $where[] = ['userId', '=', $this->request->userInfo['id']];
+        }
+
+        // 查询内容库是否存在
+        $library = ContentLibrary::where($where)->find();
 
         if (!$library) {
             return json(['code' => 500, 'msg' => '内容库不存在']);
@@ -613,18 +768,28 @@ class ContentLibraryController extends Controller
     public function getItemDetail()
     {
         $id = $this->request->param('id', 0);
+        $userId = $this->request->userInfo['id'];
+        $isAdmin = !empty($this->request->userInfo['isAdmin']);
+        
         if (empty($id)) {
             return json(['code' => 400, 'msg' => '参数错误']);
         }
 
+        // 构建查询条件
+        $where = [
+            ['i.id', '=', $id],
+            ['i.isDel', '=', 0]
+        ];
+        
+        // 非管理员只能查看自己的内容项
+        if (!$isAdmin) {
+            $where[] = ['l.userId', '=', $userId];
+        }
+
         // 查询内容项目是否存在并检查权限
         $item = ContentItem::alias('i')
             ->join('content_library l', 'i.libraryId = l.id')
-            ->where([
-                ['i.id', '=', $id],
-                ['l.userId', '=', $this->request->userInfo['id']],
-                ['i.isDel', '=', 0]
-            ])
+            ->where($where)
             ->field('i.*')
             ->find();
 
@@ -632,8 +797,7 @@ class ContentLibraryController extends Controller
             return json(['code' => 500, 'msg' => '内容项目不存在或无权限访问']);
         }
 
-        // 处理数据
-        // 处理资源URL
+        // 处理JSON字段
         $item['resUrls'] = json_decode($item['resUrls'] ?: '[]', true);
         $item['urls'] = json_decode($item['urls'] ?: '[]', true);
 
@@ -650,34 +814,71 @@ class ContentLibraryController extends Controller
         $item['contentTypeName'] = $contentTypeMap[$item['contentType'] ?? 0] ?? '未知';
 
         // 格式化时间
-        if ($item['createMomentTime']) {
-            $item['createMomentTimeFormatted'] = date('Y-m-d H:i:s', $item['createMomentTime']);
+        if (!empty($item['createMomentTime']) && is_numeric($item['createMomentTime'])) {
+            $item['createMomentTimeFormatted'] = date('Y-m-d H:i:s', (int)$item['createMomentTime']);
         }
-        if ($item['createMessageTime']) {
-            $item['createMessageTimeFormatted'] = date('Y-m-d H:i:s', $item['createMessageTime']);
+        if (!empty($item['createMessageTime']) && is_numeric($item['createMessageTime'])) {
+            $item['createMessageTimeFormatted'] = date('Y-m-d H:i:s', (int)$item['createMessageTime']);
+        }
+        if (!empty($item['createTime']) && is_numeric($item['createTime'])) {
+            $item['createTimeFormatted'] = date('Y-m-d H:i:s', (int)$item['createTime']);
         }
 
         // 格式化发送时间
-        if ($item['sendTime']) {
-            $item['sendTime'] = date('Y-m-d H:i:s', $item['sendTime']);
+        if (!empty($item['sendTime']) && is_numeric($item['sendTime'])) {
+            $item['sendTimeFormatted'] = date('Y-m-d H:i:s', (int)$item['sendTime']);
+            // 保持原字段兼容
+            $item['sendTime'] = $item['sendTimeFormatted'];
         }
 
-        // 获取发送者信息
-        if ($item['type'] == 'moment' && $item['friendId']) {
+        // 初始化发送者和群组信息
+        $item['senderInfo'] = [];
+        $item['groupInfo'] = [];
+        
+        // 批量获取关联信息
+        if ($item['type'] == 'moment' && !empty($item['friendId'])) {
+            // 获取朋友圈发送者信息
             $friendInfo = Db::name('wechat_friendship')
                 ->alias('wf')
-                ->join('wechat_account wa', 'wf.wechatId = wa.wechatId')
+                ->join('wechat_account wa', 'wf.wechatId = wa.wechatId', 'LEFT')
                 ->where('wf.id', $item['friendId'])
-                ->field('wa.nickname, wa.avatar')
+                ->field('wf.id, wf.wechatId, wa.nickname, wa.avatar')
                 ->find();
-            $item['senderInfo'] = $friendInfo ?: [];
-        } elseif ($item['type'] == 'group_message' && $item['wechatChatroomId']) {
+                
+            if ($friendInfo) {
+                $item['senderInfo'] = $friendInfo;
+            }
+        } elseif ($item['type'] == 'group_message' && !empty($item['wechatChatroomId'])) {
             // 获取群组信息
             $groupInfo = Db::name('wechat_group')
                 ->where('id', $item['wechatChatroomId'])
-                ->field('name, avatar')
+                ->field('id, chatroomId, name, avatar, ownerWechatId')
                 ->find();
-            $item['groupInfo'] = $groupInfo ?: [];
+                
+            if ($groupInfo) {
+                $item['groupInfo'] = $groupInfo;
+                
+                // 如果有发送者信息，也获取发送者详情
+                if (!empty($item['wechatId'])) {
+                    $senderInfo = Db::name('wechat_chatroom_member')
+                        ->where([
+                            'chatroomId' => $groupInfo['chatroomId'],
+                            'wechatId' => $item['wechatId']
+                        ])
+                        ->field('wechatId, nickname, avatar')
+                        ->find();
+                        
+                    if ($senderInfo) {
+                        $item['senderInfo'] = $senderInfo;
+                    }
+                }
+            }
+        }
+
+        // 如果有AI内容，添加到返回数据中
+        if (!empty($item['contentAi'])) {
+            $item['contentOriginal'] = $item['content'];
+            $item['content'] = $item['contentAi'];
         }
 
         return json([
@@ -783,14 +984,14 @@ class ContentLibraryController extends Controller
             return json(['code' => 400, 'msg' => '参数错误']);
         }
 
-        if(!empty($id)) {
+        if (!empty($id)) {
             // 查询内容项目是否存在并检查权限
             $item = ContentItem::alias('ci')
                 ->join('content_library cl', 'ci.libraryId = cl.id')
                 ->where(['ci.id' => $id, 'ci.isDel' => 0, 'cl.isDel' => 0, 'cl.companyId' => $companyId])
                 ->field('ci.*')
                 ->find();
-        }else{
+        } else {
             $item['content'] = $content;
         }
 
@@ -859,35 +1060,48 @@ class ContentLibraryController extends Controller
         // 查询条件：未删除且已开启的内容库
         $where = [
             ['isDel', '=', 0],      // 未删除
-            ['status', '=', 1],       // 已开启
-//            ['id', '=', 61],       // 已开启
+            ['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')
+            ->field('id,name,sourceType,sourceFriends,sourceGroups,keywordInclude,keywordExclude,aiEnabled,aiPrompt,timeEnabled,timeStart,timeEnd,status,userId,companyId,createTime,updateTime,groupMembers,catchType')
             ->order('id', 'desc')
             ->select()->toArray();
 
         if (empty($libraries)) {
             return json(['code' => 200, 'msg' => '没有可用的内容库配置']);
         }
+        
         $successCount = 0;
         $failCount = 0;
         $results = [];
+        $processedLibraries = 0;
+        $totalLibraries = count($libraries);
+
+        // 预处理内容库数据
+        foreach ($libraries as &$library) {
+            // 解析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);
+            $library['catchType'] = json_decode($library['catchType'] ?: '[]', true);
+        }
+        unset($library); // 解除引用
 
         // 处理每个内容库的采集任务
         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);
-
+                $processedLibraries++;
+                
                 // 根据数据来源类型执行不同的采集逻辑
-                $collectResult = [];
+                $collectResult = [
+                    'status' => 'skipped',
+                    'message' => '没有配置数据来源'
+                ];
+                
                 switch ($library['sourceType']) {
                     case 1: // 好友类型
                         if (!empty($library['sourceFriends'])) {
@@ -908,39 +1122,51 @@ class ContentLibraryController extends Controller
                         ];
                 }
 
+                // 统计成功和失败数量
                 if ($collectResult['status'] == 'success') {
                     $successCount++;
-                } else {
+                } elseif ($collectResult['status'] == 'failed' || $collectResult['status'] == 'error') {
                     $failCount++;
                 }
 
+                // 记录结果
                 $results[] = [
                     'library_id' => $library['id'],
                     'library_name' => $library['name'],
+                    'source_type' => $library['sourceType'] == 1 ? '好友' : ($library['sourceType'] == 2 ? '群组' : '未知'),
                     'status' => $collectResult['status'],
                     'message' => $collectResult['message'] ?? '',
                     'data' => $collectResult['data'] ?? []
                 ];
 
+                // 每处理5个内容库，释放一次内存
+                if ($processedLibraries % 5 == 0 && $processedLibraries < $totalLibraries) {
+                    gc_collect_cycles();
+                }
             } catch (\Exception $e) {
                 $failCount++;
                 $results[] = [
                     'library_id' => $library['id'],
                     'library_name' => $library['name'],
+                    'source_type' => $library['sourceType'] == 1 ? '好友' : ($library['sourceType'] == 2 ? '群组' : '未知'),
                     'status' => 'error',
                     'message' => $e->getMessage()
                 ];
+                
+                // 记录错误日志
+                \think\facade\Log::error('内容库采集错误: ' . $e->getMessage() . ' [库ID: ' . $library['id'] . ']');
             }
         }
 
         // 返回采集结果
-        return json_encode([
+        return json([
             'code' => 200,
             'msg' => '采集任务执行完成',
             'data' => [
-                'total' => count($libraries),
+                'total' => $totalLibraries,
                 'success' => $successCount,
                 'fail' => $failCount,
+                'skipped' => $totalLibraries - $successCount - $failCount,
                 'results' => $results
             ]
         ]);
@@ -960,22 +1186,27 @@ class ContentLibraryController extends Controller
                 'message' => '没有指定要采集的好友'
             ];
         }
-        $friendData = [];
+        
         try {
+            // 获取API配置
             $toAccountId = '';
             $username = Env::get('api.username2', '');
             $password = Env::get('api.password2', '');
-            if (!empty($username) || !empty($password)) {
+            $needFetch = false;
+            
+            // 检查是否需要主动获取朋友圈
+            if (!empty($username) && !empty($password)) {
                 $toAccountId = Db::name('users')->where('account', $username)->value('s2_accountId');
+                $needFetch = !empty($toAccountId);
             }
 
-
-            // 查询好友信息
+            // 批量查询好友信息
             $friends = Db::table('s2_wechat_friend')
-                ->field('id, wechatAccountId, wechatId,accountId')
+                ->field('id, wechatAccountId, wechatId, accountId, nickname, avatar')
                 ->whereIn('id', $friendIds)
                 ->where('isDeleted', 0)
                 ->select();
+                
             if (empty($friends)) {
                 return [
                     'status' => 'failed',
@@ -986,103 +1217,100 @@ class ContentLibraryController extends Controller
             // 从朋友圈采集内容
             $collectedData = [];
             $totalMomentsCount = 0;
-
+            $processedFriends = 0;
+            $totalFriends = count($friends);
+            
+            // 获取采集类型限制
+            $catchTypes = $library['catchType'] ?? [];
+            
             foreach ($friends as $friend) {
-                $friendData = $friend;
-                if (!empty($username) && !empty($password)) {
-                    //执行切换好友命令
-                    $automaticAssign = new AutomaticAssign();
-                    $automaticAssign->allotWechatFriend(['wechatFriendId' => $friend['id'], 'toAccountId' => $toAccountId], true);
-                    //存入缓存
-                    $friendData['friendId'] = $friend['id'];
-                    artificialAllotWechatFriend($friendData);
-                    //执行采集朋友圈命令
-                    $webSocket = new WebSocketController(['userName' => $username, 'password' => $password, 'accountId' => $toAccountId]);
-                    $webSocket->getMoments(['wechatFriendId' => $friend['id'], 'wechatAccountId' => $friend['wechatAccountId']]);
-                    //采集完毕切换
-                    $automaticAssign->allotWechatFriend(['wechatFriendId' => $friend['id'], 'toAccountId' => $friend['accountId']], true);
+                $processedFriends++;
+                
+                // 如果配置了API并且需要主动获取朋友圈
+                if ($needFetch) {
+                    try {
+                        // 执行切换好友命令
+                        $automaticAssign = new AutomaticAssign();
+                        $automaticAssign->allotWechatFriend(['wechatFriendId' => $friend['id'], 'toAccountId' => $toAccountId], true);
+                        
+                        // 存入缓存
+                        $friendData = $friend;
+                        $friendData['friendId'] = $friend['id'];
+                        artificialAllotWechatFriend($friendData);
+                        
+                        // 执行采集朋友圈命令
+                        $webSocket = new WebSocketController(['userName' => $username, 'password' => $password, 'accountId' => $toAccountId]);
+                        $webSocket->getMoments(['wechatFriendId' => $friend['id'], 'wechatAccountId' => $friend['wechatAccountId']]);
+                        
+                        // 采集完毕切换回原账号
+                        $automaticAssign->allotWechatFriend(['wechatFriendId' => $friend['id'], 'toAccountId' => $friend['accountId']], true);
+                    } catch (\Exception $e) {
+                        \think\facade\Log::error('采集朋友圈失败: ' . $e->getMessage() . ' [好友ID: ' . $friend['id'] . ']');
+                        // 继续处理下一个好友，不中断整个流程
+                    }
                 }
 
                 // 从s2_wechat_moments表获取朋友圈数据
-                $moments = Db::table('s2_wechat_moments')
+                $query = Db::table('s2_wechat_moments')
                     ->where([
                         'userName' => $friend['wechatId'],
                         'wechatAccountId' => $friend['wechatAccountId']
                     ])
-                    ->order('createTime', 'desc')
-                    //->where('create_time', '>=', time() - 86400)
-                    ->page(1, 20)
-                    ->select();
-
+                    ->order('createTime', 'desc');
+                    
+                // 如果启用了时间限制
+                if ($library['timeEnabled'] && $library['timeStart'] > 0 && $library['timeEnd'] > 0) {
+                    $query->whereBetween('createTime', [$library['timeStart'], $library['timeEnd']]);
+                }
+                
+                // 如果指定了采集类型，进行过滤
+                if (!empty($catchTypes)) {
+                    $query->whereIn('type', $catchTypes);
+                }
+                
+                // 获取最近20条朋友圈
+                $moments = $query->page(1, 20)->select();
 
                 if (empty($moments)) {
                     continue;
                 }
 
-                // 获取好友详细信息
-                $friendInfo = Db::table('s2_wechat_friend')
-                    ->where('wechatId', $friend['wechatId'])
-                    ->field('nickname, avatar')
-                    ->find();
-
-                $nickname = $friendInfo['nickname'] ?? '未知好友';
+                $nickname = $friend['nickname'] ?? '未知好友';
                 $friendMomentsCount = 0;
+                $filteredMoments = [];
 
                 // 处理每条朋友圈数据
                 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) {
+                    
+                    // 应用关键词过滤
+                    if (!$this->passKeywordFilter($content, $library['keywordInclude'], $library['keywordExclude'])) {
                         continue;
                     }
 
                     // 如果启用了AI处理
                     if (!empty($library['aiEnabled']) && !empty($content)) {
-                        $contentAi = $this->aiRewrite($library, $content);
-                        if (!empty($content)) {
-                            $moment['contentAi'] = $contentAi;
-                        } else {
+                        try {
+                            $contentAi = $this->aiRewrite($library, $content);
+                            if (!empty($contentAi)) {
+                                $moment['contentAi'] = $contentAi;
+                            }
+                        } catch (\Exception $e) {
+                            \think\facade\Log::error('AI处理失败: ' . $e->getMessage() . ' [朋友圈ID: ' . ($moment['id'] ?? 'unknown') . ']');
                             $moment['contentAi'] = '';
                         }
                     }
 
                     // 保存到内容库的content_item表
-                    $this->saveMomentToContentItem($moment, $library['id'], $friend, $nickname);
-
-                    $friendMomentsCount++;
+                    if ($this->saveMomentToContentItem($moment, $library['id'], $friend, $nickname)) {
+                        $friendMomentsCount++;
+                        $filteredMoments[] = [
+                            'id' => $moment['id'] ?? '',
+                            'content' => mb_substr($content, 0, 50) . (mb_strlen($content) > 50 ? '...' : ''),
+                            'time' => date('Y-m-d H:i:s', $moment['createTime'] ?? time())
+                        ];
+                    }
                 }
 
                 if ($friendMomentsCount > 0) {
@@ -1090,14 +1318,19 @@ class ContentLibraryController extends Controller
                     $collectedData[$friend['wechatId']] = [
                         'friendId' => $friend['id'],
                         'nickname' => $nickname,
-                        'count' => $friendMomentsCount
+                        'count' => $friendMomentsCount,
+                        'samples' => array_slice($filteredMoments, 0, 3) // 只保留前3条示例
                     ];
 
                     $totalMomentsCount += $friendMomentsCount;
                 }
+                
+                // 每处理5个好友，释放一次内存
+                if ($processedFriends % 5 == 0 && $processedFriends < $totalFriends) {
+                    gc_collect_cycles();
+                }
             }
 
-
             if (empty($collectedData)) {
                 return [
                     'status' => 'warning',
@@ -1116,12 +1349,55 @@ class ContentLibraryController extends Controller
             ];
 
         } catch (\Exception $e) {
+            \think\facade\Log::error('从好友采集朋友圈失败: ' . $e->getMessage() . ' [内容库ID: ' . ($library['id'] ?? 'unknown') . ']');
             return [
                 'status' => 'error',
                 'message' => '采集过程发生错误: ' . $e->getMessage()
             ];
         }
     }
+    
+    /**
+     * 应用关键词过滤规则
+     * @param string $content 内容文本
+     * @param array $includeKeywords 包含关键词
+     * @param array $excludeKeywords 排除关键词
+     * @return bool 是否通过过滤
+     */
+    private function passKeywordFilter($content, $includeKeywords, $excludeKeywords)
+    {
+        // 如果内容为空，跳过
+        if (empty($content)) {
+            return false;
+        }
+        
+        // 检查是否包含必须关键词
+        $includeMatch = empty($includeKeywords);
+        if (!empty($includeKeywords)) {
+            foreach ($includeKeywords as $keyword) {
+                if (strpos($content, $keyword) !== false) {
+                    $includeMatch = true;
+                    break;
+                }
+            }
+        }
+
+        // 如果不满足包含条件，跳过
+        if (!$includeMatch) {
+            return false;
+        }
+
+        // 检查是否包含排除关键词
+        if (!empty($excludeKeywords)) {
+            foreach ($excludeKeywords as $keyword) {
+                if (strpos($content, $keyword) !== false) {
+                    return false; // 包含排除关键词，不通过过滤
+                }
+            }
+        }
+        
+        return true; // 通过所有过滤条件
+    }
 
     /**
      * 从群组采集消息内容
diff --git a/Server/application/http/middleware/Jwt.php b/Server/application/http/middleware/Jwt.php
new file mode 100644
index 00000000..4f2fb7d1
--- /dev/null
+++ b/Server/application/http/middleware/Jwt.php
@@ -0,0 +1,49 @@
+<?php
+namespace app\http\middleware;
+
+use app\common\util\JwtUtil;
+use think\facade\Log;
+
+/**
+ * JWT认证中间件
+ */
+class Jwt
+{
+    /**
+     * 处理请求
+     * @param \think\Request $request
+     * @param \Closure $next
+     * @return mixed
+     */
+    public function handle($request, \Closure $next)
+    {
+        // 获取Token
+        $token = JwtUtil::getRequestToken();
+        
+        // 验证Token
+        if (!$token) {
+            return json([
+                'code' => 401,
+                'msg'  => '未授权访问，缺少有效的身份凭证',
+                'data' => null
+            ])->header(['Content-Type' => 'application/json; charset=utf-8']);
+        }
+        
+        $payload = JwtUtil::verifyToken($token);
+        if (!$payload) {
+            return json([
+                'code' => 401,
+                'msg'  => '授权已过期或无效',
+                'data' => null
+            ])->header(['Content-Type' => 'application/json; charset=utf-8']);
+        }
+        
+        // 将用户信息附加到请求中
+        $request->userInfo = $payload;
+        
+        // 写入日志
+        Log::info('JWT认证通过', ['user_id' => $payload['id'] ?? 0, 'username' => $payload['username'] ?? '']);
+        
+        return $next($request);
+    }
+}
diff --git a/Server/composer.json b/Server/composer.json
index 61d3fa7c..ea979146 100644
--- a/Server/composer.json
+++ b/Server/composer.json
@@ -13,21 +13,58 @@
         {
             "name": "liu21st",
             "email": "liu21st@gmail.com"
+        },
+        {
+            "name": "yunwuxin",
+            "email": "448901948@qq.com"
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "topthink/framework": "5.0.*"
+        "php": ">=5.6.0",
+        "topthink/framework": "5.1.*",
+        "topthink/think-installer": "~1.0",
+        "topthink/think-captcha": "^2.0",
+        "topthink/think-helper": "^3.0",
+        "topthink/think-image": "^1.0",
+        "topthink/think-queue": "^2.0",
+        "topthink/think-worker": "^2.0",
+        "textalk/websocket": "^1.2",
+        "aliyuncs/oss-sdk-php": "^2.3",
+        "monolog/monolog": "^1.24",
+        "guzzlehttp/guzzle": "^6.3",
+        "overtrue/wechat": "~4.0",
+        "endroid/qr-code": "^3.5",
+        "phpoffice/phpspreadsheet": "^1.8",
+        "workerman/workerman": "^3.5",
+        "workerman/gateway-worker": "^3.0",
+        "hashids/hashids": "^2.0",
+        "khanamiryan/qrcode-detector-decoder": "^1.0",
+        "lizhichao/word": "^2.0",
+        "adbario/php-dot-notation": "^2.2"
+    },
+    "require-dev": {
+        "symfony/var-dumper": "^3.4",
+        "topthink/think-migration": "^2.0"
     },
     "autoload": {
         "psr-4": {
             "app\\": "application"
-        }
+        },
+        "files": [
+            "application/common.php"
+        ],
+        "classmap": []
     },
     "extra": {
         "think-path": "thinkphp"
     },
     "config": {
-        "preferred-install": "dist"
-    }
+        "preferred-install": "dist",
+        "allow-plugins": {
+            "topthink/think-installer": true,
+            "easywechat-composer/easywechat-composer": true
+        }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }
diff --git a/Server/config/middleware.php b/Server/config/middleware.php
index 132ab645..b221b8a1 100644
--- a/Server/config/middleware.php
+++ b/Server/config/middleware.php
@@ -23,7 +23,8 @@ return [
     
     // 全局中间件
     'alias' => [
-        'cors' => 'app\\common\\middleware\\AllowCrossDomain'
+        'cors' => 'app\\common\\middleware\\AllowCrossDomain',
+        'jwt' => 'app\\http\\middleware\\Jwt'
     ],
     
     // 应用中间件