From 8cd8d1542a2eee5a746b62df9999073fcf155ac3 Mon Sep 17 00:00:00 2001 From: make Date: Mon, 12 May 2025 18:44:23 +0800 Subject: [PATCH] debug --- code/app/home/BaseController.php | 2 +- code/app/home/view/default/novel/getLibrary.html | 2 +- code/app/home/view/default/novel/getSearchNovel.html | 2 +- code/app/home/view/default/pc/getLibrary.html | 2 +- code/app/home/view/default/pc/getSearchNovel.html | 2 +- .../home/view/default/sitemap/sitemap-books-catalog.xml | 2 +- code/app/home/view/default/sitemap/sitemap-books.xml | 2 +- code/app/home/view/default/sitemap/sitemap-chapters.xml | 2 +- code/app/home/view/haoZi/novel/getLibrary.html | 2 +- code/app/home/view/haoZi/novel/getSearchNovel.html | 2 +- code/app/home/view/haoZi/pc/getLibrary.html | 2 +- code/app/home/view/haoZi/pc/getSearchNovel.html | 4 ++-- .../app/home/view/haoZi/sitemap/sitemap-books-catalog.xml | 2 +- code/app/home/view/haoZi/sitemap/sitemap-books.xml | 2 +- code/app/home/view/haoZi/sitemap/sitemap-chapters.xml | 2 +- code/app/home/view/kuangYu/novel/getLibrary.html | 2 +- code/app/home/view/kuangYu/novel/getSearchNovel.html | 2 +- code/app/home/view/kuangYu/pc/getLibrary.html | 2 +- code/app/home/view/kuangYu/pc/getSearchNovel.html | 4 ++-- .../home/view/kuangYu/sitemap/sitemap-books-catalog.xml | 2 +- code/app/home/view/kuangYu/sitemap/sitemap-books.xml | 2 +- code/app/home/view/kuangYu/sitemap/sitemap-chapters.xml | 2 +- code/app/home/view/shikong/novel/getLibrary.html | 2 +- code/app/home/view/shikong/novel/getSearchNovel.html | 2 +- code/app/home/view/shikong/pc/getLibrary.html | 2 +- code/app/home/view/shikong/pc/getSearchNovel.html | 2 +- .../home/view/shikong/sitemap/sitemap-books-catalog.xml | 2 +- code/app/home/view/shikong/sitemap/sitemap-books.xml | 2 +- code/app/home/view/shikong/sitemap/sitemap-chapters.xml | 2 +- .../home/view/videoBoKu/sitemap/sitemap-books-catalog.xml | 2 +- code/app/home/view/videoBoKu/sitemap/sitemap-books.xml | 2 +- code/app/home/view/videoBoKu/sitemap/sitemap-chapters.xml | 2 +- code/app/home/view/videoBoKu/video/getCategory.html | 2 +- code/app/home/view/videoBoKu/video/getSearchVideo.html | 2 +- .../home/view/videoDadi/sitemap/sitemap-books-catalog.xml | 2 +- code/app/home/view/videoDadi/sitemap/sitemap-books.xml | 2 +- code/app/home/view/videoDadi/sitemap/sitemap-chapters.xml | 2 +- code/app/home/view/videoDadi/video/getCategory.html | 2 +- code/app/home/view/videoDadi/video/getSearchVideo.html | 2 +- .../view/videoDingZhu/sitemap/sitemap-books-catalog.xml | 2 +- code/app/home/view/videoDingZhu/sitemap/sitemap-books.xml | 2 +- .../home/view/videoDingZhu/sitemap/sitemap-chapters.xml | 2 +- code/app/home/view/videoDingZhu/video/getCategory.html | 2 +- code/app/home/view/videoDingZhu/video/getSearchVideo.html | 2 +- .../view/videoFengNiao/sitemap/sitemap-books-catalog.xml | 2 +- .../app/home/view/videoFengNiao/sitemap/sitemap-books.xml | 2 +- .../home/view/videoFengNiao/sitemap/sitemap-chapters.xml | 2 +- code/app/home/view/videoFengNiao/video/getCategory.html | 2 +- .../app/home/view/videoFengNiao/video/getSearchVideo.html | 2 +- .../view/videoLaoNiu/sitemap/sitemap-books-catalog.xml | 2 +- code/app/home/view/videoLaoNiu/sitemap/sitemap-books.xml | 2 +- .../home/view/videoLaoNiu/sitemap/sitemap-chapters.xml | 2 +- code/app/home/view/videoLaoNiu/video/getCategory.html | 2 +- code/app/home/view/videoLaoNiu/video/getSearchVideo.html | 2 +- code/app/home/view/videoNuNu/base.html | 8 +++++--- .../home/view/videoNuNu/sitemap/sitemap-books-catalog.xml | 2 +- code/app/home/view/videoNuNu/sitemap/sitemap-books.xml | 2 +- code/app/home/view/videoNuNu/sitemap/sitemap-chapters.xml | 2 +- code/app/home/view/videoNuNu/video/getCategory.html | 2 +- code/app/home/view/videoNuNu/video/getSearchVideo.html | 2 +- code/app/home/view/xiongMao/novel/getLibrary.html | 2 +- code/app/home/view/xiongMao/novel/getSearchNovel.html | 2 +- code/app/home/view/xiongMao/pc/getLibrary.html | 2 +- code/app/home/view/xiongMao/pc/getSearchNovel.html | 4 ++-- .../home/view/xiongMao/sitemap/sitemap-books-catalog.xml | 2 +- code/app/home/view/xiongMao/sitemap/sitemap-books.xml | 2 +- code/app/home/view/xiongMao/sitemap/sitemap-chapters.xml | 2 +- code/app/model/GanRaoMaModel.php | 4 ++-- code/app/services/SiteContext.php | 4 ++-- 69 files changed, 78 insertions(+), 76 deletions(-) diff --git a/code/app/home/BaseController.php b/code/app/home/BaseController.php index 66ccdaa..7c56e31 100644 --- a/code/app/home/BaseController.php +++ b/code/app/home/BaseController.php @@ -138,7 +138,7 @@ abstract class BaseController * * @param integer $intDeviceType * @param integer $intNum - * @return void + * @return void */ public function generateGrm(int $intDeviceType, string|int $strDiff, int $intNum) { diff --git a/code/app/home/view/default/novel/getLibrary.html b/code/app/home/view/default/novel/getLibrary.html index 2e3684e..f057257 100644 --- a/code/app/home/view/default/novel/getLibrary.html +++ b/code/app/home/view/default/novel/getLibrary.html @@ -1,7 +1,7 @@ {extend name="baseH5" /} {block name="get-data"} -{novel:pagerexp page="$Request.get.page" limit="30" +{novel:pagerexp page="$Request.route.intPage" limit="30" n_category="$Request.route.strCategory" sort_type="$Request.route.strOrder" n_status="$Request.route.strStatus" d_key="d_key" diff --git a/code/app/home/view/default/novel/getSearchNovel.html b/code/app/home/view/default/novel/getSearchNovel.html index a3f9d94..735575c 100644 --- a/code/app/home/view/default/novel/getSearchNovel.html +++ b/code/app/home/view/default/novel/getSearchNovel.html @@ -1,7 +1,7 @@ {extend name="baseH5" /} {block name="get-data"} -{novel:pagerexp page="$Request.get.page" limit="30" +{novel:pagerexp page="$Request.route.intPage" limit="30" key="$Request.get.keyword" d_key="d_key" d_val="Novel" diff --git a/code/app/home/view/default/pc/getLibrary.html b/code/app/home/view/default/pc/getLibrary.html index e71b4bb..c4dc4f5 100644 --- a/code/app/home/view/default/pc/getLibrary.html +++ b/code/app/home/view/default/pc/getLibrary.html @@ -1,7 +1,7 @@ {extend name="basePc" /} {block name="get-data"} -{novel:pagerexp page="$Request.get.page" limit="30" +{novel:pagerexp page="$Request.route.intPage" limit="30" n_category="$Request.route.strCategory" sort_type="$Request.route.strOrder" n_status="$Request.route.strStatus" d_key="d_key" diff --git a/code/app/home/view/default/pc/getSearchNovel.html b/code/app/home/view/default/pc/getSearchNovel.html index 6ad245e..3a0a8ab 100644 --- a/code/app/home/view/default/pc/getSearchNovel.html +++ b/code/app/home/view/default/pc/getSearchNovel.html @@ -1,7 +1,7 @@ {extend name="basePc" /} {block name="get-data"} -{novel:pagerexp page="$Request.get.page" limit="30" +{novel:pagerexp page="$Request.route.intPage" limit="30" key="$Request.get.keyword" d_key="d_key" d_val="Novel" n_num="total" diff --git a/code/app/home/view/default/sitemap/sitemap-books-catalog.xml b/code/app/home/view/default/sitemap/sitemap-books-catalog.xml index c3cd716..20137d4 100644 --- a/code/app/home/view/default/sitemap/sitemap-books-catalog.xml +++ b/code/app/home/view/default/sitemap/sitemap-books-catalog.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/default/sitemap/sitemap-books.xml b/code/app/home/view/default/sitemap/sitemap-books.xml index ae36b49..f6f80be 100644 --- a/code/app/home/view/default/sitemap/sitemap-books.xml +++ b/code/app/home/view/default/sitemap/sitemap-books.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/default/sitemap/sitemap-chapters.xml b/code/app/home/view/default/sitemap/sitemap-chapters.xml index 429406f..458d40a 100644 --- a/code/app/home/view/default/sitemap/sitemap-chapters.xml +++ b/code/app/home/view/default/sitemap/sitemap-chapters.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/haoZi/novel/getLibrary.html b/code/app/home/view/haoZi/novel/getLibrary.html index b3eaad4..ef7c53c 100644 --- a/code/app/home/view/haoZi/novel/getLibrary.html +++ b/code/app/home/view/haoZi/novel/getLibrary.html @@ -1,7 +1,7 @@ {extend name="baseH5" /} {block name="get-data"} -{novel:pagerexp page="$Request.get.page" limit="30" +{novel:pagerexp page="$Request.route.intPage" limit="30" n_category="$Request.route.strCategory" n_sex="$Request.route.strGender" n_status="$Request.route.strStatus" diff --git a/code/app/home/view/haoZi/novel/getSearchNovel.html b/code/app/home/view/haoZi/novel/getSearchNovel.html index f5edd5e..5be2fd9 100644 --- a/code/app/home/view/haoZi/novel/getSearchNovel.html +++ b/code/app/home/view/haoZi/novel/getSearchNovel.html @@ -48,7 +48,7 @@ {block name="main"} -{novel:pagerexp page="$Request.get.page" limit="30" +{novel:pagerexp page="$Request.route.intPage" limit="30" key="$Request.get.keyword" d_key="d_key" d_val="Novel" diff --git a/code/app/home/view/haoZi/pc/getLibrary.html b/code/app/home/view/haoZi/pc/getLibrary.html index 108c33f..6aaa94d 100644 --- a/code/app/home/view/haoZi/pc/getLibrary.html +++ b/code/app/home/view/haoZi/pc/getLibrary.html @@ -2,7 +2,7 @@ {block name="get-data"} -{novel:pagerexp page="$Request.get.page" limit="50" +{novel:pagerexp page="$Request.route.intPage" limit="50" n_category="$Request.route.strCategory" n_sex="$Request.route.strGender" n_status="$Request.route.strStatus" diff --git a/code/app/home/view/haoZi/pc/getSearchNovel.html b/code/app/home/view/haoZi/pc/getSearchNovel.html index d9a6389..16cbcba 100644 --- a/code/app/home/view/haoZi/pc/getSearchNovel.html +++ b/code/app/home/view/haoZi/pc/getSearchNovel.html @@ -1,7 +1,7 @@ {extend name="basePc" /} {block name="get-data"} -{novel:pagerexp page="$Request.get.page" limit="30" +{novel:pagerexp page="$Request.route.intPage" limit="30" key="$Request.get.keyword" d_key="d_key" d_val="Novel" n_num="total" @@ -62,7 +62,7 @@ p_val="page_data" button_num="10" cache_life="86400" func="generateSearchPager"
-

{$Request.get.keyword}搜索结果 - {$DomainModel->d_name} 第{$Request.get.page}页

+

{$Request.get.keyword}搜索结果 - {$DomainModel->d_name} 第{$Request.route.intPage}页

搜索“{$Request.get.keyword}”相关结果共有
-

{$Request.get.keyword}搜索结果 - {$DomainModel->d_name} 第{$Request.get.page}页

+

{$Request.get.keyword}搜索结果 - {$DomainModel->d_name} 第{$Request.route.intPage}页

搜索“{$Request.get.keyword}”相关结果共有 {$resData.p_data.total} 部小说 diff --git a/code/app/home/view/kuangYu/sitemap/sitemap-books-catalog.xml b/code/app/home/view/kuangYu/sitemap/sitemap-books-catalog.xml index c3cd716..20137d4 100644 --- a/code/app/home/view/kuangYu/sitemap/sitemap-books-catalog.xml +++ b/code/app/home/view/kuangYu/sitemap/sitemap-books-catalog.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/kuangYu/sitemap/sitemap-books.xml b/code/app/home/view/kuangYu/sitemap/sitemap-books.xml index ae36b49..f6f80be 100644 --- a/code/app/home/view/kuangYu/sitemap/sitemap-books.xml +++ b/code/app/home/view/kuangYu/sitemap/sitemap-books.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/kuangYu/sitemap/sitemap-chapters.xml b/code/app/home/view/kuangYu/sitemap/sitemap-chapters.xml index 429406f..458d40a 100644 --- a/code/app/home/view/kuangYu/sitemap/sitemap-chapters.xml +++ b/code/app/home/view/kuangYu/sitemap/sitemap-chapters.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/shikong/novel/getLibrary.html b/code/app/home/view/shikong/novel/getLibrary.html index 45e19dd..c5cde10 100644 --- a/code/app/home/view/shikong/novel/getLibrary.html +++ b/code/app/home/view/shikong/novel/getLibrary.html @@ -2,7 +2,7 @@ {block name="get-data"} -{novel:pagerexp page="$Request.get.page" limit="30" +{novel:pagerexp page="$Request.route.intPage" limit="30" n_category="$Request.route.strCategory" sort_type="$Request.route.strOrder" n_status="$Request.route.strStatus" diff --git a/code/app/home/view/shikong/novel/getSearchNovel.html b/code/app/home/view/shikong/novel/getSearchNovel.html index f5e162f..3efef55 100644 --- a/code/app/home/view/shikong/novel/getSearchNovel.html +++ b/code/app/home/view/shikong/novel/getSearchNovel.html @@ -1,7 +1,7 @@ {extend name="baseH5" /} {block name="get-data"} -{novel:pagerexp page="$Request.get.page" limit="30" +{novel:pagerexp page="$Request.route.intPage" limit="30" key="$Request.get.keyword" d_key="d_key" d_val="Novel" diff --git a/code/app/home/view/shikong/pc/getLibrary.html b/code/app/home/view/shikong/pc/getLibrary.html index 78d24e1..52ca2e1 100644 --- a/code/app/home/view/shikong/pc/getLibrary.html +++ b/code/app/home/view/shikong/pc/getLibrary.html @@ -1,7 +1,7 @@ {extend name="basePc" /} {block name="get-data"} -{novel:pagerexp page="$Request.get.page" limit="30" +{novel:pagerexp page="$Request.route.intPage" limit="30" n_category="$Request.route.strCategory" sort_type="$Request.route.strOrder" n_status="$Request.route.strStatus" d_key="d_key" diff --git a/code/app/home/view/shikong/pc/getSearchNovel.html b/code/app/home/view/shikong/pc/getSearchNovel.html index 6ad245e..3a0a8ab 100644 --- a/code/app/home/view/shikong/pc/getSearchNovel.html +++ b/code/app/home/view/shikong/pc/getSearchNovel.html @@ -1,7 +1,7 @@ {extend name="basePc" /} {block name="get-data"} -{novel:pagerexp page="$Request.get.page" limit="30" +{novel:pagerexp page="$Request.route.intPage" limit="30" key="$Request.get.keyword" d_key="d_key" d_val="Novel" n_num="total" diff --git a/code/app/home/view/shikong/sitemap/sitemap-books-catalog.xml b/code/app/home/view/shikong/sitemap/sitemap-books-catalog.xml index c3cd716..20137d4 100644 --- a/code/app/home/view/shikong/sitemap/sitemap-books-catalog.xml +++ b/code/app/home/view/shikong/sitemap/sitemap-books-catalog.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/shikong/sitemap/sitemap-books.xml b/code/app/home/view/shikong/sitemap/sitemap-books.xml index ae36b49..f6f80be 100644 --- a/code/app/home/view/shikong/sitemap/sitemap-books.xml +++ b/code/app/home/view/shikong/sitemap/sitemap-books.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/shikong/sitemap/sitemap-chapters.xml b/code/app/home/view/shikong/sitemap/sitemap-chapters.xml index 429406f..458d40a 100644 --- a/code/app/home/view/shikong/sitemap/sitemap-chapters.xml +++ b/code/app/home/view/shikong/sitemap/sitemap-chapters.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/videoBoKu/sitemap/sitemap-books-catalog.xml b/code/app/home/view/videoBoKu/sitemap/sitemap-books-catalog.xml index c3cd716..20137d4 100644 --- a/code/app/home/view/videoBoKu/sitemap/sitemap-books-catalog.xml +++ b/code/app/home/view/videoBoKu/sitemap/sitemap-books-catalog.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/videoBoKu/sitemap/sitemap-books.xml b/code/app/home/view/videoBoKu/sitemap/sitemap-books.xml index ae36b49..f6f80be 100644 --- a/code/app/home/view/videoBoKu/sitemap/sitemap-books.xml +++ b/code/app/home/view/videoBoKu/sitemap/sitemap-books.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/videoBoKu/sitemap/sitemap-chapters.xml b/code/app/home/view/videoBoKu/sitemap/sitemap-chapters.xml index 429406f..458d40a 100644 --- a/code/app/home/view/videoBoKu/sitemap/sitemap-chapters.xml +++ b/code/app/home/view/videoBoKu/sitemap/sitemap-chapters.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/videoBoKu/video/getCategory.html b/code/app/home/view/videoBoKu/video/getCategory.html index 71b4ee2..7f79259 100644 --- a/code/app/home/view/videoBoKu/video/getCategory.html +++ b/code/app/home/view/videoBoKu/video/getCategory.html @@ -2,7 +2,7 @@ {block name="get-data"} -{video:pagerexp page="$Request.get.page" limit="27" button_num="10" cache_life="86400" +{video:pagerexp page="$Request.route.intPage" limit="27" button_num="10" cache_life="86400" key="$Request.get.keyword" v_parent_category_en="$Request.route.strParentCategory" v_category_en="$Request.route.strCategory" diff --git a/code/app/home/view/videoBoKu/video/getSearchVideo.html b/code/app/home/view/videoBoKu/video/getSearchVideo.html index dc1ef02..d88c711 100644 --- a/code/app/home/view/videoBoKu/video/getSearchVideo.html +++ b/code/app/home/view/videoBoKu/video/getSearchVideo.html @@ -1,7 +1,7 @@ {extend name="base" /} {block name="get-data"} -{video:pagerexp page="$Request.get.page" limit="12" +{video:pagerexp page="$Request.route.intPage" limit="12" key="$Request.get.keyword" d_key="d_key" d_val="Video" diff --git a/code/app/home/view/videoDadi/sitemap/sitemap-books-catalog.xml b/code/app/home/view/videoDadi/sitemap/sitemap-books-catalog.xml index c3cd716..20137d4 100644 --- a/code/app/home/view/videoDadi/sitemap/sitemap-books-catalog.xml +++ b/code/app/home/view/videoDadi/sitemap/sitemap-books-catalog.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/videoDadi/sitemap/sitemap-books.xml b/code/app/home/view/videoDadi/sitemap/sitemap-books.xml index ae36b49..f6f80be 100644 --- a/code/app/home/view/videoDadi/sitemap/sitemap-books.xml +++ b/code/app/home/view/videoDadi/sitemap/sitemap-books.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/videoDadi/sitemap/sitemap-chapters.xml b/code/app/home/view/videoDadi/sitemap/sitemap-chapters.xml index 429406f..458d40a 100644 --- a/code/app/home/view/videoDadi/sitemap/sitemap-chapters.xml +++ b/code/app/home/view/videoDadi/sitemap/sitemap-chapters.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/videoDadi/video/getCategory.html b/code/app/home/view/videoDadi/video/getCategory.html index 2b8cbde..df7c0a6 100644 --- a/code/app/home/view/videoDadi/video/getCategory.html +++ b/code/app/home/view/videoDadi/video/getCategory.html @@ -2,7 +2,7 @@ {block name="get-data"} -{video:pagerexp page="$Request.get.page" limit="30" button_num="10" cache_life="86400" +{video:pagerexp page="$Request.route.intPage" limit="30" button_num="10" cache_life="86400" key="$Request.get.keyword" v_parent_category_en="$Request.route.strParentCategory" v_category_en="$Request.route.strCategory" diff --git a/code/app/home/view/videoDadi/video/getSearchVideo.html b/code/app/home/view/videoDadi/video/getSearchVideo.html index e1346f2..bf85292 100644 --- a/code/app/home/view/videoDadi/video/getSearchVideo.html +++ b/code/app/home/view/videoDadi/video/getSearchVideo.html @@ -1,7 +1,7 @@ {extend name="base" /} {block name="get-data"} -{video:pagerexp page="$Request.get.page" limit="10" +{video:pagerexp page="$Request.route.intPage" limit="10" key="$Request.get.keyword" d_key="d_key" d_val="Video" diff --git a/code/app/home/view/videoDingZhu/sitemap/sitemap-books-catalog.xml b/code/app/home/view/videoDingZhu/sitemap/sitemap-books-catalog.xml index c3cd716..20137d4 100644 --- a/code/app/home/view/videoDingZhu/sitemap/sitemap-books-catalog.xml +++ b/code/app/home/view/videoDingZhu/sitemap/sitemap-books-catalog.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/videoDingZhu/sitemap/sitemap-books.xml b/code/app/home/view/videoDingZhu/sitemap/sitemap-books.xml index ae36b49..f6f80be 100644 --- a/code/app/home/view/videoDingZhu/sitemap/sitemap-books.xml +++ b/code/app/home/view/videoDingZhu/sitemap/sitemap-books.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/videoDingZhu/sitemap/sitemap-chapters.xml b/code/app/home/view/videoDingZhu/sitemap/sitemap-chapters.xml index 429406f..458d40a 100644 --- a/code/app/home/view/videoDingZhu/sitemap/sitemap-chapters.xml +++ b/code/app/home/view/videoDingZhu/sitemap/sitemap-chapters.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/videoDingZhu/video/getCategory.html b/code/app/home/view/videoDingZhu/video/getCategory.html index 1682eb2..c322ba3 100644 --- a/code/app/home/view/videoDingZhu/video/getCategory.html +++ b/code/app/home/view/videoDingZhu/video/getCategory.html @@ -2,7 +2,7 @@ {block name="get-data"} -{video:pagerexp page="$Request.get.page" limit="30" button_num="10" cache_life="86400" +{video:pagerexp page="$Request.route.intPage" limit="30" button_num="10" cache_life="86400" key="$Request.get.keyword" v_parent_category_en="$Request.route.strParentCategory" v_category_en="$Request.route.strCategory" diff --git a/code/app/home/view/videoDingZhu/video/getSearchVideo.html b/code/app/home/view/videoDingZhu/video/getSearchVideo.html index 5d6dae3..8fc79de 100644 --- a/code/app/home/view/videoDingZhu/video/getSearchVideo.html +++ b/code/app/home/view/videoDingZhu/video/getSearchVideo.html @@ -1,7 +1,7 @@ {extend name="base" /} {block name="get-data"} -{video:pagerexp page="$Request.get.page" limit="12" +{video:pagerexp page="$Request.route.intPage" limit="12" key="$Request.get.keyword" d_key="d_key" d_val="Video" diff --git a/code/app/home/view/videoFengNiao/sitemap/sitemap-books-catalog.xml b/code/app/home/view/videoFengNiao/sitemap/sitemap-books-catalog.xml index c3cd716..20137d4 100644 --- a/code/app/home/view/videoFengNiao/sitemap/sitemap-books-catalog.xml +++ b/code/app/home/view/videoFengNiao/sitemap/sitemap-books-catalog.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/videoFengNiao/sitemap/sitemap-books.xml b/code/app/home/view/videoFengNiao/sitemap/sitemap-books.xml index ae36b49..f6f80be 100644 --- a/code/app/home/view/videoFengNiao/sitemap/sitemap-books.xml +++ b/code/app/home/view/videoFengNiao/sitemap/sitemap-books.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/videoFengNiao/sitemap/sitemap-chapters.xml b/code/app/home/view/videoFengNiao/sitemap/sitemap-chapters.xml index 429406f..458d40a 100644 --- a/code/app/home/view/videoFengNiao/sitemap/sitemap-chapters.xml +++ b/code/app/home/view/videoFengNiao/sitemap/sitemap-chapters.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/videoFengNiao/video/getCategory.html b/code/app/home/view/videoFengNiao/video/getCategory.html index fe6d0af..0c96814 100644 --- a/code/app/home/view/videoFengNiao/video/getCategory.html +++ b/code/app/home/view/videoFengNiao/video/getCategory.html @@ -2,7 +2,7 @@ {block name="get-data"} -{video:pagerexp page="$Request.get.page" limit="30" button_num="10" cache_life="86400" +{video:pagerexp page="$Request.route.intPage" limit="30" button_num="10" cache_life="86400" key="$Request.get.keyword" v_parent_category_en="$Request.route.strParentCategory" v_category_en="$Request.route.strCategory" diff --git a/code/app/home/view/videoFengNiao/video/getSearchVideo.html b/code/app/home/view/videoFengNiao/video/getSearchVideo.html index 5ac2329..bd333e7 100644 --- a/code/app/home/view/videoFengNiao/video/getSearchVideo.html +++ b/code/app/home/view/videoFengNiao/video/getSearchVideo.html @@ -1,7 +1,7 @@ {extend name="base" /} {block name="get-data"} -{video:pagerexp page="$Request.get.page" limit="12" +{video:pagerexp page="$Request.route.intPage" limit="12" key="$Request.get.keyword" d_key="d_key" d_val="Video" diff --git a/code/app/home/view/videoLaoNiu/sitemap/sitemap-books-catalog.xml b/code/app/home/view/videoLaoNiu/sitemap/sitemap-books-catalog.xml index c3cd716..20137d4 100644 --- a/code/app/home/view/videoLaoNiu/sitemap/sitemap-books-catalog.xml +++ b/code/app/home/view/videoLaoNiu/sitemap/sitemap-books-catalog.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/videoLaoNiu/sitemap/sitemap-books.xml b/code/app/home/view/videoLaoNiu/sitemap/sitemap-books.xml index ae36b49..f6f80be 100644 --- a/code/app/home/view/videoLaoNiu/sitemap/sitemap-books.xml +++ b/code/app/home/view/videoLaoNiu/sitemap/sitemap-books.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/videoLaoNiu/sitemap/sitemap-chapters.xml b/code/app/home/view/videoLaoNiu/sitemap/sitemap-chapters.xml index 429406f..458d40a 100644 --- a/code/app/home/view/videoLaoNiu/sitemap/sitemap-chapters.xml +++ b/code/app/home/view/videoLaoNiu/sitemap/sitemap-chapters.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/videoLaoNiu/video/getCategory.html b/code/app/home/view/videoLaoNiu/video/getCategory.html index 2aacf96..b1377a0 100644 --- a/code/app/home/view/videoLaoNiu/video/getCategory.html +++ b/code/app/home/view/videoLaoNiu/video/getCategory.html @@ -2,7 +2,7 @@ {block name="get-data"} -{video:pagerexp page="$Request.get.page" limit="30" button_num="10" cache_life="86400" +{video:pagerexp page="$Request.route.intPage" limit="30" button_num="10" cache_life="86400" key="$Request.get.keyword" v_parent_category_en="$Request.route.strParentCategory" v_category_en="$Request.route.strCategory" diff --git a/code/app/home/view/videoLaoNiu/video/getSearchVideo.html b/code/app/home/view/videoLaoNiu/video/getSearchVideo.html index 5ac2329..bd333e7 100644 --- a/code/app/home/view/videoLaoNiu/video/getSearchVideo.html +++ b/code/app/home/view/videoLaoNiu/video/getSearchVideo.html @@ -1,7 +1,7 @@ {extend name="base" /} {block name="get-data"} -{video:pagerexp page="$Request.get.page" limit="12" +{video:pagerexp page="$Request.route.intPage" limit="12" key="$Request.get.keyword" d_key="d_key" d_val="Video" diff --git a/code/app/home/view/videoNuNu/base.html b/code/app/home/view/videoNuNu/base.html index 29b3ec1..0e78e9c 100644 --- a/code/app/home/view/videoNuNu/base.html +++ b/code/app/home/view/videoNuNu/base.html @@ -50,10 +50,12 @@
    diff --git a/code/app/home/view/videoNuNu/sitemap/sitemap-books-catalog.xml b/code/app/home/view/videoNuNu/sitemap/sitemap-books-catalog.xml index c3cd716..20137d4 100644 --- a/code/app/home/view/videoNuNu/sitemap/sitemap-books-catalog.xml +++ b/code/app/home/view/videoNuNu/sitemap/sitemap-books-catalog.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/videoNuNu/sitemap/sitemap-books.xml b/code/app/home/view/videoNuNu/sitemap/sitemap-books.xml index ae36b49..f6f80be 100644 --- a/code/app/home/view/videoNuNu/sitemap/sitemap-books.xml +++ b/code/app/home/view/videoNuNu/sitemap/sitemap-books.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/videoNuNu/sitemap/sitemap-chapters.xml b/code/app/home/view/videoNuNu/sitemap/sitemap-chapters.xml index 429406f..458d40a 100644 --- a/code/app/home/view/videoNuNu/sitemap/sitemap-chapters.xml +++ b/code/app/home/view/videoNuNu/sitemap/sitemap-chapters.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/videoNuNu/video/getCategory.html b/code/app/home/view/videoNuNu/video/getCategory.html index dc0234a..6d702fb 100644 --- a/code/app/home/view/videoNuNu/video/getCategory.html +++ b/code/app/home/view/videoNuNu/video/getCategory.html @@ -2,7 +2,7 @@ {block name="get-data"} -{video:pagerexp page="$Request.get.page" limit="30" button_num="10" cache_life="86400" +{video:pagerexp page="$Request.route.intPage" limit="30" button_num="10" cache_life="86400" key="$Request.get.keyword" v_parent_category_en="$Request.route.strParentCategory" v_category_en="$Request.route.strCategory" diff --git a/code/app/home/view/videoNuNu/video/getSearchVideo.html b/code/app/home/view/videoNuNu/video/getSearchVideo.html index 98cc96c..99816fa 100644 --- a/code/app/home/view/videoNuNu/video/getSearchVideo.html +++ b/code/app/home/view/videoNuNu/video/getSearchVideo.html @@ -1,7 +1,7 @@ {extend name="base" /} {block name="get-data"} -{video:pagerexp page="$Request.get.page" limit="12" +{video:pagerexp page="$Request.route.intPage" limit="12" key="$Request.get.keyword" d_key="d_key" d_val="Video" diff --git a/code/app/home/view/xiongMao/novel/getLibrary.html b/code/app/home/view/xiongMao/novel/getLibrary.html index 8a42e1a..3c21e31 100644 --- a/code/app/home/view/xiongMao/novel/getLibrary.html +++ b/code/app/home/view/xiongMao/novel/getLibrary.html @@ -1,7 +1,7 @@ {extend name="baseH5" /} {block name="get-data"} -{novel:pagerexp page="$Request.get.page" limit="30" +{novel:pagerexp page="$Request.route.intPage" limit="30" n_category="$Request.route.strCategory" n_sex="$Request.route.strGender" n_status="$Request.route.strStatus" diff --git a/code/app/home/view/xiongMao/novel/getSearchNovel.html b/code/app/home/view/xiongMao/novel/getSearchNovel.html index 8f6572d..8e04eae 100644 --- a/code/app/home/view/xiongMao/novel/getSearchNovel.html +++ b/code/app/home/view/xiongMao/novel/getSearchNovel.html @@ -50,7 +50,7 @@ {block name="main"} -{novel:pagerexp page="$Request.get.page" limit="30" +{novel:pagerexp page="$Request.route.intPage" limit="30" key="$Request.get.keyword" d_key="d_key" d_val="Novel" diff --git a/code/app/home/view/xiongMao/pc/getLibrary.html b/code/app/home/view/xiongMao/pc/getLibrary.html index acb2bef..74b1f5e 100644 --- a/code/app/home/view/xiongMao/pc/getLibrary.html +++ b/code/app/home/view/xiongMao/pc/getLibrary.html @@ -2,7 +2,7 @@ {block name="get-data"} -{novel:pagerexp page="$Request.get.page" limit="30" +{novel:pagerexp page="$Request.route.intPage" limit="30" n_category="$Request.route.strCategory" n_sex="$Request.route.strGender" n_status="$Request.route.strStatus" diff --git a/code/app/home/view/xiongMao/pc/getSearchNovel.html b/code/app/home/view/xiongMao/pc/getSearchNovel.html index 2d5cbc6..012e759 100644 --- a/code/app/home/view/xiongMao/pc/getSearchNovel.html +++ b/code/app/home/view/xiongMao/pc/getSearchNovel.html @@ -1,7 +1,7 @@ {extend name="basePc" /} {block name="get-data"} -{novel:pagerexp page="$Request.get.page" limit="30" +{novel:pagerexp page="$Request.route.intPage" limit="30" key="$Request.get.keyword" d_key="d_key" d_val="Novel" n_num="total" @@ -63,7 +63,7 @@ p_val="page_data" button_num="10" cache_life="86400" func="generateSearchPager"
    -

    {$Request.get.keyword}搜索结果 - {$DomainModel->d_name} 第{$Request.get.page}页

    +

    {$Request.get.keyword}搜索结果 - {$DomainModel->d_name} 第{$Request.route.intPage}页

    搜索“{$Request.get.keyword}”相关结果共有 {$resData.p_data.total} 部小说 diff --git a/code/app/home/view/xiongMao/sitemap/sitemap-books-catalog.xml b/code/app/home/view/xiongMao/sitemap/sitemap-books-catalog.xml index c3cd716..20137d4 100644 --- a/code/app/home/view/xiongMao/sitemap/sitemap-books-catalog.xml +++ b/code/app/home/view/xiongMao/sitemap/sitemap-books-catalog.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/xiongMao/sitemap/sitemap-books.xml b/code/app/home/view/xiongMao/sitemap/sitemap-books.xml index ae36b49..f6f80be 100644 --- a/code/app/home/view/xiongMao/sitemap/sitemap-books.xml +++ b/code/app/home/view/xiongMao/sitemap/sitemap-books.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/home/view/xiongMao/sitemap/sitemap-chapters.xml b/code/app/home/view/xiongMao/sitemap/sitemap-chapters.xml index 429406f..458d40a 100644 --- a/code/app/home/view/xiongMao/sitemap/sitemap-chapters.xml +++ b/code/app/home/view/xiongMao/sitemap/sitemap-chapters.xml @@ -1,4 +1,4 @@ -{novel:pagerexp page="$Request.get.page" limit="40000" +{novel:pagerexp page="$Request.route.intPage" limit="40000" sort_type="news" d_key="key" d_val="Novel" diff --git a/code/app/model/GanRaoMaModel.php b/code/app/model/GanRaoMaModel.php index bcaf674..e702b4c 100644 --- a/code/app/model/GanRaoMaModel.php +++ b/code/app/model/GanRaoMaModel.php @@ -201,11 +201,11 @@ class GanRaoMaModel extends MongoModel * * @param string $strDomain 域名 * @param string $strPageCode 视图编码 - * @param string|NULL $strDifference 差异 + * @param string|integer|NULL $strDifference 差异 * @param integer $intNum 生成数量 * @return array */ - static public function getGrmCode(string $strDomain, string $strPageCode, string|NULL $strDifference, int $intNum) + static public function getGrmCode(string $strDomain, string $strPageCode, string|int|NULL $strDifference, int $intNum) { $arrFilter = [ diff --git a/code/app/services/SiteContext.php b/code/app/services/SiteContext.php index be8a23f..a5c138b 100644 --- a/code/app/services/SiteContext.php +++ b/code/app/services/SiteContext.php @@ -209,11 +209,11 @@ class SiteContext * 获取干扰码 * * @param string $strPageCode - * @param string|NULL $strDiff + * @param string|int|NULL $strDiff * @param integer $intNum * @return array */ - public function generateGrm(string $strPageCode, string|NULL $strDiff, int $intNum): array + public function generateGrm(string $strPageCode, string|int|NULL $strDiff, int $intNum): array { $strDomain = $this->DomainModel->d_domain;