Merge branch 'dev' of ssh://git.bgbg.live:18150/root/SEONexus into dev

2025-04-15 16:33:34 +08:00
parent 5893a41166 58fc0fb50b
commit 694d5fd14c
8 changed files with 30 additions and 21 deletions
--- a/code/app/home/config/router.php
+++ b/code/app/home/config/router.php
@@ -51,12 +51,12 @@ $arrRoutes = [

        // 伪小说详情相关路径
        'kan-novel' => [
-            '/kan-xiaoshuo/:name-:n_id',
-            '/show-novel/:name-:n_id',
-            '/seo-book/:name-:n_id',
-            '/show-xiaoshuo-:name-:n_id',
-            '/see-novel-:name-:n_id',
-            '/good-book-:name-:n_id',
+            '/kan-xiaoshuo/:name-:n_id-:n_forge_id',
+            '/show-novel/:name-:n_id-:n_forge_id',
+            '/seo-book/:name-:n_id-:n_forge_id',
+            '/show-xiaoshuo-:name-:n_id-:n_forge_id',
+            '/see-novel-:name-:n_id-:n_forge_id',
+            '/good-book-:name-:n_id-:n_forge_id',
        ],

        // 小说详情相关路径
--- a/code/app/home/controller/Novel.php
+++ b/code/app/home/controller/Novel.php
@@ -595,6 +595,9 @@ 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';
+
        // 最新章节
        $ChapterModel = ChapterModel::getInstance();
        $arrChapter = $ChapterModel->getLatestChapterByNId($intNId);
@@ -676,6 +679,9 @@ class Novel extends BaseController
        $intNId = $intNovelId;
        $arrNovel = $NovelModel->getNovelByNId($intNId);

+        $arrNovel['category_pinyin'] =  $arrNovel['category_pinyin'] ?? 'all';
+        $arrNovel['category_sex'] = $arrNovel['category_sex'] ?? 'man';
+
        // 章节
        $ChapterModel = ChapterModel::getInstance();
        $arrFilter = ['n_id' => $intNId, 'c_sort_num' => $intChapterSort, 'c_page' => $intChapterPage];
@@ -759,6 +765,9 @@ class Novel extends BaseController
        $intNId = $intNovelId;
        $arrNovel = $NovelModel->getNovelByNId($intNId);

+        $arrNovel['category_pinyin'] =  $arrNovel['category_pinyin'] ?? 'all';
+        $arrNovel['category_sex'] = $arrNovel['category_sex'] ?? 'man';
+
        $ChapterModel = ChapterModel::getInstance();

        $strKey = sprintf('Nid:%s:Chapter-Page:%s:Order:%s', $intNId, $intPage, $strOrder);
--- a/code/app/home/controller/User.php
+++ b/code/app/home/controller/User.php
@@ -42,7 +42,7 @@ class User extends BaseController
            $strView = '';
            $this->generateGrm(1, 0, 20);
        } else {
-            $strView = 'Pc/User/index';
+            $strView = 'pc/user/index';
            $this->generateGrm(2, 0, 20);
        }
        return $this->rending($strView);
@@ -68,7 +68,7 @@ class User extends BaseController
            $strView = '';
            $this->generateGrm(1, 0, 10);
        } else {
-            $strView = 'Pc/User/getBookShelf';
+            $strView = 'pc/user/getBookShelf';
            $this->generateGrm(2, 0, 10);
        }
        return $this->rending($strView);
@@ -94,7 +94,7 @@ class User extends BaseController
            $strView = '';
            $this->generateGrm(1, 0, 10);
        } else {
-            $strView = 'Pc/User/getHistory';
+            $strView = 'pc/user/getHistory';
            $this->generateGrm(2, 0, 10);
        }
        return $this->rending($strView);
--- a/code/app/home/view/kuangYu/novel/getNovelInfo.html
+++ b/code/app/home/view/kuangYu/novel/getNovelInfo.html
@@ -157,7 +157,7 @@
                        {volist name="arrNovel.n_forge_novel" id="ForgeNovel" key="key"}
                        {$arrGRM[$key+20]|raw}
                        <a
-                            href='{site:nnurl n_id="$Novel[n_id]" n_py="$Novel[og_novel_pin_yin]" n_fid="$ForgeNovel[n_forge_id]"/}'>{$ForgeNovel.n_forge_title}</a>
+                            href='{site:nnurl n_id="$arrNovel[n_id]" n_py="$arrNovel[og_novel_pin_yin]" n_fid="$ForgeNovel[n_forge_id]"/}'>{$ForgeNovel.n_forge_title}</a>
                        {/volist}
                    </p>
                </div>
--- a/code/app/home/view/kuangYu/pc/getKanNovelInfo.html
+++ b/code/app/home/view/kuangYu/pc/getKanNovelInfo.html
@@ -186,7 +186,7 @@
                    <p>
                        <a href="{$strPcPath}/xiaoshuo/{$arrNovel.og_novel_pin_yin}-{$Chapter.n_id}/zhang-{$Chapter.c_sort_num}"
                            class="zj">{$Chapter.name}</a>
-                        <span class="time">{$Chapter.created_at}</span>
+                        <span class="time">{$Chapter.created_at ?? '1天前'}</span>
                        <!-- <span class="time">3天前</span>-->
                    </p>
                    <p class="zw" style="max-height: 98px; overflow: hidden;"></p>
--- a/code/app/home/view/kuangYu/pc/getNovelInfo.html
+++ b/code/app/home/view/kuangYu/pc/getNovelInfo.html
@@ -20,7 +20,7 @@
 <meta property="og:novel:update_time" content="{$arrNovel.og_novel_update_time ?? ''}">
 <meta property="og:novel:latest_chapter_name" content="{$arrLatestChapter.name ?? ''}">
 <meta property="og:novel:latest_chapter_url"
-    content='https://{$DomainModel->d_domain}{$strPcPath}{$strPcPath}{site:lcpurl n_id="$arrNovel[n_id]" n_py="$arrNovel[og_novel_pin_yin]" /}'>
+    content='https://{$DomainModel->d_domain}{$strPcPath}{site:lcpurl n_id="$arrNovel[n_id]" n_py="$arrNovel[og_novel_pin_yin]" /}'>
 <!-- 可选：支持 Twitter Card -->
 <meta name="twitter:card" content="summary_large_image" />
 <meta name="twitter:title" content="{$arrNovel['og_novel_book_name'] ?? '未知小说'}" />
@@ -81,7 +81,7 @@
                <meta itemprop="position" content="1" />
            </li>
            <li class="breadcrumb-item" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
-                <a href='{$strPcPath}{$strPcPath}{site:nflurl gender="all" category="$arrNovel[category_pinyin]"  status="all" page="1"/}'
+                <a href='{$strPcPath}{site:nflurl gender="all" category="$arrNovel[category_pinyin]"  status="all" page="1"/}'
                    itemprop="item">
                    <span itemprop="name">{$arrNovel.og_novel_category}</span>
                </a>
@@ -195,7 +195,7 @@
                        {$arrGRM[$key]|raw}
                        <a href='{$strPcPath}{site:cpurl n_id="$arrNovel[n_id]" n_py="$arrNovel[og_novel_pin_yin]" c_sort="$Chapter[c_sort_num]" c_page="0"/}'
                            title="{$arrNovel.og_novel_book_name}-{$Chapter.name}" class="zj">{$Chapter.name}</a>
-                        <span class="time">{$Chapter.created_at}</span>
+                        <span class="time">{$Chapter.created_at ?? '1天前'}</span>
                        <!-- <span class="time">3天前</span>-->
                    </p>
                    <p class="zw" style="max-height: 98px; overflow: hidden;"></p>
@@ -208,7 +208,7 @@
            <div class="pl_con">
                {volist name="arrNovel.n_forge_novel" id="ForgeNovel" key="key"}
                {if $key<20 } {$arrGRM[$key+20]|raw} {/if} <a
-                    href='{$strPcPath}{site:nnurl n_id="$Novel[n_id]" n_py="$Novel[og_novel_pin_yin]" n_fid="$ForgeNovel[n_forge_id]"/}'
+                    href='{$strPcPath}{site:nnurl n_id="$arrNovel[n_id]" n_py="$arrNovel[og_novel_pin_yin]" n_fid="$ForgeNovel[n_forge_id]"/}'
                    class="red">{$ForgeNovel.n_forge_title}</a>
                    {/volist}

--- a/code/database/seeders/TemplateSeeder.php
+++ b/code/database/seeders/TemplateSeeder.php
@@ -247,7 +247,7 @@ class TemplateSeeder
                'description' => 'kan小说详情URL 模板1',
                'sfg_id' => 30,
                'arrSubjectFomart' => [
-                    '/kan-xiaoshuo/{strPinYin}-{intNId}',
+                    '/kan-xiaoshuo/{strPinYin}-{intNId}-{intNForgeId}',
                ]
            ],
            'NOVEL_CATALOG_URL' => [
--- a/code/public/initdata/novel/urlSubjectFomartGroup.php
+++ b/code/public/initdata/novel/urlSubjectFomartGroup.php
@@ -196,35 +196,35 @@ return  [
        'description' => '伪小说详情URL 模板2',
        'sfg_id' => 64,
        'arrSubjectFomart' => [
-            '/kan-novel/{strPinYin}-{intNId}',
+            '/kan-novel/{strPinYin}-{intNId}-{intNForgeId}',
        ]
    ],
    'KAN_NOVEL_INFO_URL_T3' => [
        'description' => '伪小说详情URL 模板3',
        'sfg_id' => 65,
        'arrSubjectFomart' => [
-            '/kan-book/{strPinYin}-{intNId}',
+            '/kan-book/{strPinYin}-{intNId}-{intNForgeId}',
        ]
    ],
    'KAN_NOVEL_INFO_URL_T4' => [
        'description' => '伪小说详情URL 模板4',
        'sfg_id' => 66,
        'arrSubjectFomart' => [
-            '/kan-xiaoshuo-{strPinYin}-{intNId}',
+            '/kan-xiaoshuo-{strPinYin}-{intNId}-{intNForgeId}',
        ]
    ],
    'KAN_NOVEL_INFO_URL_T5' => [
        'description' => '伪小说详情URL 模板5',
        'sfg_id' => 67,
        'arrSubjectFomart' => [
-            '/kan-novel-{strPinYin}-{intNId}',
+            '/kan-novel-{strPinYin}-{intNId}-{intNForgeId}',
        ]
    ],
    'KAN_NOVEL_INFO_URL_T6' => [
        'description' => '伪小说详情URL 模板6',
        'sfg_id' => 68,
        'arrSubjectFomart' => [
-            '/kan-book-{strPinYin}-{intNId}',
+            '/kan-book-{strPinYin}-{intNId}-{intNForgeId}',
        ]
    ],