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 
# Conflicts:
#	code/app/services/VideoService.php
#	code/extend/template/taglib/Video.php
This commit is contained in:
Default
2025-05-03 23:56:50 +08:00
parent 577a4dab02 483c46b6d2
commit 7ed72a8073
28 changed files with 828 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/app/services/SiteContext.php
View File

@@ -137,7 +137,11 @@ class SiteContext
View::assign("strUserUrlTemp", $strUserUrlTemp);
}else{
$strPcUrlTemp = $this->DomainModel->getFomartSubject('VIDEO_PC_URL_PATH', '', false);
$strRankUrlTemp = $this->DomainModel->getFomartSubject('VIDEO_RANK_INDEX_URL', '', false);
$strSearchListUrlTemp = $this->DomainModel->getFomartSubject('VIDEO_SEARCH_LIST_URL', '', false);
View::assign("strPcPath", $strPcUrlTemp);
View::assign("strRankUrlTemp", $strRankUrlTemp);
View::assign("strSearchListUrlTemp", $strSearchListUrlTemp);
}

67
code/app/services/VideoService.php
View File

@@ -67,29 +67,50 @@ class VideoService
* @param string $intPinYin
* @return string
*/
public function getVideoInfoUrl($intVId, $intPinYin): string
public function getVideoInfoUrl(int $intVId, string $strPinYin): string
{
$strKey = 'VIDEO_INFO_URL';
$strUrl = $this->SiteContext->DomainModel->getFomartUrl($strKey, [
'intVId' => $intVId,
'strPinYin' => $intPinYin
'strPinYin' => $strPinYin
]);
return (string)$strUrl;
}
/**
* 获取视频分类URl
* 视频播放
*
* @param string|NULL $strCategory
* @param string|NULL $strClass
* @param string|NULL $strArea
* @param integer|string|NULL $strLang
* @param integer|string|NULL $strYear
* @param integer|string|NULL $strOrder
* @param integer|string|NULL $intPage
* @param integer $intVId
* @param string $strPinYin
* @param string $strPlayType
* @param integer $intPlayIndex
* @return string
*/
public function getVideoPlayUrl(int $intVId, string $strPinYin,string $strPlayType,int $intPlayIndex): string
{
$strKey = 'VIDEO_PLAY_URL';
$strUrl = $this->SiteContext->DomainModel->getFomartUrl($strKey, [
'intVId' => $intVId,
'strPinYin' => $strPinYin,
'strPlayType' => $strPlayType,
'intPlayIndex' => $intPlayIndex,
]);
return (string)$strUrl;
}
/**
* 获取视频分类URl
*
* @param string|NULL $strCategory
* @param string|NULL $strClass
* @param string|NULL $strArea
* @param integer|string|NULL $strLang
* @param integer|string|NULL $strYear
* @param integer|string|NULL $strOrder
* @param integer|string|NULL $intPage
* @return string
*/
public function getVideoCategoryUrl(string|NULL $strCategory, string|NULL $strClass, string|NULL $strArea, int|string|NULL $strLang, int|string|NULL $strYear, int|string|NULL $strOrder, int|string|NULL $intPage): string
{
$strKey = 'VIDEO_CATEGORY_URL';
@@ -107,26 +128,23 @@ class VideoService
return (string)$strUrl;
}
/**
* 排行榜url
* 排行榜 列表 url
*
* @param string $strGender
* @param string $strCategory
* @param string $strStatus
* @param string $strOrder
* @param string $strClass
* @param string $strSortType
* @param integer $intPage
* @return string
*/
public function getVideoRankUrl(string $strGender, string $strCategory, string $strStatus, string $strOrder, int $intPage): string
public function getVideoRankUrl(string $strCategory,string $strClass, string $strSortType, int $intPage): string
{
$strKey = 'RANK_LIST_URL';
$strKey = 'VIDEO_RANK_LIST_URL';
$strUrl = $this->SiteContext->DomainModel->getFomartUrl($strKey, [
'strGender' => !empty($strGender) ? $strGender : '',
'strCategory' => !empty($strCategory) ? $strCategory : 'all',
'strStatus' => !empty($strStatus) ? $strStatus : 'all',
'strOrder' => !empty($strOrder) ? $strOrder : 'all',
'strClass' => !empty($strClass) ? $strClass : 'all',
'strSortType' => !empty($strSortType) ? $strSortType : 'all',
'intPage' => $intPage ?? 1,
]);
@@ -165,7 +183,7 @@ class VideoService
*/
public function getVideoSearchUrl($strKeyWords, $intPage = 1): string
{
$strKey = 'SEARCH_INFO_URL';
$strKey = 'VIDEO_SEARCH_LIST_URL';
$strUrl = $this->SiteContext->DomainModel->getFomartUrl($strKey, [
'intPage' => $intPage,
'strSearchKeywords' => $strKeyWords
@@ -436,7 +454,6 @@ class VideoService
$strVYear = $arrParams['v_year'];
$strSortType = $arrParams['sort_type'];
$strVStatus = $arrParams['v_isend'];
$strDiffKey = $arrParams['diff_key'];
$strKey = $arrParams['key'];
$intCacheLifeTime = $arrParams['cache_life'];
@@ -570,8 +587,8 @@ class VideoService
ConverterMovel::setVal([
'intPage' => $intPage,
// 'strVideoClassName' => empty($strVClass) ? '' : StaticConfig::$arrVideoClass[$strVClass],
'strVideoCategoryName' => empty($strVCategory) ? '' : str_replace("视频", "", $strVCategory),
'strVideoClassName' => empty($strVClass) || $strVClass == 'all' ? '' : StaticConfig::$arrVideoClass[$strVClass],
'strVideoCategoryName' => empty($strNCategory) ? '' : str_replace("视频", "", $strNCategory),
'strVideoStatus' => empty($strVStatus) ? '' : StaticConfig::$arrVideoStatus[$strVStatus],
'strVideoOrder' => empty($strSortType) ? '' : StaticConfig::$arrVideoSortType[$strSortType],
'strSearchKeywords' => $strKey,