From bbac5b5cdb82115eba803273c399eae615b7a798 Mon Sep 17 00:00:00 2001
From: make <make.chaofanai@gmail.com>
Date: Wed, 30 Apr 2025 13:24:55 +0800
Subject: [PATCH] debug

---
 code/app/admin/controller/Site.php            |  1 +
 .../home/view/default/novel/getNovelInfo.html | 28 ++++++++++++++++---
 .../home/view/default/pc/getNovelInfo.html    | 27 ++++++++++++++++--
 .../home/view/haoZi/novel/getNovelInfo.html   | 26 +++++++++++++++--
 code/app/home/view/haoZi/pc/getNovelInfo.html | 26 +++++++++++++++--
 .../home/view/kuangYu/novel/getNovelInfo.html | 26 +++++++++++++++--
 .../home/view/kuangYu/pc/getNovelInfo.html    | 26 +++++++++++++++--
 .../home/view/shikong/novel/getNovelInfo.html | 26 +++++++++++++++--
 .../view/xiongMao/novel/getNovelInfo.html     | 25 +++++++++++++++--
 .../home/view/xiongMao/pc/getNovelInfo.html   | 26 +++++++++++++++--
 code/app/services/SiteContext.php             |  4 +--
 11 files changed, 211 insertions(+), 30 deletions(-)

diff --git a/code/app/admin/controller/Site.php b/code/app/admin/controller/Site.php
index 6cf2825..0467ee3 100644
--- a/code/app/admin/controller/Site.php
+++ b/code/app/admin/controller/Site.php
@@ -179,6 +179,7 @@ class Site extends BaseController
             "d_img_log" => $Request->post('d_img_log'),
             "d_content_encode" => $Request->post('d_content_encode'),
             "t_cfg" => $Request->post('t_cfg'),
+            "info_id" => $Request->post('info_id'),
         ];
 
         $arrRule = [
diff --git a/code/app/home/view/default/novel/getNovelInfo.html b/code/app/home/view/default/novel/getNovelInfo.html
index 73b05e4..e154a76 100644
--- a/code/app/home/view/default/novel/getNovelInfo.html
+++ b/code/app/home/view/default/novel/getNovelInfo.html
@@ -9,9 +9,30 @@ $Novel.n_id{extend name="baseH5" /}
 {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" 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="title"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@TITLE"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /}
+    {/if}
+{/block}
+
+
+{block name="keywords"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@KEYWORDS"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"}
+    {/if}
+{/block}
+
+{block name="description"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@DESCRIPTION"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"}
+    {/if}
+{/block}
 
 {block name="head"}
 
@@ -94,7 +115,6 @@ $Novel.n_id{extend name="baseH5" /}
 {/block}
 
 
-
 {block name="head-js"}
 {/block}
 
diff --git a/code/app/home/view/default/pc/getNovelInfo.html b/code/app/home/view/default/pc/getNovelInfo.html
index f9e06c7..f44e737 100644
--- a/code/app/home/view/default/pc/getNovelInfo.html
+++ b/code/app/home/view/default/pc/getNovelInfo.html
@@ -9,9 +9,30 @@
 {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="title"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@TITLE"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /}
+    {/if}
+{/block}
+
+
+{block name="keywords"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@KEYWORDS"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"}
+    {/if}
+{/block}
+
+{block name="description"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@DESCRIPTION"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"}
+    {/if}
+{/block}
 
 {block name="head"}
 
diff --git a/code/app/home/view/haoZi/novel/getNovelInfo.html b/code/app/home/view/haoZi/novel/getNovelInfo.html
index e84a00b..d168dd7 100644
--- a/code/app/home/view/haoZi/novel/getNovelInfo.html
+++ b/code/app/home/view/haoZi/novel/getNovelInfo.html
@@ -9,9 +9,29 @@
 {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" 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="title"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@TITLE"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /}
+    {/if}
+{/block}
+
+{block name="keywords"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@KEYWORDS"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"}
+    {/if}
+{/block}
+
+{block name="description"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@DESCRIPTION"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"}
+    {/if}
+{/block}
 
 {block name="head"}
 
diff --git a/code/app/home/view/haoZi/pc/getNovelInfo.html b/code/app/home/view/haoZi/pc/getNovelInfo.html
index bcf10be..84a1a8c 100644
--- a/code/app/home/view/haoZi/pc/getNovelInfo.html
+++ b/code/app/home/view/haoZi/pc/getNovelInfo.html
@@ -9,9 +9,29 @@
 {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" 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="title"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@TITLE"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /}
+    {/if}
+{/block}
+
+{block name="keywords"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@KEYWORDS"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"}
+    {/if}
+{/block}
+
+{block name="description"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@DESCRIPTION"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"}
+    {/if}
+{/block}
 
 
 {block name="head"}
diff --git a/code/app/home/view/kuangYu/novel/getNovelInfo.html b/code/app/home/view/kuangYu/novel/getNovelInfo.html
index 295d528..6d7b8bf 100644
--- a/code/app/home/view/kuangYu/novel/getNovelInfo.html
+++ b/code/app/home/view/kuangYu/novel/getNovelInfo.html
@@ -9,9 +9,29 @@
 {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" 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="title"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@TITLE"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /}
+    {/if}
+{/block}
+
+{block name="keywords"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@KEYWORDS"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"}
+    {/if}
+{/block}
+
+{block name="description"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@DESCRIPTION"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"}
+    {/if}
+{/block}
 
 {block name="head"}
 
diff --git a/code/app/home/view/kuangYu/pc/getNovelInfo.html b/code/app/home/view/kuangYu/pc/getNovelInfo.html
index 4e6f453..c154e90 100644
--- a/code/app/home/view/kuangYu/pc/getNovelInfo.html
+++ b/code/app/home/view/kuangYu/pc/getNovelInfo.html
@@ -9,9 +9,29 @@
 {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" 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="title"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@TITLE"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /}
+    {/if}
+{/block}
+
+{block name="keywords"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@KEYWORDS"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"}
+    {/if}
+{/block}
+
+{block name="description"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@DESCRIPTION"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"}
+    {/if}
+{/block}
 
 
 {block name="head"}
diff --git a/code/app/home/view/shikong/novel/getNovelInfo.html b/code/app/home/view/shikong/novel/getNovelInfo.html
index 141ea74..914e3cd 100644
--- a/code/app/home/view/shikong/novel/getNovelInfo.html
+++ b/code/app/home/view/shikong/novel/getNovelInfo.html
@@ -9,9 +9,29 @@ $Novel.n_id{extend name="baseH5" /}
 {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" 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="title"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@TITLE"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /}
+    {/if}
+{/block}
+
+{block name="keywords"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@KEYWORDS"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"}
+    {/if}
+{/block}
+
+{block name="description"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@DESCRIPTION"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"}
+    {/if}
+{/block}
 
 {block name="head"}
 
diff --git a/code/app/home/view/xiongMao/novel/getNovelInfo.html b/code/app/home/view/xiongMao/novel/getNovelInfo.html
index 6a68867..4422764 100644
--- a/code/app/home/view/xiongMao/novel/getNovelInfo.html
+++ b/code/app/home/view/xiongMao/novel/getNovelInfo.html
@@ -9,10 +9,29 @@
 {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" 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="title"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@TITLE"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /}
+    {/if}
+{/block}
 
+{block name="keywords"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@KEYWORDS"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"}
+    {/if}
+{/block}
+
+{block name="description"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@DESCRIPTION"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"}
+    {/if}
+{/block}
 {block name="head"}
 
 <!-- 社交媒体标签 -->
diff --git a/code/app/home/view/xiongMao/pc/getNovelInfo.html b/code/app/home/view/xiongMao/pc/getNovelInfo.html
index 56aa021..4481cbe 100644
--- a/code/app/home/view/xiongMao/pc/getNovelInfo.html
+++ b/code/app/home/view/xiongMao/pc/getNovelInfo.html
@@ -9,9 +9,29 @@
 {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" 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="title"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@TITLE"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /}
+    {/if}
+{/block}
+
+{block name="keywords"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@KEYWORDS"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"}
+    {/if}
+{/block}
+
+{block name="description"}
+    {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)}
+    {site:replace code="INDEX@INDEX@DESCRIPTION"}
+    {else}
+    {site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"}
+    {/if}
+{/block}
 
 
 {block name="head"}
diff --git a/code/app/services/SiteContext.php b/code/app/services/SiteContext.php
index 533cfd5..41c2b85 100644
--- a/code/app/services/SiteContext.php
+++ b/code/app/services/SiteContext.php
@@ -157,10 +157,10 @@ class SiteContext
      * 变量转换
      *
      * @param string $strCode
-     * @param string $strDiff
+     * @param string|null $strDiff
      * @return string
      */
-    public function converterTemplate(string $strCode, string $strDiff = "0"): string
+    public function converterTemplate(string $strCode, string | Null $strDiff = "0"): string
     {
         $strTitleTemplate =  $this->DomainModel->getFomartSubject($strCode, $strDiff);