feature

code/app/admin/config/router.php

@@ -46,6 +46,7 @@ Route::group("/novel", function () {
 Route::group("/video", function () {
     Route::get("/list", [Video::class, "getVideoList"])->name("Domain@getVideoList");
     Route::post("/level/set", [Video::class, "updateVideoLevel"])->name("Video@updateVideoLevel");
+    Route::post("/boxoffice/set", [Video::class, "updateBoxOffice"])->name("Video@updateBoxOffice");
     Route::get("/category/list", [Video::class, "getCategory"])->name("Video@getCategory");
 })->middleware(AdminAuth::class);
 

code/app/admin/controller/Video.php

@@ -14,9 +14,37 @@ use think\Response;
 
 class Video extends BaseController
 {
+    /**
+     * 根据关键词修改视频票房
+     *
+     * @param Request $Request
+     * @param AdminUserModel|null $AdminUserModel
+     * @return Response
+     */
+    public function updateBoxOffice(Request $Request,  ?AdminUserModel $AdminUserModel)
+    {
+        $arrData = [
+            "keywords" => $Request->post('keywords'),
+            "v_box_office" => (float)$Request->post('v_box_office'),
+        ];
+
+        $arrRule = [
+            'keywords' => 'require',
+            'v_box_office' => 'require',
+        ];
+
+        $this->validate($arrData, $arrRule);
+
+        $arrKeywords  = explode(',', $arrData['keywords']);
+        $arrUpdate =  ['v_box_office' => $arrData['v_box_office']];
+        $VideoModel = VideoModel::getInstance();
+        $VideoModel->updateByKeywords($arrKeywords, $arrUpdate);
+        return $this->success();
+    }
+
 
     /**
-     * 根据关键词修改小说评级
+     * 根据关键词修改视频评级
      *
      * @param Request $Request
      * @param AdminUserModel|null $AdminUserModel
@@ -37,13 +65,15 @@ class Video extends BaseController
         $this->validate($arrData, $arrRule);
 
         $arrKeywords  = explode(',', $arrData['keywords']);
+        $arrUpdate =  ['v_level' => $arrData['v_level']];
+
         $VideoModel = VideoModel::getInstance();
-        $VideoModel->updateByKeywords($arrKeywords, $arrData['v_level']);
+        $VideoModel->updateByKeywords($arrKeywords, $arrUpdate);
         return $this->success();
     }
 
     /**
-     * 小说分页
+     * 视频分页
      *
      * @param Request $Request
      * @param AdminUserModel|null $AdminUserModel

code/app/api/config/router.php

@@ -15,19 +15,27 @@ Route::post("/publish", [Statis::class, 'publish'])
     ->name('Statis@publish');
 
 
-Route::get("/search", [Novel::class, 'search'])
+// Route::get("/search", [Novel::class, 'search'])
 // ->middleware(\think\middleware\Throttle::class, [
 //     'visit_rate' => '1/m',
 //     'key' => '__CONTROLLER__/__ACTION__/__IP__',
 // ])
-    ->name('Novel@search');;
+// ->name('Novel@search');
 
 
 
 
-Route::get("/test", [Statis::class, 'test'])
+Route::post("/publishv", [Statis::class, 'publishV'])
     // ->middleware(\think\middleware\Throttle::class, [
     //     'visit_rate' => '1/m',
     //     'key' => '__CONTROLLER__/__ACTION__/__IP__',
     // ])
-    ->name('Statis@test');
+    ->name('Statis@publishV');
+
+
+Route::get("/test0909", [Statis::class, 'test0909'])
+    // ->middleware(\think\middleware\Throttle::class, [
+    //     'visit_rate' => '1/m',
+    //     'key' => '__CONTROLLER__/__ACTION__/__IP__',
+    // ])
+    ->name('Statis@test0909');

code/app/api/controller/Statis.php

@@ -8,6 +8,7 @@ use app\api\BaseController;
 use app\model\CategoryModel;
 use app\model\NovelClicksModel;
 use app\model\NovelModel;
+use app\model\VideoClicksModel;
 use DateTime;
 use db\mongo\MongoBase;
 use ddl\DDLManage;
@@ -41,4 +42,118 @@ class Statis extends BaseController
 
         return Response::create()->code(204);
     }
+
+    /**
+     * novel statis
+     *
+     * @param Request $Request
+     * @return Response
+     */
+    public function publishV(Request $Request): Response
+    {
+        $intNId = $Request->post('v_id/d');
+
+        if ($intNId <= 0) {
+            return Response::create('非法请求！')->code(400);
+        }
+
+        $NovelClicksModel = VideoClicksModel::getInstance();
+
+        try {
+            $NovelClicksModel->addStatis($intNId);
+        } catch (\Exception $e) {
+            // throw $e;
+        }
+
+        return Response::create()->code(204);
+    }
+
+    public function test0909()
+    {
+        $a = [
+            'Hindi',
+            'Malay',
+            'Swahili',
+            'Tamil',
+            '上海',
+            '丹麦语',
+            '乌克兰',
+            '乌尔都语',
+            '他加',
+            '俄语',
+            '其它',
+            '匈牙利语',
+            '北印度语',
+            '印地语',
+            '印地语Hindi',
+            '印尼语',
+            '印度尼西亚语',
+            '印度语',
+            '印度语Hindi',
+            '因纽特语',
+            '国语',
+            '土库曼语',
+            '土耳',
+            '土耳其语',
+            '基库尤语',
+            '希腊',
+            '希腊语',
+            '库尔德语',
+            '德语',
+            '意大',
+            '意大利',
+            '意大利语',
+            '挪威语',
+            '捷克语',
+            '日语',
+            '普通话',
+            '林加拉语',
+            '毛利语',
+            '汉语',
+            '汉语普通',
+            '汉语普通话',
+            '汉语普通话Manda',
+            '河南方言',
+            '法语',
+            '波兰语',
+            '波斯语',
+            '泰卢固语',
+            '泰米尔',
+            '泰米尔语',
+            '泰米尔语Tamil',
+            '泰语',
+            '澳大利亚语',
+            '瑞典语',
+            '粤语',
+            '美国手语',
+            '英语',
+            '英语手语',
+            '荷兰语',
+            '菲律宾语',
+            '葡萄',
+            '葡萄牙语',
+            '藏语',
+            '西班',
+            '西班牙语',
+            '越南语',
+            '闽南语',
+            '阿拉',
+            '阿拉伯',
+            '阿拉伯语',
+            '韩语',
+            '马拉雅拉姆语',
+            '马来西亚语',
+            '马来语'
+
+        ];
+
+        $arrArea = [];
+        foreach ($a as $v) {
+            $arrArea[zhToPinYin($v)] = $v;
+        }
+        echo '<pre>';
+
+        krsort($arrArea);
+        echo var_export($arrArea, true);
+    }
 }

code/app/home/view/videoDadi/test/test01/index.html

@@ -1,23 +1,23 @@
 <pre>
 
 
-{video:ranklist count="10" sort_type="total" n_status="wanjie" d_key="d_key" d_val="video" cache_life="1000"}
+<!-- {video:ranklist count="10" sort_type="total" v_status="wanjie" d_key="d_key" d_val="video" cache_life="1000" diff_key="fdasfads"}
     <li>
-        {php}var_dump($video){/php}
+
         章节名称: {$video.v_name}
         章节序号: {$video.v_category}
     </li>
-{/video:ranklist} 
+{/video:ranklist}  -->
 
     
-<!-- {video:pager page="1" limit="10" d_key="d_key" d_val="video" cache_life="1000" button_num="3"  v_category="动作片"  v_status="wanjie" sort_type="update" p_val="page_data"  func="generateVideoPager"}
+{video:pager page="1" limit="10" d_key="d_key" d_val="video" cache_life="1000" button_num="3"  v_category_en="动作片"  v_status="wanjie" sort_type="update" p_val="page_data"  func="generateVideoPager"}
 <li>
     Index: {$d_key}
     章节名称: {$video.v_name}
     章节序号: {$video.v_category}
 </li>
 {/video:pager}
-{php}var_dump($page_data);{/php} -->
+<!-- {php}var_dump($page_data);{/php} -->
 
 <!-- 
 {video:list count="10" v_category="动作片"  v_status="wanjie" sort_type="update" d_key="d_key" d_val="video" cache_life="1000" }
@@ -28,7 +28,7 @@
 </li>
 {/video:list} -->
 
-<!-- {video:info v_id="12" v_key="aaa" /}
+<!-- {video:info v_id="124793" v_key="aaa" /}
 {php}print_r($aaa);{/php} -->
 
 <!-- {video:ranksort d_key="key" d_val="val"}

code/app/model/VideoCategoryModel.php

@@ -32,7 +32,7 @@ class VideoCategoryModel extends MongoModel
     static $arrCategoryTypeONE = [
         [
             "v_category" => "电影",
-            "v_category_en" => "dianying",
+            "v_category_en" => 'dian-ying',
             "children" => [
                 [
                     "v_category_en" => "dong-zuo-pian",
@@ -88,7 +88,7 @@ class VideoCategoryModel extends MongoModel
         ],
         [
             "v_category" => "电视剧",
-            "v_category_en" => "dianshiju",
+            "v_category_en" =>'dian-shi-ju',
             "children" => [
                 [
                     "v_category_en" => "guo-chan-ju",
@@ -134,7 +134,7 @@ class VideoCategoryModel extends MongoModel
         ],
         [
             "v_category" => "综艺",
-            "v_category_en" => "zonyi",
+            "v_category_en" => 'zong-yi',
             "children" => [
                 [
                     "v_category_en" => "da-lu-zong-yi",
@@ -160,7 +160,7 @@ class VideoCategoryModel extends MongoModel
         ],
         [
             "v_category" => "动漫",
-            "v_category_en" => "donman",
+            "v_category_en" => 'dong-man',
             "children" => [
                 [
                     "v_category_en" => "guo-chan-dong-man",
@@ -191,7 +191,7 @@ class VideoCategoryModel extends MongoModel
         ],
         [
             "v_category" => "短剧",
-            "v_category_en" => "duanju",
+            "v_category_en" => 'duan-ju-da-quan',
             "children" => [
                 [
                     "v_category_en" => "duan-ju-da-quan",

code/app/model/VideoClicksModel.php

@@ -39,12 +39,12 @@ class VideoClicksModel extends MongoModel
     public function addStatis(int $intVId)
     {
 
-        $NovelModel = NovelModel::getInstance();
+        $VideoModel = VideoModel::getInstance();
-        $Novel = $NovelModel->getCol()->findOne([
+        $Video = $VideoModel->getCol()->findOne([
             "v_id" => $intVId,
         ]);
 
-        if (empty($Novel)) {
+        if (empty($Video)) {
             return false;
         }
 
@@ -70,6 +70,10 @@ class VideoClicksModel extends MongoModel
                 ],
                 [
                     '$inc' => ['vc_clicks' => 1],
+                    '$set' => [
+                        'v_category' => $Video->v_category,
+                        'v_parent_category' => $Video->v_parent_category
+                    ],
                 ],
                 [
                     'upsert' => true

code/app/model/VideoModel.php

@@ -49,10 +49,10 @@ class VideoModel extends MongoModel
     /**
      * 根据关键词数组更新小说推荐等级
      * @param array $arrKeywords 关键词数组，例如 ["斗罗", "遮天", "凡人"]
-     * @param int $intLevel 推荐等级1~9，例如 3
+     * @param array 待修改的字段
      * @return array 更新结果
      */
-    public function updateByKeywords(array $arrKeywords, int $intLevel)
+    public function updateByKeywords(array $arrKeywords, array $arrUpdate)
     {
         if (empty($arrKeywords)) {
             return false;
@@ -65,7 +65,7 @@ class VideoModel extends MongoModel
 
             $UpdateResult = $this->getCol()->updateMany(
                 ['$or' => $arrConditions],
-                ['$set' => ['v_level' => $intLevel]]
+                ['$set' => $arrUpdate]
             );
 
             $UpdateResult->getModifiedCount();
@@ -409,8 +409,14 @@ class VideoModel extends MongoModel
      * * total     总
      * @return array
      */
-    public function getRankVideoOnCache(string $strKey, int $intCount = 10,  $strDateType = 'daily', $strStatus = NULL): array
+    public function getRankVideoOnCache(
-    {
+        string $strKey,
+        int $intCount = 10,
+        $strDateType = 'daily',
+        $strStatus = NULL,
+        $strVCategoryEn  = NULL,
+        $strVParentCategoryEn = NULL,
+    ): array {
         try {
             $intLifeTime = 24 * 3600;
 
@@ -418,17 +424,26 @@ class VideoModel extends MongoModel
             if ($arrResult !== NULL) {
                 return $arrResult;
             }
+
+
             $arrFilter = [
-                'nc_type' => $strDateType,
+                'vc_type' => $strDateType,
             ];
 
             if ($strStatus !== NULL) {
                 $arrFilter['v_status'] = $strStatus;
             }
 
+            if ($strVCategoryEn !== NULL) {
+                $arrFilter['v_category_en'] = $strVCategoryEn;
+            }
+
+            if ($strVParentCategoryEn !== NULL) {
+                $arrFilter['v_parent_category_en'] = $strVParentCategoryEn;
+            }
 
             $arrOptions = [
-                'sort' => ['nc_clicks' => -1],
+                'sort' => ['vc_clicks' => -1],
                 'limit' => $intCount * 3,
                 'projection' => [
                     'v_id' => 1,
@@ -466,8 +481,4 @@ class VideoModel extends MongoModel
             return [];
         }
     }
-
-
-  
-    
 }

code/app/services/StaticConfig.php

@@ -4,7 +4,7 @@ namespace app\services;
 
 use app\model\CategoryModel;
 use app\model\VideoCategoryModel;
-use app\model\VideoModel;
+
 
 class StaticConfig
 {
@@ -50,6 +50,7 @@ class StaticConfig
         'news' => '最新入库',
         'tuijian' => '推荐',
         'update' => '最新更新',
+        'piaofang' => '票房',
     ];
 
     static $arrVideoRankSortType = [
@@ -60,34 +61,229 @@ class StaticConfig
     ];
 
     static $arrVideoLang = [
-        'hanyuputonghua'     => '汉语普通话',
+        'all' => '所有',
-        'yueyu'    => '粤语',
+        'yue-yu' => '粤语',
-        'yingyu'   => '英语',
+        'yue-nan-yu' => '越南语',
-        'guoyu'     => '国语',
+        'ying-yu-shou-yu' => '英语手语',
+        'ying-yu' => '英语',
+        'yin-niu-te-yu' => '因纽特语',
+        'yin-ni-yu' => '印尼语',
+        'yin-du-yu' => '印度语Hindi',
+        'yin-du-ni-xi-ya-yu' => '印度尼西亚语',
+        'yin-di-yu' => '印地语Hindi',
+        'yi-da-li-yu' => '意大利语',
+        'yi-da-li' => '意大利',
+        'yi-da' => '意大',
+        'xiong-ya-li-yu' => '匈牙利语',
+        'xi-la-yu' => '希腊语',
+        'xi-la' => '希腊',
+        'xi-ban-ya-yu' => '西班牙语',
+        'xi-ban' => '西班',
+        'wu-ke-lan' => '乌克兰',
+        'wu-er-dou-yu' => '乌尔都语',
+        'tu-ku-man-yu' => '土库曼语',
+        'tu-er-qi-yu' => '土耳其语',
+        'tu-er' => '土耳',
+        'tai-yu' => '泰语',
+        'tai-mi-er-yu' => '泰米尔语Tamil',
+        'tai-mi-er' => '泰米尔',
+        'tai-lu-gu-yu' => '泰卢固语',
+        'ta-jia' => '他加',
+        'shang-hai' => '上海',
+        'rui-dian-yu' => '瑞典语',
+        'ri-yu' => '日语',
+        'qi-ta' => '其它',
+        'pu-tong-hua' => '普通话',
+        'pu-tao-ya-yu' => '葡萄牙语',
+        'pu-tao' => '葡萄',
+        'nuo-wei-yu' => '挪威语',
+        'min-nan-yu' => '闽南语',
+        'mei-guo-shou-yu' => '美国手语',
+        'mao-li-yu' => '毛利语',
+        'ma-lai-yu' => '马来语',
+        'ma-lai-xi-ya-yu' => '马来西亚语',
+        'ma-la-ya-la-mu-yu' => '马拉雅拉姆语',
+        'lin-jia-la-yu' => '林加拉语',
+        'ku-er-de-yu' => '库尔德语',
+        'jie-ke-yu' => '捷克语',
+        'ji-ku-you-yu' => '基库尤语',
+        'he-nan-fang-yan' => '河南方言',
+        'he-lan-yu' => '荷兰语',
+        'han-yu-pu-tong-hua' => '汉语普通话Manda',
+        'han-yu-pu-tong' => '汉语普通',
+        'han-yu' => '韩语',
+        'guo-yu' => '国语',
+        'fei-lv-bin-yu' => '菲律宾语',
+        'fa-yu' => '法语',
+        'e-yu' => '俄语',
+        'de-yu' => '德语',
+        'dan-mai-yu' => '丹麦语',
+        'cang-yu' => '藏语',
+        'bo-si-yu' => '波斯语',
+        'bo-lan-yu' => '波兰语',
+        'bei-yin-du-yu' => '北印度语',
+        'ao-da-li-ya-yu' => '澳大利亚语',
+        'a-la-bo-yu' => '阿拉伯语',
+        'a-la-bo' => '阿拉伯',
+        'a-la' => '阿拉',
     ];
 
     static $arrVideoArea = [
-        'zhongguodalu'    => '中国大陆',
+        'all' => '所有',
-        'zhongguotaiwang'    => '中国台湾',
+        'zhong-guo-xiang-gang' => '中国香港',
-        'zhongguoxianggan'   => '中国香港',
+        'zhong-guo-tai-wan' => '中国台湾',
-        'meiguo'     => '美国',
+        'zhong-guo-da-lu' => '中国大陆',
-        'yingguo'     => '英国',
+        'zhong-guo' => '中国',
-        'faguo'     => '法国',
+        'zhi-li' => '智利',
-        'yindu'     => '印度',
+        'yue-nan' => '越南',
-        'riben'     => '日本',
+        'ying-guo' => '英国',
-        'taiguo'     => '泰国',
+        'yin-ni' => '印尼',
+        'yin-du' => '印度',
+        'yi-da-li' => '意大利',
+        'xiong-ya-li' => '匈牙利',
+        'xin-xi-lan' => '新西兰',
+        'xin-jia-po' => '新加坡',
+        'xiang-gang' => '香港',
+        'xi-de' => '西德',
+        'xi-ban-ya' => '西班牙',
+        'tu-er-qi' => '土耳其',
+        'tai-wan' => '台湾',
+        'tai-guo' => '泰国',
+        'si-luo-wen-ni-ya' => '斯洛文尼亚',
+        'rui-shi' => '瑞士',
+        'rui-dian' => '瑞典',
+        'ri-ben' => '日本',
+        'qi-ta' => '其它',
+        'pu-tao-ya' => '葡萄牙',
+        'nuo-wei' => '挪威',
+        'nei-di' => '内地',
+        'nan-si-la-fu' => '南斯拉夫',
+        'nan-fei' => '南非',
+        'mo-xi-ge' => '墨西哥',
+        'mo-luo-ge' => '摩洛哥',
+        'mei-guo' => '美国',
+        'ma-lai-xi-ya' => '马来西亚',
+        'ma-er-ta' => '马耳他',
+        'lu-sen-bao' => '卢森堡',
+        'la-tuo-wei-ya' => '拉脱维亚',
+        'jie-ke' => '捷克',
+        'jian-pu-zhai' => '柬埔寨',
+        'jia-na-da' => '加拿大',
+        'he-lan' => '荷兰',
+        'han-guo' => '韩国',
+        'ha-sa-ke-si-tan' => '哈萨克斯坦',
+        'fei-lv-bin' => '菲律宾',
+        'fa-guo' => '法国',
+        'e-luo-si' => '俄罗斯',
+        'de-guo' => '德国',
+        'dan-mai' => '丹麦',
+        'da-lu' => '大陆',
+        'bo-lan' => '波兰',
+        'bi-li-shi' => '比利时',
+        'bao-jia-li-ya' => '保加利亚',
+        'ba-xi' => '巴西',
+        'ao-di-li' => '奥地利',
+        'ao-da-li-ya' => '澳大利亚',
+        'ai-er-lan' => '爱尔兰',
+        'a-lian-qiu' => '阿联酋',
+        'a-gen-ting' => '阿根廷',
+
     ];
 
     static $arrVideoYear = [
+        'all' => '所有',
+        '1924' => '1924',
+        '1935' => '1935',
+        '1938' => '1938',
+        '1940' => '1940',
+        '1941' => '1941',
+        '1942' => '1942',
+        '1945' => '1945',
+        '1948' => '1948',
+        '1949' => '1949',
+        '1950' => '1950',
+        '1952' => '1952',
+        '1953' => '1953',
+        '1954' => '1954',
+        '1955' => '1955',
+        '1956' => '1956',
+        '1957' => '1957',
+        '1958' => '1958',
+        '1959' => '1959',
+        '1960' => '1960',
+        '1962' => '1962',
+        '1963' => '1963',
+        '1964' => '1964',
+        '1965' => '1965',
+        '1966' => '1966',
+        '1967' => '1967',
+        '1968' => '1968',
+        '1969' => '1969',
+        '1970' => '1970',
+        '1971' => '1971',
+        '1972' => '1972',
+        '1973' => '1973',
+        '1974' => '1974',
+        '1975' => '1975',
+        '1976' => '1976',
+        '1977' => '1977',
+        '1978' => '1978',
+        '1979' => '1979',
+        '1980' => '1980',
+        '1981' => '1981',
+        '1982' => '1982',
+        '1983' => '1983',
+        '1984' => '1984',
+        '1985' => '1985',
+        '1986' => '1986',
+        '1987' => '1987',
+        '1988' => '1988',
+        '1989' => '1989',
+        '1990' => '1990',
+        '1991' => '1991',
+        '1992' => '1992',
+        '1993' => '1993',
+        '1994' => '1994',
+        '1995' => '1995',
+        '1996' => '1996',
+        '1997' => '1997',
+        '1998' => '1998',
+        '1999' => '1999',
+        '2000' => '2000',
+        '2001' => '2001',
+        '2002' => '2002',
+        '2003' => '2003',
+        '2004' => '2004',
+        '2005' => '2005',
+        '2006' => '2006',
+        '2007' => '2007',
+        '2008' => '2008',
+        '2009' => '2009',
+        '2010' => '2010',
+        '2011' => '2011',
+        '2012' => '2012',
+        '2013' => '2013',
+        '2014' => '2014',
+        '2015' => '2015',
+        '2016' => '2016',
+        '2017' => '2017',
+        '2018' => '2018',
+        '2019' => '2019',
+        '2020' => '2020',
+        '2021' => '2021',
+        '2022' => '2022',
+        '2023' => '2023',
+        '2024' => '2024',
+        '2025' => '2025',
 
     ];
 
     static $arrVideoClass = [
-        "dianying" => "电影",
+        "dian-ying" => "电影",
-        "dianshiju" => "电视剧",
+        "dian-shi-ju" => "电视剧",
-        "zonyi" => "综艺",
+        "zong-yi" => "综艺",
-        "donman" => "动漫",
+        "dong-man" => "动漫",
-        "duanju" => "短剧",
+        "duan-ju-da-quan" => "短剧",
     ];
 
     // 'v_lang', # 视频的语言（如“中文”、“英语”）

code/app/services/VideoService.php

@@ -6,6 +6,7 @@ use app\model\CategoryModel;
 use app\model\ChapterModel;
 use app\model\ConverterMovel;
 use app\model\DomainModel;
+use app\model\VideoCategoryModel;
 use app\model\VideoClicksModel;
 use app\model\VideoModel;
 use template\page\CusteomPage02;
@@ -184,11 +185,30 @@ class VideoService
         $strSortType = (string)$arrParams['sort_type'] ?? '';
         $strVStatus = (string) $arrParams['v_status'] ?? '';
 
+        $strVCategoryEn = (string) $arrParams['v_category_en'] ?? '';
+        $strVParentCategoryEn = (string) $arrParams['v_parent_category_en'] ?? '';
+
         $strDiffKey = (string) $arrParams['diff_key'] ?? '';
         $intCacheLifeTime = (int)$arrParams['cache_life'] ?? 0;
 
         $arrFilter = [];
 
+        # v_category_en filter
+        $arrFilter['v_category_en'] = NULL;
+        if (!empty($strVCategoryEn)) {
+            if (key_exists($strVCategoryEn, VideoCategoryModel::$arrCategory)) {
+                $arrFilter['v_category_en'] = $strVCategoryEn;
+            }
+        }
+
+        # v_parent_category_en filter
+        $arrFilter['v_parent_category_en'] = NULL;
+        if (!empty($strVParentCategoryEn)) {
+            if (key_exists($strVParentCategoryEn, VideoCategoryModel::$arrCategory)) {
+                $arrFilter['v_parent_category_en'] = $strVParentCategoryEn;
+            }
+        }
+
         # v_isend filter
         if (!empty($strVStatus)) {
             switch ($strVStatus) {
@@ -225,15 +245,18 @@ class VideoService
         $strCacheKey = '';
         $intLifeTime = 0;
 
+
         # cache filter
         if ($intCacheLifeTime > 0) {
             $strCacheKey = sprintf(
-                'VideoService:getRankList:%s:%s:%s:%s:%s',
+                'VideoService:getRankList:%s:%s:%s:%s:%s:%s:%s',
                 $this->SiteContext->DomainModel->d_domain,
                 md5(serialize($arrFilter)),
                 md5(serialize($arrSort)),
                 $intCount,
                 $strDiffKey,
+                (string) $arrFilter['v_category_en'],
+                (string) $arrFilter['v_parent_category_en'],
             );
 
             $intLifeTime = $intLifeTime;
@@ -244,6 +267,8 @@ class VideoService
             $intCount,
             $arrSort['v_sort_type'] ?? 'daily',
             $arrFilter['v_status'] ?? NULL,
+            $arrFilter['v_category_en'],
+            $arrFilter['v_parent_category_en'],
         );
 
         return $arrVideo;
@@ -259,20 +284,33 @@ class VideoService
     public function getVideoList(array $arrParams): array
     {
         $intCount = (int)$arrParams['count'] ?? 10;
-        $strNCategory = $arrParams['v_category'] ?? '';
+        // $strVCategory = $arrParams['v_category'] ?? '';
         $strSortType = (string)$arrParams['sort_type'] ?? '';
         $strVStatus = (string) $arrParams['v_status'] ?? '';
 
         $strDiffKey = (string) $arrParams['diff_key'] ?? '';
         $intCacheLifeTime = (int)$arrParams['cache_life'] ?? 0;
 
+        $strVCategoryEn = (string) $arrParams['v_category_en'] ?? '';
+        $strVParentCategoryEn = (string) $arrParams['v_parent_category_en'] ?? '';
+
+        $strVLangEn = (string)$arrParams['v_lang_en'] ?? 'all';
+        $strVAreaEn = (string)$arrParams['v_area_en'] ?? 'all';
+        $strVYear = (string)$arrParams['v_year'] ?? 'all';
+
         $arrFilter = [];
 
-        # v_category filter
+        # v_category_en filter
-        if (!empty($strNCategory)) {
+        if (!empty($strVCategoryEn)) {
-            $strNCategory =  CategoryModel::getZhByPinYin($strNCategory);
+            if (key_exists($strVCategoryEn, VideoCategoryModel::$arrCategory)) {
-            if ($strNCategory) {
+                $arrFilter['v_category_en'] = $strVCategoryEn;
-                $arrFilter['v_category'] = $strNCategory;
+            }
+        }
+
+        # v_parent_category_en filter
+        if (!empty($strVParentCategoryEn)) {
+            if (key_exists($strVParentCategoryEn, VideoCategoryModel::$arrCategory)) {
+                $arrFilter['v_parent_category_en'] = $strVParentCategoryEn;
             }
         }
 
@@ -288,6 +326,32 @@ class VideoService
             }
         }
 
+        # v_lang_en filter
+        if (!empty($strVLangEn)) {
+            if (key_exists($strVLangEn, StaticConfig::$arrVideoLang) && $strVYear != 'all') {
+                $arrFilter['v_lang_en'] = $strVLangEn;
+            } else {
+                $arrParams['v_lang_en'] = 'all';
+            }
+        }
+        # v_area_en filter
+        if (!empty($strVAreaEn)) {
+            if (key_exists($strVAreaEn, StaticConfig::$arrVideoArea) && $strVYear != 'all') {
+                $arrFilter['v_area_en'] = $strVAreaEn;
+            } else {
+                $arrParams['v_area_en'] = 'all';
+            }
+        }
+
+        # v_year filter
+        if (!empty($strVYear)) {
+            if (key_exists($strVYear, StaticConfig::$arrVideoYear) && $strVYear != 'all') {
+                $arrFilter['v_year'] = $strVYear;
+            } else {
+                $arrParams['v_year'] = 'all';
+            }
+        }
+
         $arrSort = [];
 
         # sort filter
@@ -302,6 +366,9 @@ class VideoService
                 case 'update':
                     $arrSort['v_publish_date'] = -1;
                     break;
+                case 'piaofang':
+                    $arrSort['v_box_office'] = -1;
+                    break;
             }
         }
 
@@ -347,9 +414,8 @@ class VideoService
             'limit' => (int)($arrParams['limit'] ?? 10),
             'buttov_num' => (int)($arrParams['buttov_num'] ?? 0),
             'v_class' => (string)($arrParams['v_class'] ?? ''),
-            'v_category' => (string)($arrParams['v_category'] ?? ''),
+            'v_lang_en' => (string)($arrParams['v_lang_en'] ?? ''),
-            'v_lang' => (string)($arrParams['v_lang'] ?? ''),
+            'v_area_en' => (string)($arrParams['v_area_en'] ?? ''),
-            'v_area' => (string)($arrParams['v_area'] ?? ''),
             'v_year' => (string)($arrParams['v_year'] ?? ''),
             'sort_type' => (string)($arrParams['sort_type'] ?? ''),
             'v_isend' => (string)($arrParams['v_isend'] ?? ''),
@@ -357,14 +423,16 @@ class VideoService
             'key' => (string)($arrParams['key'] ?? ''),
             'cache_life' => (int)($arrParams['cache_life'] ?? 0),
             'func' => (string)($arrParams['func']),
+            'v_category_en' => (string)($arrParams['v_category_en']),
+            'v_parent_category_en' => (string)($arrParams['v_parent_category_en']),
         ];
 
         $intPage = $arrParams['page'];
         $intLimit = $arrParams['limit'];
-        $strVClass = $arrParams['v_class'];
+        $strVParentCategory = $arrParams['v_parent_category_en'];
-        $strNCategory = $arrParams['v_category'];
+        $strVCategoryEn = $arrParams['v_category_en'];
-        $strVLang = $arrParams['v_lang'];
+        $strVLangEn = $arrParams['v_lang_en'];
-        $strVArea = $arrParams['v_area'];
+        $strVAreaEn = $arrParams['v_area_en'];
         $strVYear = $arrParams['v_year'];
         $strSortType = $arrParams['sort_type'];
         $strVStatus =  $arrParams['v_isend'];
@@ -382,13 +450,47 @@ class VideoService
             '$and' => [],
         ];
 
-        # v_category filter
+        # v_lang_en filter
-        if (!empty($strNCategory)) {
+        if (!empty($strVLangEn)) {
-            $strNCategory =  CategoryModel::getZhByPinYin($strNCategory);
+            if (key_exists($strVLangEn, StaticConfig::$arrVideoLang) && $strVYear != 'all') {
-            if ($strNCategory) {
+                $arrFilter['$and'][] = ['v_lang_en' => $strVLangEn];
-                $arrFilter['$and'][] = ['v_category' => $strNCategory];
             } else {
-                $arrParams['v_category'] = 'all';
+                $arrParams['v_lang_en'] = 'all';
+            }
+        }
+        # v_area_en filter
+        if (!empty($strVAreaEn)) {
+            if (key_exists($strVAreaEn, StaticConfig::$arrVideoArea) && $strVYear != 'all') {
+                $arrFilter['$and'][] = ['v_area_en' => $strVAreaEn];
+            } else {
+                $arrParams['v_area_en'] = 'all';
+            }
+        }
+
+        # v_year filter
+        if (!empty($strVYear)) {
+            if (key_exists($strVYear, StaticConfig::$arrVideoYear) && $strVYear != 'all') {
+                $arrFilter['$and'][] = ['v_year' => $strVYear];
+            } else {
+                $arrParams['v_year'] = 'all';
+            }
+        }
+
+        # v_parent_category_en filter
+        if (!empty($strVParentCategory)) {
+            if (key_exists($strVParentCategory, VideoCategoryModel::$arrCategory)) {
+                $arrFilter['$and'][] = ['v_parent_category_en' => $strVParentCategory];
+            } else {
+                $arrParams['v_parent_category_en'] = 'all';
+            }
+        }
+
+        # v_category_en filter
+        if (!empty($strVCategoryEn)) {
+            if (key_exists($strVCategoryEn, VideoCategoryModel::$arrCategory)) {
+                $arrFilter['$and'][] = ['v_category_en' => $strVCategoryEn];
+            } else {
+                $arrParams['v_category_en'] = 'all';
             }
         }
 
@@ -437,6 +539,9 @@ class VideoService
                 case 'update':
                     $arrSort['v_publish_date'] = -1;
                     break;
+                case 'piaofang':
+                    $arrSort['v_box_office'] = -1;
+                    break;
                 default:
                     $arrParams['sort_type'] = 'all';
                     break;
@@ -465,8 +570,8 @@ class VideoService
 
         ConverterMovel::setVal([
             'intPage' => $intPage,
-            'strVideoClassName' => empty($strVClass) ? '' : StaticConfig::$arrVideoClass[$strVClass],
+            // 'strVideoClassName' => empty($strVClass) ? '' : StaticConfig::$arrVideoClass[$strVClass],
-            'strVideoCategoryName' => empty($strNCategory) ? '' : str_replace("视频", "", $strNCategory),
+            'strVideoCategoryName' => empty($strVCategory) ? '' : str_replace("视频", "", $strVCategory),
             'strVideoStatus' => empty($strVStatus) ? '' : StaticConfig::$arrVideoStatus[$strVStatus],
             'strVideoOrder' => empty($strSortType) ? '' : StaticConfig::$arrVideoSortType[$strSortType],
             'strSearchKeywords' => $strKey,
@@ -543,7 +648,6 @@ class VideoService
         $arrPaginator = CusteomPage02::generate($intPage,  $arrVideo['total'], $intLimit, $strBaseUrl, $intButtomNum);
 
         return  $arrPaginator;
-
     }
 
 

code/app/task/crawler/fengchao/Scheduler.php

@@ -80,6 +80,9 @@ class Scheduler
         //     'data' => $arrVSourceId,
         // ];
         // $this->QueueManage->set($arrTask);
+
+        // $this->fetchVideo($arrVSourceId);
+
         // return;
 
         $Site = $this->getSite();

code/app/task/crawler/fengchao/page/Site.php

@@ -154,6 +154,18 @@ class Site
         $arrContent = json_decode($strContent, true);
         $arrFilter = $arrContent['class'];
 
+        // print_r($arrFilter);
+
+        // $arrA = [];
+        // foreach ($arrFilter as $b) {
+        //     $arrA[$b['type_id']] = [
+        //         'name' => $b['type_name'],
+        //         'pinyin' => zhToPinYin($b['type_name']),
+        //     ];
+        // }
+        // print_r($arrA);
+
+
         $arrCategory = [];
 
         foreach ($arrFilter as $intKey => $arrItem) {

code/app/task/crawler/fengchao/page/VideoCategory.php

@@ -0,0 +1,147 @@
+<?php
+
+declare(strict_types=1);
+
+namespace app\task\crawler\fengchao\page;
+
+class VideoCategory
+{
+    static $arrCategory = [
+        1 => [
+            'name' => '电影',
+            'pinyin' => 'dian-ying',
+        ],
+        2 => [
+            'name' => '电视剧',
+            'pinyin' => 'dian-shi-ju',
+        ],
+        3 => [
+            'name' => '综艺',
+            'pinyin' => 'zong-yi',
+        ],
+        4 => [
+            'name' => '动漫',
+            'pinyin' => 'dong-man',
+        ],
+        6 => [
+            'name' => '动作片',
+            'pinyin' => 'dong-zuo-pian',
+        ],
+        7 => [
+            'name' => '喜剧片',
+            'pinyin' => 'xi-ju-pian',
+        ],
+        8 => [
+            'name' => '爱情片',
+            'pinyin' => 'ai-qing-pian',
+        ],
+        9 => [
+            'name' => '科幻片',
+            'pinyin' => 'ke-huan-pian',
+        ],
+        10 => [
+            'name' => '恐怖片',
+            'pinyin' => 'kong-bu-pian',
+        ],
+        11 => [
+            'name' => '剧情片',
+            'pinyin' => 'ju-qing-pian',
+        ],
+        12 => [
+            'name' => '战争片',
+            'pinyin' => 'zhan-zheng-pian',
+        ],
+        13 => [
+            'name' => '国产剧',
+            'pinyin' => 'guo-chan-ju',
+        ],
+        14 => [
+            'name' => '欧美剧',
+            'pinyin' => 'ou-mei-ju',
+        ],
+        15 => [
+            'name' => '韩剧',
+            'pinyin' => 'han-ju',
+        ],
+        16 => [
+            'name' => '日剧',
+            'pinyin' => 'ri-ju',
+        ],
+        17 => [
+            'name' => '港剧',
+            'pinyin' => 'gang-ju',
+        ],
+        18 => [
+            'name' => '台剧',
+            'pinyin' => 'tai-ju',
+        ],
+        19 => [
+            'name' => '泰剧',
+            'pinyin' => 'tai-ju',
+        ],
+        20 => [
+            'name' => '纪录片',
+            'pinyin' => 'ji-lu-pian',
+        ],
+        23 => [
+            'name' => '海外剧',
+            'pinyin' => 'hai-wai-ju',
+        ],
+        25 => [
+            'name' => '大陆综艺',
+            'pinyin' => 'da-lu-zong-yi',
+        ],
+        26 => [
+            'name' => '日韩综艺',
+            'pinyin' => 'ri-han-zong-yi',
+        ],
+        27 => [
+            'name' => '港台综艺',
+            'pinyin' => 'gang-tai-zong-yi',
+        ],
+        28 => [
+            'name' => '欧美综艺',
+            'pinyin' => 'ou-mei-zong-yi',
+        ],
+        29 => [
+            'name' => '国产动漫',
+            'pinyin' => 'guo-chan-dong-man',
+        ],
+        30 => [
+            'name' => '日韩动漫',
+            'pinyin' => 'ri-han-dong-man',
+        ],
+        31 => [
+            'name' => '欧美动漫',
+            'pinyin' => 'ou-mei-dong-man',
+        ],
+        39 => [
+            'name' => '动画片',
+            'pinyin' => 'dong-hua-pian',
+        ],
+        44 => [
+            'name' => '港台动漫',
+            'pinyin' => 'gang-tai-dong-man',
+        ],
+        45 => [
+            'name' => '海外动漫',
+            'pinyin' => 'hai-wai-dong-man',
+        ],
+        47 => [
+            'name' => '演唱会',
+            'pinyin' => 'yan-chang-hui',
+        ],
+        55 => [
+            'name' => '伦理',
+            'pinyin' => 'lun-li',
+        ],
+        62 => [
+            'name' => '4K电影',
+            'pinyin' => 'dian-ying',
+        ],
+        70 => [
+            'name' => '邵氏电影',
+            'pinyin' => 'shao-shi-dian-ying',
+        ],
+    ];
+}

code/app/task/crawler/fengchao/page/VideoInfoPage.php

@@ -6,7 +6,6 @@ namespace app\task\crawler\fengchao\page;
 
 use app\model\CountersModel;
 use app\model\VideoModel;
-use storage\StorageCore;
 
 class VideoInfoPage extends BasePage
 {
@@ -84,19 +83,41 @@ class VideoInfoPage extends BasePage
                 ];
             }
 
+            $arrVideo['vod_actor']  = trim($arrVideo['vod_actor']);
+            $arrVideo['vod_director']  = trim($arrVideo['vod_director']);
             $arrVideo['vod_class']  = trim($arrVideo['vod_class']);
+            $arrVideo['vod_lang']  = trim($arrVideo['vod_lang']);
+            $arrVideo['vod_area']  = trim($arrVideo['vod_area']);
 
             $arrVideo['vod_play_url'][$this->getsite()->getSiteCode()] = $arrPlayUrl;
 
             $arrVideo['vod_actor'] = $arrVideo['vod_actor'] === '' ? [] : explode(',', $arrVideo['vod_actor']);
             $arrVideo['vod_director'] = $arrVideo['vod_director'] === '' ? [] : explode(',', $arrVideo['vod_director']);
             $arrVideo['vod_class'] = $arrVideo['vod_class'] === '' ? [] :  explode(',', $arrVideo['vod_class']);
+            $arrVideo['vod_lang'] = $arrVideo['vod_lang'] === '' ? [] : explode(',', $arrVideo['vod_lang']);
+            $arrVideo['vod_area'] = $arrVideo['vod_area'] === '' ? [] :  explode(',', $arrVideo['vod_area']);
 
+            $arrVideo['vod_lang_en'] =     $arrVideo['vod_area_en'] = [];
+
+            foreach ($arrVideo['vod_lang'] as $strVal) {
+                $arrVideo['vod_lang_en'][] = zhToPinYin($strVal);
+            }
+
+            foreach ($arrVideo['vod_area'] as $strVal) {
+                $arrVideo['vod_area_en'][] = zhToPinYin($strVal);
+            }
+
+
+            $arrVideo['vod_content'] = strip_tags($arrVideo['vod_content']);
             $arrVideo['vod_content'] = trim($arrVideo['vod_content']);
             $arrVideo['vod_content'] = mb_rtrim($arrVideo['vod_content'], '\　');
-
             $arrVideo['vod_content'] = ensureUtf8($arrVideo['vod_content']);
 
+            $arrVideo['v_category'] = VideoCategory::$arrCategory[$arrVideo['type_id']]['name'];
+            $arrVideo['v_category_en'] = VideoCategory::$arrCategory[$arrVideo['type_id']]['pinyin'];
+            $arrVideo['v_parent_category'] = VideoCategory::$arrCategory[$arrVideo['type_id_1']]['name'];
+            $arrVideo['v_parent_category_en'] = VideoCategory::$arrCategory[$arrVideo['type_id_1']]['pinyin'];
+
             foreach ($arrVideo as $strKey => $mixedVal) {
                 $strKey = str_replace('vod', 'v', $strKey);
 
@@ -165,15 +186,19 @@ class VideoInfoPage extends BasePage
                 'v_id' =>   CountersModel::getInstance()->getNextSequence('video'),
                 'v_name' => $arrPageVideo['v_name'],
                 'v_name_en' => zhToPinYin($arrPageVideo['v_name']),
+                'v_parent_category' => $arrPageVideo['v_parent_category'],
+                'v_parent_category_en' => $arrPageVideo['v_parent_category_en'],
                 'v_category' => $arrPageVideo['v_category'],
-                'v_category_en' => zhToPinYin($arrPageVideo['v_category']),
+                'v_category_en' => $arrPageVideo['v_category_en'],
                 'v_actor' => $arrPageVideo['v_actor'],
                 'v_director' => $arrPageVideo['v_director'],
                 'v_class' => $arrPageVideo['v_class'],
                 'v_letter' => $arrPageVideo['v_letter'],
                 'v_pic' => '',
                 'v_lang' => $arrPageVideo['v_lang'],
+                'v_lang_en' => $arrPageVideo['v_lang_en'],
                 'v_area' => $arrPageVideo['v_area'],
+                'v_area_en' =>  $arrPageVideo['v_area_en'],
                 'v_year' => $arrPageVideo['v_year'],
                 'v_remarks' => $arrPageVideo['v_remarks'],
                 'v_isend' => $arrPageVideo['v_isend'],

code/app/task/crawler/wuxian/Scheduler.php

@@ -80,10 +80,10 @@ class Scheduler
         //     'data' => $arrVSourceId,
         // ];
         // $this->QueueManage->set($arrTask);
+        // $this->fetchVideo($arrVSourceId);
         // return;
 
         $Site = $this->getSite();
-
         $arrAllCategory = $Site->getCategory();
 
         // print_r($arrAllCategory);

code/app/task/crawler/wuxian/page/Site.php

@@ -154,6 +154,17 @@ class Site
         $arrContent = json_decode($strContent, true);
         $arrFilter = $arrContent['class'];
 
+        // print_r($arrFilter);
+
+        // $arrA = [];
+        // foreach ($arrFilter as $b) {
+        //     $arrA[$b['type_id']] = [
+        //         'name' => $b['type_name'],
+        //         'pinyin' => zhToPinYin($b['type_name']),
+        //     ];
+        // }
+        // print_r($arrA);
+
         $arrCategory = [];
 
         foreach ($arrFilter as $intKey => $arrItem) {

code/app/task/crawler/wuxian/page/VideoCategory.php

@@ -0,0 +1,155 @@
+<?php
+
+declare(strict_types=1);
+
+namespace app\task\crawler\wuxian\page;
+
+class VideoCategory
+{
+    static $arrCategory = [
+        1 => [
+            'name' => '电影',
+            'pinyin' => 'dian-ying',
+        ],
+        2 => [
+            'name' => '电视剧',
+            'pinyin' => 'dian-shi-ju',
+        ],
+        3 => [
+            'name' => '综艺',
+            'pinyin' => 'zong-yi',
+        ],
+        4 => [
+            'name' => '动漫',
+            'pinyin' => 'dong-man',
+        ],
+        6 => [
+            'name' => '动作片',
+            'pinyin' => 'dong-zuo-pian',
+        ],
+        7 => [
+            'name' => '喜剧片',
+            'pinyin' => 'xi-ju-pian',
+        ],
+        8 => [
+            'name' => '爱情片',
+            'pinyin' => 'ai-qing-pian',
+        ],
+        9 => [
+            'name' => '科幻片',
+            'pinyin' => 'ke-huan-pian',
+        ],
+        10 => [
+            'name' => '恐怖片',
+            'pinyin' => 'kong-bu-pian',
+        ],
+        11 => [
+            'name' => '剧情片',
+            'pinyin' => 'ju-qing-pian',
+        ],
+        12 => [
+            'name' => '战争片',
+            'pinyin' => 'zhan-zheng-pian',
+        ],
+        13 => [
+            'name' => '国产剧',
+            'pinyin' => 'guo-chan-ju',
+        ],
+        14 => [
+            'name' => '欧美剧',
+            'pinyin' => 'ou-mei-ju',
+        ],
+        15 => [
+            'name' => '韩剧',
+            'pinyin' => 'han-ju',
+        ],
+        16 => [
+            'name' => '日剧',
+            'pinyin' => 'ri-ju',
+        ],
+        17 => [
+            'name' => '港剧',
+            'pinyin' => 'gang-ju',
+        ],
+        18 => [
+            'name' => '台剧',
+            'pinyin' => 'tai-ju',
+        ],
+        19 => [
+            'name' => '泰剧',
+            'pinyin' => 'tai-ju',
+        ],
+        20 => [
+            'name' => '纪录片',
+            'pinyin' => 'ji-lu-pian',
+        ],
+        23 => [
+            'name' => '海外剧',
+            'pinyin' => 'hai-wai-ju',
+        ],
+        25 => [
+            'name' => '大陆综艺',
+            'pinyin' => 'da-lu-zong-yi',
+        ],
+        26 => [
+            'name' => '日韩综艺',
+            'pinyin' => 'ri-han-zong-yi',
+        ],
+        27 => [
+            'name' => '港台综艺',
+            'pinyin' => 'gang-tai-zong-yi',
+        ],
+        28 => [
+            'name' => '欧美综艺',
+            'pinyin' => 'ou-mei-zong-yi',
+        ],
+        29 => [
+            'name' => '国产动漫',
+            'pinyin' => 'guo-chan-dong-man',
+        ],
+        30 => [
+            'name' => '日韩动漫',
+            'pinyin' => 'ri-han-dong-man',
+        ],
+        31 => [
+            'name' => '欧美动漫',
+            'pinyin' => 'ou-mei-dong-man',
+        ],
+        39 => [
+            'name' => '动画片',
+            'pinyin' => 'dong-hua-pian',
+        ],
+        44 => [
+            'name' => '港台动漫',
+            'pinyin' => 'gang-tai-dong-man',
+        ],
+        45 => [
+            'name' => '海外动漫',
+            'pinyin' => 'hai-wai-dong-man',
+        ],
+        47 => [
+            'name' => '演唱会',
+            'pinyin' => 'yan-chang-hui',
+        ],
+        48 => [
+            'name' => '体育赛事',
+            'pinyin' => 'ti-yu-sai-shi',
+        ],
+        49 => [
+            'name' => '篮球',
+            'pinyin' => 'lan-qiu',
+        ],
+        50 => [
+            'name' => '足球',
+            'pinyin' => 'zu-qiu',
+        ],
+        52 => [
+            'name' => '斯诺克',
+            'pinyin' => 'si-nuo-ke',
+        ],
+        55 => [
+            'name' => '伦理',
+            'pinyin' => 'lun-li',
+        ],
+    ];
+}

code/app/task/crawler/wuxian/page/VideoInfoPage.php

@@ -84,19 +84,46 @@ class VideoInfoPage extends BasePage
                 ];
             }
 
+            $arrVideo['vod_actor']  = trim($arrVideo['vod_actor']);
+            $arrVideo['vod_director']  = trim($arrVideo['vod_director']);
             $arrVideo['vod_class']  = trim($arrVideo['vod_class']);
+            $arrVideo['vod_lang']  = trim($arrVideo['vod_lang']);
+            $arrVideo['vod_area']  = trim($arrVideo['vod_area']);
 
             $arrVideo['vod_play_url'][$this->getsite()->getSiteCode()] = $arrPlayUrl;
 
             $arrVideo['vod_actor'] = $arrVideo['vod_actor'] === '' ? [] : explode(',', $arrVideo['vod_actor']);
             $arrVideo['vod_director'] = $arrVideo['vod_director'] === '' ? [] : explode(',', $arrVideo['vod_director']);
             $arrVideo['vod_class'] = $arrVideo['vod_class'] === '' ? [] :  explode(',', $arrVideo['vod_class']);
+            $arrVideo['vod_lang'] = $arrVideo['vod_lang'] === '' ? [] : explode(',', $arrVideo['vod_lang']);
+            $arrVideo['vod_area'] = $arrVideo['vod_area'] === '' ? [] :  explode(',', $arrVideo['vod_area']);
 
+            $arrVideo['vod_lang_en'] =     $arrVideo['vod_area_en'] = [];
+
+            foreach ($arrVideo['vod_lang'] as $strVal) {
+                $arrVideo['vod_lang_en'][] = zhToPinYin($strVal);
+            }
+
+            foreach ($arrVideo['vod_area'] as $strVal) {
+                $arrVideo['vod_area_en'][] = zhToPinYin($strVal);
+            }
+
+
+            $arrVideo['vod_content'] = strip_tags($arrVideo['vod_content']);
             $arrVideo['vod_content'] = trim($arrVideo['vod_content']);
             $arrVideo['vod_content'] = mb_rtrim($arrVideo['vod_content'], '\　');
-
             $arrVideo['vod_content'] = ensureUtf8($arrVideo['vod_content']);
 
+            $arrVideo['v_category'] = VideoCategory::$arrCategory[$arrVideo['type_id']]['name'];
+            $arrVideo['v_category_en'] = VideoCategory::$arrCategory[$arrVideo['type_id']]['pinyin'];
+            $arrVideo['v_parent_category'] = VideoCategory::$arrCategory[$arrVideo['type_id_1']]['name'];
+            $arrVideo['v_parent_category_en'] = VideoCategory::$arrCategory[$arrVideo['type_id_1']]['pinyin'];
+
+            // 'v_lang' => $arrPageVideo['v_lang'],
+            // 'v_lang_en' => zhToPinYin($arrPageVideo['v_lang']),
+            // 'v_area' => $arrPageVideo['v_area'],
+            // 'v_area_en' => zhToPinYin($arrPageVideo['v_area']),
+
             foreach ($arrVideo as $strKey => $mixedVal) {
                 $strKey = str_replace('vod', 'v', $strKey);
 
@@ -165,15 +192,19 @@ class VideoInfoPage extends BasePage
                 'v_id' =>   CountersModel::getInstance()->getNextSequence('video'),
                 'v_name' => $arrPageVideo['v_name'],
                 'v_name_en' => zhToPinYin($arrPageVideo['v_name']),
+                'v_parent_category' => $arrPageVideo['v_parent_category'],
+                'v_parent_category_en' => $arrPageVideo['v_parent_category_en'],
                 'v_category' => $arrPageVideo['v_category'],
-                'v_category_en' => zhToPinYin($arrPageVideo['v_category']),
+                'v_category_en' => $arrPageVideo['v_category_en'],
                 'v_actor' => $arrPageVideo['v_actor'],
                 'v_director' => $arrPageVideo['v_director'],
                 'v_class' => $arrPageVideo['v_class'],
                 'v_letter' => $arrPageVideo['v_letter'],
                 'v_pic' => '',
                 'v_lang' => $arrPageVideo['v_lang'],
+                'v_lang_en' => $arrPageVideo['v_lang_en'],
                 'v_area' => $arrPageVideo['v_area'],
+                'v_area_en' =>  $arrPageVideo['v_area_en'],
                 'v_year' => $arrPageVideo['v_year'],
                 'v_remarks' => $arrPageVideo['v_remarks'],
                 'v_isend' => $arrPageVideo['v_isend'],

code/app/task/crawler/youzhi/Scheduler.php

@@ -74,18 +74,23 @@ class Scheduler
      */
     public function crawlFull()
     {
-        // $arrVSourceId = [['v_source_id' => 14256]];
+        // $arrVSourceId = [['v_source_id' => 66471]];
         // $arrTask = [
         //     'callback' => [static::class, 'fetchVideo'],
         //     'data' => $arrVSourceId,
         // ];
         // $this->QueueManage->set($arrTask);
+        // $this->fetchVideo($arrVSourceId);
         // return;
 
         $Site = $this->getSite();
 
         $arrAllCategory = $Site->getCategory();
 
+        // print_r($arrAllCategory);
+
+        // return;
+
         $intLimit = 5;
 
         $arrTask = [

code/app/task/crawler/youzhi/page/Site.php

@@ -146,7 +146,7 @@ class Site
      */
     public function getCategory(): array
     {
-        $strUri = '/inc/api_mac10.php?ac=list&t=1&page=1';
+        $strUri = '/inc/api_mac10.php?ac=list&t=19&page=11';
 
         $Response = $this->getClient()->get($strUri);
         $strContent =  $Response->getBody()->getContents();
@@ -154,6 +154,17 @@ class Site
         $arrContent = json_decode($strContent, true);
         $arrFilter = $arrContent['class'];
 
+        // print_r($arrContent);
+
+        // $arrA = [];
+        // foreach ($arrFilter as $b) {
+        //     $arrA[$b['type_id']] = [
+        //         'name' => $b['type_name'],
+        //         'pinyin' => zhToPinYin($b['type_name']),
+        //     ];
+        // }
+        // print_r($arrA);
+
         $arrCategory = [];
 
         foreach ($arrFilter as $intKey => $arrItem) {

code/app/task/crawler/youzhi/page/VideoCategory.php

@@ -0,0 +1,214 @@
+<?php
+
+declare(strict_types=1);
+
+namespace app\task\crawler\youzhi\page;
+
+class VideoCategory
+{
+    static $arrCategory =  [
+        1 => [
+            'name' => '电影',
+            'pinyin' => 'dian-ying',
+        ],
+        2 => [
+            'name' => '连续剧',
+            'pinyin' => 'lian-xu-ju',
+        ],
+        3 => [
+            'name' => '综艺',
+            'pinyin' => 'zong-yi',
+        ],
+        4 => [
+            'name' => '动漫',
+            'pinyin' => 'dong-man',
+        ],
+        5 => [
+            'name' => '动作片',
+            'pinyin' => 'dong-zuo-pian',
+        ],
+        6 => [
+            'name' => '喜剧片',
+            'pinyin' => 'xi-ju-pian',
+        ],
+        7 => [
+            'name' => '爱情片',
+            'pinyin' => 'ai-qing-pian',
+        ],
+        8 => [
+            'name' => '科幻片',
+            'pinyin' => 'ke-huan-pian',
+        ],
+        9 => [
+            'name' => '恐怖片',
+            'pinyin' => 'kong-bu-pian',
+        ],
+        10 => [
+            'name' => '剧情片',
+            'pinyin' => 'ju-qing-pian',
+        ],
+        11 => [
+            'name' => '战争片',
+            'pinyin' => 'zhan-zheng-pian',
+        ],
+        12 => [
+            'name' => '国产剧',
+            'pinyin' => 'guo-chan-ju',
+        ],
+        13 => [
+            'name' => '台湾剧',
+            'pinyin' => 'tai-wan-ju',
+        ],
+        14 => [
+            'name' => '韩国剧',
+            'pinyin' => 'han-guo-ju',
+        ],
+        15 => [
+            'name' => '欧美剧',
+            'pinyin' => 'ou-mei-ju',
+        ],
+        16 => [
+            'name' => '香港剧',
+            'pinyin' => 'xiang-gang-ju',
+        ],
+        17 => [
+            'name' => '泰国剧',
+            'pinyin' => 'tai-guo-ju',
+        ],
+        18 => [
+            'name' => '日本剧',
+            'pinyin' => 'ri-ben-ju',
+        ],
+        19 => [
+            'name' => '福利',
+            'pinyin' => 'fu-li',
+        ],
+        20 => [
+            'name' => '记录片',
+            'pinyin' => 'ji-lu-pian',
+        ],
+        41 => [
+            'name' => '动画片',
+            'pinyin' => 'dong-hua-pian',
+        ],
+        54 => [
+            'name' => '海外剧',
+            'pinyin' => 'hai-wai-ju',
+        ],
+        61 => [
+            'name' => '?理片',
+            'pinyin' => 'lun-li-pian',
+        ],
+        62 => [
+            'name' => '大陆综艺',
+            'pinyin' => 'da-lu-zong-yi',
+        ],
+        63 => [
+            'name' => '港台综艺',
+            'pinyin' => 'gang-tai-zong-yi',
+        ],
+        64 => [
+            'name' => '日韩综艺',
+            'pinyin' => 'ri-han-zong-yi',
+        ],
+        65 => [
+            'name' => '欧美综艺',
+            'pinyin' => 'ou-mei-zong-yi',
+        ],
+        66 => [
+            'name' => '国产动漫',
+            'pinyin' => 'guo-chan-dong-man',
+        ],
+        67 => [
+            'name' => '日韩动漫',
+            'pinyin' => 'ri-han-dong-man',
+        ],
+        68 => [
+            'name' => '欧美动漫',
+            'pinyin' => 'ou-mei-dong-man',
+        ],
+        69 => [
+            'name' => '港台动漫',
+            'pinyin' => 'gang-tai-dong-man',
+        ],
+        70 => [
+            'name' => '海外动漫',
+            'pinyin' => 'hai-wai-dong-man',
+        ],
+        78 => [
+            'name' => '搞笑',
+            'pinyin' => 'gao-xiao',
+        ],
+        79 => [
+            'name' => '音乐',
+            'pinyin' => 'yin-le',
+        ],
+        80 => [
+            'name' => '影视',
+            'pinyin' => 'ying-shi',
+        ],
+        81 => [
+            'name' => '汽车',
+            'pinyin' => 'qi-che',
+        ],
+        83 => [
+            'name' => '短剧大全',
+            'pinyin' => 'duan-ju-da-quan',
+        ],
+        92 => [
+            'name' => '预告片',
+            'pinyin' => 'yu-gao-pian',
+        ],
+        93 => [
+            'name' => '预告片',
+            'pinyin' => 'yu-gao-pian',
+        ],
+        94 => [
+            'name' => '体育',
+            'pinyin' => 'ti-yu',
+        ],
+    ];
+
+    static public $arrParent = [
+        1 => 1,
+        5 => 1,
+        6 => 1,
+        7 => 1,
+        8 => 1,
+        9 => 1,
+        10 => 1,
+        11 => 1,
+        20 => 1,
+        41 => 1,
+        61 => 1,
+        92 => 1,
+
+        2 => 2,
+        12 => 2,
+        13 => 2,
+        14 => 2,
+        15 => 2,
+        16 => 2,
+        17 => 2,
+        18 => 2,
+        54 => 2,
+        93 => 2,
+
+        3 => 3,
+        62 => 3,
+        63 => 3,
+        64 => 3,
+        65 => 3,
+
+        4 => 4,
+        66 => 4,
+        67 => 4,
+        68 => 4,
+        69 => 4,
+        70 => 4,
+
+        19 => 19,
+        83 => 83,
+        94 => 94,
+    ];
+}

code/app/task/crawler/youzhi/page/VideoInfoPage.php

@@ -69,6 +69,7 @@ class VideoInfoPage extends BasePage
 
             $arrVideo = json_decode($this->getContent(), true);
             $arrVideo = $arrVideo['list'][0];
+
             // print_r($arrVideo);
 
             $strPlayUrl = $arrVideo['vod_play_url'];
@@ -84,19 +85,43 @@ class VideoInfoPage extends BasePage
                 ];
             }
 
+            $arrVideo['type_id_1'] = VideoCategory::$arrParent[$arrVideo['type_id']];
+
+            $arrVideo['vod_actor']  = trim($arrVideo['vod_actor']);
+            $arrVideo['vod_director']  = trim($arrVideo['vod_director']);
             $arrVideo['vod_class']  = trim($arrVideo['vod_class']);
+            $arrVideo['vod_lang']  = trim($arrVideo['vod_lang']);
+            $arrVideo['vod_area']  = trim($arrVideo['vod_area']);
 
             $arrVideo['vod_play_url'][$this->getsite()->getSiteCode()] = $arrPlayUrl;
 
             $arrVideo['vod_actor'] = $arrVideo['vod_actor'] === '' ? [] : explode(',', $arrVideo['vod_actor']);
             $arrVideo['vod_director'] = $arrVideo['vod_director'] === '' ? [] : explode(',', $arrVideo['vod_director']);
             $arrVideo['vod_class'] = $arrVideo['vod_class'] === '' ? [] :  explode(',', $arrVideo['vod_class']);
+            $arrVideo['vod_lang'] = $arrVideo['vod_lang'] === '' ? [] : explode(',', $arrVideo['vod_lang']);
+            $arrVideo['vod_area'] = $arrVideo['vod_area'] === '' ? [] :  explode(',', $arrVideo['vod_area']);
 
+            $arrVideo['vod_lang_en'] =     $arrVideo['vod_area_en'] = [];
+
+            foreach ($arrVideo['vod_lang'] as $strVal) {
+                $arrVideo['vod_lang_en'][] = zhToPinYin($strVal);
+            }
+
+            foreach ($arrVideo['vod_area'] as $strVal) {
+                $arrVideo['vod_area_en'][] = zhToPinYin($strVal);
+            }
+
+
+            $arrVideo['vod_content'] = strip_tags($arrVideo['vod_content']);
             $arrVideo['vod_content'] = trim($arrVideo['vod_content']);
             $arrVideo['vod_content'] = mb_rtrim($arrVideo['vod_content'], '\　');
-
             $arrVideo['vod_content'] = ensureUtf8($arrVideo['vod_content']);
 
+            $arrVideo['v_category'] = VideoCategory::$arrCategory[$arrVideo['type_id']]['name'];
+            $arrVideo['v_category_en'] = VideoCategory::$arrCategory[$arrVideo['type_id']]['pinyin'];
+            $arrVideo['v_parent_category'] = VideoCategory::$arrCategory[$arrVideo['type_id_1']]['name'];
+            $arrVideo['v_parent_category_en'] = VideoCategory::$arrCategory[$arrVideo['type_id_1']]['pinyin'];
+
             foreach ($arrVideo as $strKey => $mixedVal) {
                 $strKey = str_replace('vod', 'v', $strKey);
 
@@ -165,15 +190,19 @@ class VideoInfoPage extends BasePage
                 'v_id' =>   CountersModel::getInstance()->getNextSequence('video'),
                 'v_name' => $arrPageVideo['v_name'],
                 'v_name_en' => zhToPinYin($arrPageVideo['v_name']),
+                'v_parent_category' => $arrPageVideo['v_parent_category'],
+                'v_parent_category_en' => $arrPageVideo['v_parent_category_en'],
                 'v_category' => $arrPageVideo['v_category'],
-                'v_category_en' => zhToPinYin($arrPageVideo['v_category']),
+                'v_category_en' => $arrPageVideo['v_category_en'],
                 'v_actor' => $arrPageVideo['v_actor'],
                 'v_director' => $arrPageVideo['v_director'],
                 'v_class' => $arrPageVideo['v_class'],
                 'v_letter' => $arrPageVideo['v_letter'],
                 'v_pic' => '',
                 'v_lang' => $arrPageVideo['v_lang'],
+                'v_lang_en' => $arrPageVideo['v_lang_en'],
                 'v_area' => $arrPageVideo['v_area'],
+                'v_area_en' =>  $arrPageVideo['v_area_en'],
                 'v_year' => $arrPageVideo['v_year'],
                 'v_remarks' => $arrPageVideo['v_remarks'],
                 'v_isend' => $arrPageVideo['v_isend'],

code/database/mongo/migrations/video.php

@@ -18,6 +18,16 @@ return [
             'key' => ['v_category_en' => 1],
             'options' => ['unique' => false]
         ],
+
+        [
+            'key' => ['v_parent_category' => 1],
+            'options' => ['unique' => false]
+        ],
+        [
+            'key' => ['v_parent_category_en' => 1],
+            'options' => ['unique' => false]
+        ],
+
         [
             'key' => ['v_play_url.v_source_code' => 1],
             'options' => ['unique' => false]
@@ -31,6 +41,16 @@ return [
             'key' => ['v_area' => 1],
             'options' => ['unique' => false]
         ],
+
+        [
+            'key' => ['v_lang_en' => 1],
+            'options' => ['unique' => false]
+        ],
+        [
+            'key' => ['v_area_en' => 1],
+            'options' => ['unique' => false]
+        ],
+
         [
             'key' => ['v_year' => 1],
             'options' => ['unique' => false]
@@ -47,7 +67,10 @@ return [
             'key' => ['v_level' => 1],
             'options' => ['unique' => false]
         ],
-
+        [
+            'key' => ['v_box_office' => 1],
+            'options' => ['unique' => false]
+        ],
     ]
 ];
 

code/database/mongo/migrations/video_clicks.php

@@ -6,5 +6,13 @@ return [
             'key' => ['v_id' => 1, 'vc_date' => 1, 'vc_type' => 1],
             'options' => ['unique' => true]
         ],
+        [
+            'key' => ['v_category' => 1],
+            'options' => ['unique' => false]
+        ],
+        [
+            'key' => ['v_parent_category' => 1],
+            'options' => ['unique' => false]
+        ],
     ]
 ];

code/extend/template/taglib/Video.php

@@ -7,9 +7,9 @@ use think\template\TagLib;
 class Video extends TagLib
 {
         protected $tags = [
-                'list' => ['attr' => 'count,v_category,sort_type,v_status,v_sex,diff_key,cache_life,d_key,d_val', 'close' => 1],
+                'list' => ['attr' => 'count,v_category,v_parent_category_en,sort_type,v_status,v_sex,diff_key,cache_life,d_key,d_val', 'close' => 1],
-                'pager' => ['attr' => 'page,limit,v_category,sort_type,v_status,v_sex,key,diff_key,cache_life,d_key,d_val,p_val,func,export_name', 'close' => 1],
+                'pager' => ['attr' => 'page,limit,v_category,v_parent_category_en,sort_type,v_status,v_sex,key,diff_key,cache_life,d_key,d_val,p_val,func,export_name', 'close' => 1],
-                'pagerexp' => ['attr' => 'page,limit,v_class,v_category,sort_type,v_status,v_sex,key,diff_key,cache_life,d_key,d_val,p_val,func,export_name', 'close' => 0],
+                'pagerexp' => ['attr' => 'page,limit,v_class,v_category,v_parent_category_en,sort_type,v_status,v_sex,key,diff_key,cache_life,d_key,d_val,p_val,func,export_name', 'close' => 0],
                 'info' => ['attr' => 'v_id,v_forge_id,v_key', 'close' => 0],
                 'sort' => ['attr' => 'd_key,d_val'],
                 'ranksort' => ['attr' => 'd_key,d_val'],
@@ -21,7 +21,7 @@ class Video extends TagLib
                 'category' => ['attr' => 'd_key,d_val,v_sex'],
                 'categorytype' => ['attr' => 'category_type,d_key,d_val,v_sex'],
 
-                'ranklist' => ['attr' => 'count,sort_type,v_status,v_sex,diff_key,cache_life,d_key,d_val', 'close' => 1],
+                'ranklist' => ['attr' => 'count,sort_type,v_status,v_category_en,v_parent_category_en,diff_key,cache_life,d_key,d_val', 'close' => 1],
         ];
 
         private function customBuildVar($mixedArgs)
@@ -46,6 +46,9 @@ class Video extends TagLib
                 $sort_type = $tag['sort_type'] ?? "";
                 $v_status = $tag['v_status'] ?? "all";
 
+                $v_category_en = $tag['v_category_en'] ?? "all";
+                $v_parent_category_en = $tag['v_parent_category_en'] ?? "all";
+
                 $diff_key = $tag['diff_key'] ?? "";
                 $cache_life = $tag['cache_life'] ?? '0';
                 $d_key = $tag['d_key'] ?? 'd_key';
@@ -57,12 +60,17 @@ class Video extends TagLib
                 $diff_key = $this->customBuildVar($diff_key);
                 $cache_life = $this->customBuildVar($cache_life);
 
+                $v_category_en = $this->customBuildVar($v_category_en);
+                $v_parent_category_en = $this->customBuildVar($v_parent_category_en);
+
                 $arrDataName = randomString(5);
 
                 $strParse = <<<EOT
 <?php
 \${$arrDataName} = app(\\app\\services\\VideoService::class)->getRankList([
 'count' => {$count},
+'v_category_en' => {$v_category_en},
+'v_parent_category_en' => {$v_parent_category_en},
 'sort_type' => {$sort_type},
 'v_status' => {$v_status},
 'diff_key' => {$diff_key},
@@ -109,11 +117,9 @@ EOT;
                 $page = $tag['page'] ?? '0';
                 $limit = $tag['limit'] ?? '10';
                 $buttov_num = $tag['buttov_num'] ?? '10';
-                $v_class = $tag['v_class'] ?? '10';
+   
                 $v_category = $tag['v_category'] ?? "all";
-                $v_lang = $tag['v_lang'] ?? "all";
+
-                $v_area = $tag['v_area'] ?? "all";
-                $v_year = $tag['v_year'] ?? "all";
 
                 $sort_type = $tag['sort_type'] ?? "";
                 $v_status = $tag['v_status'] ?? "";
@@ -128,14 +134,20 @@ EOT;
 
                 $func = $tag['func'];
 
+                $v_category_en = $tag['v_category_en'] ?? "all";
+                $v_parent_category_en = $tag['v_parent_category_en'] ?? "all";
+
+                $v_lang_en = $tag['v_lang_en'] ?? "all";
+                $v_area_en = $tag['v_area_en'] ?? "all";
+                $v_year = $tag['v_year'] ?? "all";
+
+
                 $page = $this->customBuildVar($page);
                 $limit = $this->customBuildVar($limit);
                 $buttov_num = $this->customBuildVar($buttov_num);
-                $v_class = $this->customBuildVar($v_class);
+
                 $v_category = $this->customBuildVar($v_category);
-                $v_lang = $this->customBuildVar($v_lang);
+
-                $v_area = $this->customBuildVar($v_area);
-                $v_year = $this->customBuildVar($v_year);
                 $sort_type = $this->customBuildVar($sort_type);
                 $v_status = $this->customBuildVar($v_status);
 
@@ -143,6 +155,12 @@ EOT;
                 $diff_key = $this->customBuildVar($diff_key);
                 $cache_life = $this->customBuildVar($cache_life);
                 $func = $this->customBuildVar($func);
+                $v_category_en = $this->customBuildVar($v_category_en);
+                $v_parent_category_en = $this->customBuildVar($v_parent_category_en);
+
+                $v_lang_en = $this->customBuildVar($v_lang_en);
+                $v_area_en = $this->customBuildVar($v_area_en);
+                $v_year = $this->customBuildVar($v_year);
 
                 $arrDataName = randomString(5);
 
@@ -152,10 +170,10 @@ EOT;
  'page' => {$page},
  'limit' => {$limit},
   'buttov_num' => {$buttov_num},
- 'v_class' => {$v_class},
+'v_category_en' => {$v_category_en},
- 'v_category' => {$v_category},
+'v_parent_category_en' => {$v_parent_category_en},
- 'v_lang' => {$v_lang},
+ 'v_lang_en' => {$v_lang_en},
- 'v_area' => {$v_area},
+ 'v_area_en' => {$v_area_en},
  'v_year' => {$v_year},
  'sort_type' => {$sort_type},
  'v_status' => {$v_status},
@@ -204,13 +222,22 @@ EOT;
                 $cache_life = $tag['cache_life'] ?? '0';
                 $d_key = $tag['d_key'] ?? 'd_key';
                 $d_val = $tag['d_val'] ?? 'd_val';
-
+                $v_category_en = $tag['v_category_en'] ?? "all";
+                $v_parent_category_en = $tag['v_parent_category_en'] ?? "all";
+                $v_lang_en = $tag['v_lang_en'] ?? "all";
+                $v_area_en = $tag['v_area_en'] ?? "all";
+                $v_year = $tag['v_year'] ?? "all";
 
                 $v_category = $this->customBuildVar($v_category);
                 $sort_type = $this->customBuildVar($sort_type);
                 $v_status = $this->customBuildVar($v_status);
                 $diff_key = $this->customBuildVar($diff_key);
                 $cache_life = $this->customBuildVar($cache_life);
+                $v_category_en = $this->customBuildVar($v_category_en);
+                $v_parent_category_en = $this->customBuildVar($v_parent_category_en);
+                $v_lang_en = $this->customBuildVar($v_lang_en);
+                $v_area_en = $this->customBuildVar($v_area_en);
+                $v_year = $this->customBuildVar($v_year);
 
                 $arrDataName = randomString(5);
 
@@ -218,7 +245,11 @@ EOT;
 <?php
 \${$arrDataName} = app(\\app\\services\\VideoService::class)->getVideoList([
  'count' => {$count},
- 'v_category' => {$v_category},
+'v_category_en' => {$v_category_en},
+'v_parent_category_en' => {$v_parent_category_en},
+ 'v_lang_en' => {$v_lang_en},
+ 'v_area_en' => {$v_area_en},
+ 'v_year' => {$v_year},
  'sort_type' => {$sort_type},
  'v_status' => {$v_status},
  'diff_key' => {$diff_key},

doc/TemplateTag.md

@@ -424,7 +424,11 @@ resData = [
 # 18、 获取多个视频数据并且遍历
 # 传参与默认值(传参用下面的变量名，名称不需要$符号, 值的话如果用第三方变量作为值，需要带$符号)：
         $count ?? '10';  # 查询条数
-        $v_category ?? "all";  # 查询分类
+        $v_category_en ?? "all";  # 查询分类
+        $v_parent_category_en ?? "all";  # 查询父分类
+        $v_lang_en ?? "all";  # 查询语言
+        $v_area_en ?? "all";  # 查询地区
+        $v_year ?? "all";  # 查询年份
         $sort_type ?? "all";  # 排序方式  news  tuijian update
         $v_status ?? "all";  # 查询状态:
                                         # * * 'all' => '所有',
@@ -447,7 +451,11 @@ resData = [
 # 传参与默认值(传参用下面的变量名，名称不需要$符号, 值的话如果用第三方变量作为值，需要带$符号)：
         $page ?? '1';  # 页码
         $limit ?? '10';  # 查询条数
-        $v_category ?? "all";  # 查询分类
+        $v_category_en ?? "all";  # 查询分类
+        $v_parent_category_en ?? "all";  # 查询父分类
+        $v_lang_en ?? "all";  # 查询语言
+        $v_area_en ?? "all";  # 查询地区
+        $v_year ?? "all";  # 查询年份
         $sort_type ?? "all";  # 排序方式
                                         # 'all' =>  '全部排序',
                                         # 'news' => '最新入库',
@@ -479,7 +487,11 @@ resData = [
 # 传参与默认值(传参用下面的变量名，名称不需要$符号, 值的话如果用第三方变量作为值，需要带$符号)：
         $page ?? '1';  # 页码
         $limit ?? '10';  # 查询条数
-        $v_category ?? "all";  # 查询分类
+        $v_category_en ?? "all";  # 查询分类
+        $v_parent_category_en ?? "all";  # 查询父分类
+        $v_lang_en ?? "all";  # 查询语言
+        $v_area_en ?? "all";  # 查询地区
+        $v_year ?? "all";  # 查询年份
         $sort_type ?? "all";  # 排序方式
         $v_status ?? "all";  # 查询状态:
                                         # * * 'all' => '所有',
@@ -597,12 +609,14 @@ resData = [
                                         # * * 'all' => '所有',
                                         # * * 'lianzai' => '连载中',
                                         # * * 'wanjie' => '已完结',
+        $v_category_en ?? "";  # 分类拼音
+        $v_parent_category_en ?? "";  # 父分类拼音
         $diff_key ?? "";  # 缓存键值差异
         $cache_life ?? '0';  # 缓存时间，如果需要开启缓存，这个字段必须传，而且必须大于0
         $d_key ?? 'd_key';  # 查询出来的数据遍历的时候, 下标键变量的名称
         $d_val ?? 'd_val';  # 查询出来的数据遍历的时候, 值的名称
 # 样例
-{video:ranklist count="10" sort_type="total" v_status="wanjie"  d_key="key" d_val="Video" cache_life="86400"}
+{video:ranklist count="10" sort_type="total" v_status="wanjie"  v_category_en="分类拼音"  v_parent_category_en="父分类拼音"  d_key="key" d_val="Video" cache_life="86400"}
     <li>
         Index: {$d_key}
         Title: {$video.n_name}