admin/SEONexus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
make
2025-04-11 20:52:36 +08:00
parent 89bbd72eb4 d1b2a7d5e1
commit aadbcd96e5
4 changed files with 63 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/.gitignore vendored
View File

@@ -8,4 +8,5 @@ Thumbs.db
/vendor /vendor
/.settings /.settings
/.buildpath /.buildpath
/.project /.project
composer.lock

10
code/app/home/controller/Novel.php
View File

@@ -57,7 +57,7 @@ class Novel extends BaseController
$strStatus = '已完结'; $strStatus = '已完结';
$strKey = sprintf('%s:PC:NOVEL:RANK:%s:SEX:%s:%s', $Request->DomainModel->d_domain, 'total', 0, 'finished'); $strKey = sprintf('%s:PC:NOVEL:RANK:%s:SEX:%s:%s', $Request->DomainModel->d_domain, 'total', 0, 'finished');
$arrEdnNovelRankNovel = $NovelModel->getRankNovelOnCache($strKey, 10, 0, 'total', $strStatus); $arrEdnNovelRankNovel = $NovelModel->getRankNovelOnCache($strKey, 10, 0, 'total', $strStatus);
// Title 模板 // Title 模板
ConverterMovel::setVal([ ConverterMovel::setVal([
'intPage' => 1, 'intPage' => 1,
@@ -241,7 +241,7 @@ class Novel extends BaseController
$strKey = sprintf('%s:PC:Novel:Channel:Latest:%s', $Request->DomainModel->d_domain, $intType); $strKey = sprintf('%s:PC:Novel:Channel:Latest:%s', $Request->DomainModel->d_domain, $intType);
$intCount = 20; $intCount = 20;
$arrNewsUpdateNovel = $NovelModel->getCommonNovelOnCache($strKey, $intLifeTime, $intCount, $intType, NULL, ['og_novel_update_time' => -1]); $arrNewsUpdateNovel = $NovelModel->getCommonNovelOnCache($strKey, $intLifeTime, $intCount, $intType, NULL, ['og_novel_update_time' => -1]);
// echo "<pre>"; // echo "<pre>";
// var_dump($arrNewsUpdateNovel);exit; // var_dump($arrNewsUpdateNovel);exit;
// TODO og_description 改成 og_description // TODO og_description 改成 og_description
@@ -597,7 +597,7 @@ class Novel extends BaseController
'strNovelCategoryName' => $arrNovel['og_novel_category'], 'strNovelCategoryName' => $arrNovel['og_novel_category'],
'strNovelStatus' => $arrNovel['og_novel_status'], 'strNovelStatus' => $arrNovel['og_novel_status'],
'strNovelDescription' => $arrNovel['og_description'], 'strNovelDescription' => $arrNovel['og_description'],
'strChapterDescription' => $strChapterDescription, 'strChapterDescription' => $strChapterDescription,
'strNovelChapterName' => $arrChapter['name'] ?? '', 'strNovelChapterName' => $arrChapter['name'] ?? '',
'strNovelChapterSort' => $arrChapter['c_sort_num'] ?? '', 'strNovelChapterSort' => $arrChapter['c_sort_num'] ?? '',
]); ]);
@@ -668,6 +668,8 @@ class Novel extends BaseController
$strChapterDescription = strip_tags($arrChapter['content']); $strChapterDescription = strip_tags($arrChapter['content']);
$intCount = mb_strlen($strChapterDescription); $intCount = mb_strlen($strChapterDescription);
$strChapterDescription = ($intCount > 50) ? mb_substr($strChapterDescription, 0, 50) : $strChapterDescription; $strChapterDescription = ($intCount > 50) ? mb_substr($strChapterDescription, 0, 50) : $strChapterDescription;
$arrChapter['content'] = base64_encode($arrChapter['content']);
} }
$arrCategoryAll = CategoryModel::$arrCategoryAll; $arrCategoryAll = CategoryModel::$arrCategoryAll;
@@ -680,7 +682,7 @@ class Novel extends BaseController
'strNovelCategoryName' => $arrNovel['og_novel_category'], 'strNovelCategoryName' => $arrNovel['og_novel_category'],
'strNovelStatus' => $arrNovel['og_novel_status'], 'strNovelStatus' => $arrNovel['og_novel_status'],
'strNovelDescription' => $arrNovel['og_description'], 'strNovelDescription' => $arrNovel['og_description'],
'strChapterDescription' => $strChapterDescription, 'strChapterDescription' => $strChapterDescription,
'strNovelChapterName' => $arrChapter['name'], 'strNovelChapterName' => $arrChapter['name'],
'strNovelChapterSort' => $arrChapter['c_sort_num'], 'strNovelChapterSort' => $arrChapter['c_sort_num'],
]); ]);

2
code/app/task/crawler/zw630/Scheduler.php
View File

@@ -69,7 +69,7 @@ class Scheduler
} }
} }
print_r($arrUri); // print_r($arrUri);
} }
/** /**

108
code/composer.lock generated
View File

@@ -302,16 +302,16 @@
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
"version": "7.9.2", "version": "7.9.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/guzzle.git", "url": "https://github.com/guzzle/guzzle.git",
"reference": "d281ed313b989f213357e3be1a179f02196ac99b" "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
"reference": "d281ed313b989f213357e3be1a179f02196ac99b", "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -408,7 +408,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/guzzle/issues", "issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/7.9.2" "source": "https://github.com/guzzle/guzzle/tree/7.9.3"
}, },
"funding": [ "funding": [
{ {
@@ -424,20 +424,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-07-24T11:22:20+00:00" "time": "2025-03-27T13:37:11+00:00"
}, },
{ {
"name": "guzzlehttp/promises", "name": "guzzlehttp/promises",
"version": "2.0.4", "version": "2.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/promises.git", "url": "https://github.com/guzzle/promises.git",
"reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455" "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455", "url": "https://api.github.com/repos/guzzle/promises/zipball/7c69f28996b0a6920945dd20b3857e499d9ca96c",
"reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455", "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -491,7 +491,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/promises/issues", "issues": "https://github.com/guzzle/promises/issues",
"source": "https://github.com/guzzle/promises/tree/2.0.4" "source": "https://github.com/guzzle/promises/tree/2.2.0"
}, },
"funding": [ "funding": [
{ {
@@ -507,20 +507,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-10-17T10:06:22+00:00" "time": "2025-03-27T13:27:01+00:00"
}, },
{ {
"name": "guzzlehttp/psr7", "name": "guzzlehttp/psr7",
"version": "2.7.0", "version": "2.7.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/psr7.git", "url": "https://github.com/guzzle/psr7.git",
"reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201" "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201", "url": "https://api.github.com/repos/guzzle/psr7/zipball/c2270caaabe631b3b44c85f99e5a04bbb8060d16",
"reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201", "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -607,7 +607,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/psr7/issues", "issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.7.0" "source": "https://github.com/guzzle/psr7/tree/2.7.1"
}, },
"funding": [ "funding": [
{ {
@@ -623,7 +623,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-07-18T11:15:46+00:00" "time": "2025-03-27T12:30:47+00:00"
}, },
{ {
"name": "jaeger/g-http", "name": "jaeger/g-http",
@@ -1887,16 +1887,16 @@
}, },
{ {
"name": "symfony/cache", "name": "symfony/cache",
"version": "v7.2.4", "version": "v7.2.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/cache.git", "url": "https://github.com/symfony/cache.git",
"reference": "d33cd9e14326e14a4145c21e600602eaf17cc9e7" "reference": "9131e3018872d2ebb6fe8a9a4d6631273513d42c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/cache/zipball/d33cd9e14326e14a4145c21e600602eaf17cc9e7", "url": "https://api.github.com/repos/symfony/cache/zipball/9131e3018872d2ebb6fe8a9a4d6631273513d42c",
"reference": "d33cd9e14326e14a4145c21e600602eaf17cc9e7", "reference": "9131e3018872d2ebb6fe8a9a4d6631273513d42c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1965,7 +1965,7 @@
"psr6" "psr6"
], ],
"support": { "support": {
"source": "https://github.com/symfony/cache/tree/v7.2.4" "source": "https://github.com/symfony/cache/tree/v7.2.5"
}, },
"funding": [ "funding": [
{ {
@@ -1981,7 +1981,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2025-02-26T09:57:54+00:00" "time": "2025-03-25T15:54:33+00:00"
}, },
{ {
"name": "symfony/cache-contracts", "name": "symfony/cache-contracts",
@@ -2374,16 +2374,16 @@
}, },
{ {
"name": "symfony/var-exporter", "name": "symfony/var-exporter",
"version": "v7.2.4", "version": "v7.2.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/var-exporter.git", "url": "https://github.com/symfony/var-exporter.git",
"reference": "4ede73aa7a73d81506002d2caadbbdad1ef5b69a" "reference": "c37b301818bd7288715d40de634f05781b686ace"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/var-exporter/zipball/4ede73aa7a73d81506002d2caadbbdad1ef5b69a", "url": "https://api.github.com/repos/symfony/var-exporter/zipball/c37b301818bd7288715d40de634f05781b686ace",
"reference": "4ede73aa7a73d81506002d2caadbbdad1ef5b69a", "reference": "c37b301818bd7288715d40de634f05781b686ace",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2430,7 +2430,7 @@
"serialize" "serialize"
], ],
"support": { "support": {
"source": "https://github.com/symfony/var-exporter/tree/v7.2.4" "source": "https://github.com/symfony/var-exporter/tree/v7.2.5"
}, },
"funding": [ "funding": [
{ {
@@ -2446,7 +2446,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2025-02-13T10:27:23+00:00" "time": "2025-03-13T12:21:46+00:00"
}, },
{ {
"name": "topthink/framework", "name": "topthink/framework",
@@ -2611,16 +2611,16 @@
}, },
{ {
"name": "topthink/think-helper", "name": "topthink/think-helper",
"version": "v3.1.10", "version": "v3.1.11",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/top-think/think-helper.git", "url": "https://github.com/top-think/think-helper.git",
"reference": "ac66cc0859a12cd5d73258f50f338aadc95e9b46" "reference": "1d6ada9b9f3130046bf6922fe1bd159c8d88a33c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/top-think/think-helper/zipball/ac66cc0859a12cd5d73258f50f338aadc95e9b46", "url": "https://api.github.com/repos/top-think/think-helper/zipball/1d6ada9b9f3130046bf6922fe1bd159c8d88a33c",
"reference": "ac66cc0859a12cd5d73258f50f338aadc95e9b46", "reference": "1d6ada9b9f3130046bf6922fe1bd159c8d88a33c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2651,9 +2651,9 @@
"description": "The ThinkPHP6 Helper Package", "description": "The ThinkPHP6 Helper Package",
"support": { "support": {
"issues": "https://github.com/top-think/think-helper/issues", "issues": "https://github.com/top-think/think-helper/issues",
"source": "https://github.com/top-think/think-helper/tree/v3.1.10" "source": "https://github.com/top-think/think-helper/tree/v3.1.11"
}, },
"time": "2024-11-21T01:47:51+00:00" "time": "2025-04-07T06:55:59+00:00"
}, },
{ {
"name": "topthink/think-migration", "name": "topthink/think-migration",
@@ -2762,16 +2762,16 @@
}, },
{ {
"name": "topthink/think-orm", "name": "topthink/think-orm",
"version": "v4.0.3", "version": "v4.0.16",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/top-think/think-orm.git", "url": "https://github.com/top-think/think-orm.git",
"reference": "0c951d1eb08b48211d31079a616164e195028e44" "reference": "1692d2c85eaca0b66935ca04d6cefa77b2fce43e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/top-think/think-orm/zipball/0c951d1eb08b48211d31079a616164e195028e44", "url": "https://api.github.com/repos/top-think/think-orm/zipball/1692d2c85eaca0b66935ca04d6cefa77b2fce43e",
"reference": "0c951d1eb08b48211d31079a616164e195028e44", "reference": "1692d2c85eaca0b66935ca04d6cefa77b2fce43e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2815,9 +2815,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/top-think/think-orm/issues", "issues": "https://github.com/top-think/think-orm/issues",
"source": "https://github.com/top-think/think-orm/tree/v4.0.3" "source": "https://github.com/top-think/think-orm/tree/v4.0.16"
}, },
"time": "2025-02-13T06:09:45+00:00" "time": "2025-04-10T23:40:03+00:00"
}, },
{ {
"name": "topthink/think-template", "name": "topthink/think-template",
@@ -2959,16 +2959,16 @@
}, },
{ {
"name": "topthink/think-view", "name": "topthink/think-view",
"version": "v2.0.4", "version": "v2.0.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/top-think/think-view.git", "url": "https://github.com/top-think/think-view.git",
"reference": "e6a68e4179baf8d795700d62b710da86d7c3f783" "reference": "b42009b98199b5a3833d3d6fd18c8a55aa511fad"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/top-think/think-view/zipball/e6a68e4179baf8d795700d62b710da86d7c3f783", "url": "https://api.github.com/repos/top-think/think-view/zipball/b42009b98199b5a3833d3d6fd18c8a55aa511fad",
"reference": "e6a68e4179baf8d795700d62b710da86d7c3f783", "reference": "b42009b98199b5a3833d3d6fd18c8a55aa511fad",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2994,24 +2994,24 @@
"description": "thinkphp template driver", "description": "thinkphp template driver",
"support": { "support": {
"issues": "https://github.com/top-think/think-view/issues", "issues": "https://github.com/top-think/think-view/issues",
"source": "https://github.com/top-think/think-view/tree/v2.0.4" "source": "https://github.com/top-think/think-view/tree/v2.0.5"
}, },
"time": "2025-01-10T08:49:57+00:00" "time": "2025-03-19T07:04:19+00:00"
} }
], ],
"packages-dev": [ "packages-dev": [
{ {
"name": "topthink/think-dumper", "name": "topthink/think-dumper",
"version": "v1.0.4", "version": "v1.0.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/top-think/think-dumper.git", "url": "https://github.com/top-think/think-dumper.git",
"reference": "49e6975cec4ffe7997c05fc902f98f1ab1f54150" "reference": "eba662a1843d5db68059050c530f7d43287289fc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/top-think/think-dumper/zipball/49e6975cec4ffe7997c05fc902f98f1ab1f54150", "url": "https://api.github.com/repos/top-think/think-dumper/zipball/eba662a1843d5db68059050c530f7d43287289fc",
"reference": "49e6975cec4ffe7997c05fc902f98f1ab1f54150", "reference": "eba662a1843d5db68059050c530f7d43287289fc",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -3044,9 +3044,9 @@
"description": "Dumper extend for thinkphp", "description": "Dumper extend for thinkphp",
"support": { "support": {
"issues": "https://github.com/top-think/think-dumper/issues", "issues": "https://github.com/top-think/think-dumper/issues",
"source": "https://github.com/top-think/think-dumper/tree/v1.0.4" "source": "https://github.com/top-think/think-dumper/tree/v1.0.5"
}, },
"time": "2025-01-17T09:41:46+00:00" "time": "2025-03-21T07:15:45+00:00"
}, },
{ {
"name": "topthink/think-trace", "name": "topthink/think-trace",