tom/dd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
hellcat 2025-12-31 17:08:12 +08:00
parent 7573187bd6
commit 9d0e6fd128
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/Cron/FreenodeMerge.php
View File

@ -351,7 +351,7 @@ final class FreenodeMerge
if (!$sConfig) {continue;} if (!$sConfig) {continue;}
$aTmp = CronFreenodePool::v2ray_chai($sConfig); $aTmp = CronFreenodePool::v2ray_chai($sConfig);
$sConfig = $aTmp[0]; $sConfig = $aTmp[0];
$sName = $aTmp[1]; $sName = $aTmp[1] ?? "美国"; // 没得到名字默认美国
$sName = urldecode($sName); $sName = urldecode($sName);
$aFeed[] = $sConfig."#".$sName; $aFeed[] = $sConfig."#".$sName;

3
app/Services/Cron/FreenodePool.php
View File

@ -98,6 +98,9 @@ final class FreenodePool
$aMerge[$sFromFileRealClient][$sConfigMd5] = $aNodeFormat; $aMerge[$sFromFileRealClient][$sConfigMd5] = $aNodeFormat;
} }
} else if ($sFromFileRealClient == "clash") { } else if ($sFromFileRealClient == "clash") {
$bom = pack('H*','EFBBBF');
$sFromFileContent = preg_replace("/^$bom/", '', $sFromFileContent);
$aFromFileContent = Yaml::parse($sFromFileContent); $aFromFileContent = Yaml::parse($sFromFileContent);
$aFromFileContent = $aFromFileContent["proxies"]; $aFromFileContent = $aFromFileContent["proxies"];