Merge branch 'dev' of ssh://git.bgbg.live:18150/root/SEONexus into dev
# Conflicts: # code/app/home/controller/Novel.php # code/app/model/NovelModel.php # code/extend/template/taglib/Site.php
This commit is contained in:
@@ -28,7 +28,27 @@ class NovelService
|
||||
}
|
||||
|
||||
/**
|
||||
* GetNovelInfoUrl
|
||||
* Undocumented function
|
||||
*
|
||||
* @param array $arrArgs
|
||||
* @return string
|
||||
*/
|
||||
public function getPageUrl($strKey, array $arrArgs,): string
|
||||
{
|
||||
$strSfVal = $this->SiteContext->DomainModel->getFomartSubject($strKey, '', false);
|
||||
$arrKeys = [];
|
||||
$arrVals = [];
|
||||
foreach ($arrArgs as $strKey => $strVal) {
|
||||
$arrKeys[] = '{' . $strKey . '}';
|
||||
$arrVals[] = $strVal;
|
||||
}
|
||||
|
||||
return str_replace($arrKeys, $arrVals, $strSfVal);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Undocumented function
|
||||
*
|
||||
* @param int $intNId
|
||||
* @param string $intPinYin
|
||||
@@ -45,7 +65,7 @@ class NovelService
|
||||
}
|
||||
|
||||
/**
|
||||
* GetForgeNovelInfoUrl
|
||||
* Undocumented function
|
||||
* 伪造小说
|
||||
* @param int $intNId
|
||||
* @param string $intPinYin
|
||||
@@ -64,14 +84,15 @@ class NovelService
|
||||
|
||||
|
||||
/**
|
||||
* GetNovelChapterUrl
|
||||
* Undocumented function
|
||||
*
|
||||
* @param int $intNId
|
||||
* @param string $intPinYin
|
||||
* @param int $intPinYin
|
||||
* @param int $intChapterSort
|
||||
* @param integer $intChapterPage
|
||||
* @return string
|
||||
*
|
||||
*/
|
||||
public function getNovelChapterUrl($intNId, $intPinYin, $intChapterSort, $intChapterPage = 1): string
|
||||
public function getNovelChapterUrl(int $intNId, $intPinYin, $intChapterSort, $intChapterPage = 1): string
|
||||
{
|
||||
$strKey = 'CONTENT_INFO_URL';
|
||||
$strUrl = $this->getPageUrl($strKey, [
|
||||
@@ -84,12 +105,12 @@ class NovelService
|
||||
}
|
||||
|
||||
/**
|
||||
* GetNovelLasterChapterUrl
|
||||
* Undocumented function
|
||||
*
|
||||
* @param int $intNId
|
||||
* @param string $intPinYin
|
||||
* @return string
|
||||
*
|
||||
*
|
||||
*/
|
||||
public function getNovelLasterChapterUrl($intNId, $intPinYin): string
|
||||
{
|
||||
@@ -102,34 +123,39 @@ class NovelService
|
||||
}
|
||||
|
||||
/**
|
||||
* GetNovelCategoryUrl
|
||||
* 小说分类
|
||||
* @param int $intNId
|
||||
* @param string $intPinYin
|
||||
* @return string
|
||||
* 小说分类/书库
|
||||
* Undocumented function
|
||||
*
|
||||
* @param [type] $strGender
|
||||
* @param [type] $strCategory
|
||||
* @param [type] $strStatus
|
||||
* @param [type] $strOrder
|
||||
* @param [type] $intPage
|
||||
* @return string
|
||||
*/
|
||||
public function getNovelCategoryUrl($strGender, $strCategory, $strStatus, $intPage): string
|
||||
public function getNovelCategoryUrl($strGender, $strCategory, $strStatus, $strOrder, $intPage): string
|
||||
{
|
||||
$strKey = 'CATEGORY_INFO_URL';
|
||||
$strUrl = $this->getPageUrl($strKey, [
|
||||
'strGender' => $strGender,
|
||||
'strCategory' => $strCategory,
|
||||
'strStatus' => $strStatus,
|
||||
'intPage' => $intPage,
|
||||
'strGender' => $strGender ?? '',
|
||||
'strCategory' => $strCategory ?? '',
|
||||
'strStatus' => $strStatus ?? '',
|
||||
'strOrder' => $strOrder ?? '',
|
||||
'intPage' => $intPage ?? 1,
|
||||
]);
|
||||
$strUrl = preg_replace('#/{2,}#', '/', $strUrl);
|
||||
return (string)$strUrl;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* getNovelCatalogUrl
|
||||
* Undocumented function
|
||||
* 小说目录
|
||||
* @param int $intNId
|
||||
* @param string $intPinYin
|
||||
* @return string
|
||||
*
|
||||
*
|
||||
*/
|
||||
public function getNovelCatalogUrl($intNId, $intPinYin, $strOrder, $intPage = 1): string
|
||||
{
|
||||
@@ -162,24 +188,6 @@ class NovelService
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Undocumented function
|
||||
*
|
||||
* @param array $arrArgs
|
||||
* @return string
|
||||
*/
|
||||
public function getPageUrl($strKey, array $arrArgs,): string
|
||||
{
|
||||
$strSfVal = $this->SiteContext->DomainModel->getFomartSubject($strKey, '', false);
|
||||
$arrKeys = [];
|
||||
$arrVals = [];
|
||||
foreach ($arrArgs as $strKey => $strVal) {
|
||||
$arrKeys[] = '{' . $strKey . '}';
|
||||
$arrVals[] = $strVal;
|
||||
}
|
||||
|
||||
return str_replace($arrKeys, $arrVals, $strSfVal);
|
||||
}
|
||||
|
||||
protected $arrSortType = [
|
||||
'day_desc' => 'daily',
|
||||
|
||||
Reference in New Issue
Block a user