From 0468aa1b57df3dfb63ef4abef1829abc794331b0 Mon Sep 17 00:00:00 2001
From: make <make.chaofanai@gmail.com>
Date: Sun, 18 May 2025 17:52:38 +0800
Subject: [PATCH] debug-log

---
 code/app/common.php                           |  4 +-
 .../home/view/xiongMao/pc/getNovelRank.html   |  0
 code/app/model/GanRaoMaModel.php              | 49 ++++++++++++-------
 code/app/services/ChapterService.php          |  4 +-
 code/app/services/NovelService.php            |  8 +--
 code/app/services/SiteContext.php             | 10 +++-
 code/app/services/VideoService.php            |  7 +--
 7 files changed, 52 insertions(+), 30 deletions(-)
 create mode 100644 code/app/home/view/xiongMao/pc/getNovelRank.html

diff --git a/code/app/common.php b/code/app/common.php
index 49ca04b..170035f 100644
--- a/code/app/common.php
+++ b/code/app/common.php
@@ -69,13 +69,13 @@ namespace {
     function replaceLastPageNumber($url, $number)
     {
         // 使用正则表达式替换最后一个 "1" 为 "number"
-        return preg_replace('/1(?=[^1]*$)/', $number, $url);
+        return preg_replace('/1(?=[^1]*$)/', $number, (string)$url);
     }
 
     function removeScriptTags($rpText, $newText)
     {
         // 使用正则表达式替换所有 <script> 标签
-        return preg_replace($rpText, '', $newText);
+        return preg_replace($rpText, '', (string)$newText);
     }
 
     function extractFilename($url)
diff --git a/code/app/home/view/xiongMao/pc/getNovelRank.html b/code/app/home/view/xiongMao/pc/getNovelRank.html
new file mode 100644
index 0000000..e69de29
diff --git a/code/app/model/GanRaoMaModel.php b/code/app/model/GanRaoMaModel.php
index e702b4c..8dbd4f5 100644
--- a/code/app/model/GanRaoMaModel.php
+++ b/code/app/model/GanRaoMaModel.php
@@ -211,36 +211,49 @@ class GanRaoMaModel extends MongoModel
         $arrFilter = [
             'grm_domain' => (string) $strDomain,
             'grm_page_code' => (string) $strPageCode,
-            'grm_page_diff' => (string) $strDifference ?? '0',
+            'grm_page_diff' => (string) ($strDifference ?? '0'),
         ];
         $arrResult =  self::getInstance()->getOne($arrFilter, self::$arrOptions);
 
+        // chatgpt 给 处理 日志 重复插入报错
         if (empty($arrResult)) {
-
-            //     $intNum = mt_rand($intStartNumber, $intEndNumber);
-            //     $arrGrmCode = self::$arrSelfClosing;
-            //     shuffle($arrGrmCode);
-            //     $arrGrmCode =  array_slice($arrGrmCode, 0, $intNum);
-            //     $strGrmCode = implode('', $arrGrmCode);
-            //     $intRandNum = substr_count($strGrmCode, '%s');
-            //     $arrRandStr = self::generateRandomStrings($intRandNum);
-            //     $strGrmCode = sprintf($strGrmCode, ...$arrRandStr);
-
             $arrGrmCode = [];
             while ($intNum-- > 0) {
-                // $arrGrmCode[] = self::generateRandomCustomizeHtml(mt_rand(1, 3), mt_rand(3, 6));
                 $arrGrmCode[] = self::generateRandomCustomizeHtml(1, 1);
             }
-
+        
             $arrData = $arrFilter;
-            $arrData['grm_code'] =  $arrGrmCode;
-
-            self::getInstance()->insert($arrData);
+            $arrData['grm_code'] = $arrGrmCode;
+        
+            // ✅ 更安全的方式
+            self::getInstance()->updateOne(
+                $arrFilter,
+                ['$setOnInsert' => ['grm_code' => $arrGrmCode]],
+                ['upsert' => true]
+            );
+        
+            return $arrGrmCode;
         } else {
-            $arrGrmCode = $arrResult['grm_code'];
+            return $arrResult['grm_code'];
         }
 
-        return  $arrGrmCode;
+        // if (empty($arrResult)) {         
+
+        //     $arrGrmCode = [];
+        //     while ($intNum-- > 0) {
+        //         // $arrGrmCode[] = self::generateRandomCustomizeHtml(mt_rand(1, 3), mt_rand(3, 6));
+        //         $arrGrmCode[] = self::generateRandomCustomizeHtml(1, 1);
+        //     }
+
+        //     $arrData = $arrFilter;
+        //     $arrData['grm_code'] =  $arrGrmCode;
+
+        //     self::getInstance()->insert($arrData);
+        // } else {
+        //     $arrGrmCode = $arrResult['grm_code'];
+        // }
+
+        // return  $arrGrmCode;
     }
 
     static public function splitTagsToArray(string $htmlTags): array
diff --git a/code/app/services/ChapterService.php b/code/app/services/ChapterService.php
index 4059800..0f88976 100644
--- a/code/app/services/ChapterService.php
+++ b/code/app/services/ChapterService.php
@@ -294,8 +294,8 @@ class ChapterService
 
         $arrNovel = $this->NovelModel->getNovelByNId($arrParams['n_id']);
         $intButtonNum = $arrParams['button_num'];
-        $intPage = $arrChapter['page'];
-        $intLimit = $arrChapter['limit'];
+        $intPage = $arrChapter['page'] ?? 1;
+        $intLimit = $arrChapter['limit'] ?? 10 ;
 
         $strBaseUrl =  app(NovelService::class)->getNovelCatalogUrl($arrParams['n_id'], $arrNovel['n_name_pinyin'], $arrParams['sort_type'], '{page}');
         $arrPaginator = CusteomPage02::generate($intPage,  $arrChapter['total'], $intLimit, $strBaseUrl, $intButtonNum);
diff --git a/code/app/services/NovelService.php b/code/app/services/NovelService.php
index 3742df6..2e8f074 100644
--- a/code/app/services/NovelService.php
+++ b/code/app/services/NovelService.php
@@ -148,7 +148,7 @@ class NovelService
             'intPage' => $intPage ?? 1,
         ]);
 
-        $strUrl = preg_replace('#/{2,}#', '/', $strUrl);
+        $strUrl = preg_replace('#/{2,}#', '/', (string)$strUrl);
         return  (string)$strUrl;
     }
 
@@ -175,7 +175,7 @@ class NovelService
             'intPage' => $intPage ?? 1,
         ]);
 
-        $strUrl = preg_replace('#/{2,}#', '/', $strUrl);
+        $strUrl = preg_replace('#/{2,}#', '/', (string)$strUrl);
         return  (string)$strUrl;
     }
 
@@ -593,8 +593,8 @@ class NovelService
     public function generateSearchPager(array $arrParams, array $arrSort, array $arrNovel): array
     {
         $strKey = $arrParams['key'];
-        $intPage = $arrNovel['page'];
-        $intLimit = $arrNovel['limit'];
+        $intPage = $arrNovel['page'] ?? 1;
+        $intLimit = $arrNovel['limit'] ?? 10;
         $intButtomNum = $arrParams['button_num'];
         $strBaseUrl =  app(NovelService::class)->getNovelSearchUrl($strKey, '{page}');
         $arrPaginator = CusteomPage02::generate($intPage,  $arrNovel['total'], $intLimit, $strBaseUrl, $intButtomNum);
diff --git a/code/app/services/SiteContext.php b/code/app/services/SiteContext.php
index 1bf1fe6..6ab70d4 100644
--- a/code/app/services/SiteContext.php
+++ b/code/app/services/SiteContext.php
@@ -360,13 +360,21 @@ class SiteContext
         $strOrder = $this->Request->param('strOrder');
         $strLang = $this->Request->param('strLang');
         $intPage = $this->Request->param('intPage');
+
+        $strVYear = 'all';
+        if (!empty($strYear)) {
+            if (key_exists($strYear, StaticConfig::$arrVideoYear) && $strYear != 'all') {
+                $strVYear = StaticConfig::$arrVideoYear[$strYear];
+            }
+        }
+
         ConverterMovel::setVal([
             'strVideoParentCategoryName' =>  empty($strParentCategory) || $strParentCategory == 'all' ? '' : StaticConfig::$arrVideoClass[$strParentCategory],
             'strVideoCategoryName' =>  empty($strCategory) || $strCategory == 'all' ? '' : VideoCategoryModel::$arrCategory[$strCategory],
             'strAreaName' =>  empty($strArea) || $strArea == 'all' ? '' : StaticConfig::$arrVideoArea[$strArea],
             'strLangName' =>  empty($strLang) || $strLang == 'all' ? '' : StaticConfig::$arrVideoLang[$strLang],
             'strOrderName' =>  empty($strOrder) || $strOrder == 'all' ? '' : StaticConfig::$arrVideoSortType[$strOrder],
-            'strYear' => empty($strYear) || $strYear == 'all' ? '' : StaticConfig::$arrVideoYear[$strYear],
+            'strYear' => $strVYear,
             'intPage' => $intPage ?? 1,
         ]);
     }
diff --git a/code/app/services/VideoService.php b/code/app/services/VideoService.php
index 0faa7e3..4603f3a 100644
--- a/code/app/services/VideoService.php
+++ b/code/app/services/VideoService.php
@@ -487,6 +487,7 @@ class VideoService
             }
         }
 
+        
         # v_year filter
         if (!empty($strVYear)) {
             if (key_exists($strVYear, StaticConfig::$arrVideoYear) && $strVYear != 'all') {
@@ -634,7 +635,7 @@ class VideoService
     {
         $strKey = $arrParams['key'];
         $intPage = $arrVideo['page'] ?? 1;
-        $intLimit = $arrVideo['limit'];
+        $intLimit = $arrVideo['limit'] ?? 10;
         $intButtomNum = $arrParams['button_num'];
         $strBaseUrl =  app(VideoService::class)->getVideoSearchUrl($strKey, '{page}');
         $arrPaginator = CusteomPage02::generate($intPage,  $arrVideo['total'], $intLimit, $strBaseUrl, $intButtomNum);
@@ -661,8 +662,8 @@ class VideoService
         $strYear = $arrParams['v_year'];
         $strOrder = $arrParams['sort_type'];
 
-        $intPage = $arrVideo['page'];
-        $intLimit = $arrVideo['limit'];
+        $intPage = $arrVideo['page'] ?? 1;
+        $intLimit = $arrVideo['limit'] ?? 10;
         $intButtomNum = $arrParams['button_num'];
         $strBaseUrl =  app(VideoService::class)->getVideoCategoryUrl($strCategory, $strParentCategory, $strArea, $strLang, $strYear, $strOrder, '{page}');
         $arrPaginator = CusteomPage02::generate($intPage,  $arrVideo['total'], $intLimit, $strBaseUrl, $intButtomNum);