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 2026-01-17 14:53:55 +08:00
parent 9f49492831
commit 4b524672ba
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,7 +200,13 @@ final class FreenodeMerge
$aProxyGroup["proxies"] = self::arrMerge($aProxyGroup["proxies"], $aNodeCountryList); $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; $sFileDir = $sDirBase."public/freenode/merge/base/".$sPoolClient;

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

@ -105,12 +105,13 @@ final class FreenodePool
$aFromFileContent = $aFromFileContent["proxies"]; $aFromFileContent = $aFromFileContent["proxies"];
foreach ($aFromFileContent as $aNode) { foreach ($aFromFileContent as $aNode) {
if (isset($aNode["cipher"])) { // if (isset($aNode["cipher"])) {
if ($aNode["cipher"] == "auto") { // if ($aNode["cipher"] == "auto") {
$sRawCipher = "auto"; //// $sRawCipher = "auto";
$aNode["cipher"] = '"' . $sRawCipher . '"'; //// $aNode["cipher"] = '"' . $sRawCipher . '"';
} // $aNode["cipher"] = '"auto'';
} // }
// }
$aNodeFormat["protocolType"] = $aNode["type"]; $aNodeFormat["protocolType"] = $aNode["type"];
$aNodeFormat["country"] = $aNode["name"]; // data $aNodeFormat["country"] = $aNode["name"]; // data