diff --git a/app/Services/Cron/FreenodeMerge.php b/app/Services/Cron/FreenodeMerge.php index 556e5f92..8d51efea 100755 --- a/app/Services/Cron/FreenodeMerge.php +++ b/app/Services/Cron/FreenodeMerge.php @@ -200,7 +200,13 @@ final class FreenodeMerge $aProxyGroup["proxies"] = self::arrMerge($aProxyGroup["proxies"], $aNodeCountryList); } - $sMerge = Yaml::dump($aClashTemplate, 4); + $sMerge = Yaml::dump( + $aClashTemplate, + 4, // 层级深度 + 2, // 缩进空格数 + Yaml::DUMP_STR_QUOTED // 核心指令:全员穿上引号防弹衣! + ); + } $sFileDir = $sDirBase."public/freenode/merge/base/".$sPoolClient; diff --git a/app/Services/Cron/FreenodePool.php b/app/Services/Cron/FreenodePool.php index 8fd824f1..b01b51cf 100755 --- a/app/Services/Cron/FreenodePool.php +++ b/app/Services/Cron/FreenodePool.php @@ -105,12 +105,13 @@ final class FreenodePool $aFromFileContent = $aFromFileContent["proxies"]; foreach ($aFromFileContent as $aNode) { - if (isset($aNode["cipher"])) { - if ($aNode["cipher"] == "auto") { - $sRawCipher = "auto"; - $aNode["cipher"] = '"' . $sRawCipher . '"'; - } - } +// if (isset($aNode["cipher"])) { +// if ($aNode["cipher"] == "auto") { +//// $sRawCipher = "auto"; +//// $aNode["cipher"] = '"' . $sRawCipher . '"'; +// $aNode["cipher"] = '"auto''; +// } +// } $aNodeFormat["protocolType"] = $aNode["type"]; $aNodeFormat["country"] = $aNode["name"]; // data