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

# Conflicts:
#	code/app/home/controller/Novel.php
#	code/app/home/controller/User.php
This commit is contained in:
Default
2025-04-09 02:16:23 +08:00
35 changed files with 172 additions and 512 deletions

View File

@@ -82,7 +82,7 @@ class Index extends BaseController
$strView = $boolIsMobile ? '' : 'pc/index';
$this->generateGrm(1, 0, 30);
$this->generateGrm(1, 0, 60);
return $this->rending($strView);
}

View File

@@ -47,7 +47,7 @@ class Novel extends BaseController
$strKey = sprintf('%s:PC:NOVEL:RANK:%s:SEX:%s', $Request->DomainModel->d_domain, 'total', 0);
$arrTotalRankNovel = $NovelModel->getRankNovelOnCache($strKey, 10, 0, 'total');
// 模拟数据-新书榜 随机10个小说n_id倒叙
// 新书榜 随机10个小说n_id倒叙
$strKey = $Request->DomainModel->d_domain . ':RANK:NEW:';
$intLifeTime = 24 * 3600;
$intCount = 10;
@@ -56,7 +56,7 @@ class Novel extends BaseController
$arrSort = ['n_id' => -1];
$arrNewsNovelRankNovel = $NovelModel->getCommonNovelOnCache($strKey, $intLifeTime, $intCount, $intType, $strStatus, $arrSort);
// 模拟数据-完结榜 随机10个小说
// 完结榜 随机10个小说
$strStatus = '已完结';
$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);
@@ -89,7 +89,7 @@ class Novel extends BaseController
$strView = $boolIsMobile ? '' : 'pc/getNovelRank';
$this->generateGrm(2, 0, 60);
return $this->rending($strView);
}
@@ -203,6 +203,9 @@ class Novel extends BaseController
'strDescription' => $strDescription,
]);
// 生成多少个干扰吗
$this->generateGrm(2, $strGender.'-'.$strCategory.'-'.$strStatus.'-'.$intPage, 30);
return $this->rending($strTemplate);
}
@@ -268,7 +271,8 @@ class Novel extends BaseController
$strView = $boolIsMobile ? '' : 'pc/getNovelChannel';
// 生成多少个干扰吗
$this->generateGrm(2, $strNovelChannel, 50);
return $this->rending($strView);
}
@@ -454,7 +458,7 @@ class Novel extends BaseController
$strView = $boolIsMobile ? 'getNovelInfo' : 'pc/getNovelInfo';
$this->generateGrm(2, $intNId.'-'.$intForgeId, 50);
return $this->rending($strView);
}
@@ -543,7 +547,7 @@ class Novel extends BaseController
]);
$strView = $boolIsMobile ? '' : 'pc/getNovelInfo';
$this->generateGrm(2, $intNId, 50);
return $this->rending($strView);
}
@@ -632,7 +636,7 @@ class Novel extends BaseController
]);
$strView = $boolIsMobile ? 'getNovelChapter' : 'pc/getNovelChapter';
$this->generateGrm(2, $intNId . '-' .$arrChapter['c_sort_num'] ?? 0, 20);
return $this->rending($strView);
}
@@ -707,7 +711,7 @@ class Novel extends BaseController
]);
$strView = $boolIsMobile ? '' : 'pc/getNovelChapter';
$this->generateGrm(2, $intNId . '-' .$arrChapter['c_sort_num'] ?? 0, 20);
return $this->rending($strView);
}
@@ -789,12 +793,12 @@ class Novel extends BaseController
if ($boolIsMobile) {
$strView = '';
$this->generateGrm(1, $intNovelId . '-' . $intPage, 30);
$this->generateGrm(1, $intNId . '-' .$strOrder. '-' .$intPage, 110);
} else {
$strView = 'pc/getNovelChapterAll';
$this->generateGrm(2, $intNovelId . '-' . $intPage, 20);
$this->generateGrm(2, $intNId . '-' .$strOrder. '-' .$intPage, 110);
}
return $this->rending($strView);
}
@@ -864,7 +868,7 @@ class Novel extends BaseController
]);
$strView = $boolIsMobile ? '' : 'pc/getSearchNovel';
$this->generateGrm(2, $strSearchKeywords.$intPage, 20);
return $this->rending($strView);
}

View File

@@ -14,7 +14,7 @@ class User extends BaseController
{
public function index(Request $Request)
{
// 获取路由附加的参数
$boolIsMobile = $Request->param('boolIsMobile');
$NovelModel = NovelModel::getInstance();
@@ -34,15 +34,18 @@ class User extends BaseController
]);
if ($boolIsMobile) {
return View::fetch();
$strView = '';
$this->generateGrm(1, 0, 20);
} else {
return View::fetch('Pc/User/index');
$strView = 'Pc/User/index';
$this->generateGrm(2, 0, 20);
}
return $this->rending($strView);
}
public function getBookShelf(Request $Request)
{
// 获取路由附加的参数
$boolIsMobile = $Request->param('boolIsMobile');
View::assign([
@@ -50,15 +53,18 @@ class User extends BaseController
]);
if ($boolIsMobile) {
return View::fetch();
$strView = '';
$this->generateGrm(1, 0, 10);
} else {
return View::fetch('Pc/User/getBookShelf');
$strView = 'Pc/User/getBookShelf';
$this->generateGrm(2, 0, 10);
}
return $this->rending($strView);
}
public function getHistory(Request $Request)
{
// 获取路由附加的参数
$boolIsMobile = $Request->param('boolIsMobile');
View::assign([
@@ -66,221 +72,12 @@ class User extends BaseController
]);
if ($boolIsMobile) {
return View::fetch();
$strView = '';
$this->generateGrm(1, 0, 10);
} else {
return View::fetch('Pc/User/getHistory');
$strView = 'Pc/User/getHistory';
$this->generateGrm(2, 0, 10);
}
}
public function getPcIndex(Request $Request)
{
// 获取路由附加的参数
$boolIsMobile = $Request->param('boolIsMobile');
// 模拟数据-推荐等级为9的连载的 随机15个小说
$arrRecommendSerializationNovel = [
['id' => 1, 'name' => '小说1', 'author' => '作者1'],
['id' => 2, 'name' => '小说2', 'author' => '作者2'],
['id' => 3, 'name' => '小说3', 'author' => '作者3'],
['id' => 4, 'name' => '小说3', 'author' => '作者3'],
['id' => 5, 'name' => '小说3', 'author' => '作者3'],
['id' => 6, 'name' => '小说3', 'author' => '作者3'],
['id' => 7, 'name' => '小说3', 'author' => '作者3'],
['id' => 8, 'name' => '小说3', 'author' => '作者3'],
['id' => 9, 'name' => '小说3', 'author' => '作者3'],
['id' => 8, 'name' => '小说3', 'author' => '作者3'],
['id' => 8, 'name' => '小说3', 'author' => '作者3'],
['id' => 8, 'name' => '小说3', 'author' => '作者3'],
['id' => 8, 'name' => '小说3', 'author' => '作者3'],
['id' => 8, 'name' => '小说3', 'author' => '作者3'],
['id' => 15, 'name' => '小说3', 'author' => '作者3'],
];
// 模拟数据-推荐等级为9的完结的 随机12个小说
$arrRecommendEndNovel = [
['id' => 1, 'name' => '小说1', 'author' => '作者1'],
['id' => 2, 'name' => '小说2', 'author' => '作者2'],
['id' => 3, 'name' => '小说3', 'author' => '作者3'],
['id' => 4, 'name' => '小说3', 'author' => '作者3'],
['id' => 5, 'name' => '小说3', 'author' => '作者3'],
['id' => 6, 'name' => '小说3', 'author' => '作者3'],
['id' => 7, 'name' => '小说3', 'author' => '作者3'],
['id' => 8, 'name' => '小说3', 'author' => '作者3'],
['id' => 9, 'name' => '小说3', 'author' => '作者3'],
['id' => 10, 'name' => '小说3', 'author' => '作者3'],
['id' => 11, 'name' => '小说3', 'author' => '作者3'],
['id' => 12, 'name' => '小说3', 'author' => '作者3'],
];
// 模拟数据-男生频道,最新的 随机5个小说
$arrBoyNewsNovel = [
['id' => 1, 'name' => '小说1', 'author' => '作者1'],
['id' => 2, 'name' => '小说2', 'author' => '作者2'],
['id' => 3, 'name' => '小说3', 'author' => '作者3'],
['id' => 4, 'name' => '小说3', 'author' => '作者3'],
['id' => 5, 'name' => '小说3', 'author' => '作者3'],
];
// 模拟数据-男生频道,周排行榜 随机10个小说
$arrBoyWeekRankNovel = [
['id' => 1, 'name' => '小说1', 'author' => '作者1'],
['id' => 2, 'name' => '小说2', 'author' => '作者2'],
['id' => 3, 'name' => '小说3', 'author' => '作者3'],
['id' => 4, 'name' => '小说3', 'author' => '作者3'],
['id' => 5, 'name' => '小说3', 'author' => '作者3'],
['id' => 6, 'name' => '小说3', 'author' => '作者3'],
['id' => 7, 'name' => '小说3', 'author' => '作者3'],
['id' => 8, 'name' => '小说3', 'author' => '作者3'],
['id' => 9, 'name' => '小说3', 'author' => '作者3'],
['id' => 10, 'name' => '小说3', 'author' => '作者3'],
];
// 模拟数据-男生频道,月排行榜 随机10个小说
$arrBoyMoonRankNovel = [
['id' => 1, 'name' => '小说1', 'author' => '作者1'],
['id' => 2, 'name' => '小说2', 'author' => '作者2'],
['id' => 3, 'name' => '小说3', 'author' => '作者3'],
['id' => 4, 'name' => '小说3', 'author' => '作者3'],
['id' => 5, 'name' => '小说3', 'author' => '作者3'],
['id' => 6, 'name' => '小说3', 'author' => '作者3'],
['id' => 7, 'name' => '小说3', 'author' => '作者3'],
['id' => 8, 'name' => '小说3', 'author' => '作者3'],
['id' => 9, 'name' => '小说3', 'author' => '作者3'],
['id' => 10, 'name' => '小说3', 'author' => '作者3'],
];
// 模拟数据-男生频道,总排行榜 随机10个小说
$arrBoyTotalRankNovel = [
['id' => 1, 'name' => '小说1', 'author' => '作者1'],
['id' => 2, 'name' => '小说2', 'author' => '作者2'],
['id' => 3, 'name' => '小说3', 'author' => '作者3'],
['id' => 4, 'name' => '小说3', 'author' => '作者3'],
['id' => 5, 'name' => '小说3', 'author' => '作者3'],
['id' => 6, 'name' => '小说3', 'author' => '作者3'],
['id' => 7, 'name' => '小说3', 'author' => '作者3'],
['id' => 8, 'name' => '小说3', 'author' => '作者3'],
['id' => 9, 'name' => '小说3', 'author' => '作者3'],
['id' => 10, 'name' => '小说3', 'author' => '作者3'],
];
// 模拟数据-男生频道,最新的 随机5个小说
$arrGirlNewsNovel = [
['id' => 1, 'name' => '小说1', 'author' => '作者1'],
['id' => 2, 'name' => '小说2', 'author' => '作者2'],
['id' => 3, 'name' => '小说3', 'author' => '作者3'],
['id' => 4, 'name' => '小说3', 'author' => '作者3'],
['id' => 5, 'name' => '小说3', 'author' => '作者3'],
];
// 模拟数据-男生频道,周排行榜 随机10个小说
$arrGirlWeekRankNovel = [
['id' => 1, 'name' => '小说1', 'author' => '作者1'],
['id' => 2, 'name' => '小说2', 'author' => '作者2'],
['id' => 3, 'name' => '小说3', 'author' => '作者3'],
['id' => 4, 'name' => '小说3', 'author' => '作者3'],
['id' => 5, 'name' => '小说3', 'author' => '作者3'],
['id' => 6, 'name' => '小说3', 'author' => '作者3'],
['id' => 7, 'name' => '小说3', 'author' => '作者3'],
['id' => 8, 'name' => '小说3', 'author' => '作者3'],
['id' => 9, 'name' => '小说3', 'author' => '作者3'],
['id' => 10, 'name' => '小说3', 'author' => '作者3'],
];
// 模拟数据-男生频道,月排行榜 随机10个小说
$arrGirlMoonRankNovel = [
['id' => 1, 'name' => '小说1', 'author' => '作者1'],
['id' => 2, 'name' => '小说2', 'author' => '作者2'],
['id' => 3, 'name' => '小说3', 'author' => '作者3'],
['id' => 4, 'name' => '小说3', 'author' => '作者3'],
['id' => 5, 'name' => '小说3', 'author' => '作者3'],
['id' => 6, 'name' => '小说3', 'author' => '作者3'],
['id' => 7, 'name' => '小说3', 'author' => '作者3'],
['id' => 8, 'name' => '小说3', 'author' => '作者3'],
['id' => 9, 'name' => '小说3', 'author' => '作者3'],
['id' => 10, 'name' => '小说3', 'author' => '作者3'],
];
// 模拟数据-男生频道,总排行榜 随机10个小说
$arrBGirlTotalRankNovel = [
['id' => 1, 'name' => '小说1', 'author' => '作者1'],
['id' => 2, 'name' => '小说2', 'author' => '作者2'],
['id' => 3, 'name' => '小说3', 'author' => '作者3'],
['id' => 4, 'name' => '小说3', 'author' => '作者3'],
['id' => 5, 'name' => '小说3', 'author' => '作者3'],
['id' => 6, 'name' => '小说3', 'author' => '作者3'],
['id' => 7, 'name' => '小说3', 'author' => '作者3'],
['id' => 8, 'name' => '小说3', 'author' => '作者3'],
['id' => 9, 'name' => '小说3', 'author' => '作者3'],
['id' => 10, 'name' => '小说3', 'author' => '作者3'],
];
// 模拟数据-最近更新-随机50
$arrNewsUpdateNovel = [
['id' => 1, 'name' => '小说1', 'author' => '作者1'],
['id' => 2, 'name' => '小说2', 'author' => '作者2'],
['id' => 3, 'name' => '小说3', 'author' => '作者3'],
['id' => 4, 'name' => '小说3', 'author' => '作者3'],
['id' => 5, 'name' => '小说3', 'author' => '作者3'],
['id' => 6, 'name' => '小说3', 'author' => '作者3'],
['id' => 7, 'name' => '小说3', 'author' => '作者3'],
['id' => 8, 'name' => '小说3', 'author' => '作者3'],
['id' => 9, 'name' => '小说3', 'author' => '作者3'],
['id' => 10, 'name' => '小说3', 'author' => '作者3'],
['id' => 1, 'name' => '小说1', 'author' => '作者1'],
['id' => 2, 'name' => '小说2', 'author' => '作者2'],
['id' => 3, 'name' => '小说3', 'author' => '作者3'],
['id' => 4, 'name' => '小说3', 'author' => '作者3'],
['id' => 5, 'name' => '小说3', 'author' => '作者3'],
['id' => 6, 'name' => '小说3', 'author' => '作者3'],
['id' => 7, 'name' => '小说3', 'author' => '作者3'],
['id' => 8, 'name' => '小说3', 'author' => '作者3'],
['id' => 9, 'name' => '小说3', 'author' => '作者3'],
['id' => 10, 'name' => '小说3', 'author' => '作者3'],
];
View::assign([
'arrNewsUpdateNovel' => $arrNewsUpdateNovel,
'arrRecommendSerializationNovel' => $arrRecommendSerializationNovel,
'arrRecommendEndNovel' => $arrRecommendEndNovel,
'arrBoyNewsNovel' => $arrBoyNewsNovel,
'arrBoyWeekRankNovel' => $arrBoyWeekRankNovel,
'arrBoyMoonRankNovel' => $arrBoyMoonRankNovel,
'arrBoyTotalRankNovel' => $arrBoyTotalRankNovel,
'arrGirlNewsNovel' => $arrGirlNewsNovel,
'arrGirlWeekRankNovel' => $arrGirlWeekRankNovel,
'arrGirlMoonRankNovel' => $arrGirlMoonRankNovel,
'arrBGirlTotalRankNovel' => $arrBGirlTotalRankNovel,
'arrAdBanner' => [],
]);
if ($boolIsMobile) {
return View::fetch();
} else {
return View::fetch('pc/index');
}
}
public function test()
{
$strNovelKey = "novels/12/chapters/3001.txt";
$StorageCore = StorageCore::getInstance();
// $content = '我是一个大傻逼';
$content = file_get_contents('123.txt');
if ($StorageCore->has($strNovelKey)) {
// $MinIO->update($strNovelKey, $content); // 更新已有文件
} else {
$StorageCore->write($strNovelKey, $content); // 创建新文件
}
echo $StorageCore->read($strNovelKey);
return;
return $this->rending($strView);
}
}