diff --git a/app/Services/Cron/FreenodeMerge.php b/app/Services/Cron/FreenodeMerge.php index 5f8bf6bf..84d38fc6 100644 --- a/app/Services/Cron/FreenodeMerge.php +++ b/app/Services/Cron/FreenodeMerge.php @@ -351,7 +351,7 @@ final class FreenodeMerge if (!$sConfig) {continue;} $aTmp = CronFreenodePool::v2ray_chai($sConfig); $sConfig = $aTmp[0]; - $sName = $aTmp[1]; + $sName = $aTmp[1] ?? "美国"; // 没得到名字默认美国 $sName = urldecode($sName); $aFeed[] = $sConfig."#".$sName; diff --git a/app/Services/Cron/FreenodePool.php b/app/Services/Cron/FreenodePool.php index fcfffc11..737715ea 100644 --- a/app/Services/Cron/FreenodePool.php +++ b/app/Services/Cron/FreenodePool.php @@ -98,6 +98,9 @@ final class FreenodePool $aMerge[$sFromFileRealClient][$sConfigMd5] = $aNodeFormat; } } else if ($sFromFileRealClient == "clash") { + + $bom = pack('H*','EFBBBF'); + $sFromFileContent = preg_replace("/^$bom/", '', $sFromFileContent); $aFromFileContent = Yaml::parse($sFromFileContent); $aFromFileContent = $aFromFileContent["proxies"];