This commit is contained in:
make
2025-04-11 23:56:23 +08:00
parent 9350a2afff
commit bc92b44086
37 changed files with 246 additions and 216 deletions

View File

@@ -94,10 +94,9 @@ class DomainModel extends BaseModel
* @param string $strKey
* @return void
*/
public function getFomartSubject($strKey, $strDiff = '')
public function getFomartSubject($strKey, $strDiff = '', bool $boolJoin = true)
{
$intSfgId = $this->t_cfg->{$strKey}['sfg_id'];
$SubjectFomartModel = NULL;
$arrAllSubjectFomartModel = SubjectFomartModel::getAllSubjectFomartOnCacheBySfgId($intSfgId);
@@ -109,11 +108,14 @@ class DomainModel extends BaseModel
$strController = request()->controller();
$strAction = request()->action();
$strUUId = sprintf('%s-%s-%s-%s-%s', $strDomain, $strController, $strAction, $strKey, $strDiff);
if ($boolJoin) {
$strUUId = sprintf('%s-%s-%s-%s-%s', $strDomain, $strController, $strAction, $strKey, $strDiff);
} else {
$strUUId = sprintf('%s-%s-%s', $strDomain, $strKey, $strDiff);
}
$arrConfigSubjectFomart = ConfigSubjectFomartModel::getInstance()->getConfigSubjectFomartByCsfKey($strUUId);
if (empty($arrConfigSubjectFomart)) {
$intKey = array_rand($arrAllSubjectFomartModel);
@@ -124,17 +126,22 @@ class DomainModel extends BaseModel
'csf_key' => $strUUId,
'sf_id' => $SubjectFomartModel->sf_id,
]);
} else {
$intSfId = $arrConfigSubjectFomart['sf_id'];
foreach ($arrAllSubjectFomartModel as $objTemp) {
if ($objTemp->sf_id == $intSfId) {
$SubjectFomartModel = $objTemp;
break;
}
}
}
return $SubjectFomartModel->sf_val;
return $SubjectFomartModel->sf_val ?? '';
}
@@ -148,8 +155,7 @@ class DomainModel extends BaseModel
{
$Request = request();
$strSfVal = $Request->DomainModel->getFomartSubject($strKey);
$strSfVal = $Request->DomainModel->getFomartSubject($strKey,'',false);
$arrKeys = [];
$arrVals = [];
foreach ($arrArgs as $strKey => $strVal) {