From d19ea974817549526d417053c70d9c620af22f24 Mon Sep 17 00:00:00 2001 From: Default Date: Tue, 15 Apr 2025 21:16:14 +0800 Subject: [PATCH] debug --- code/app/home/controller/Index.php | 8 +- code/app/home/controller/Novel.php | 111 ++++---- code/app/home/view/default/Index/index.html | 10 +- code/app/home/view/default/baseH5.html | 2 +- .../view/kuangYu/novel/getNovelCatalog.html | 50 ++-- .../view/kuangYu/novel/getNovelChapter.html | 86 +++--- .../home/view/kuangYu/novel/getNovelInfo.html | 90 +++---- .../view/kuangYu/novel/getSearchNovel.html | 2 +- .../home/view/kuangYu/pc/getKanNovelInfo.html | 106 ++++---- .../home/view/kuangYu/pc/getNovelCatalog.html | 54 ++-- .../home/view/kuangYu/pc/getNovelChapter.html | 90 +++---- .../home/view/kuangYu/pc/getNovelInfo.html | 108 ++++---- .../home/view/kuangYu/pc/getSearchNovel.html | 2 +- code/app/home/view/kuangYu/pc/index.html | 8 +- .../view/kuangYu/pc/public/endNovelList.html | 8 +- .../view/kuangYu/pc/public/hostListImg.html | 10 +- .../view/kuangYu/pc/public/hostListText.html | 6 +- .../kuangYu/pc/public/indexBoyNewsList.html | 16 +- .../kuangYu/pc/public/indexBoyNewsOne.html | 16 +- .../kuangYu/pc/public/indexBoyRankList.html | 14 +- .../kuangYu/pc/public/indexBoyRankOne.html | 12 +- .../pc/public/indexNewsUpdateList.html | 18 +- .../kuangYu/pc/public/shukuNovelList.html | 16 +- .../view/kuangYu/pc/public/swiperListImg.html | 4 +- .../kuangYu/pc/public/swiperListText.html | 4 +- code/app/home/view/kuangYu/pc/user/index.html | 68 ++--- .../home/view/kuangYu/public/articleList.html | 2 +- .../home/view/kuangYu/public/novelListH.html | 12 +- .../view/kuangYu/public/novelListRank.html | 2 +- .../home/view/kuangYu/public/novelListS.html | 8 +- code/app/model/CategoryModel.php | 6 +- code/app/model/ChapterModel.php | 18 +- code/app/model/NovelClicksModel.php | 2 +- code/app/model/NovelModel.php | 18 +- code/app/task/crawler/zw/Scheduler.php | 16 +- code/app/task/crawler/zw/page/ChapterPage.php | 135 +++++----- code/app/task/crawler/zw/page/NovelPage.php | 246 +++++++++++------- code/app/task/crawler/zw/page/Site.php | 66 ++++- .../app/task/crawler/zw630/page/NovelPage.php | 2 +- code/app/task/crawler/zw74/page/NovelPage.php | 2 +- code/composer.json | 4 +- code/composer.lock | 154 +++++------ code/database/mongo/migrations/chapter.php | 2 +- code/database/mongo/migrations/novel.php | 6 +- code/extend/db/NovelManage.php | 10 +- code/extend/storage/StorageCore.php | 6 + .../template/kuangyu/public/js/common.js | 40 +-- 47 files changed, 907 insertions(+), 769 deletions(-) diff --git a/code/app/home/controller/Index.php b/code/app/home/controller/Index.php index 910ba42..5a70e4b 100644 --- a/code/app/home/controller/Index.php +++ b/code/app/home/controller/Index.php @@ -42,7 +42,7 @@ class Index extends BaseController break; case 'kuangYu': $strKey = sprintf('%s:H5:INDEX:ZUIJIAN:SEX:%s:%s', $Request->DomainModel->d_domain, 0, 8); - $arrNewsNovel = $NovelModel->getCommonNovelOnCache($strKey, $intTTL, 8, 0, NULL, ['og_novel_update_time' => -1]); + $arrNewsNovel = $NovelModel->getCommonNovelOnCache($strKey, $intTTL, 8, 0, NULL, ['n_update_time' => -1]); $strKey = sprintf('%s:H5:INDEX:RANK:%s:SEX:%s', $Request->DomainModel->d_domain, 'daily', 0); $arrDayRankNovel = $NovelModel->getRankNovelOnCache($strKey, 10, 0, 'daily'); @@ -141,7 +141,7 @@ class Index extends BaseController // 男生频道，最新的 随机5个小说 $strKey = sprintf('%s:PC:INDEX:ZUIJIAN:SEX:%s:%s', $Request->DomainModel->d_domain, 1, 5); - $arrBoyNewsNovel = $NovelModel->getCommonNovelOnCache($strKey, $intTTL, 5, 1, NULL, ['og_novel_update_time' => -1]); + $arrBoyNewsNovel = $NovelModel->getCommonNovelOnCache($strKey, $intTTL, 5, 1, NULL, ['n_update_time' => -1]); // 男生频道，周排行榜 随机10个小说 @@ -158,7 +158,7 @@ class Index extends BaseController // 女生频道，最新的 随机5个小说 $strKey = sprintf('%s:PC:INDEX:ZUIJIAN:SEX:%s:%s', $Request->DomainModel->d_domain, 2, 5); - $arrGirlNewsNovel = $NovelModel->getCommonNovelOnCache($strKey, $intTTL, 5, 2, NULL, ['og_novel_update_time' => -1]); + $arrGirlNewsNovel = $NovelModel->getCommonNovelOnCache($strKey, $intTTL, 5, 2, NULL, ['n_update_time' => -1]); // 女生频道，周排行榜 随机10个小说 $strKey = sprintf('%s:PC:INDEX:RANK:%s:SEX:%s', $Request->DomainModel->d_domain, 'weekly', 2); @@ -174,7 +174,7 @@ class Index extends BaseController // 最近更新-随机50 $strKey = sprintf('%s:PC:INDEX:ZUIJIAN:SEX:%s:%s', $Request->DomainModel->d_domain, 0, 50); - $arrNewsUpdateNovel = $NovelModel->getCommonNovelOnCache($strKey, $intTTL, 50, 0, NULL, ['og_novel_update_time' => -1]); + $arrNewsUpdateNovel = $NovelModel->getCommonNovelOnCache($strKey, $intTTL, 50, 0, NULL, ['n_update_time' => -1]); // Title 模板 ConverterMovel::setVal([ diff --git a/code/app/home/controller/Novel.php b/code/app/home/controller/Novel.php index 0224a04..c85cb65 100644 --- a/code/app/home/controller/Novel.php +++ b/code/app/home/controller/Novel.php @@ -248,11 +248,11 @@ class Novel extends BaseController // 模拟数据-最近更新-随机50 $strKey = sprintf('%s:PC:Novel:Channel:Latest:%s', $Request->DomainModel->d_domain, $intType); $intCount = 20; - $arrNewsUpdateNovel = $NovelModel->getCommonNovelOnCache($strKey, $intLifeTime, $intCount, $intType, NULL, ['og_novel_update_time' => -1]); + $arrNewsUpdateNovel = $NovelModel->getCommonNovelOnCache($strKey, $intLifeTime, $intCount, $intType, NULL, ['n_update_time' => -1]); // echo "
";
         // var_dump($arrNewsUpdateNovel);exit;
-        // TODO   og_description  改成 og_description
+        // TODO   n_description  改成 n_description
         // 更新值
         ConverterMovel::setVal([
             'intPage' => 1,
@@ -388,14 +388,14 @@ class Novel extends BaseController
 
         foreach ($arrNovel['n_forge_novel'] as $arrForgeNovel) {
             if ($arrForgeNovel['n_forge_id'] == $intForgeId) {
-                $arrNovel['og_novel_book_name'] = $arrForgeNovel['n_forge_title'];
+                $arrNovel['n_name'] = $arrForgeNovel['n_forge_title'];
                 break;
             }
         }
 
         // 分类拼音
-        $arrNovel['category_pinyin'] = CategoryModel::getPinYinByZh($arrNovel['og_novel_category']);
-        $arrNovel['category_sex'] = $arrNovel['category_sex'] ?? 'man';
+        $arrNovel['n_category_pinyin'] = CategoryModel::getPinYin($arrNovel['n_category']);
+        $arrNovel['n_category_sex_en'] = $arrNovel['n_category_sex_en'] ?? 'man';
 
         // 最后章节
         $ChapterModel = ChapterModel::getInstance();
@@ -411,7 +411,7 @@ class Novel extends BaseController
         $strFocus = '';
         // 要点
         if ($arrLatestChapter) {
-            $strFocus =  strip_tags($arrLatestChapter['content']);
+            $strFocus =  strip_tags($arrLatestChapter['c_content']);
             $intCount = mb_strlen($strFocus);
             if ($intCount > 300) {
                 $intPos = mt_rand(0, $intCount - 300);
@@ -439,12 +439,12 @@ class Novel extends BaseController
         // 更新值
         ConverterMovel::setVal([
             'intPage' => 1,
-            'strNovelName' => $arrNovel['og_novel_book_name'],
-            'strNovelAuthor' => $arrNovel['og_novel_author'],
-            'strNovelCategoryName' => $arrNovel['og_novel_category'],
-            'strNovelSex' => $arrNovel['category_sex'] == 'man' ? '男生' : '女生',
-            'strNovelStatus' => $arrNovel['og_novel_status'],
-            'strNovelDescription' => $arrNovel['og_description'],
+            'strNovelName' => $arrNovel['n_name'],
+            'strNovelAuthor' => $arrNovel['n_author'],
+            'strNovelCategoryName' => $arrNovel['n_category'],
+            'strNovelSex' => $arrNovel['n_category_sex_en'] == 'man' ? '男生' : '女生',
+            'strNovelStatus' => $arrNovel['n_status'],
+            'strNovelDescription' => $arrNovel['n_description'],
         ]);
 
         $strTitleTemplate =  $Request->DomainModel->getFomartSubject('NOVEL@GETNOVELINFO@TITLE',$intForgeId);
@@ -457,7 +457,7 @@ class Novel extends BaseController
 
         // js使用到
         $arrNovelJs = $arrNovel;
-        unset($arrNovelJs['n_related_novel'], $arrNovelJs['n_forge_novel'], $arrNovelJs['og_description']);
+        unset($arrNovelJs['n_related_novel'], $arrNovelJs['n_forge_novel'], $arrNovelJs['n_description']);
 
         View::assign([
             'arrRelateveNovel' => $arrRelateveNovel,
@@ -498,8 +498,8 @@ class Novel extends BaseController
         $arrNovel = $NovelModel->getNovelByNId($intNId);
 
         // 分类拼音
-        $arrNovel['category_pinyin'] = CategoryModel::getPinYinByZh($arrNovel['og_novel_category']);
-        $arrNovel['category_sex'] = $arrNovel['category_sex'] ?? 'man';
+        $arrNovel['n_category_pinyin'] = CategoryModel::getPinYin($arrNovel['n_category']);
+        $arrNovel['n_category_sex_en'] = $arrNovel['n_category_sex_en'] ?? 'man';
 
         // 最后章节
         $ChapterModel = ChapterModel::getInstance();
@@ -515,7 +515,7 @@ class Novel extends BaseController
         $strFocus = '';
         // 要点
         if ($arrLatestChapter) {
-            $strFocus =  strip_tags($arrLatestChapter['content']);
+            $strFocus =  strip_tags($arrLatestChapter['c_content']);
             $intCount = mb_strlen($strFocus);
             if ($intCount > 300) {
                 $intPos = mt_rand(0, $intCount - 300);
@@ -543,12 +543,12 @@ class Novel extends BaseController
         // 更新值
         ConverterMovel::setVal([
             'intPage' => 1,
-            'strNovelName' => $arrNovel['og_novel_book_name'],
-            'strNovelAuthor' => $arrNovel['og_novel_author'],
-            'strNovelCategoryName' => $arrNovel['og_novel_category'],
-            'strNovelSex' => $arrNovel['category_sex'] == 'man' ? '男生' : '女生',
-            'strNovelStatus' => $arrNovel['og_novel_status'],
-            'strNovelDescription' => $arrNovel['og_description'],
+            'strNovelName' => $arrNovel['n_name'],
+            'strNovelAuthor' => $arrNovel['n_author'],
+            'strNovelCategoryName' => $arrNovel['n_category'],
+            'strNovelSex' => $arrNovel['n_category_sex_en'] == 'man' ? '男生' : '女生',
+            'strNovelStatus' => $arrNovel['n_status'],
+            'strNovelDescription' => $arrNovel['n_description'],
         ]);
 
         $strTitleTemplate =  $Request->DomainModel->getFomartSubject(getFomartSubjectKey(__METHOD__) . '@TITLE',$intNId);
@@ -595,8 +595,8 @@ class Novel extends BaseController
         $NovelModel = NovelModel::getInstance();
         $arrNovel = $NovelModel->getNovelByNId($intNId);
 
-        $arrNovel['category_pinyin'] =  $arrNovel['category_pinyin'] ?? 'all';
-        $arrNovel['category_sex'] = $arrNovel['category_sex'] ?? 'man';
+        $arrNovel['n_category_pinyin'] =  $arrNovel['n_category_pinyin'] ?? 'all';
+        $arrNovel['n_category_sex_en'] = $arrNovel['n_category_sex_en'] ?? 'man';
 
         // 最新章节
         $ChapterModel = ChapterModel::getInstance();
@@ -611,9 +611,11 @@ class Novel extends BaseController
             $arrNextChapter = $ChapterModel->getNextChapter($arrChapter['n_id'], $arrChapter['c_sort_num'], $arrChapter['c_page']);
 
             // 要点-先从章节随机截取，后面如果用上ai，看看使用ai 提炼 精简内容
-            $strChapterDescription = strip_tags($arrChapter['content']);
+            $strChapterDescription = strip_tags($arrChapter['c_content']);
             $intCount = mb_strlen($strChapterDescription);
             $strChapterDescription = ($intCount > 50) ? mb_substr($strChapterDescription, 0, 50) : $strChapterDescription;
+
+            $arrChapter['c_content'] = base64_encode($arrChapter['c_content']);
         }
 
         $arrCategoryAll = CategoryModel::$arrCategoryAll;
@@ -621,13 +623,13 @@ class Novel extends BaseController
         // 更新值
         ConverterMovel::setVal([
             'intPage' => 1,
-            'strNovelName' => $arrNovel['og_novel_book_name'],
-            'strNovelAuthor' => $arrNovel['og_novel_author'],
-            'strNovelCategoryName' => $arrNovel['og_novel_category'],
-            'strNovelStatus' => $arrNovel['og_novel_status'],
-            'strNovelDescription' => $arrNovel['og_description'],
+            'strNovelName' => $arrNovel['n_name'],
+            'strNovelAuthor' => $arrNovel['n_author'],
+            'strNovelCategoryName' => $arrNovel['n_category'],
+            'strNovelStatus' => $arrNovel['n_status'],
+            'strNovelDescription' => $arrNovel['n_description'],
             'strChapterDescription' => $strChapterDescription,
-            'strNovelChapterName' => $arrChapter['name'] ?? '',
+            'strNovelChapterName' => $arrChapter['c_name'] ?? '',
             'strNovelChapterSort' => $arrChapter['c_sort_num'] ?? '',
         ]);
 
@@ -640,6 +642,7 @@ class Novel extends BaseController
         $strKeywords = ConverterMovel::convert($strKeywordsTemplate);
         $strDescription = ConverterMovel::convert($strDescriptionTemplate);
 
+
         View::assign([
             'arrNovel' => $arrNovel,
             'arrCategoryAll' => $arrCategoryAll,
@@ -679,8 +682,8 @@ class Novel extends BaseController
         $intNId = $intNovelId;
         $arrNovel = $NovelModel->getNovelByNId($intNId);
 
-        $arrNovel['category_pinyin'] =  $arrNovel['category_pinyin'] ?? 'all';
-        $arrNovel['category_sex'] = $arrNovel['category_sex'] ?? 'man';
+        $arrNovel['n_category_pinyin'] =  $arrNovel['n_category_pinyin'] ?? 'all';
+        $arrNovel['n_category_sex_en'] = $arrNovel['n_category_sex_en'] ?? 'man';
 
         // 章节
         $ChapterModel = ChapterModel::getInstance();
@@ -697,11 +700,11 @@ class Novel extends BaseController
             $arrNextChapter = $ChapterModel->getNextChapter($arrChapter['n_id'], $arrChapter['c_sort_num'], $arrChapter['c_page']);
 
             // 要点-先从章节随机截取，后面如果用上ai，看看使用ai 提炼 精简内容
-            $strChapterDescription = strip_tags($arrChapter['content']);
+            $strChapterDescription = strip_tags($arrChapter['c_content']);
             $intCount = mb_strlen($strChapterDescription);
             $strChapterDescription = ($intCount > 50) ? mb_substr($strChapterDescription, 0, 50) : $strChapterDescription;
 
-            $arrChapter['content'] = base64_encode($arrChapter['content']);
+            $arrChapter['c_content'] = base64_encode($arrChapter['c_content']);
         }
 
         $arrCategoryAll = CategoryModel::$arrCategoryAll;
@@ -709,13 +712,13 @@ class Novel extends BaseController
         // 更新值
         ConverterMovel::setVal([
             'intPage' => 1,
-            'strNovelName' => $arrNovel['og_novel_book_name'],
-            'strNovelAuthor' => $arrNovel['og_novel_author'],
-            'strNovelCategoryName' => $arrNovel['og_novel_category'],
-            'strNovelStatus' => $arrNovel['og_novel_status'],
-            'strNovelDescription' => $arrNovel['og_description'],
+            'strNovelName' => $arrNovel['n_name'],
+            'strNovelAuthor' => $arrNovel['n_author'],
+            'strNovelCategoryName' => $arrNovel['n_category'],
+            'strNovelStatus' => $arrNovel['n_status'],
+            'strNovelDescription' => $arrNovel['n_description'],
             'strChapterDescription' => $strChapterDescription,
-            'strNovelChapterName' => $arrChapter['name'],
+            'strNovelChapterName' => $arrChapter['c_name'],
             'strNovelChapterSort' => $arrChapter['c_sort_num'],
         ]);
 
@@ -765,8 +768,8 @@ class Novel extends BaseController
         $intNId = $intNovelId;
         $arrNovel = $NovelModel->getNovelByNId($intNId);
 
-        $arrNovel['category_pinyin'] =  $arrNovel['category_pinyin'] ?? 'all';
-        $arrNovel['category_sex'] = $arrNovel['category_sex'] ?? 'man';
+        $arrNovel['n_category_pinyin'] =  $arrNovel['n_category_pinyin'] ?? 'all';
+        $arrNovel['n_category_sex_en'] = $arrNovel['n_category_sex_en'] ?? 'man';
 
         $ChapterModel = ChapterModel::getInstance();
 
@@ -789,18 +792,18 @@ class Novel extends BaseController
             $intButtomNum = 10;
         }
 
-        $strBaseUrl = sprintf('/pc/xiaoshuo/%s-%s/mulu/%s/{page}', $arrNovel['og_novel_pin_yin'], $intNId, $strOrder);
+        $strBaseUrl = sprintf('/pc/xiaoshuo/%s-%s/mulu/%s/{page}', $arrNovel['n_name_pinyin'], $intNId, $strOrder);
         $arrPaginator = CusteomPage02::generate($intPage,  $arrPage['total'], $intLimit, $strBaseUrl, $intButtomNum);
 
         // 更新值
         ConverterMovel::setVal([
             'intPage' => $intPage,
-            'strNovelSex' => $arrNovel['category_sex'] == 'man' ? '男生' : '女生',
-            'strNovelName' => $arrNovel['og_novel_book_name'],
-            'strNovelAuthor' => $arrNovel['og_novel_author'],
-            'strNovelCategoryName' => $arrNovel['og_novel_category'],
-            'strNovelStatus' => $arrNovel['og_novel_status'],
-            'strNovelDescription' => $arrNovel['og_description'],
+            'strNovelSex' => $arrNovel['n_category_sex_en'] == 'man' ? '男生' : '女生',
+            'strNovelName' => $arrNovel['n_name'],
+            'strNovelAuthor' => $arrNovel['n_author'],
+            'strNovelCategoryName' => $arrNovel['n_category'],
+            'strNovelStatus' => $arrNovel['n_status'],
+            'strNovelDescription' => $arrNovel['n_description'],
         ]);
 
         $strTitleTemplate =  $Request->DomainModel->getFomartSubject(getFomartSubjectKey(__METHOD__) . '@TITLE',$intNId);
@@ -861,10 +864,10 @@ class Novel extends BaseController
 
         $arrFilter = [
             '$or' => [
-                ['og_novel_book_name' => ['$regex' => $strSearchKeywords, '$options' => 'i']],
-                ['og_novel_author' => ['$regex' => $strSearchKeywords, '$options' => 'i']],
-                ['og_novel_category' => ['$regex' => $strSearchKeywords, '$options' => 'i']],
-                ['og_description' => ['$regex' => $strSearchKeywords, '$options' => 'i']],
+                ['n_name' => ['$regex' => $strSearchKeywords, '$options' => 'i']],
+                ['n_author' => ['$regex' => $strSearchKeywords, '$options' => 'i']],
+                ['n_category' => ['$regex' => $strSearchKeywords, '$options' => 'i']],
+                ['n_description' => ['$regex' => $strSearchKeywords, '$options' => 'i']],
             ]
         ];
 
diff --git a/code/app/home/view/default/Index/index.html b/code/app/home/view/default/Index/index.html
index 12d6a61..c4c95d5 100644
--- a/code/app/home/view/default/Index/index.html
+++ b/code/app/home/view/default/Index/index.html
@@ -16,15 +16,15 @@
         {foreach $arrRecommendNovel as $key=>$Novel }
         

             

-                
-                    {$Novel.og_novel_book_name ?? ''} - {$Novel.og_novel_category ?? ''}最新章节在线免费阅读
+                    {$Novel.n_name ?? ''} - {$Novel.n_category ?? ''}最新章节在线免费阅读
                     
                 

             

-                
{$Novel.og_novel_book_name}

-                
作者：{$Novel.og_novel_author}

-                
{$Novel.og_description}

+                
{$Novel.n_name}

+                
作者：{$Novel.n_author}

+                
{$Novel.n_description}

             

         

         {/foreach}
diff --git a/code/app/home/view/default/baseH5.html b/code/app/home/view/default/baseH5.html
index 64e913f..32f2351 100644
--- a/code/app/home/view/default/baseH5.html
+++ b/code/app/home/view/default/baseH5.html
@@ -68,7 +68,7 @@
         
最新标签

         

             {foreach $arrRecommendNovel as $key=>$vo }
-            {$vo.og_novel_book_name}  
+            {$vo.n_name}  
             {/foreach}
             XML地图  
         

diff --git a/code/app/home/view/kuangYu/novel/getNovelCatalog.html b/code/app/home/view/kuangYu/novel/getNovelCatalog.html
index 0d49627..421b923 100644
--- a/code/app/home/view/kuangYu/novel/getNovelCatalog.html
+++ b/code/app/home/view/kuangYu/novel/getNovelCatalog.html
@@ -4,26 +4,26 @@
 {block name="description"}{$strDescription??''}{/block}
 {block name="head"}
 
-
+
 
 
+    content='https://{$DomainModel->d_domain}{site:nurl n_id="$arrNovel[n_id]" n_py="$arrNovel[n_name_pinyin]" /}' />
 
 
 
-
-
-
+
+
+
 
-
-
-
+    content='https://{$DomainModel->d_domain}{site:cpurl n_id="$arrNovel[n_id]" n_py="$arrNovel[n_name_pinyin]" c_sort="$intFirstChapterSort"/}'>
+
+
+
 
+    content='https://{$DomainModel->d_domain}{site:lcpurl n_id="$arrNovel[n_id]" n_py="$arrNovel[n_name_pinyin]" /}'>
 
 
-
+
 
 
 
@@ -33,23 +33,23 @@
 {
     "@context": "https://schema.org",
     "@type": "Book",
-    "name": "{$arrNovel['og_novel_book_name'] ?? '未知小说'}",
+    "name": "{$arrNovel['n_name'] ?? '未知小说'}",
     "author": {
         "@type": "Person",
-        "name": "{$arrNovel['og_novel_author'] ??'佚名'}"
+        "name": "{$arrNovel['n_author'] ??'佚名'}"
     },
     "publisher": {
         "@type": "Organization",
         "name": "{$DomainModel->d_name}",
         "url": "https://{$DomainModel->d_domain}"
     },
-    "url": 'https://{$DomainModel->d_domain}{site:nclurl n_id="$arrNovel[n_id]" n_py="$arrNovel[og_novel_pin_yin]" order="zheng" page="$intPage"/}',
+    "url": 'https://{$DomainModel->d_domain}{site:nclurl n_id="$arrNovel[n_id]" n_py="$arrNovel[n_name_pinyin]" order="zheng" page="$intPage"/}',
     "inLanguage": "zh-CN",
-    "genre": "{$arrNovel['og_novel_category'] ?? '未知分类'}",
+    "genre": "{$arrNovel['n_category'] ?? '未知分类'}",
     "hasPart": {
         "@type": "WebPage",
-        "name": "{$arrNovel['og_novel_book_name'] ?? '未知小说'}章节目录 第{$intPage}页",
-        "url": 'https://{$DomainModel->d_domain}{site:nclurl n_id="$arrNovel[n_id]" n_py="$arrNovel[og_novel_pin_yin]" order="zheng" page="$intPage"/}'
+        "name": "{$arrNovel['n_name'] ?? '未知小说'}章节目录 第{$intPage}页",
+        "url": 'https://{$DomainModel->d_domain}{site:nclurl n_id="$arrNovel[n_id]" n_py="$arrNovel[n_name_pinyin]" order="zheng" page="$intPage"/}'
     }
 }
 
@@ -72,15 +72,15 @@
                 
             
             
  • 
-                
-                
-                    {$arrNovel.og_novel_category}
+                
+                
+                    {$arrNovel.n_category}
                 
                 
             
    • 
             
  • 
-                
-                    {$arrNovel['og_novel_book_name']}
+                
+                    {$arrNovel['n_name']}
                 
                 
             
    • 
@@ -91,7 +91,7 @@
     
    
         {$arrGRM[0]|raw}
         
    
-            
    {$arrNovel['og_novel_book_name']}章节目录 - {$arrNovel['og_novel_author']} - {$DomainModel->d_name} 第{$intPage}页
    
+            
    {$arrNovel['n_name']}章节目录 - {$arrNovel['n_author']} - {$DomainModel->d_name} 第{$intPage}页
    
         
    
         
 
@@ -103,8 +103,8 @@
                 {volist name="arrPage.data" id="Chapter" key="key"}
                 
  • 
                     {$arrGRM[$key]|raw}
-                    {$Chapter.name}
+                    {$Chapter.c_name}
                 
    • 
                 {/volist}
             
diff --git a/code/app/home/view/kuangYu/novel/getNovelChapter.html b/code/app/home/view/kuangYu/novel/getNovelChapter.html
index 38098f7..1ada4bc 100644
--- a/code/app/home/view/kuangYu/novel/getNovelChapter.html
+++ b/code/app/home/view/kuangYu/novel/getNovelChapter.html
@@ -20,26 +20,26 @@
 	
 
 	
-	
+	
 	
 	
+		content='https://{$DomainModel->d_domain}{site:nurl n_id="$arrNovel[n_id]" n_py="$arrNovel[n_name_pinyin]" /}'  />
 	
 	
 	
-	
-	
-	
+	
+	
+	
 	
-	
-	
-	
+		content='https://{$DomainModel->d_domain}{site:cpurl n_id="$arrNovel[n_id]" n_py="$arrNovel[n_name_pinyin]" c_sort="$$arrChapter[c_sort_num]"/}'>
+	
+	
+	
 	
+		content='https://{$DomainModel->d_domain}{site:lcpurl n_id="$arrNovel[n_id]" n_py="$arrNovel[n_name_pinyin]" /}'>
 	
 	
-	
+	
 	
 	
 	
@@ -47,10 +47,10 @@
 		{
 			"@context": "https://schema.org",
 			"@type": "Book",
-			"name": "{$arrNovel['og_novel_book_name'] ?? '未知小说'}",
+			"name": "{$arrNovel['n_name'] ?? '未知小说'}",
 			"author": {
 				"@type": "Person",
-				"name": "{$arrNovel['og_novel_author'] ??'佚名'}"
+				"name": "{$arrNovel['n_author'] ??'佚名'}"
 			},
 			"publisher": {
 				"@type": "Organization",
@@ -58,14 +58,14 @@
 				"url": "https://{$DomainModel->d_domain}"
 			},
 			"image": "{$arrNovel.n_cover_path ?? ''}",
-			"url":'https://{$DomainModel->d_domain}{site:cpurl n_id="$arrNovel[n_id]" n_py="$arrNovel[og_novel_pin_yin]" c_sort="$arrChapter[c_sort_num]" c_page="0"/}',
+			"url":'https://{$DomainModel->d_domain}{site:cpurl n_id="$arrNovel[n_id]" n_py="$arrNovel[n_name_pinyin]" c_sort="$arrChapter[c_sort_num]" c_page="0"/}',
 			"inLanguage": "zh-CN",
-			"genre": "{$arrNovel.og_novel_category ??''}",
-			"datePublished": "{$arrNovel['og_novel_update_time'] ?? time()}",
+			"genre": "{$arrNovel.n_category ??''}",
+			"datePublished": "{$arrNovel['n_update_time'] ?? time()}",
 			"hasPart": {
 				"@type": "CreativeWork",
-				"name": "{$arrChapter.name ?? ''}",
-				"url":'https://{$DomainModel->d_domain}{site:cpurl n_id="$arrNovel[n_id]" n_py="$arrNovel[og_novel_pin_yin]" c_sort="$arrChapter[c_sort_num]" c_page="0"/}',
+				"name": "{$arrChapter.c_name ?? ''}",
+				"url":'https://{$DomainModel->d_domain}{site:cpurl n_id="$arrNovel[n_id]" n_py="$arrNovel[n_name_pinyin]" c_sort="$arrChapter[c_sort_num]" c_page="0"/}',
 				"description": "{$strDescription}"
 			}
 		}
@@ -104,12 +104,12 @@
 				上一章
 				{else}
 				{$arrGRM[4]|raw}
-				上一章
 				{/if}
 
 				{if $arrNextChapter && $arrNextChapter.c_sort_num}
-				下一章
 				{/if}
 				
@@ -117,7 +117,7 @@
 			
    
 				
    
 					
-					
+					
 				
    
 			
    
 			{$arrGRM[5]|raw}
@@ -126,12 +126,12 @@
 				
 				上一章
 				{else}
-				上一章
 				{/if}
 
 				{if $arrNextChapter && $arrNextChapter.c_sort_num}
-				下一章
 				{/if}
 
@@ -150,25 +150,25 @@
 						
 					
 					
  • 
-						
-						
-							{$arrNovel.og_novel_category}
+						
+						
+							{$arrNovel.n_category}
 						
 						
 					
    • 
 					
  • 
-						
-							{$arrNovel.og_novel_book_name}
+						
+							{$arrNovel.n_name}
 						
 						
 					
    • 
 				
 			
 			
    
-				
-				{$arrNovel.og_novel_book_name}
+				
+				{$arrNovel.n_name}
 				
-				{$arrChapter.name}
+				{$arrChapter.c_name}
 				
 			
    
 		
    
@@ -202,7 +202,7 @@
 	    			
 	    			离线章节
 	    		 -->
-			
+			
 				
 				书籍详情
 			
@@ -299,7 +299,7 @@