From 8a6bc33cad34ad44ad94af512225f0310557905b Mon Sep 17 00:00:00 2001
From: mubai <1609539827@qq.com>
Date: Mon, 30 Mar 2026 21:47:26 +0800
Subject: [PATCH] collect optimization

---
 client/src/assets/css/pagination.css    |   8 +-
 client/src/views/index/FilmDetails.vue  | 105 ++++-----
 client/src/views/index/Play.vue         |  91 ++++---
 client/src/views/manage/film/Film.vue   |   2 +-
 client/src/vite-env.d.ts                |   5 +
 client/tsconfig.json                    |   4 +
 client/vite.config.ts                   |  15 +-
 server/config/DataConfig.go             |  16 +-
 server/config/SecurityConfig.go         |  50 +++-
 server/controller/IndexController.go    |   1 -
 server/logic/IndexLogic.go              |   4 +-
 server/logic/SpiderLogic.go             |   2 +-
 server/model/system/Categories.go       |  21 ++
 server/model/system/Jwt.go              |   3 +-
 server/model/system/Movies.go           | 235 +++++++++++++++++--
 server/model/system/Search.go           | 213 ++++++-----------
 server/plugin/SystemInit/SpiderInit.go  |   5 +-
 server/plugin/common/conver/Collect.go  |   4 +-
 server/plugin/common/conver/System.go   |  59 +++--
 server/plugin/common/util/Request.go    |  17 +-
 server/plugin/common/util/StringUtil.go |  16 +-
 server/plugin/db/mysql.go               |   5 +-
 server/plugin/spider/Spider.go          | 300 ++++++++++++++++++++++--
 23 files changed, 827 insertions(+), 354 deletions(-)

diff --git a/client/src/assets/css/pagination.css b/client/src/assets/css/pagination.css
index c014942..44a0734 100644
--- a/client/src/assets/css/pagination.css
+++ b/client/src/assets/css/pagination.css
@@ -26,7 +26,7 @@
     color: #67d9e8;
 }
 
-:deep(.btn-prev) {
+:deep(.el-pagination .btn-prev) {
     font-weight: bold;
     width: 45px;
     height: 45px;
@@ -35,7 +35,7 @@
     border-radius: 50%;
 }
 
-:deep(.btn-next) {
+:deep(.el-pagination .btn-next) {
     font-weight: bold;
     width: 45px;
     height: 45px;
@@ -64,12 +64,12 @@
         height: 35px;
     }
 
-    :deep(.btn-prev) {
+    :deep(.el-pagination .btn-prev) {
         width: 35px;
         height: 35px;
     }
 
-    :deep(.btn-next) {
+    :deep(.el-pagination .btn-next) {
         width: 35px;
         height: 35px;
     }
diff --git a/client/src/views/index/FilmDetails.vue b/client/src/views/index/FilmDetails.vue
index 6033036..3c0b2ea 100644
--- a/client/src/views/index/FilmDetails.vue
+++ b/client/src/views/index/FilmDetails.vue
@@ -8,20 +8,20 @@
           <h3>{{ data.detail.name }}</h3>
           <ul class="tags">
             <li style="margin: 2px 0">{{
-                data.detail.descriptor.classTag ? `${data.detail.descriptor.classTag}`.replaceAll(",", " | ") : '未知'
+                data.detail.classTag ? `${data.detail.classTag}`.replaceAll(",", " | ") : '未知'
               }}
             </li>
           </ul>
-          <p><span>导演:</span> {{ data.detail.descriptor.director }}</p>
-          <p><span>主演:</span> {{ handleLongText(data.detail.descriptor.actor) }}</p>
-          <p><span>上映:</span> {{ data.detail.descriptor.releaseDate }}</p>
-          <p><span>地区:</span> {{ data.detail.descriptor.area }}</p>
-          <p v-if="data.detail.descriptor.remarks"><span>连载:</span>{{ data.detail.descriptor.remarks }}</p>
-          <!--<p><span>评分:</span><b id="score">{{ data.detail.descriptor.dbScore }}</b></p>-->
+          <p><span>导演:</span> {{ data.detail.director }}</p>
+          <p><span>主演:</span> {{ handleLongText(data.detail.actor) }}</p>
+          <p><span>上映:</span> {{ data.detail.releaseDate }}</p>
+          <p><span>地区:</span> {{ data.detail.area }}</p>
+          <p v-if="data.detail.remarks"><span>连载:</span>{{ data.detail.remarks }}</p>
+          <!--<p><span>评分:</span><b id="score">{{ data.detail.dbScore }}</b></p>-->
         </div>
       </div>
       <div class="mt_content">
-        <p v-html="`${data.detail.descriptor.content}`.replaceAll('　　', '')"></p>
+        <p v-html="`${data.detail.content}`.replaceAll('　　', '')"></p>
       </div>
     </div>
     <!-- pc端title-->
@@ -34,32 +34,33 @@
             <el-icon>
               <Promotion/>
             </el-icon>
-            {{ data.detail.descriptor.cName }}
+            {{ data.detail.cName }}
           </a>
         </li>
-        <li v-if="data.detail.descriptor.classTag">
-          {{ `${data.detail.descriptor.classTag}`.replaceAll(",", "&emsp;") }}
+        <li v-if="data.detail.classTag">
+          {{ `${data.detail.classTag}`.replaceAll(",", "&emsp;") }}
         </li>
-        <li>{{ data.detail.descriptor.year }}</li>
-        <li>{{ data.detail.descriptor.area }}</li>
+        <li>{{ data.detail.year }}</li>
+        <li>{{ data.detail.area }}</li>
       </ul>
-      <p><span>导演:</span> {{ data.detail.descriptor.director }}</p>
-      <p><span>主演:</span> {{ data.detail.descriptor.actor }}</p>
-      <p><span>上映:</span> {{ data.detail.descriptor.releaseDate }}</p>
-      <p v-if="data.detail.descriptor.remarks"><span>连载:</span>{{ data.detail.descriptor.remarks }}</p>
-      <p><span>评分:</span><b id="score">{{ data.detail.descriptor.dbScore }}</b></p>
+      <p><span>导演:</span> {{ data.detail.director }}</p>
+      <p><span>主演:</span> {{ data.detail.actor }}</p>
+      <p><span>上映:</span> {{ data.detail.releaseDate }}</p>
+      <p v-if="data.detail.remarks"><span>连载:</span>{{ data.detail.remarks }}</p>
+      <p><span>评分:</span><b id="score">{{ data.detail.dbScore }}</b></p>
       <div class="cus_wap">
         <p style="min-width: 40px"><span>剧情:</span></p>
         <p ref="textContent" class="text_content">
-          <el-button v-if="`${data.detail.descriptor.content}`.length > 140" class="multi_text"
+          <el-button v-if="`${data.detail.content}`.length > 140" class="multi_text"
                      style="color:#a574b7;"
                      @click="showContent(multiBtn.state)" link>{{ multiBtn.text }}
           </el-button>
-          <span class="cus_info" v-html="data.detail.descriptor.content"></span>
+          <span class="cus_info" v-html="data.detail.content"></span>
         </p>
       </div>
       <p>
-        <el-button type="warning" class="player" size="large" @click="play({episode:0,source:data.detail.list[0].id})" round>
+        <el-button type="warning" class="player" size="large" @click="play({episode:0,source:data.detail.list[0].id})"
+                   round>
           <el-icon>
             <CaretRight/>
           </el-icon>
@@ -69,12 +70,12 @@
     </div>
     <!--播放列表-->
     <div class="play-module">
-      <div class="play-module-item" >
+      <div class="play-module-item">
         <div class="module-heading">
           <p class=" play-module-title">播放列表</p>
           <div class="play-tab-group">
-            <a  href="javascript:;"  :class="`play-tab-item ${data.currentTabId == item.id ? 'tab-active':''}`"
-                v-for="item in data.detail.list" @click="changeTab(item.id)" >{{ item.name }}</a>
+            <a href="javascript:;" :class="`play-tab-item ${data.currentTabId == item.id ? 'tab-active':''}`"
+               v-for="item in data.detail.list" @click="changeTab(item.id)">{{ item.name }}</a>
           </div>
         </div>
         <div class="play-list">
@@ -100,6 +101,7 @@ import {ApiGet} from "../../utils/request";
 import {ElMessage} from 'element-plus'
 import {Promotion, CaretRight} from "@element-plus/icons-vue";
 import RelateList from "../../components/index/RelateList.vue";
+
 // 获取路由对象
 const router = useRouter()
 const data = reactive({
@@ -113,29 +115,27 @@ const data = reactive({
     DownFrom: '',
     playList: [[]],
     downloadList: '',
-    descriptor: {
-      subTitle: '',
-      cName: '',
-      enName: '',
-      initial: '',
-      classTag: '',
-      actor: '',
-      director: '',
-      writer: '',
-      blurb: '',
-      remarks: '',
-      releaseDate: '',
-      area: '',
-      language: '',
-      year: '',
-      state: '',
-      updateTime: '',
-      addTime: '',
-      dbId: '',
-      dbScore: '',
-      hits: '',
-      content: '',
-    },
+    subTitle: '',
+    cName: '',
+    enName: '',
+    initial: '',
+    classTag: '',
+    actor: '',
+    director: '',
+    writer: '',
+    blurb: '',
+    remarks: '',
+    releaseDate: '',
+    area: '',
+    language: '',
+    year: '',
+    state: '',
+    updateTime: '',
+    addTime: '',
+    dbId: '',
+    dbScore: '',
+    hits: '',
+    content: '',
     list: []
   },
   relate: [],
@@ -155,9 +155,8 @@ const handleLongText = (t: string): string => {
 }
 
 
-
 // 播放源切换
-const changeTab = (id:string)=>{
+const changeTab = (id: string) => {
   data.currentTabId = id
 }
 
@@ -187,11 +186,11 @@ onBeforeMount(() => {
       data.detail = resp.data.detail
       // 去除影视简介中的无用内容和特殊标签格式等
       data.detail.name = data.detail.name.replace(/(～.*～)/g, '')
-      data.detail.descriptor.content = data.detail.descriptor.content.replace(/(&.*;)|( )|(　　)|(\n)|(<[^>]+>)/g, '')
+      data.detail.content = data.detail.content.replace(/(&.*;)|( )|(　　)|(\n)|(<[^>]+>)/g, '')
       data.relate = resp.data.relate
       // 处理过长数据
-      data.detail.descriptor.actor = handleLongText(data.detail.descriptor.actor)
-      data.detail.descriptor.director = handleLongText(data.detail.descriptor.director)
+      data.detail.actor = handleLongText(data.detail.actor)
+      data.detail.director = handleLongText(data.detail.director)
       data.currentTabId = resp.data.detail.list[0].id
       data.loading = true
     } else {
@@ -207,7 +206,6 @@ onBeforeMount(() => {
 </script>
 
 
-
 <!--移动端适配-->
 <style scoped>
 @media (max-width: 768px) {
@@ -284,6 +282,7 @@ onBeforeMount(() => {
   width: 100%;
   padding: 0 1%;
 }
+
 /*影片播放列表信息展示*/
 
 /*顶部影片信息显示区域*/
diff --git a/client/src/views/index/Play.vue b/client/src/views/index/Play.vue
index 128d233..062f394 100644
--- a/client/src/views/index/Play.vue
+++ b/client/src/views/index/Play.vue
@@ -15,18 +15,18 @@
     <div class="current_play_info">
       <div class="play_info_left">
         <h3 class="current_play_title"><a
-            :href="`/filmDetail?link=${data.detail.id}`">{{ data.detail.name }}</a>{{ data.current.episode }}</h3>
+            :href="`/filmDetail?link=${data.detail.mid}`">{{ data.detail.name }}</a>{{ data.current.episode }}</h3>
         <div class="tags">
           <a :href="`/filmClassifySearch?Pid=${data.detail.pid}&Category=${data.detail.cid}`">
             <el-icon>
               <Promotion/>
             </el-icon>
-            {{ data.detail.descriptor.cName }}</a>
+            {{ data.detail.cName }}</a>
           <span>{{
-              data.detail.descriptor.classTag ? data.detail.descriptor.classTag.replaceAll(',', '/') : '未知'
+              data.detail.classTag ? data.detail.classTag.replaceAll(',', '/') : '未知'
             }}</span>
-          <span class="hidden-sm-and-down">{{ data.detail.descriptor.year }}</span>
-          <span class="hidden-sm-and-down">{{ data.detail.descriptor.area }}</span>
+          <span class="hidden-sm-and-down">{{ data.detail.year }}</span>
+          <span class="hidden-sm-and-down">{{ data.detail.area }}</span>
         </div>
       </div>
       <div class="play_info_right">
@@ -103,6 +103,7 @@ const data = reactive({
   loading: false,
   detail: {
     id: '',
+    mid: '',
     cid: '',
     pid: '',
     name: '',
@@ -111,29 +112,27 @@ const data = reactive({
     DownFrom: '',
     playList: [[]],
     downloadList: '',
-    descriptor: {
-      subTitle: '',
-      cName: '',
-      enName: '',
-      initial: '',
-      classTag: '',
-      actor: '',
-      director: '',
-      writer: '',
-      blurb: '',
-      remarks: '',
-      releaseDate: '',
-      area: '',
-      language: '',
-      year: '',
-      state: '',
-      updateTime: '',
-      addTime: '',
-      dbId: '',
-      dbScore: '',
-      hits: '',
-      content: '',
-    },
+    subTitle: '',
+    cName: '',
+    enName: '',
+    initial: '',
+    classTag: '',
+    actor: '',
+    director: '',
+    writer: '',
+    blurb: '',
+    remarks: '',
+    releaseDate: '',
+    area: '',
+    language: '',
+    year: '',
+    state: '',
+    updateTime: '',
+    addTime: '',
+    dbId: '',
+    dbScore: '',
+    hits: '',
+    content: '',
     list: [],
   },
   current: {index: 0, episode: '', link: ''},
@@ -258,25 +257,25 @@ const saveFilmHisroy = () => {
     // 处理播放历史要记录的影片相关信息
     let player = document.getElementsByTagName("video")[0]
     let history = cookieUtil.getCookie(COOKIE_KEY_MAP.FILM_HISTORY) ? JSON.parse(cookieUtil.getCookie(COOKIE_KEY_MAP.FILM_HISTORY)) : {}
-    let link = `/play?id=${data.detail.id}&source=${data.currentTabId}&episode=${data.current.index}&currentTime=${player.currentTime}`
+    let link = `/play?id=${data.detail.mid}&source=${data.currentTabId}&episode=${data.current.index}&currentTime=${player.currentTime}`
     // 处理播放时长
     let timeStamp = new Date().getTime()
     let time = fmt.dateFormat(timeStamp)
     let progress = `${fmt.secondToTime(player.currentTime)} / ${fmt.secondToTime(player.duration)}`
-    history[data.detail.id] = {
-          id: data.detail.id,
-          name: data.detail.name,
-          picture: data.detail.picture,
-          episode: data.current.episode,
-          time: time,
-          timeStamp: timeStamp,
-          source: data.currentTabId,
-          link: link,
-          currentTime: player.currentTime,
-          duration: player.duration,
-          progress: progress,
-          devices: global.isMobile
-        }
+    history[data.detail.mid] = {
+      id: data.detail.mid,
+      name: data.detail.name,
+      picture: data.detail.picture,
+      episode: data.current.episode,
+      time: time,
+      timeStamp: timeStamp,
+      source: data.currentTabId,
+      link: link,
+      currentTime: player.currentTime,
+      duration: player.duration,
+      progress: progress,
+      devices: global.isMobile
+    }
     // 将历史记录添加到cookie中
     cookieUtil.setCookie(COOKIE_KEY_MAP.FILM_HISTORY, JSON.stringify(history))
   }
@@ -420,8 +419,8 @@ onBeforeMount(() => {
 
   .tags a {
     padding: 5px 10px;
-/*    background-color: rgba(155, 73, 231, 0.72);*/
-    background: linear-gradient( #9B49E7B8, #9B49E799);
+    /*    background-color: rgba(155, 73, 231, 0.72);*/
+    background: linear-gradient(#9B49E7B8, #9B49E799);
     color: #c4c2c2;
     font-size: 13px;
     border-radius: 6px;
@@ -513,7 +512,7 @@ onBeforeMount(() => {
   .tags a {
     padding: 5px 10px;
     color: #c4c2c2;
-    background: linear-gradient( #9B49E7B8, #9B49E799);
+    background: linear-gradient(#9B49E7B8, #9B49E799);
     font-size: 13px;
     border-radius: 6px;
     margin-right: 3px;
diff --git a/client/src/views/manage/film/Film.vue b/client/src/views/manage/film/Film.vue
index 1f39162..13ef3e6 100644
--- a/client/src/views/manage/film/Film.vue
+++ b/client/src/views/manage/film/Film.vue
@@ -65,7 +65,7 @@
         <!--<el-table-column prop="subTitle" align="center" label="影片别名" />-->
         <el-table-column prop="cName" align="center" label="所属分类">
           <template #default="scope">
-            <el-tag type="warning" disable-transitions>{{ scope.row.cName }}</el-tag>
+            <el-tag type="warning" disable-transitions>{{ scope.row.cName?scope.row.cName:'暂无' }}</el-tag>
           </template>
         </el-table-column>
         <!--<el-table-column prop="classTag" align="left" label="剧情标签" >-->
diff --git a/client/src/vite-env.d.ts b/client/src/vite-env.d.ts
index 11f02fe..65189f9 100644
--- a/client/src/vite-env.d.ts
+++ b/client/src/vite-env.d.ts
@@ -1 +1,6 @@
 /// <reference types="vite/client" />
+declare module '*.vue' {
+    import type { DefineComponent } from 'vue'
+    const component: DefineComponent<{}, {}, any>
+    export default component
+}
\ No newline at end of file
diff --git a/client/tsconfig.json b/client/tsconfig.json
index 280fa00..33e425c 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -12,6 +12,10 @@
     "lib": ["ESNext", "DOM"],
     "skipLibCheck": true,
     "noEmit": true,
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["src/*"]
+    }
   },
   "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"],
   "references": [{ "path": "./tsconfig.node.json" }]
diff --git a/client/vite.config.ts b/client/vite.config.ts
index 2dc16de..f9c3050 100644
--- a/client/vite.config.ts
+++ b/client/vite.config.ts
@@ -4,7 +4,6 @@ import AutoImport from 'unplugin-auto-import/vite'
 import Components from 'unplugin-vue-components/vite'
 import {ElementPlusResolver} from "unplugin-vue-components/resolvers";
 
-
 export default defineConfig({
     // 本地测试环境
     server: {
@@ -43,13 +42,13 @@ export default defineConfig({
         }),
     ],
     css: {devSourcemap: true},
-    build: {
-        terserOptions: {
-            compress: {
-                drop_console:true,
-                drop_debugger: true,
-            }
+    esbuild: {
+        // 生产环境移除 console 和 debugger
+        drop: ['console', 'debugger'],
+    },
+    resolve: {
+        alias: {
         }
-    }
+    },
 
 })
diff --git a/server/config/DataConfig.go b/server/config/DataConfig.go
index 8eb18be..41df19b 100644
--- a/server/config/DataConfig.go
+++ b/server/config/DataConfig.go
@@ -15,6 +15,12 @@ const (
 	// MAXGoroutine max goroutine, 执行spider中对协程的数量限制
 	MAXGoroutine = 10
 
+	// FilmSaveCacheThreshold 采集数据保存时直接保存 or 缓存到 redis ( h < 168, 缓存到redis)
+	FilmSaveCacheThreshold = 168
+
+	// FilmScanSize 同步影片数据时每次扫描的数据量
+	FilmScanSize = 50
+
 	FilmPictureUploadDir = "./static/upload/gallery"
 	FilmPictureUrlPath   = "/upload/pic/poster/"
 	FilmPictureAccess    = "/api/upload/pic/poster/"
@@ -29,12 +35,14 @@ const (
 	MovieListInfoKey = "MovieList:Cid%d"
 
 	// MovieDetailKey movie detail影视详情信息 可以
-	MovieDetailKey = "MovieDetail:Cid%d:Id%d"
+	MovieDetailKey = "MovieDetail:Master"
 	// MovieBasicInfoKey 影片基本信息, 简略版本
 	MovieBasicInfoKey = "MovieBasicInfo:Cid%d:Id%d"
 
-	// MultipleSiteDetail 多站点影片信息存储key
-	MultipleSiteDetail = "MultipleSource:%s"
+	// MultipleSiteDetailKey 多站点影片信息存储key
+	MultipleSiteDetailKey = "MovieDetail:Slave:%s"
+
+	MovieDetailTemp = "Temp:MovieDetail:%s"
 
 	// SearchInfoTemp redis暂存检索数据信息
 	SearchInfoTemp = "Search:SearchInfoTemp"
@@ -45,7 +53,7 @@ const (
 	SearchTag = "Search:Pid%d:%s"
 
 	// VirtualPictureKey 待同步图片临时存储 key
-	VirtualPictureKey = "VirtualPicture"
+	VirtualPictureKey = "Temp:VirtualPicture"
 	// MaxScanCount redis Scan 操作每次扫描的数据量, 每次最多扫描300条数据
 	MaxScanCount = 300
 )
diff --git a/server/config/SecurityConfig.go b/server/config/SecurityConfig.go
index 68e7075..2b26cb8 100644
--- a/server/config/SecurityConfig.go
+++ b/server/config/SecurityConfig.go
@@ -1,20 +1,44 @@
 package config
 
-const PrivateKey = `-----BEGIN RSA PRIVATE KEY-----
-MIIBPAIBAAJBANNnshoUaT2gFNrihmFdmC1cBCs1XLFc5Fn3MfNOR3aOGDO0ohXl
-bku6Ir/qITN/yeH5pY34WEcETet3YhESpE8CAwEAAQJBAI7Ekdfg/u26RTtJDd2F
-WrcPVFVl1TKGfERxl08sB0D9HLvUSBfAEg/UpfWSQ57aSJ9b0gVKmDhgF8FymuUV
-v2kCIQDzXXSZ/oeKmqObwad0Fa82IFof3LeZdpbrjyz3w45JDQIhAN5hdmuW+y2w
-UgSy0o4zGFsEG/RBZsvVnSSfkdR47dPLAiEA2XbPNLQu5fnc7NeVDLQ7xsAOCJ6w
-KR/BKGjeI9/JCxkCIQCjMkU0ec2FXxMhzZXFs2uZR6+4FdL5nZ9ABDaCBekK9wIg
-XEfd11qabi9jPrbsOVNZCTk51B7Ug0ZwGyn0BA8Jlo0=
------END RSA PRIVATE KEY-----
+const PrivateKey = `-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCWE8ZtWREHrTpd
+WRu0X2pcDWsW6C2bB268+2vFWNhmLd9P3DOeCYyNDk2HfyZHDzUovhuxsePA+R77
+y+Vl5UvZivci6mS4gqQCSof158j76z3rkChTawlBAs3cKU6GuWCeHq02Z4ajXXQn
+3ekNATVj/grnAC+RaDguHu2ZSXnt4kQvtX7IErnCWmwDw6BXLN2EVMN/+QZBk34y
+woc0OqM/aXr1e4NZJ6hUj8ji+s1ViqGisWM3KRSPX6Z1g3tLvjjwpQ9+BQ2jztvF
+QC25Ysjf/AuITlnjEizW/fTepxXxzjj8GTCnTtonn+dqz4WUoh8lhhf2lvRURIiq
+quv4HcVDAgMBAAECggEANERp2H5rBHHrwEP+9pg+ehXARKeS7omtowqrM31oTFnQ
+isclgPZRaXTgQn7hbWEaAfkHuyC5seTxSf9ugsjTXE3eGV5puqrhBN1BMb7KTBZX
+J9m6eabu/6HC4VjPfPNF93u2lpqClRXAlPvfpQRVPGBnGqGBb5JM8p8Z38drvBGH
+ZehjrkDpcnTESCVqm2wywXXiwwdR7kyl1EZO9lNUwxGutP4IY1owaSfB/yXv9XPW
+q0aQBiDdwMV/Csez8eUKjr1sYEpoIb1WnTigL03Wvaml5MMA5Lrq7E2ejvFamXeq
+GBenoJlJri+4rpLWZUz2QyaMfNitF0aHxeHnLSFzVQKBgQDFpLaHA73UuvStU3lp
+/Ug8kAycoSUjMorY7CHN2qiqqVE5fgEI4tPIa+9/+iMR7ENBT92+TdwBFnm5C+Jp
+zb1fWIkmNcvgCCOB3voVTsBaFVlX1x4uDu0XREQ37tJW/WlcASh9xdjS8VMenc2x
+5L2RC5BZHBHcYsCbEUBO82N6zQKBgQDCY6zMXWxyLxgZbVyXr4BjoP13rVvH2lnr
+yUgb9akE25WO2BRNQeFzlJ3Cbjf+Co5jnTnAXyHW8vcC8EwSIWMgER5tjkrQ829d
+KxZFdfqvfbqDTTiQjTBX60UZPnTQmXZ4vtM/pm0uY9Os4A6s2Z4zsBU14+8Uemwc
+QNdyg9ZgTwKBgAy6wBrQDeDuraWgM7i03HsyF+3anya2MaUpCEBW7fgX8ahPSkfF
+PDizYviOJsYXvnktaK3CHAJh7TMS5eFEpAbJEARLALeMLqVFtDu9F7x1lYyHyWTU
+B0cxWWd01U1PAwMu++ml3YIwktbs+PuVLPRzlzd2DFxya89Q/CBZorWdAoGATrYf
+nSzjIaUyI/GlgYI+AZmJqPEYbedba984BKJHi0EC4TFbnyDjEnMGIlmQ8JwDphBe
+9ydOQ4RkQttcYicExVJJOOFaKBu6Z0ZwITYxiOfnIw2cruOMxLzuYNdqY6EQWLok
+Pey83wDrEGA1cQY5SgKtxAGEqI0dw5753lPF9X8CgYEAgrOVmtQz9AvT5fHjehmt
+yHtEh62NMU6IolwGXOMbhaJNFawKwPuSD5o9pyHiGJewuVVc+xxdaxyJyYp1jbAg
+ip9NFXC9bHAanEhguWcjuCo7UzOgAJAWZLtpi1ehtfydj2aoGEpg3G+oA/A9M2sj
+pbOGmHayWJekUoZktxIYVxo=
+-----END PRIVATE KEY-----
 `
 
-const PublicKey = `-----BEGIN RSA PUBLIC KEY-----
-MEgCQQDTZ7IaFGk9oBTa4oZhXZgtXAQrNVyxXORZ9zHzTkd2jhgztKIV5W5LuiK/
-6iEzf8nh+aWN+FhHBE3rd2IREqRPAgMBAAE=
------END RSA PUBLIC KEY-----
+const PublicKey = `-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlhPGbVkRB606XVkbtF9q
+XA1rFugtmwduvPtrxVjYZi3fT9wzngmMjQ5Nh38mRw81KL4bsbHjwPke+8vlZeVL
+2Yr3IupkuIKkAkqH9efI++s965AoU2sJQQLN3ClOhrlgnh6tNmeGo110J93pDQE1
+Y/4K5wAvkWg4Lh7tmUl57eJEL7V+yBK5wlpsA8OgVyzdhFTDf/kGQZN+MsKHNDqj
+P2l69XuDWSeoVI/I4vrNVYqhorFjNykUj1+mdYN7S7448KUPfgUNo87bxUAtuWLI
+3/wLiE5Z4xIs1v303qcV8c44/Bkwp07aJ5/nas+FlKIfJYYX9pb0VESIqqrr+B3F
+QwIDAQAB
+-----END PUBLIC KEY-----
 `
 
 const (
diff --git a/server/controller/IndexController.go b/server/controller/IndexController.go
index 288342c..1c1d8f7 100644
--- a/server/controller/IndexController.go
+++ b/server/controller/IndexController.go
@@ -66,7 +66,6 @@ func FilmPlayInfo(c *gin.Context) {
 	// 如果 playFrom 为空, 则设置默认播放源和默认影片数据
 	if len(playFrom) <= 1 && len(detail.List) > 0 {
 		playFrom = detail.List[0].Id
-
 	}
 	// 获取当前影片播放信息
 	var currentPlay system.PlayItem
diff --git a/server/logic/IndexLogic.go b/server/logic/IndexLogic.go
index 24f61c6..f9e671f 100644
--- a/server/logic/IndexLogic.go
+++ b/server/logic/IndexLogic.go
@@ -199,7 +199,7 @@ func multipleSource(detail *system.MovieDetail) []system.PlayLinkVo {
 	// 通过 name 以及 subTitle  生成 hash id  和 dbID 匹配次级站点播放信息
 	// 使用map 防止清洗后的id重复
 	idMap := make(map[string]int)
-	idMap[system.GenerateHashKey(detail.Mid)] = 0
+	idMap[system.GenerateHashKey(detail.Name)] = 0
 	// 将subTitle进行切割
 	if len(detail.SubTitle) > 0 {
 		for _, s := range strings.Split(util.FormatSpecialChar(detail.SubTitle), ",") {
@@ -218,7 +218,7 @@ func multipleSource(detail *system.MovieDetail) []system.PlayLinkVo {
 	}
 	// 获取满足条件的次级站点播放数据
 	for _, s := range system.GetMultiplePlay(ids, detail.DbId) {
-		l = append(l, system.PlayLinkVo{Id: s.Mid, Name: sMap[s.Mid].Name, LinkList: s.PlayList[0]})
+		l = append(l, system.PlayLinkVo{Id: s.Sid, Name: sMap[s.Sid].Name, LinkList: s.PlayList[0]})
 	}
 	return l
 }
diff --git a/server/logic/SpiderLogic.go b/server/logic/SpiderLogic.go
index c6184bf..ab77783 100644
--- a/server/logic/SpiderLogic.go
+++ b/server/logic/SpiderLogic.go
@@ -25,7 +25,7 @@ func (sl *SpiderLogic) StartCollect(id string, h int) error {
 	}
 	// 存在则开启协程执行采集方法
 	go func() {
-		err := spider.HandleCollect(id, h)
+		err := spider.HandleCollectRefine(id, h)
 		if err != nil {
 			log.Printf("资源站[%s]采集任务执行失败: %s", id, err)
 		}
diff --git a/server/model/system/Categories.go b/server/model/system/Categories.go
index 5dadc08..9370584 100644
--- a/server/model/system/Categories.go
+++ b/server/model/system/Categories.go
@@ -57,3 +57,24 @@ func GetChildrenTree(id int64) []*CategoryTree {
 	return nil
 
 }
+
+// GetRevealCategoryList 获取show=true的二级分类信息
+func GetRevealCategoryList() []*CategoryTree {
+	// 初始化分类信息切片
+	var cl []*CategoryTree
+	var tree CategoryTree
+	// 从redis获取分类信息树
+	data := db.Rdb.Get(db.Cxt, config.CategoryTreeKey).Val()
+	_ = json.Unmarshal([]byte(data), &tree)
+	// 迭代分类树信息, 将show=true的二级分类信息添加到cl切片中
+	for _, t := range tree.Children {
+		if t.Show {
+			for _, c := range t.Children {
+				if c.Show {
+					cl = append(cl, c)
+				}
+			}
+		}
+	}
+	return cl
+}
diff --git a/server/model/system/Jwt.go b/server/model/system/Jwt.go
index a3895bc..2fd9531 100644
--- a/server/model/system/Jwt.go
+++ b/server/model/system/Jwt.go
@@ -3,12 +3,13 @@ package system
 import (
 	"errors"
 	"fmt"
-	"github.com/golang-jwt/jwt/v5"
 	"log"
 	"server/config"
 	"server/plugin/common/util"
 	"server/plugin/db"
 	"time"
+
+	"github.com/golang-jwt/jwt/v5"
 )
 
 type UserClaims struct {
diff --git a/server/model/system/Movies.go b/server/model/system/Movies.go
index 98299ae..d53cf97 100644
--- a/server/model/system/Movies.go
+++ b/server/model/system/Movies.go
@@ -76,7 +76,7 @@ type MovieDetail struct {
 	Actor       string   `json:"actor"`                     //主演
 	Director    string   `json:"director"`                  //导演
 	Writer      string   `json:"writer"`                    //作者
-	Blurb       string   `json:"blurb"`                     //简介, 残缺,不建议使用
+	Blurb       string   `json:"blurb" gorm:"type:text"`    //简介, 残缺,不建议使用
 	Remarks     string   `json:"remarks"`                   // 更新情况
 	ReleaseDate string   `json:"releaseDate"`               //上映时间
 	Area        string   `json:"area"`                      // 地区
@@ -88,7 +88,7 @@ type MovieDetail struct {
 	DbId        int64    `json:"dbId"`                      //豆瓣id
 	DbScore     string   `json:"dbScore"`                   // 豆瓣评分
 	Hits        int64    `json:"hits"`                      //影片热度
-	Content     string   `json:"content"`                   //内容简介
+	Content     string   `json:"content" gorm:"type:text"`  //内容简介
 	PlayFrom    FromList `json:"playFrom" gorm:"type:json"` // 播放来源
 	DownFrom    string   `json:"DownFrom"`                  //下载来源 例: http
 	//PlaySeparator   string              `json:"playSeparator"` // 播放信息分隔符
@@ -115,6 +115,8 @@ func (m *SlaveMovieInfo) TableName() string {
 	return config.SlaveMovieInfo
 }
 
+// ================================= 数据表处理 =================================
+
 // CreateMovieDetailTable 创建存储检索信息的数据表
 func CreateMovieDetailTable() {
 	// 如果不存在则创建表 并设置自增ID初始值为10000
@@ -131,6 +133,15 @@ func ExistMovieDetailTable() bool {
 	return db.Mdb.Migrator().HasTable(&MovieDetail{})
 }
 
+// ResetMovieDetailTable 重置 MovieDetailTable
+func ResetMovieDetailTable() {
+	var m MovieDetail
+	err := db.Mdb.Exec(fmt.Sprintf("TRUNCATE TABLE %s", m.TableName())).Error
+	if err != nil {
+		log.Println("MovieDetailTable Reset Error: ", err)
+	}
+}
+
 // CreateSlaveMovieInfoTable 创建存储检索信息的数据表
 func CreateSlaveMovieInfoTable() {
 	// 如果不存在则创建表 并设置自增ID初始值为10000
@@ -147,6 +158,39 @@ func ExistSlaveMovieInfoTable() bool {
 	return db.Mdb.Migrator().HasTable(&SlaveMovieInfo{})
 }
 
+// ResetSlaveMovieInfoTable 重置 SlaveMovieInfoTable (附属站点数据表一般不会单独重置)
+func ResetSlaveMovieInfoTable() {
+	var s SlaveMovieInfo
+	err := db.Mdb.Exec(fmt.Sprintf("TRUNCATE TABLE %s", s.TableName())).Error
+	if err != nil {
+		log.Println("SlaveMovieInfoTable Reset Error: ", err)
+	}
+}
+
+// DelSlaveMovieInfos 删除表中对应站点的数据信息
+func DelSlaveMovieInfos(id string) {
+	// 一次删除过多数据会锁表, 因此直接截断表
+
+	//if err := db.Mdb.Where("sid = ?", id).Delete(&SlaveMovieInfo{}).Error; err != nil {
+	//	log.Println("Delete SlaveMovieInfos  Error: ", err)
+	//}
+}
+
+func AddMovieDetailIndex() {
+	var m MovieDetail
+	tableName := m.TableName()
+	// 添加索引
+	db.Mdb.Exec(fmt.Sprintf("CREATE UNIQUE INDEX idx_mid ON %s (mid)", tableName))
+}
+
+func AddSlaveMovieInfoIndex() {
+	var s SlaveMovieInfo
+	tableName := s.TableName()
+	// 添加索引
+	db.Mdb.Exec(fmt.Sprintf("CREATE UNIQUE INDEX idx_mid ON %s (mid)", tableName))
+	db.Mdb.Exec(fmt.Sprintf("CREATE INDEX idx_dbId ON %s (db_id)", tableName))
+}
+
 // =================================== column序列化 接口========================================================
 
 func (m *MoviePlayList) Scan(value interface{}) error {
@@ -234,6 +278,33 @@ func SaveDetail(m MovieDetail) (err error) {
 
 }
 
+// BatchUpdateDetails 保存或更新detail数据
+func BatchUpdateDetails(ml []MovieDetail) (err error) {
+	// 先将details批量保存或更新
+	for _, m := range ml {
+		if !ExistMovieDetailByMid(m.Mid) {
+			// 执行插入操作
+			if err := db.Mdb.Create(&m).Error; err != nil {
+				return err
+			}
+		} else {
+			// 只对会变化的字段进行更新
+			err := db.Mdb.Model(&MovieDetail{}).Where("mid", m.Mid).Updates(MovieDetail{PlayList: m.PlayList, DownloadList: m.DownloadList,
+				Remarks: m.Remarks, State: m.State, UpdateTime: m.UpdateTime, AddTime: m.AddTime, DbScore: m.DbScore, Hits: m.Hits}).Error
+			if err != nil {
+				return err
+			}
+		}
+		// 转化处理searchInfo信息s
+		s := ConvertSearchInfo(m)
+		// 保存searchInfo信息
+		if err := SaveSearchInfo(s); err != nil {
+			return err
+		}
+	}
+	return err
+}
+
 // ExistMovieDetailByMid 通过mid判断是否存在对应信息
 func ExistMovieDetailByMid(mid int64) bool {
 	var count int64
@@ -241,8 +312,40 @@ func ExistMovieDetailByMid(mid int64) bool {
 	return count > 0
 }
 
-// SaveSitePlayList 仅保存播放url列表信息到当前站点
-func SaveSitePlayList(id string, ml []MovieDetail) (err error) {
+// SaveAllSitePlayList 保存附属站点影片信息 (仅在全量采集时使调用)
+func SaveAllSitePlayList(id string, ml []MovieDetail) (err error) {
+	// 如果ml 为空则直接返回
+	if len(ml) <= 0 {
+		return nil
+	}
+	var sl []SlaveMovieInfo
+	for _, m := range ml {
+		// 只执行保存操作, 不考虑更新情况
+		s := SlaveMovieInfo{Sid: id, Mid: GenerateHashKey(m.Name), DbId: m.DbId, PlayList: m.PlayList}
+		sl = append(sl, s)
+	}
+	// 将处理后的结果存储到 SalveMovieInfo表中
+	if len(sl) > 0 {
+		if err = db.Mdb.Create(&sl).Error; err != nil {
+			log.Println("附属站点影片信息保存失败: ", err)
+		}
+	}
+	return
+}
+
+// SaveSitePlayList 保存附属站点影片信息
+func SaveSitePlayList(sl []SlaveMovieInfo) (err error) {
+	if len(sl) <= 0 {
+		return nil
+	}
+	if err = db.Mdb.Create(&sl).Error; err != nil {
+		log.Println("附属站点影片信息保存失败: ", err)
+	}
+	return err
+}
+
+// UpdateSitePlayList 仅保存播放url列表信息到当前站点
+func UpdateSitePlayList(id string, ml []MovieDetail) (err error) {
 	// 如果ml 为空则直接返回
 	if len(ml) <= 0 {
 		return nil
@@ -250,8 +353,8 @@ func SaveSitePlayList(id string, ml []MovieDetail) (err error) {
 	var sl []SlaveMovieInfo
 	for _, m := range ml {
 		s := SlaveMovieInfo{Sid: id, Mid: GenerateHashKey(m.Name), DbId: m.DbId, PlayList: m.PlayList}
-		// 查询表中是否已经存在对应的数据记录, 如果有则更新, 无则追加到切片中统一处理
-		if id := ExistSlaveMovieInfo(s); id <= 0 {
+		// 查询表中是否已经存在对应的数据记录, 如果有则更新, 无则追加到切片中统一处理, id =-1 表示不存在对应数据
+		if id := ExistSlaveMovieInfo(s); id > 0 {
 			if err = db.Mdb.Model(&s).Where("id", id).Updates(s).Error; err != nil {
 				log.Println("附属站点影片信息更新失败: ", err)
 			}
@@ -260,8 +363,10 @@ func SaveSitePlayList(id string, ml []MovieDetail) (err error) {
 		sl = append(sl, s)
 	}
 	// 将处理后的结果存储到 SalveMovieInfo表中
-	if err = db.Mdb.Create(&sl).Error; err != nil {
-		log.Println("附属站点影片信息保存失败: ", err)
+	if len(sl) > 0 {
+		if err = db.Mdb.Create(&sl).Error; err != nil {
+			log.Println("附属站点影片信息保存失败: ", err)
+		}
 	}
 	return
 }
@@ -281,6 +386,108 @@ func ExistSlaveMovieInfo(s SlaveMovieInfo) int64 {
 	return id
 }
 
+// =================================== Spider数据处理--Redis转存 ========================================================
+
+// MovieDetailCache 主站点数据采集先缓存到redis
+func MovieDetailCache(ml []MovieDetail) error {
+	// 以mid为key将数据存储到redis的hash中
+	var data = make(map[string]string)
+	for _, m := range ml {
+		r, _ := json.Marshal(m)
+		data[fmt.Sprint(m.Mid)] = string(r)
+	}
+	return db.Rdb.HSet(db.Cxt, config.MovieDetailKey, data).Err()
+}
+
+// SlaveDetailCache 附属站点影片信息缓存
+func SlaveDetailCache(id string, ml []MovieDetail) error {
+	// 以mid为key将数据存储到redis的hash中
+	var data = make(map[string]string)
+	for _, m := range ml {
+		// 只执行保存操作, 不考虑更新情况
+		s := SlaveMovieInfo{Sid: id, Mid: GenerateHashKey(m.Name), DbId: m.DbId, PlayList: m.PlayList}
+		r, _ := json.Marshal(s)
+		data[s.Mid] = string(r)
+	}
+	// 使用 Sid:Mid为key, 用以区分不同站点数据
+	return db.Rdb.HSet(db.Cxt, fmt.Sprintf(config.MultipleSiteDetailKey, id), data).Err()
+}
+
+// SyncMovieDetail 同步redis中的影片数据到mysql中
+func SyncMovieDetail(sid string, grade SourceGrade) {
+	// 初始化游标
+	var cursor uint64 = 0
+	// 根据采集站的类型 Master | Slave 进行不同的处理逻辑
+	switch grade {
+	case MasterCollect:
+		// 循环扫描detail信息, 存储完成后进行删除
+		for {
+			vs, nextCursor, err := db.Rdb.HScan(db.Cxt, config.MovieDetailKey, cursor, "", config.FilmScanSize).Result()
+			if err != nil {
+				log.Println("ScanMovieDetail Failed: ", err)
+			}
+			if len(vs) > 0 {
+				var ks []string
+				var ml []MovieDetail
+				for i := 0; i < len(vs); i += 2 {
+					ks = append(ks, vs[i])
+					var m MovieDetail
+					_ = json.Unmarshal([]byte(vs[i+1]), &m)
+					ml = append(ml, m)
+				}
+				// 批量保存movieDetail
+				if err := SaveDetails(ml); err != nil {
+					log.Println("SyncMovieDetail Failed: ", err)
+				}
+				// 删除已提取的元素
+				if err := db.Rdb.HDel(db.Cxt, config.MovieDetailKey, ks...).Err(); err != nil {
+					log.Println("DeleteMovieDetailCache Failed: ", err)
+				}
+			}
+			// 更新游标
+			cursor = nextCursor
+			// 如果游标归零则结束循环同步
+			if cursor <= 0 {
+				break
+			}
+		}
+	case SlaveCollect:
+		// 循环扫描detail信息, 存储完成后进行删除
+		for {
+			vs, nextCursor, err := db.Rdb.HScan(db.Cxt, fmt.Sprintf(config.MultipleSiteDetailKey, sid), cursor, "", config.FilmScanSize).Result()
+			if err != nil {
+				log.Println("ScanSlaveDetail Failed: ", err)
+			}
+			if len(vs) > 0 {
+				var ks []string
+				var sl []SlaveMovieInfo
+				for i := 0; i < len(vs); i += 2 {
+					ks = append(ks, vs[i])
+					var s SlaveMovieInfo
+					_ = json.Unmarshal([]byte(vs[i+1]), &s)
+					sl = append(sl, s)
+				}
+				// 批量保存movieDetail
+				err := SaveSitePlayList(sl)
+				if err != nil {
+					log.Println("SyncSlaveDetail Failed: ", err)
+				}
+				// 删除已提取的元素
+				if err := db.Rdb.HDel(db.Cxt, fmt.Sprintf(config.MultipleSiteDetailKey, sid), ks...).Err(); err != nil {
+					log.Println("DeleteSlaveDetailCache Failed: ", err)
+				}
+			}
+			// 更新游标
+			cursor = nextCursor
+			// 如果游标归零则结束循环同步
+			if cursor == 0 {
+				break
+			}
+		}
+	}
+
+}
+
 // ============================ APi接口 ==================================================
 
 // GetDetailByMid 获取影片对应的详情信息
@@ -342,7 +549,7 @@ func GetMovieListByPid(pid int64, page *Page) []MovieBasicInfo {
 	page.PageCount = int((page.Total + page.PageSize - 1) / page.PageSize)
 	// 通过Search表查询
 	var ids []int64
-	if err := db.Mdb.Limit(page.PageSize).Offset((page.Current-1)*page.PageSize).Select("mid").Where("pid", pid).Order("update_stamp DESC").Find(&ids).Error; err != nil {
+	if err := db.Mdb.Model(&SearchInfo{}).Limit(page.PageSize).Offset((page.Current-1)*page.PageSize).Select("mid").Where("pid", pid).Order("update_stamp DESC").Find(&ids).Error; err != nil {
 		log.Println(err)
 		return nil
 	}
@@ -367,7 +574,7 @@ func GetMovieListByCid(cid int64, page *Page) []MovieBasicInfo {
 	return GetBasicInfoByIds(ids)
 }
 
-// GetRelateMovieBasicInfo GetRelateMovie 根据 name, cid, pid, classtag 获取相关影片
+// GetRelateMovieBasicInfo GetRelateMovie 根据 name, cid, pid, classTag 获取相关影片
 func GetRelateMovieBasicInfo(search SearchInfo, page *Page) []MovieBasicInfo {
 	/*
 		根据当前影片信息匹配相关的影片
@@ -385,7 +592,7 @@ func GetRelateMovieBasicInfo(search SearchInfo, page *Page) []MovieBasicInfo {
 	sql = fmt.Sprintf(`select mid from %s where (name LIKE "%%%s%%" or sub_title LIKE "%%%[2]s%%") AND cid=%d AND search.deleted_at IS NULL union`, search.TableName(), name, search.Cid)
 
 	// 添加其他相似匹配规则 同属二级分类
-	sql = fmt.Sprintf(`%s (select * from %s where cid=%d AND `, sql, search.TableName(), search.Cid)
+	sql = fmt.Sprintf(`%s (select mid from %s where cid=%d AND `, sql, search.TableName(), search.Cid)
 	// 根据剧情标签查找相似影片, classTag 使用的分隔符为 , | /首先去除 classTag 中包含的所有空格
 	search.ClassTag = strings.ReplaceAll(search.ClassTag, " ", "")
 	// 如果 classTag 中包含分割符则进行拆分匹配
@@ -416,7 +623,7 @@ func GetMultiplePlay(mIds []string, dbIds int64) []SlaveMovieInfo {
 	// 初始化返回值
 	var l []SlaveMovieInfo
 	// 通过siteId, mIds, dbIds 检索满足条件的数据
-	if err := db.Mdb.Model(&SlaveMovieInfo{}).Select("play_list").Where("mid IN (?) OR db_id = ?", mIds, dbIds).Find(&l).Error; err != nil {
+	if err := db.Mdb.Model(&SlaveMovieInfo{}).Select("sid, play_list").Where("mid IN (?) OR db_id = ?", mIds, dbIds).Find(&l).Error; err != nil {
 		log.Println("GetMultiplePlay Failed: ", err)
 		return nil
 	}
@@ -436,7 +643,7 @@ func ConvertSearchInfo(m MovieDetail) SearchInfo {
 		year = 0
 	}
 	return SearchInfo{
-		Mid:         m.Id,
+		Mid:         m.Mid,
 		Cid:         m.Cid,
 		Pid:         m.Pid,
 		Name:        m.Name,
@@ -483,7 +690,7 @@ func GenerateHashKey[K string | ~int | int64](key K) string {
 		// --- 3. 剧场版标准化 ---
 		"剧场版", "ovo", "映画", "ovo", "电影版", "ovo", "The Movie", "ovo", "Movie", "ovo", "(Movie)", "ovo", "〔映画〕", "ovo",
 		// 特殊数学符号 (用户常用来代替数字，如 ∬ 代表 2)
-		"Ⅰ", "1", "Ⅱ", "2", "Ⅲ",
+		"Ⅰ", "1", "Ⅱ", "2", "Ⅲ", "3",
 		"∫", "1", "∬", "2", "∮", "3", "Ⅳ", "4", "Ⅴ", "5", "Ⅵ", "6", "Ⅶ", "7", "Ⅷ", "8", "Ⅸ", "9", "Ⅹ", "10", // 用户可能用积分号代表季数
 		"一", "1", "二", "2", "三", "3", "四", "4", "五", "5", "六", "6", "七", "7", "八", "8", "九", "9",
 		// 移除或替换无意义的装饰符号，这些符号在搜索中通常不仅无用还会阻碍匹配
diff --git a/server/model/system/Search.go b/server/model/system/Search.go
index 38f1a41..4e44b9e 100644
--- a/server/model/system/Search.go
+++ b/server/model/system/Search.go
@@ -45,28 +45,58 @@ type Tag struct {
 	Value interface{} `json:"value"`
 }
 
+// ================================= Search 数据表处理 =================================
+
+// TableName 设置默认表名
 func (s *SearchInfo) TableName() string {
 	return config.SearchTableName
 }
 
-// ================================= Spider 数据处理(redis) =================================
+// CreateSearchTable 创建存储检索信息的数据表
+func CreateSearchTable() {
+	// 如果不存在则创建表
+	if !ExistSearchTable() {
+		err := db.Mdb.AutoMigrate(&SearchInfo{})
+		if err != nil {
+			log.Println("Create Table SearchInfo Failed: ", err)
+		}
+	}
+}
+
+// ExistSearchTable 是否存在Search Table
+func ExistSearchTable() bool {
+	// 1. 判断表中是否存在当前表
+	return db.Mdb.Migrator().HasTable(&SearchInfo{})
+}
+
+// AddSearchIndex search表中数据保存完毕后 将常用字段添加索引提高查询效率
+func AddSearchIndex() {
+	var s SearchInfo
+	tableName := s.TableName()
+	// 添加索引
+	db.Mdb.Exec(fmt.Sprintf("CREATE UNIQUE INDEX idx_mid ON %s (mid)", tableName))
+	db.Mdb.Exec(fmt.Sprintf("CREATE INDEX idx_time ON %s (update_stamp DESC)", tableName))
+	db.Mdb.Exec(fmt.Sprintf("CREATE INDEX idx_hits ON %s (hits DESC)", tableName))
+	db.Mdb.Exec(fmt.Sprintf("CREATE INDEX idx_score ON %s (score DESC)", tableName))
+	db.Mdb.Exec(fmt.Sprintf("CREATE INDEX idx_release ON %s (release_stamp DESC)", tableName))
+	db.Mdb.Exec(fmt.Sprintf("CREATE INDEX idx_year ON %s (year DESC)", tableName))
+
+}
 
 // FilmZero 删除所有库存数据
 func FilmZero() {
 	// 删除redis中当前库存储的所有数据
 	//db.Rdb.FlushDB(db.Cxt)
-	db.Rdb.Del(db.Cxt, db.Rdb.Keys(db.Cxt, "MovieBasicInfoKey*").Val()...)
-	db.Rdb.Del(db.Cxt, db.Rdb.Keys(db.Cxt, "MovieDetail*").Val()...)
-	db.Rdb.Del(db.Cxt, db.Rdb.Keys(db.Cxt, "MultipleSource*").Val()...)
-	db.Rdb.Del(db.Cxt, db.Rdb.Keys(db.Cxt, "OriginalResource*").Val()...)
+	//db.Rdb.Del(db.Cxt, db.Rdb.Keys(db.Cxt, "MovieBasicInfoKey*").Val()...)
+	//db.Rdb.Del(db.Cxt, db.Rdb.Keys(db.Cxt, "MovieDetail*").Val()...)
+	//db.Rdb.Del(db.Cxt, db.Rdb.Keys(db.Cxt, "MultipleSource*").Val()...)
+	//db.Rdb.Del(db.Cxt, db.Rdb.Keys(db.Cxt, "OriginalResource*").Val()...)
 	db.Rdb.Del(db.Cxt, db.Rdb.Keys(db.Cxt, "Search*").Val()...)
-	// 删除mysql中留存的检索表
-	var s SearchInfo
-	//db.Mdb.Exec(fmt.Sprintf(`drop table if exists %s`, s.TableName()))
-	// 截断数据表 truncate table users
-	if ExistSearchTable() {
-		db.Mdb.Exec(fmt.Sprintf("TRUNCATE table %s", s.TableName()))
-	}
+	// 执行影片信息相关数据表的初始化重置
+	ResetSearchTable()
+	ResetMovieDetailTable()
+	// 次级站点共用一张表, 所以目前暂不处理
+	//ResetSlaveMovieInfoTable()
 }
 
 // ResetSearchTable 重置Search表
@@ -75,9 +105,14 @@ func ResetSearchTable() {
 	var s SearchInfo
 	db.Mdb.Exec(fmt.Sprintf("drop table if exists %s", s.TableName()))
 	// 重新创建 Search 表
-	CreateSearchTable()
+	err := db.Mdb.AutoMigrate(&SearchInfo{})
+	if err != nil {
+		log.Println("Create Table SearchInfo Failed: ", err)
+	}
 }
 
+// ================================= Spider 数据处理(redis) =================================
+
 // DelMtPlay 清空附加播放源信息
 func DelMtPlay(keys []string) {
 	db.Rdb.Del(db.Cxt, keys...)
@@ -85,8 +120,8 @@ func DelMtPlay(keys []string) {
 
 // TunCateSearchTable 截断SearchInfo数据表
 func TunCateSearchTable() {
-	var searchInfo SearchInfo
-	err := db.Mdb.Exec(fmt.Sprintf("TRUNCATE TABLE %s", searchInfo.TableName())).Error
+	var s SearchInfo
+	err := db.Mdb.Exec(fmt.Sprintf("TRUNCATE TABLE %s", s.TableName())).Error
 	if err != nil {
 		log.Println("TRUNCATE TABLE Error: ", err)
 	}
@@ -216,45 +251,26 @@ func BatchHandleSearchTag(infos ...SearchInfo) {
 
 // ================================= Spider 数据处理(mysql) =================================
 
-// CreateSearchTable 创建存储检索信息的数据表
-func CreateSearchTable() {
-	// 如果不存在则创建表
-	if !ExistSearchTable() {
-		err := db.Mdb.AutoMigrate(&SearchInfo{})
+// SaveSearchInfo 添加影片检索信息( 无记录则保存, 有记录则更新)
+func SaveSearchInfo(s SearchInfo) error {
+	// 先查询数据库中是否存在对应记录
+	// 如果不存在对应记录则 保存当前记录
+	if !ExistSearchInfo(s.Mid) {
+		// 执行插入操作
+		if err := db.Mdb.Create(&s).Error; err != nil {
+			return err
+		}
+		// 执行添加操作时保存一份tag信息
+		BatchHandleSearchTag(s)
+	} else {
+		// 如果已经存在当前记录则将当前记录进行更新
+		err := db.Mdb.Model(&SearchInfo{}).Where("mid", s.Mid).Updates(SearchInfo{UpdateStamp: s.UpdateStamp, Hits: s.Hits, State: s.State,
+			Remarks: s.Remarks, Score: s.Score, ReleaseStamp: s.ReleaseStamp}).Error
 		if err != nil {
-			log.Println("Create Table SearchInfo Failed: ", err)
+			return err
 		}
 	}
-}
-
-// ExistSearchTable 是否存在Search Table
-func ExistSearchTable() bool {
-	// 1. 判断表中是否存在当前表
-	return db.Mdb.Migrator().HasTable(&SearchInfo{})
-}
-
-// AddSearchIndex search表中数据保存完毕后 将常用字段添加索引提高查询效率
-func AddSearchIndex() {
-	var s SearchInfo
-	tableName := s.TableName()
-	// 添加索引
-	db.Mdb.Exec(fmt.Sprintf("CREATE UNIQUE INDEX idx_mid ON %s (mid)", tableName))
-	db.Mdb.Exec(fmt.Sprintf("CREATE INDEX idx_time ON %s (update_stamp DESC)", tableName))
-	db.Mdb.Exec(fmt.Sprintf("CREATE INDEX idx_hits ON %s (hits DESC)", tableName))
-	db.Mdb.Exec(fmt.Sprintf("CREATE INDEX idx_score ON %s (score DESC)", tableName))
-	db.Mdb.Exec(fmt.Sprintf("CREATE INDEX idx_release ON %s (release_stamp DESC)", tableName))
-	db.Mdb.Exec(fmt.Sprintf("CREATE INDEX idx_year ON %s (year DESC)", tableName))
-
-}
-
-// BatchSave 批量保存影片search信息
-func BatchSave(sl []SearchInfo) {
-	if err := db.Mdb.Model(&SearchInfo{}).Create(&sl).Error; err != nil {
-		log.Println("BatchSaveSearchInfo Failed: ", err)
-		return
-	}
-	// 保存成功后将相应tag数据缓存到redis中
-	BatchHandleSearchTag(sl...)
+	return nil
 }
 
 // BatchSaveOrUpdate 判断数据库中是否存在对应mid的数据, 如果存在则更新, 否则插入
@@ -285,44 +301,9 @@ func BatchSaveOrUpdate(list []SearchInfo) {
 	tx.Commit()
 }
 
-// SaveSearchInfo 添加影片检索信息
-func SaveSearchInfo(s SearchInfo) error {
-	// 先查询数据库中是否存在对应记录
-	// 如果不存在对应记录则 保存当前记录
-	tx := db.Mdb.Begin()
-	if !ExistSearchInfo(s.Mid) {
-		// 执行插入操作
-		if err := tx.Create(&s).Error; err != nil {
-			tx.Rollback()
-			return err
-		}
-		// 执行添加操作时保存一份tag信息
-		BatchHandleSearchTag(s)
-	} else {
-		// 如果已经存在当前记录则将当前记录进行更新
-		err := tx.Model(&SearchInfo{}).Where("mid", s.Mid).Updates(SearchInfo{UpdateStamp: s.UpdateStamp, Hits: s.Hits, State: s.State,
-			Remarks: s.Remarks, Score: s.Score, ReleaseStamp: s.ReleaseStamp}).Error
-		if err != nil {
-			tx.Rollback()
-			return err
-		}
-	}
-	// 提交事务
-	tx.Commit()
-	return nil
-}
-
-// ExistSearchInfo 通过Mid查询是否存在影片的检索信息
-func ExistSearchInfo(mid int64) bool {
-	var count int64
-	db.Mdb.Model(&SearchInfo{}).Where("mid", mid).Count(&count)
-	return count > 0
-}
-
-// 777777777
-
-// BatchSaveSearchInfo 批量保存Search信息
+// BatchSaveSearchInfo 批量保存Search信息(全量采集时使用,不考虑更新情况)
 func BatchSaveSearchInfo(ml []MovieDetail) {
+	// 将 MovieDetail切片 处理为 searchInfo切片
 	var sl []SearchInfo
 	for _, m := range ml {
 		s := ConvertSearchInfo(m)
@@ -337,54 +318,11 @@ func BatchSaveSearchInfo(ml []MovieDetail) {
 	}
 }
 
-// SyncSearchInfo 同步影片检索信息
-func SyncSearchInfo(model int) {
-	switch model {
-	case 0:
-		// 重置Search表, (恢复为初始状态, 未添加索引)
-		ResetSearchTable()
-		// 批量添加 SearchInfo
-		SearchInfoToMdb(model)
-		// 保存完所有 SearchInfo 后添加字段索引
-		AddSearchIndex()
-	case 1:
-		// 批量更新或添加
-		SearchInfoToMdb(model)
-	}
-}
-
-// SearchInfoToMdb 扫描redis中的检索信息, 并批量存入mysql (model 执行模式 0-清空并保存 || 1-更新)
-func SearchInfoToMdb(model int) {
-	// 获取集合中的元素数量, 如果集合中没有元素则直接返回
-	count := db.Rdb.ZCard(db.Cxt, config.SearchInfoTemp).Val()
-	if count <= 0 {
-		return
-	}
-	// 1.从redis中批量扫描详情信息
-	list := db.Rdb.ZPopMax(db.Cxt, config.SearchInfoTemp, config.MaxScanCount).Val()
-	// 如果扫描到的信息为空则直接退出
-	if len(list) <= 0 {
-		return
-	}
-	// 2. 处理数据
-	var sl []SearchInfo
-	for _, s := range list {
-		// 解析详情数据
-		info := SearchInfo{}
-		_ = json.Unmarshal([]byte(s.Member.(string)), &info)
-		sl = append(sl, info)
-	}
-	// 通过model执行对应的保存方法
-	switch model {
-	case 0:
-		// 批量添加 SearchInfo
-		BatchSave(sl)
-	case 1:
-		// 批量更新或添加
-		BatchSaveOrUpdate(sl)
-	}
-	//  如果 SearchInfoTemp 依然存在数据, 则递归执行
-	SearchInfoToMdb(model)
+// ExistSearchInfo 通过Mid查询是否存在影片的检索信息
+func ExistSearchInfo(mid int64) bool {
+	var count int64
+	db.Mdb.Model(&SearchInfo{}).Where("mid", mid).Count(&count)
+	return count > 0
 }
 
 // ================================= API 数据接口信息处理 =================================
@@ -434,8 +372,9 @@ func SearchFilmKeyword(keyword string, page *Page) []int64 {
 	page.Total = int(count)
 	page.PageCount = int((page.Total + page.PageSize - 1) / page.PageSize)
 	// 2. 获取满足条件的数据
-	db.Mdb.Limit(page.PageSize).Offset((page.Current-1)*page.PageSize).Select("mid").
+	db.Mdb.Model(&SearchInfo{}).Limit(page.PageSize).Offset((page.Current-1)*page.PageSize).Select("mid").
 		Where("name LIKE ?", fmt.Sprintf(`%%%s%%`, keyword)).Or("sub_title LIKE ?", fmt.Sprintf(`%%%s%%`, keyword)).Order("year DESC, update_stamp DESC").Find(&ids)
+
 	return ids
 }
 
diff --git a/server/plugin/SystemInit/SpiderInit.go b/server/plugin/SystemInit/SpiderInit.go
index 54cb5a4..7800668 100644
--- a/server/plugin/SystemInit/SpiderInit.go
+++ b/server/plugin/SystemInit/SpiderInit.go
@@ -24,12 +24,11 @@ func FilmSourceInit() {
 		{Id: util.GenerateSalt(), Name: "HD(LZ)", Uri: `https://cj.lziapi.com/api.php/provide/vod/`, ResultModel: system.JsonResult, Grade: system.SlaveCollect, SyncPictures: false, CollectType: system.CollectVideo, State: false},
 		{Id: util.GenerateSalt(), Name: "HD(BF)", Uri: `https://bfzyapi.com/api.php/provide/vod/`, ResultModel: system.JsonResult, Grade: system.SlaveCollect, SyncPictures: false, CollectType: system.CollectVideo, State: false, Interval: 2500},
 		{Id: util.GenerateSalt(), Name: "HD(FF)", Uri: `http://cj.ffzyapi.com/api.php/provide/vod/`, ResultModel: system.JsonResult, Grade: system.SlaveCollect, SyncPictures: false, CollectType: system.CollectVideo, State: false},
-		{Id: util.GenerateSalt(), Name: "HD(OK)", Uri: `https://okzyapi.com/api.php/provide/vod/`, ResultModel: system.JsonResult, Grade: system.SlaveCollect, SyncPictures: false, CollectType: system.CollectVideo, State: false},
-		{Id: util.GenerateSalt(), Name: "HD(HM)", Uri: `https://json.heimuer.xyz/api.php/provide/vod/`, ResultModel: system.JsonResult, Grade: system.SlaveCollect, SyncPictures: false, CollectType: system.CollectVideo, State: false},
+		{Id: util.GenerateSalt(), Name: "HD(OK)", Uri: `https://api.okzyw.net/api.php/provide/vod/`, ResultModel: system.JsonResult, Grade: system.SlaveCollect, SyncPictures: false, CollectType: system.CollectVideo, State: false},
 		{Id: util.GenerateSalt(), Name: "HD(LY)", Uri: `https://360zy.com/api.php/provide/vod/at/json`, ResultModel: system.JsonResult, Grade: system.SlaveCollect, SyncPictures: false, CollectType: system.CollectVideo, State: false},
 		{Id: util.GenerateSalt(), Name: "HD(SN)", Uri: `https://suoniapi.com/api.php/provide/vod/from/snm3u8/`, ResultModel: system.JsonResult, Grade: system.SlaveCollect, SyncPictures: false, CollectType: system.CollectVideo, State: false, Interval: 2000},
 		{Id: util.GenerateSalt(), Name: "HD(DB)", Uri: `https://caiji.dbzy.tv/api.php/provide/vod/from/dbm3u8/at/josn/`, ResultModel: system.JsonResult, Grade: system.SlaveCollect, SyncPictures: false, CollectType: system.CollectVideo, State: false},
-		{Id: util.GenerateSalt(), Name: "HD(IK)", Uri: `https://ikunzyapi.com/api.php/provide/vod/at/json`, ResultModel: system.JsonResult, Grade: system.SlaveCollect, SyncPictures: false, CollectType: system.CollectVideo, State: false},
+		{Id: util.GenerateSalt(), Name: "HD(TT)", Uri: `https://caiji.dyttzyapi.com/api.php/provide/vod/at/json/`, ResultModel: system.JsonResult, Grade: system.SlaveCollect, SyncPictures: false, CollectType: system.CollectVideo, State: false},
 	}
 	err := system.SaveCollectSourceList(l)
 	if err != nil {
diff --git a/server/plugin/common/conver/Collect.go b/server/plugin/common/conver/Collect.go
index 38a55e1..783ea0c 100644
--- a/server/plugin/common/conver/Collect.go
+++ b/server/plugin/common/conver/Collect.go
@@ -3,7 +3,6 @@ package conver
 import (
 	"encoding/xml"
 	"log"
-	"regexp"
 	"server/config"
 	"server/model/collect"
 	"server/model/system"
@@ -77,7 +76,6 @@ func ConvertFilmDetail(detail collect.FilmDetail) system.MovieDetail {
 		1.对常见分割符进行统一化处理
 		2.如果演员和导演名单过长,则进行截断, 最多只保留3个
 	*/
-	detail.VodActor = regexp.MustCompile(`[$&#%]`).ReplaceAllString(detail.VodActor, ",")
 
 	md := system.MovieDetail{
 		Mid:      detail.VodID,
@@ -113,7 +111,7 @@ func ConvertFilmDetail(detail collect.FilmDetail) system.MovieDetail {
 	md.PlayFrom = strings.Split(detail.VodPlayFrom, detail.VodPlayNote)
 	// v2 只保留m3u8播放源
 	md.PlayList = GenFilmPlayList(detail.VodPlayURL, detail.VodPlayNote)
-	md.DownloadList = GenFilmPlayList(detail.VodDownURL, detail.VodPlayNote)
+	//md.DownloadList = GenFilmPlayList(detail.VodDownURL, detail.VodPlayNote)
 
 	return md
 }
diff --git a/server/plugin/common/conver/System.go b/server/plugin/common/conver/System.go
index 38a993d..4261abd 100644
--- a/server/plugin/common/conver/System.go
+++ b/server/plugin/common/conver/System.go
@@ -13,41 +13,40 @@ import (
 func CovertFilmDetailVo(fd system.FilmDetailVo) (system.MovieDetail, error) {
 	t, err := time.ParseInLocation(time.DateTime, fd.AddTime, time.Local)
 	md := system.MovieDetail{
-		Id:       fd.Id,
-		Cid:      fd.Cid,
-		Pid:      fd.Pid,
-		Name:     fd.Name,
-		Picture:  fd.Picture,
-		DownFrom: fd.DownFrom,
-		MovieDescriptor: system.MovieDescriptor{
-			SubTitle:    fd.SubTitle,
-			CName:       fd.CName,
-			EnName:      fd.EnName,
-			Initial:     fd.Initial,
-			ClassTag:    fd.ClassTag,
-			Actor:       fd.Actor,
-			Director:    fd.Director,
-			Writer:      fd.Writer,
-			Blurb:       fd.Content,
-			Remarks:     fd.Remarks,
-			ReleaseDate: fd.ReleaseDate,
-			Area:        fd.Area,
-			Language:    fd.Language,
-			Year:        fd.Year,
-			State:       fd.State,
-			UpdateTime:  fd.UpdateTime,
-			AddTime:     t.Unix(),
-			DbId:        fd.DbId,
-			DbScore:     fd.DbScore,
-			Hits:        fd.Hits,
-			Content:     fd.Content,
-		},
+		Mid:         fd.Id,
+		Cid:         fd.Cid,
+		Pid:         fd.Pid,
+		Name:        fd.Name,
+		Picture:     fd.Picture,
+		SubTitle:    fd.SubTitle,
+		CName:       fd.CName,
+		EnName:      fd.EnName,
+		Initial:     fd.Initial,
+		ClassTag:    fd.ClassTag,
+		Actor:       fd.Actor,
+		Director:    fd.Director,
+		Writer:      fd.Writer,
+		Blurb:       fd.Content,
+		Remarks:     fd.Remarks,
+		ReleaseDate: fd.ReleaseDate,
+		Area:        fd.Area,
+		Language:    fd.Language,
+		Year:        fd.Year,
+		State:       fd.State,
+		UpdateTime:  fd.UpdateTime,
+		AddTime:     t.Unix(),
+		DbId:        fd.DbId,
+		DbScore:     fd.DbScore,
+		Hits:        fd.Hits,
+		Content:     fd.Content,
+		PlayFrom:    fd.PlayFrom,
+		DownFrom:    fd.DownFrom,
 	}
 	// 通过分割符切分播放源信息  PlaySeparator $$$
 	//md.PlayFrom = strings.Split(fd.VodPlayFrom, fd.VodPlayNote)
 	// v2 只保留m3u8播放源
 	md.PlayList = GenFilmPlayList(fd.PlayLink, "$$$")
 	//md.DownloadList = GenFilmPlayList(fd.DownloadLink, fd.VodPlayNote)
-
+	md.DownloadList = GenFilmPlayList(fd.DownloadLink, "$$$")
 	return md, err
 }
diff --git a/server/plugin/common/util/Request.go b/server/plugin/common/util/Request.go
index ca66c0a..c41b957 100644
--- a/server/plugin/common/util/Request.go
+++ b/server/plugin/common/util/Request.go
@@ -2,14 +2,15 @@ package util
 
 import (
 	"fmt"
-	"github.com/gocolly/colly/v2"
-	"github.com/gocolly/colly/v2/extensions"
 	"log"
 	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/gocolly/colly/v2"
+	"github.com/gocolly/colly/v2/extensions"
 )
 
 /*
@@ -29,6 +30,18 @@ type RequestInfo struct {
 	Err    string      `json:"err"`    // 错误信息
 }
 
+// CopyRequestInfo 属性复制, 隔离地址引用造成的并发问题
+func CopyRequestInfo(r RequestInfo) RequestInfo {
+	// 初始化返回值
+	newInfo := RequestInfo{Uri: r.Uri, Params: url.Values{}}
+
+	// 循环拷贝r的每个k,v
+	for k, v := range r.Params {
+		newInfo.Params[k] = append([]string(nil), v...)
+	}
+	return newInfo
+}
+
 // RefererUrl 记录上次请求的url
 var RefererUrl string
 
diff --git a/server/plugin/common/util/StringUtil.go b/server/plugin/common/util/StringUtil.go
index ec3f283..29626ab 100644
--- a/server/plugin/common/util/StringUtil.go
+++ b/server/plugin/common/util/StringUtil.go
@@ -3,7 +3,6 @@ package util
 import (
 	"crypto/md5"
 	"crypto/rand"
-	"crypto/rsa"
 	"crypto/x509"
 	"encoding/hex"
 	"encoding/pem"
@@ -61,24 +60,24 @@ func PasswordEncrypt(password, salt string) string {
 }
 
 // ParsePriKeyBytes 解析私钥
-func ParsePriKeyBytes(buf []byte) (*rsa.PrivateKey, error) {
+func ParsePriKeyBytes(buf []byte) (any, error) {
 	p := &pem.Block{}
 	p, buf = pem.Decode(buf)
 	if p == nil {
 		return nil, errors.New("private key parse  error")
 	}
-	return x509.ParsePKCS1PrivateKey(p.Bytes)
+	return x509.ParsePKCS8PrivateKey(p.Bytes)
 }
 
 // ParsePubKeyBytes 解析公钥
-func ParsePubKeyBytes(buf []byte) (*rsa.PublicKey, error) {
+func ParsePubKeyBytes(buf []byte) (any, error) {
 	p, _ := pem.Decode(buf)
 	if p == nil {
 		return nil, errors.New("parse publicKey content nil")
 	}
-	pubKey, err := x509.ParsePKCS1PublicKey(p.Bytes)
+	pubKey, err := x509.ParsePKIXPublicKey(p.Bytes)
 	if err != nil {
-		return nil, errors.New("x509.ParsePKCS1PublicKey error")
+		return nil, errors.New("x509.ParsePKIXPublicKey error")
 	}
 	return pubKey, nil
 }
@@ -130,7 +129,7 @@ func ValidPwd(s string) error {
 // TruncateBySep 截断字符串,保留指定数量的结果
 func TruncateBySep(s string, limit int) string {
 	// 如果保留数量小于等于0则返回空值
-	if limit <= 0 {
+	if len(s) <= 0 || limit <= 0 {
 		return ""
 	}
 	// 先强制对不同的分割符进行统一替换为 ,
@@ -139,6 +138,9 @@ func TruncateBySep(s string, limit int) string {
 	// Split 会在分隔符连续出现或出现在首尾时产生空字符串，这通常符合预期
 	parts := strings.Split(s, ",")
 	// 片段数量小于或等于限制，直接返回原字符串
+	if len(parts) <= limit {
+		return strings.Join(parts, ",")
+	}
 	// 返回原字符串是为了保留原始的格式（比如末尾是否有分隔符）
 	// 即使不截断也重新 Join 一遍（去除多余的空片段等)
 	return strings.Join(parts[:limit], ",")
diff --git a/server/plugin/db/mysql.go b/server/plugin/db/mysql.go
index db787a8..6a21887 100644
--- a/server/plugin/db/mysql.go
+++ b/server/plugin/db/mysql.go
@@ -26,8 +26,9 @@ func InitMysql() (err error) {
 			SingularTable: true, //是否使用 结构体名称作为表名 (关闭自动变复数)
 			//NameReplacer:  strings.NewReplacer("spider_", ""), // 替表名和字段中的 Me 为 空
 		},
-		Logger: logger.Default.LogMode(logger.Warn), //设置日志级别为Info
-		//Logger: logger.Default.LogMode(logger.Info), //设置日志级别为Info
+		//Logger: logger.Default.LogMode(logger.Warn), //设置日志级别为Info
+		Logger: logger.Default.LogMode(logger.Info), //设置日志级别为Info
+		//Logger: logger.Default.LogMode(logger.Error), //设置日志级别为Info
 	})
 	return
 }
diff --git a/server/plugin/spider/Spider.go b/server/plugin/spider/Spider.go
index ac30c2e..6c4231b 100644
--- a/server/plugin/spider/Spider.go
+++ b/server/plugin/spider/Spider.go
@@ -13,6 +13,7 @@ import (
 	"server/model/system"
 	"server/plugin/common/conver"
 	"server/plugin/common/util"
+	"strconv"
 	"time"
 )
 
@@ -46,14 +47,22 @@ func HandleCollect(id string, h int) error {
 
 	// 生成 RequestInfo
 	r := util.RequestInfo{Uri: s.Uri, Params: url.Values{}}
-	// 如果 h == 0 则直接返回错误信息
-	if h == 0 {
-		log.Println(" Collect time cannot be zero ")
-		return errors.New(" Collect time cannot be zer ")
-	}
-	// 如果 h = -1 则进行全量采集
-	if h > 0 {
+	// 通过 采集时长 h 的不同来执行不同出处理方式
+	switch {
+	case h < 0:
+		// 采集时长为负数则先执行对应数据表的重置
+		if s.Grade == system.MasterCollect {
+			system.FilmZero()
+		} else {
+			// 如果所处站点是次级站点, 则删除对应站点在表中的数据
+			system.ResetSlaveMovieInfoTable()
+		}
+	case h > 0:
+		// 如果采集时长是正常数值, 则设置参数 h
 		r.Params.Set("h", fmt.Sprint(h))
+	default:
+		log.Println("Params Collect time Exception !!!")
+		return errors.New(" Params Collect time Exception !!! ")
 	}
 	// 2. 首先获取分页采集的页数
 	pageCount, err := spiderCore.GetPageCount(r)
@@ -86,22 +95,169 @@ func HandleCollect(id string, h int) error {
 			// 如果分页数量较大则开启协程
 			ConcurrentPageSpider(pageCount, s, h, collectFilm)
 		}
-		// 视频数据采集完成后同步相关信息到mysql
+		// 视频数据采集完成后 对暂存数据进行处理和优化
 		if s.Grade == system.MasterCollect {
-			// 执行影片信息更新操作
-			if h > 0 {
-				// 执行数据更新操作
-				system.SyncSearchInfo(1)
-			} else {
-				// 清空searchInfo中的数据并重新添加, 否则执行
-				system.SyncSearchInfo(0)
+			// 如果采集时长为负, (全量采集), 则在数据采集完成后为search表添加索引
+			if h < 0 {
+				// 全量采集时进行数据同步(仅保存)
+				system.SyncMovieDetail(s.Id, s.Grade)
+				system.AddSearchIndex()
 			}
+			// 采集时长在一定阈值内时执行redis数据同步 (存在则更新, 不存在则新增)
+
 			// 开启图片同步
 			if s.SyncPictures {
 				system.SyncFilmPicture()
 			}
 			// 每次成功执行完都清理redis中的相关API接口数据缓存
 			ClearCache()
+		} else if s.Grade == system.SlaveCollect {
+			// 如果采集时长为负, (全量采集), 则在数据采集完成后为search表添加索引
+			if h < 0 {
+				// 全量采集时进行数据同步
+				system.SyncMovieDetail(s.Id, s.Grade)
+			}
+		}
+
+	case system.CollectArticle, system.CollectActor, system.CollectRole, system.CollectWebSite:
+		log.Println("暂未开放此采集功能!!!")
+		return errors.New("暂未开放此采集功能")
+	}
+	log.Println("Spider Task Exercise Success")
+	return nil
+}
+
+func HandleCollectRefine(id string, h int) error {
+	// 1. 首先通过ID获取对应采集站信息
+	s := system.FindCollectSourceById(id)
+	if s == nil {
+		log.Println("Cannot Find Collect Source Site")
+		return errors.New(" Cannot Find Collect Source Site ")
+	} else if !s.State {
+		log.Println(" The acquisition site was disabled ")
+		return errors.New(" The acquisition site was disabled ")
+	}
+	// 如果是主站点且状态为启用则先获取分类tree信息
+	if s.Grade == system.MasterCollect && s.State {
+		// 是否存在分类树信息, 不存在则获取
+		if !system.ExistsCategoryTree() {
+			CollectCategory(s)
+		}
+	}
+	// 生成 RequestInfo
+	r := util.RequestInfo{Uri: s.Uri, Params: url.Values{}}
+	// 通过 采集时长 h 的不同来执行不同前置出处理方式
+	switch {
+	case h < 0:
+		// 采集时长为负数则先执行对应数据表的重置
+		if s.Grade == system.MasterCollect {
+			system.FilmZero()
+		} else {
+			// 如果所处站点是次级站点, 则删除对应站点在表中的数据
+			system.ResetSlaveMovieInfoTable()
+		}
+	case h > 0:
+		// 如果采集时长是正常数值, 则设置参数 h
+		r.Params.Set("h", fmt.Sprint(h))
+	default:
+		log.Println("Params Collect time Exception !!!")
+		return errors.New(" Params Collect time Exception !!! ")
+	}
+	// 通过采集类型分别执行不同的采集方法
+	switch s.CollectType {
+	case system.CollectVideo:
+		// 采集视频资源 根据采集站类型进行不同逻辑
+		switch s.Grade {
+		case system.MasterCollect:
+			// 获取展示的分类切片信息
+			cl := system.GetRevealCategoryList()
+			for _, c := range cl {
+				// 获取分类采集页数
+				r.Params.Set("t", fmt.Sprint(c.Id))
+				pageCount, err := spiderCore.GetPageCount(r)
+				if err != nil {
+					// 如果第二次获取分页页数依旧获取失败则关闭当前采集任务
+					pageCount, err = spiderCore.GetPageCount(r)
+					if err != nil {
+						return err
+					}
+				}
+				// 如果采集源参数中采集间隔参数大于500ms,则使用单线程采集
+				if s.Interval > 500 {
+					// 少量数据不开启协程
+					for i := 1; i <= pageCount; i++ {
+						// 设置采集参数pg
+						r.Params.Set("pg", fmt.Sprint(i))
+						collectFilmRefine(s, r)
+						// 执行一次采集后休眠指定时长
+						time.Sleep(time.Duration(s.Interval) * time.Millisecond)
+					}
+				} else if pageCount <= config.MAXGoroutine*5 {
+					// 少量数据不开启协程
+					for i := 1; i <= pageCount; i++ {
+						r.Params.Set("pg", fmt.Sprint(i))
+						collectFilmRefine(s, r)
+					}
+				} else {
+					// 如果分页数量较大则开启协程
+					collectFilmMT(pageCount, s, r, collectFilmRefine)
+				}
+			}
+		case system.SlaveCollect:
+			pageCount, err := spiderCore.GetPageCount(r)
+			if err != nil {
+				// 如果第二次获取分页页数依旧获取失败则关闭当前采集任务
+				pageCount, err = spiderCore.GetPageCount(r)
+				if err != nil {
+					return err
+				}
+			}
+			// 如果采集源参数中采集间隔参数大于500ms,则使用单线程采集
+			if s.Interval > 500 {
+				// 少量数据不开启协程
+				for i := 1; i <= pageCount; i++ {
+					// 设置采集参数pg
+					r.Params.Set("pg", fmt.Sprint(i))
+					collectFilmRefine(s, r)
+					// 执行一次采集后休眠指定时长
+					time.Sleep(time.Duration(s.Interval) * time.Millisecond)
+				}
+			} else if pageCount <= config.MAXGoroutine*5 {
+				// 少量数据不开启协程
+				for i := 1; i <= pageCount; i++ {
+					r.Params.Set("pg", fmt.Sprint(i))
+					collectFilmRefine(s, r)
+				}
+			} else {
+				// 如果分页数量较大则开启协程
+				collectFilmMT(pageCount, s, r, collectFilmRefine)
+			}
+		}
+
+		// 视频数据采集完成后 对暂存数据进行处理和优化
+		if s.Grade == system.MasterCollect {
+			// 如果采集时长为负, (全量采集), 则在数据采集完成后为search表添加索引
+			if h < 0 {
+				// 全量采集时进行数据同步以及添加索引(仅保存)
+				system.SyncMovieDetail(s.Id, s.Grade)
+				system.AddSearchIndex()
+				system.AddMovieDetailIndex()
+			}
+			// 采集时长在一定阈值内时执行redis数据同步 (存在则更新, 不存在则新增)
+
+			// 开启图片同步
+			if s.SyncPictures {
+				system.SyncFilmPicture()
+			}
+			// 每次成功执行完都清理redis中的相关API接口数据缓存
+			ClearCache()
+		} else if s.Grade == system.SlaveCollect {
+			// 如果采集时长为负, (全量采集), 则在数据采集完成后为search表添加索引
+			if h < 0 {
+				// 全量采集时进行数据同步
+				system.SyncMovieDetail(s.Id, s.Grade)
+				system.AddSlaveMovieInfoIndex()
+			}
 		}
 
 	case system.CollectArticle, system.CollectActor, system.CollectRole, system.CollectWebSite:
@@ -149,10 +305,23 @@ func collectFilm(s *system.FilmSource, h, pg int) {
 	// 通过采集站 Grade 类型, 执行不同的存储逻辑
 	switch s.Grade {
 	case system.MasterCollect:
-		// 主站点 	保存完整影片详情信息到 redis
-		if err = system.SaveDetails(list); err != nil {
+		// 将数据缓存到redis中
+		if err = system.MovieDetailCache(list); err != nil {
 			log.Println("SaveDetails Error: ", err)
 		}
+		//break
+		// 如果 采集时长 h 小于阈值, 则将主体数据缓存到redis
+		//if h > 0 && h < config.FilmSaveCacheThreshold {
+		//	// 主站点 	执行保存或更新
+		//	if err = system.BatchUpdateDetails(list); err != nil {
+		//		log.Println("SaveDetails Error: ", err)
+		//	}
+		//} else {
+		//	// 主站点 	从零开始只执行保存逻辑
+		//	if err = system.MovieDetailCache(list); err != nil {
+		//		log.Println("SaveDetails Error: ", err)
+		//	}
+		//}
 		// 如果主站点开启了图片同步, 则将图片url以及对应的mid存入ZSet集合中
 		if s.SyncPictures {
 			if err = system.SaveVirtualPic(conver.ConvertVirtualPicture(list)); err != nil {
@@ -160,10 +329,22 @@ func collectFilm(s *system.FilmSource, h, pg int) {
 			}
 		}
 	case system.SlaveCollect:
-		// 附属站点	仅保存影片播放信息到redis
-		if err = system.SaveSitePlayList(s.Id, list); err != nil {
+		// 将采集数据缓存到redis中
+		if err = system.SlaveDetailCache(s.Id, list); err != nil {
 			log.Println("SaveDetails Error: ", err)
 		}
+		//if h > 0 && h < config.FilmSaveCacheThreshold {
+		//	// 附属站点	仅保存影片播放信息到mysql
+		//	if err = system.UpdateSitePlayList(s.Id, list); err != nil {
+		//		log.Println("SaveDetails Error: ", err)
+		//	}
+		//} else {
+		//	// 附属站点	仅保存影片播放信息到mysql
+		//	if err = system.SlaveDetailCache(s.Id, list); err != nil {
+		//		log.Println("SaveDetails Error: ", err)
+		//	}
+		//}
+
 	}
 }
 
@@ -196,7 +377,42 @@ func collectFilmById(ids string, s *system.FilmSource) {
 		}
 	case system.SlaveCollect:
 		// 附属站点	仅保存影片播放信息到redis
-		if err = system.SaveSitePlayList(s.Id, list); err != nil {
+		if err = system.UpdateSitePlayList(s.Id, list); err != nil {
+			log.Println("SaveDetails Error: ", err)
+		}
+	}
+}
+
+// 影片信息采集, 改进版
+func collectFilmRefine(s *system.FilmSource, r util.RequestInfo) {
+	// 执行采集方法 获取影片详情list
+	//log.Printf("%s?%s", r.Uri, r.Params.Encode())
+	list, err := spiderCore.GetFilmDetail(r)
+	if err != nil || len(list) <= 0 {
+		// 添加采集失败记录
+		pg, _ := strconv.Atoi(r.Params.Get("pg"))
+		h, _ := strconv.Atoi(r.Params.Get("h"))
+		fr := system.FailureRecord{OriginId: s.Id, OriginName: s.Name, Uri: s.Uri, CollectType: system.CollectVideo, PageNumber: pg, Hour: h, Cause: fmt.Sprintln(err), Status: 1}
+		system.SaveFailureRecord(fr)
+		log.Println("GetMovieDetail Error: ", err)
+		return
+	}
+	// 通过采集站 Grade 类型, 执行不同的存储逻辑
+	switch s.Grade {
+	case system.MasterCollect:
+		// 将数据缓存到redis中
+		if err = system.MovieDetailCache(list); err != nil {
+			log.Println("SaveDetails Error: ", err)
+		}
+		// 如果主站点开启了图片同步, 则将图片url以及对应的mid存入ZSet集合中
+		if s.SyncPictures {
+			if err = system.SaveVirtualPic(conver.ConvertVirtualPicture(list)); err != nil {
+				log.Println("SaveVirtualPic Error: ", err)
+			}
+		}
+	case system.SlaveCollect:
+		// 将采集数据缓存到redis中
+		if err = system.SlaveDetailCache(s.Id, list); err != nil {
 			log.Println("SaveDetails Error: ", err)
 		}
 	}
@@ -235,6 +451,46 @@ func ConcurrentPageSpider(capacity int, s *system.FilmSource, h int, collectFunc
 	}
 }
 
+// collectFilmMT 并发采集影片信息
+func collectFilmMT(capacity int, s *system.FilmSource, r util.RequestInfo, collectFunc func(s *system.FilmSource, r util.RequestInfo)) {
+	// 初始化 channel, 容量为 capacity
+	ch := make(chan int, capacity)
+
+	// 收集结束标识
+	waitCh := make(chan int)
+	// 循环将所有需采集的页码写入 ch
+	for i := 1; i <= capacity; i++ {
+		ch <- i
+	}
+	close(ch)
+	// 开启 MAXGoroutine 数量的协程, 如果分页页数小于设定的最大线程数, 则将线程数设置为1
+	var GoroutineNum = config.MAXGoroutine
+	if capacity < GoroutineNum*5 {
+		GoroutineNum = 1
+	}
+	// 如果满足开启并发的条件, 则开启GoroutineNum数量的协程进行并发采集
+	for i := 0; i < GoroutineNum; i++ {
+		go func() {
+			defer func() { waitCh <- 0 }()
+			for {
+				// 从channel中获取 pageNumber
+				pg, ok := <-ch
+				if !ok {
+					break
+				}
+				// 执行对应的采集方法, 并发时不同使用同一个requestInfo
+				requestInfo := util.CopyRequestInfo(r)
+				requestInfo.Params.Set("pg", fmt.Sprint(pg))
+				collectFunc(s, requestInfo)
+			}
+		}()
+	}
+	// 等待所有协程执行完毕
+	for i := 0; i < GoroutineNum; i++ {
+		<-waitCh
+	}
+}
+
 // BatchCollect 批量采集, 采集指定的所有站点最近x小时内更新的数据
 func BatchCollect(h int, ids ...string) {
 	for _, id := range ids {
@@ -242,7 +498,7 @@ func BatchCollect(h int, ids ...string) {
 		if fs := system.FindCollectSourceById(id); fs != nil && fs.State {
 			// 采用协程并发执行, 每个站点单独开启一个协程执行
 			go func() {
-				err := HandleCollect(fs.Id, h)
+				err := HandleCollectRefine(fs.Id, h)
 				if err != nil {
 					log.Println(err)
 				}
@@ -261,7 +517,7 @@ func AutoCollect(h int) {
 	for _, s := range system.GetCollectSourceList() {
 		// 如果当前站点为启用状态 则执行 HandleCollect 进行数据采集
 		if s.State {
-			if err := HandleCollect(s.Id, h); err != nil {
+			if err := HandleCollectRefine(s.Id, h); err != nil {
 				log.Println(err)
 			}
 		}