From 43761001fae8a1672ae351351f0bb1337131c726 Mon Sep 17 00:00:00 2001 From: make Date: Mon, 21 Apr 2025 21:03:24 +0800 Subject: [PATCH] debug --- code/app/home/config/router.php | 8 +- code/app/home/view/default/baseH5.html | 1 + code/app/home/view/default/basePc.html | 1 + .../view/default/novel/getNovelCatalog.html | 8 +- .../view/default/novel/getNovelChapter.html | 13 ++-- .../home/view/default/novel/getNovelInfo.html | 37 +++++---- code/app/home/view/default/pc/getLibrary.html | 2 + .../home/view/default/pc/getNovelCatalog.html | 8 +- .../home/view/default/pc/getNovelChapter.html | 12 ++- .../home/view/default/pc/getNovelInfo.html | 15 ++-- code/app/home/view/kuangYu/baseH5.html | 1 + code/app/home/view/kuangYu/baseH5User.html | 1 + code/app/home/view/kuangYu/basePc.html | 1 + code/app/home/view/kuangYu/basePcUser.html | 1 + .../home/view/kuangYu/novel/getNovelInfo.html | 16 ++-- .../home/view/kuangYu/pc/getNovelCatalog.html | 7 +- code/app/services/NovelService.php | 10 ++- code/app/services/SiteContext.php | 6 +- code/extend/template/taglib/Novel.php | 77 +------------------ code/extend/template/taglib/Site.php | 17 ++-- 20 files changed, 106 insertions(+), 136 deletions(-) diff --git a/code/app/home/config/router.php b/code/app/home/config/router.php index 6d3545d..bb1130d 100644 --- a/code/app/home/config/router.php +++ b/code/app/home/config/router.php @@ -218,7 +218,7 @@ foreach ($arrRoutes['prefixes'] as $platform => $prefixes) { Route::get($strRoute, function () use ($strView) { return view($strView); }) - ->pattern(['n_id' => '\d+', 'name' => '[\w-]+',]); + ->pattern(['intNovelId' => '\d+', 'name' => '[\w-]+',]); break; case 'chapter': @@ -242,7 +242,7 @@ foreach ($arrRoutes['prefixes'] as $platform => $prefixes) { Route::get($strRoute, function () use ($strView) { return view($strView); }) - ->pattern(['n_id' => '\d+', 'n_forge_id' => '\d+', 'name' => '[\w-]+',]); + ->pattern(['intNovelId' => '\d+', 'n_forge_id' => '\d+', 'name' => '[\w-]+',]); break; case 'novel': @@ -254,7 +254,7 @@ foreach ($arrRoutes['prefixes'] as $platform => $prefixes) { Route::get($strRoute, function () use ($strView) { return view($strView); }) - ->pattern(['n_id' => '\d+', 'name' => '[\w-]+',]); + ->pattern(['intNovelId' => '\d+', 'name' => '[\w-]+',]); break; case 'catalog': @@ -266,7 +266,7 @@ foreach ($arrRoutes['prefixes'] as $platform => $prefixes) { Route::get($strRoute, function () use ($strView) { return view($strView); }) - ->pattern(['n_id' => '\d+', 'name' => '[\w-]+', 'strOrder' => 'zheng|dao', 'intPage' => '\d+']); + ->pattern(['intNovelId' => '\d+', 'name' => '[\w-]+', 'strOrder' => 'zheng|dao', 'intPage' => '\d+']); break; case 'library': diff --git a/code/app/home/view/default/baseH5.html b/code/app/home/view/default/baseH5.html index ed61ebf..99a5071 100644 --- a/code/app/home/view/default/baseH5.html +++ b/code/app/home/view/default/baseH5.html @@ -1,6 +1,7 @@ + {block name="get-data"}{/block} diff --git a/code/app/home/view/default/basePc.html b/code/app/home/view/default/basePc.html index 9ec6e8d..e977bda 100644 --- a/code/app/home/view/default/basePc.html +++ b/code/app/home/view/default/basePc.html @@ -1,6 +1,7 @@ + {block name="get-data"}{/block} diff --git a/code/app/home/view/default/novel/getNovelCatalog.html b/code/app/home/view/default/novel/getNovelCatalog.html index 6577c37..4373c4a 100644 --- a/code/app/home/view/default/novel/getNovelCatalog.html +++ b/code/app/home/view/default/novel/getNovelCatalog.html @@ -1,14 +1,16 @@ {extend name="baseH5" /} +{block name="get-data"} +{novel:info n_id="$Request.route.intNovelId" n_key="arrNovel" n_forge_id="0" /} +{site:grm page_code="h5_novel_catalog " diff="$Request.url" num="120" g_key="arrGrm" /} +{/block} + {block name="title"}{site:replace code="NOVEL@GETNOVELCATALOG@TITLE"}{/block} {block name="keywords"}{site:replace code="NOVEL@GETNOVELCATALOG@KEYWORDS"}{/block} {block name="description"}{site:replace code="NOVEL@GETNOVELCATALOG@DESCRIPTION"}{/block} {block name="head"} -{novel:info n_id="$Request.route.intNovelId" n_key="arrNovel" n_forge_id="0" /} -{site:grm page_code="h5_novel_catalog " diff="$Request.url" num="120" g_key="arrGrm" /} - diff --git a/code/app/home/view/default/novel/getNovelChapter.html b/code/app/home/view/default/novel/getNovelChapter.html index 8c08d9d..ea85df0 100644 --- a/code/app/home/view/default/novel/getNovelChapter.html +++ b/code/app/home/view/default/novel/getNovelChapter.html @@ -1,17 +1,18 @@ {extend name="baseH5" /} +{block name="get-data"} +{site:grm page_code="h5_novel_chapter" diff="$Request.url" num="20" g_key="arrGrm" /} +{novel:info n_id="$Request.route.intNovelId" n_key="arrNovel" n_forge_id="0" /} +{chapter:info n_id="$Request.route.intNovelId" c_sort_num="$Request.route.intChapterSort" +c_page="$Request.route.intChapterPage" c_key="arrChapter" /} +{/block} + {block name="title"}{site:replace code="NOVEL@GETNOVELCHAPTER@TITLE"}{/block} {block name="keywords"}{site:replace code="NOVEL@GETNOVELCHAPTER@KEYWORDS"}{/block} {block name="description"}{site:replace code="NOVEL@GETNOVELCHAPTER@DESCRIPTION"}{/block} {block name="head"} -{site:grm page_code="h5_novel_chapter" diff="$Request.url" num="20" g_key="arrGrm" /} - -{novel:info n_id="$Request.route.intNovelId" n_key="arrNovel" n_forge_id="0" /} -{chapter:info n_id="$Request.route.intNovelId" c_sort_num="$Request.route.intChapterSort" -c_page="$Request.route.intChapterPage" c_key="arrChapter" /} - diff --git a/code/app/home/view/default/novel/getNovelInfo.html b/code/app/home/view/default/novel/getNovelInfo.html index 91e9ce2..92290c4 100644 --- a/code/app/home/view/default/novel/getNovelInfo.html +++ b/code/app/home/view/default/novel/getNovelInfo.html @@ -1,22 +1,24 @@ $Novel.n_id{extend name="baseH5" /} -{block name="title"}{site:replace code="NOVEL@GETNOVELINFO@TITLE"}{/block} -{block name="keywords"}{site:replace code="NOVEL@GETNOVELINFO@KEYWORDS"}{/block} -{block name="description"}{site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION"}{/block} - -{block name="head"} +{block name="get-data"} {if $Request.route.intNovelId} {novel:info n_id="$Request.route.intNovelId" n_key="arrNovel" n_forge_id="0" /} {else} {novel:info n_id="$DomainModel->info_id" n_key="arrNovel" n_forge_id="0" /} {/if} +{site:grm page_code="h5_novel_info" diff="$arrNovel.n_id" num="120" g_key="arrGrm" /} +{/block} -{site:grm page_code="h5_novel_info" diff="$arrNovel.n_id" num="120" g_key="arrGrm" /} +{block name="title"}{site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /}{/block} +{block name="keywords"}{site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"}{/block} +{block name="description"}{site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"}{/block} +{block name="head"} - + @@ -35,7 +37,8 @@ $Novel.n_id{extend name="baseH5" /} - + {/block} + + {block name="head-js"} {/block} @@ -112,7 +117,8 @@ $Novel.n_id{extend name="baseH5" /}
  • - + {$arrNovel.n_category} @@ -184,7 +190,8 @@ $Novel.n_id{extend name="baseH5" /}

    章节列表

      - {chapter:list count="100" sort_type="zheng" n_id="$arrNovel.n_id" d_key="d_key" d_val="Chapter" cache_life="86400"} + {chapter:list count="100" sort_type="zheng" n_id="$arrNovel.n_id" d_key="d_key" d_val="Chapter" + cache_life="86400"}
    • {$arrGrm[$d_key+10]|raw}

      完结推荐

      - {novel:list count="6" n_category="$arrNovel.n_category_pinyin" n_status="wanjie" d_key="d_key" d_val="Novel" p_val="page_data" cache_life="86400"} + {novel:list count="6" n_category="$arrNovel.n_category_pinyin" n_status="wanjie" d_key="d_key" d_val="Novel" + p_val="page_data" cache_life="86400"}
      {$arrGrm[$d_key+110]|raw} - {$Novel.n_name ?? ''} - {$Novel.n_category ?? ''}最新章节在线免费阅读
      + alt="{$Novel.n_name ?? ''} - {$Novel.n_category ?? ''}最新章节在线免费阅读"> +

      {$Novel.n_name}

      diff --git a/code/app/home/view/default/pc/getLibrary.html b/code/app/home/view/default/pc/getLibrary.html index 201e5b0..726cff3 100644 --- a/code/app/home/view/default/pc/getLibrary.html +++ b/code/app/home/view/default/pc/getLibrary.html @@ -1,7 +1,9 @@ {extend name="basePc" /} + {block name="title"}{site:replace code="NOVEL@GETLIBRARY@TITLE"}{/block} {block name="keywords"}{site:replace code="NOVEL@GETLIBRARY@KEYWORDS"}{/block} {block name="description"}{site:replace code="NOVEL@GETLIBRARY@DESCRIPTION"}{/block} + {block name="head"} diff --git a/code/app/home/view/default/pc/getNovelCatalog.html b/code/app/home/view/default/pc/getNovelCatalog.html index 2fbcbeb..d15a5b1 100644 --- a/code/app/home/view/default/pc/getNovelCatalog.html +++ b/code/app/home/view/default/pc/getNovelCatalog.html @@ -1,14 +1,16 @@ {extend name="basePc" /} +{block name="get-data"} +{novel:info n_id="$Request.route.intNovelId" n_key="arrNovel" n_forge_id="0" /} +{site:grm page_code="pc_novel_catalog" diff="$Request.url" num="120" g_key="arrGrm" /} +{/block} + {block name="title"}{site:replace code="NOVEL@GETNOVELCATALOG@TITLE"}{/block} {block name="keywords"}{site:replace code="NOVEL@GETNOVELCATALOG@KEYWORDS"}{/block} {block name="description"}{site:replace code="NOVEL@GETNOVELCATALOG@DESCRIPTION"}{/block} {block name="head"} -{novel:info n_id="$Request.route.intNovelId" n_key="arrNovel" n_forge_id="0" /} -{site:grm page_code="pc_novel_catalog" diff="$Request.url" num="120" g_key="arrGrm" /} - diff --git a/code/app/home/view/default/pc/getNovelChapter.html b/code/app/home/view/default/pc/getNovelChapter.html index 6868ba4..8a5b89e 100644 --- a/code/app/home/view/default/pc/getNovelChapter.html +++ b/code/app/home/view/default/pc/getNovelChapter.html @@ -1,15 +1,19 @@ {extend name="basePc" /} + +{block name="get-data"} +{site:grm page_code="pc_novel_chapter" diff="$Request.url" num="20" g_key="arrGrm" /} +{novel:info n_id="$Request.route.intNovelId" n_key="arrNovel" n_forge_id="0" /} +{chapter:info n_id="$Request.route.intNovelId" c_sort_num="$Request.route.intChapterSort" +c_page="$Request.route.intChapterPage" c_key="arrChapter" /} +{/block} + {block name="title"}{site:replace code="NOVEL@GETNOVELCHAPTER@TITLE"}{/block} {block name="keywords"}{site:replace code="NOVEL@GETNOVELCHAPTER@KEYWORDS"}{/block} {block name="description"}{site:replace code="NOVEL@GETNOVELCHAPTER@DESCRIPTION"}{/block} {block name="head"} -{site:grm page_code="pc_novel_chapter" diff="$Request.url" num="20" g_key="arrGrm" /} -{novel:info n_id="$Request.route.intNovelId" n_key="arrNovel" n_forge_id="0" /} -{chapter:info n_id="$Request.route.intNovelId" c_sort_num="$Request.route.intChapterSort" -c_page="$Request.route.intChapterPage" c_key="arrChapter" /} diff --git a/code/app/home/view/default/pc/getNovelInfo.html b/code/app/home/view/default/pc/getNovelInfo.html index 7f18d39..79969ca 100644 --- a/code/app/home/view/default/pc/getNovelInfo.html +++ b/code/app/home/view/default/pc/getNovelInfo.html @@ -1,18 +1,21 @@ {extend name="basePc" /} +{block name="get-data"} +{if $Request.route.intNovelId} +{novel:info n_id="$Request.route.intNovelId" n_key="arrNovel" n_forge_id="0" /} +{else} +{novel:info n_id="$DomainModel->info_id" n_key="arrNovel" n_forge_id="0" /} +{/if} +{site:grm page_code="pc_novel_info" diff="$arrNovel.n_id" num="120" g_key="arrGrm" /} +{/block} + {block name="title"}{site:replace code="NOVEL@GETNOVELINFO@TITLE"}{/block} {block name="keywords"}{site:replace code="NOVEL@GETNOVELINFO@KEYWORDS"}{/block} {block name="description"}{site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION"}{/block} {block name="head"} -{if $Request.route.intNovelId} -{novel:info n_id="$Request.route.intNovelId" n_key="arrNovel" n_forge_id="0" /} -{else} -{novel:info n_id="$DomainModel->info_id" n_key="arrNovel" n_forge_id="0" /} -{/if} -{site:grm page_code="pc_novel_info" diff="$arrNovel.n_id" num="120" g_key="arrGrm" /} diff --git a/code/app/home/view/kuangYu/baseH5.html b/code/app/home/view/kuangYu/baseH5.html index c79d5a1..d892ee7 100644 --- a/code/app/home/view/kuangYu/baseH5.html +++ b/code/app/home/view/kuangYu/baseH5.html @@ -2,6 +2,7 @@ + {block name="get-data"}{/block} diff --git a/code/app/home/view/kuangYu/baseH5User.html b/code/app/home/view/kuangYu/baseH5User.html index 303dc20..e00a742 100644 --- a/code/app/home/view/kuangYu/baseH5User.html +++ b/code/app/home/view/kuangYu/baseH5User.html @@ -1,6 +1,7 @@ + {block name="get-data"}{/block} diff --git a/code/app/home/view/kuangYu/basePc.html b/code/app/home/view/kuangYu/basePc.html index 75f9ac1..aba10f7 100644 --- a/code/app/home/view/kuangYu/basePc.html +++ b/code/app/home/view/kuangYu/basePc.html @@ -2,6 +2,7 @@ + {block name="get-data"}{/block} diff --git a/code/app/home/view/kuangYu/basePcUser.html b/code/app/home/view/kuangYu/basePcUser.html index 0295dd7..0caa451 100644 --- a/code/app/home/view/kuangYu/basePcUser.html +++ b/code/app/home/view/kuangYu/basePcUser.html @@ -1,6 +1,7 @@ + {block name="get-data"}{/block} diff --git a/code/app/home/view/kuangYu/novel/getNovelInfo.html b/code/app/home/view/kuangYu/novel/getNovelInfo.html index f90fcfd..056c1c4 100644 --- a/code/app/home/view/kuangYu/novel/getNovelInfo.html +++ b/code/app/home/view/kuangYu/novel/getNovelInfo.html @@ -1,17 +1,21 @@ {extend name="baseH5" /} +{block name="get-data"} +{if $Request.route.intNovelId} +{novel:info n_id="$Request.route.intNovelId" n_key="arrNovel" n_forge_id="0" /} +{else} +{novel:info n_id="$DomainModel->info_id" n_key="arrNovel" n_forge_id="0" /} +{/if} +{site:grm page_code="h5_novel_info" diff="$arrNovel.n_id" num="120" g_key="arrGrm" /} +{/block} + {block name="title"}{site:replace code="NOVEL@GETNOVELINFO@TITLE"}{/block} {block name="keywords"}{site:replace code="NOVEL@GETNOVELINFO@KEYWORDS"}{/block} {block name="description"}{site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION"}{/block} {block name="head"} -{if $Request.route.intNovelId} -{novel:info n_id="$Request.route.intNovelId" n_key="arrNovel" n_forge_id="0" /} -{else} -{novel:info n_id="$DomainModel->info_id" n_key="arrNovel" n_forge_id="0" /} -{/if} -{site:grm page_code="h5_novel_info" diff="$arrNovel.n_id" num="120" g_key="arrGrm" /} + diff --git a/code/app/home/view/kuangYu/pc/getNovelCatalog.html b/code/app/home/view/kuangYu/pc/getNovelCatalog.html index f1c0d8d..f7b7d09 100644 --- a/code/app/home/view/kuangYu/pc/getNovelCatalog.html +++ b/code/app/home/view/kuangYu/pc/getNovelCatalog.html @@ -1,13 +1,16 @@ {extend name="basePc" /} +{block name="get-data"} +{novel:info n_id="$Request.route.intNovelId" n_key="arrNovel" n_forge_id="0" /} +{site:grm page_code="pc_novel_catalog" diff="$Request.url" num="120" g_key="arrGrm" /} +{/block} + {block name="title"}{site:replace code="NOVEL@GETNOVELCATALOG@TITLE"}{/block} {block name="keywords"}{site:replace code="NOVEL@GETNOVELCATALOG@KEYWORDS"}{/block} {block name="description"}{site:replace code="NOVEL@GETNOVELCATALOG@DESCRIPTION"}{/block} {block name="head"} -{novel:info n_id="$Request.route.intNovelId" n_key="arrNovel" n_forge_id="0" /} -{site:grm page_code="pc_novel_catalog" diff="$Request.url" num="120" g_key="arrGrm" /} diff --git a/code/app/services/NovelService.php b/code/app/services/NovelService.php index dd8db5b..db5df4c 100644 --- a/code/app/services/NovelService.php +++ b/code/app/services/NovelService.php @@ -158,12 +158,13 @@ class NovelService { $strKey = 'CATEGORY_INFO_URL'; $strUrl = $this->getPageUrl($strKey, [ - 'strGender' => $strGender ?? 'all', - 'strCategory' => $strCategory ?? 'all', - 'strStatus' => $strStatus ?? 'all', - 'strOrder' => $strOrder ?? 'all', + 'strGender' => !empty($strGender) ? $strGender : '', + 'strCategory' => !empty($strCategory) ? $strCategory : 'all', + 'strStatus' => !empty($strStatus) ? $strStatus : 'all', + 'strOrder' => !empty($strOrder) ? $strOrder : 'all', 'intPage' => $intPage ?? 1, ]); + $strUrl = preg_replace('#/{2,}#', '/', $strUrl); return (string)$strUrl; } @@ -637,6 +638,7 @@ class NovelService $intTotal = $arrNovel['total'] ?? 0; $intButtomNum = $arrParams['button_num']; $strBaseUrl = app(NovelService::class)->getNovelCategoryUrl($strGender, $strCategory, $strStatus, $strOrder, '{page}'); + $arrPaginator = CusteomPage02::generate($intPage, $intTotal, $intLimit, $strBaseUrl, $intButtomNum); return $arrPaginator; diff --git a/code/app/services/SiteContext.php b/code/app/services/SiteContext.php index 48bb7ab..f477f8b 100644 --- a/code/app/services/SiteContext.php +++ b/code/app/services/SiteContext.php @@ -155,15 +155,17 @@ class SiteContext * 变量转换 * * @param string $strCode + * @param string $strDiff * @return string */ - public function converterTemplate(string $strCode): string + public function converterTemplate(string $strCode,string $strDiff="0"): string { - $strTitleTemplate = $this->DomainModel->getFomartSubject($strCode); + $strTitleTemplate = $this->DomainModel->getFomartSubject($strCode,$strDiff); return ConverterMovel::convert($strTitleTemplate); } + /** * 获取干扰码 * diff --git a/code/extend/template/taglib/Novel.php b/code/extend/template/taglib/Novel.php index 872a2ab..b2b5668 100644 --- a/code/extend/template/taglib/Novel.php +++ b/code/extend/template/taglib/Novel.php @@ -7,7 +7,7 @@ use think\template\TagLib; class Novel extends TagLib { protected $tags = [ - 'list' => ['attr' => 'count,n_category,sort_type,n_status,n_sex,diff_key,cache_life,d_key,d_val', 'close' => 1], + 'list' => ['attr' => 'limit,n_category,sort_type,n_status,n_sex,key,diff_key,cache_life,d_key,d_val', 'close' => 1], 'pager' => ['attr' => 'page,limit,n_category,sort_type,n_status,n_sex,key,diff_key,cache_life,d_key,d_val,p_val,func,export_name', 'close' => 1], 'pagerexp' => ['attr' => 'page,limit,n_category,sort_type,n_status,n_sex,key,diff_key,cache_life,d_key,d_val,p_val,func,export_name', 'close' => 0], 'info' => ['attr' => 'n_id,n_key', 'close' => 0], @@ -15,8 +15,6 @@ class Novel extends TagLib 'status' => ['attr' => 'd_key,d_val'], 'sex' => ['attr' => 'd_key,d_val'], 'category' => ['attr' => 'd_key,d_val,n_sex'], - - 'ranklist' => ['attr' => 'count,sort_type,n_status,n_sex,diff_key,cache_life,d_key,d_val', 'close' => 1], ]; private function customBuildVar($mixedArgs) @@ -29,67 +27,8 @@ class Novel extends TagLib } - /** - * tagRankList - * - * @param array $tag - * @param string $content - * @return void - */ - public function tagRankList($tag, $content) - { - $count = $tag['count'] ?? '10'; - $sort_type = $tag['sort_type'] ?? ""; - $n_status = $tag['n_status'] ?? "all"; - $n_sex = $tag['n_sex'] ?? "all"; - - $diff_key = $tag['diff_key'] ?? ""; - $cache_life = $tag['cache_life'] ?? '0'; - $d_key = $tag['d_key'] ?? 'd_key'; - $d_val = $tag['d_val'] ?? 'd_val'; - - $sort_type = $this->customBuildVar($sort_type); - $n_status = $this->customBuildVar($n_status); - $n_sex = $this->customBuildVar($n_sex); - $diff_key = $this->customBuildVar($diff_key); - $cache_life = $this->customBuildVar($cache_life); - - $arrDataName = randomString(5); - - $strParse = <<getRankList([ -'count' => {$count}, -'sort_type' => {$sort_type}, -'n_status' => {$n_status}, -'n_sex' => {$n_sex}, -'diff_key' => {$diff_key}, -'cache_life' => {$cache_life} -]); - -if (!empty(\${$arrDataName}) && is_array(\${$arrDataName})): - -?> -EOT; - $strParse .= << \${$d_val}): ?> -EOT; - $strParse .= $content; - $strParse .= << - -EOT; - return $strParse; - } - - - /** - * tagPagerExp - * - * @param array $tag - * @param string $content - * @return void + * novel 自定义标签 */ public function tagPagerExp($tag, $content) { @@ -97,11 +36,7 @@ EOT; } /** - * tagPager - * - * @param array $tag - * @param string $content - * @return void + * novel 自定义标签 */ public function tagPager($tag, $content) { @@ -180,11 +115,7 @@ EOT; } /** - * tagList - * - * @param array $tag - * @param string $content - * @return void + * novel 自定义标签 */ public function tagList($tag, $content) { diff --git a/code/extend/template/taglib/Site.php b/code/extend/template/taglib/Site.php index d2c86bd..9f89552 100644 --- a/code/extend/template/taglib/Site.php +++ b/code/extend/template/taglib/Site.php @@ -17,7 +17,7 @@ class Site extends TagLib 'nclurl' => ['attr' => 'n_id,n_py,order,page', 'close' => 0], 'nflurl' => ['attr' => 'gender,category,status,order,page', 'close' => 0], 'grm' => ['attr' => 'domain,code,line,diff,start,end,index,type', 'close' => 0], - 'replace' => ['attr' => 'code', 'close' => 0], + 'replace' => ['attr' => 'code,diff', 'close' => 0], 'forgelist' => ['attr' => 'count,diff_key,cache_life,d_key,d_val', 'close' => 1], ]; @@ -253,10 +253,10 @@ EOD; */ public function tagNFLUrl($tag) { - $strGender = isset($tag['gender']) ? $tag['gender'] : 'all'; + $strGender = isset($tag['gender']) ? $tag['gender'] : ''; $strCategory = isset($tag['category']) ? $tag['category'] : 'all'; $strStatus = isset($tag['status']) ? $tag['status'] : 'all'; - $strOrder = isset($tag['order']) ? $tag['order'] : 'all'; + $strOrder = isset($tag['order']) ? $tag['order'] : ''; $intPage = isset($tag['page']) ? $tag['page'] : 1; $strGender = $this->customBuildVar($strGender); @@ -311,10 +311,13 @@ EOD; public function tagReplace($tag) { $strCode = isset($tag['code']) ? $tag['code'] : ''; + $strDiff = isset($tag['diff']) ? $tag['diff'] : '0'; + // $strCode = $this->customBuildVar($strCode); + $strDiff = $this->customBuildVar($strDiff); $strParse = <<converterTemplate("{$strCode}"); + \$strUrl = app(\\app\\services\\SiteContext::class)->converterTemplate("{$strCode}",{$strDiff}); echo \$strUrl; ?> EOD; @@ -322,7 +325,6 @@ EOD; } - /** * get grm * @@ -341,10 +343,7 @@ EOD; $page_code = $this->customBuildVar($page_code); $diff = $this->customBuildVar($diff); $num = $this->customBuildVar($num); - // var_dump($page_code); - // var_dump($diff); - // var_dump($num); - // exit; + $arrDataName = randomString(5); $strParse = <<