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-08-11 16:10:04 +08:00
parent e585e4ac17
commit 50085246b1
3 changed files with 7667 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,6 +226,8 @@ final class FreenodeMerge
$aSingboxConfig = json_decode($sSingboxTemplate, true); $aSingboxConfig = json_decode($sSingboxTemplate, true);
// tt($aNodeMerge);
foreach ($aSingboxConfig["outbounds"] as &$aOutbounds) { foreach ($aSingboxConfig["outbounds"] as &$aOutbounds) {
if ($aOutbounds["type"] == "selector") { if ($aOutbounds["type"] == "selector") {
@ -234,24 +236,15 @@ final class FreenodeMerge
} }
} }
// $a = [ // $aSingboxConfig["outbounds"] = $aSingboxConfig["outbounds"] + $aNodeMerge;
// "a" => "ss", $aSingboxConfig["outbounds"] = array_merge($aSingboxConfig["outbounds"], $aNodeMerge);
// "b" => "bb"
// ];
// $b = [
// "cc" => "gg"
// ];
// array_push($a, b);
// // 结果就是刚才那样，怎么办
$aSingboxConfig["outbounds"] = $aSingboxConfig["outbounds"] + $aNodeMerge;
// tt($aSingboxConfig["outbounds"]); // tt($aSingboxConfig["outbounds"]);
// array_push($aSingboxConfig["outbounds"], $aNodeMerge);
// echo "<pre>";
// var_dump($aSingboxConfig);
$sMerge = json_encode($aSingboxConfig); $sMerge = json_encode($aSingboxConfig);
// $s = json_encode($aNodeMerge);
// $s = json_decode($sMerge, true);
// tt($s);
} else { } else {
$sMerge = "?"; $sMerge = "?";
} }
@ -355,6 +348,13 @@ final class FreenodeMerge
$sFeedContent = str_replace('{{slogan_telegram}}', $sSlogan_telegram, $sFeedContent); $sFeedContent = str_replace('{{slogan_telegram}}', $sSlogan_telegram, $sFeedContent);
$sFeedContent = str_replace('{{slogan_date}}', "更新于：".$sSloganDate, $sFeedContent); $sFeedContent = str_replace('{{slogan_date}}', "更新于：".$sSloganDate, $sFeedContent);
// if ($aSiteMapRow["code"] == "vfnfull" && $sClient == "singbox") {
// echo $sFeedContent;exit;
// echo "<pre>";
// $sFeedContent = json_decode($sFeedContent, true);
// var_dump($sFeedContent);
// }
if ($aSiteMapRow["code"] !== "_admin") { if ($aSiteMapRow["code"] !== "_admin") {
$sFeedContent = preg_replace('/ :\[.*?\]:/su', '', $sFeedContent); $sFeedContent = preg_replace('/ :\[.*?\]:/su', '', $sFeedContent);
} }
@ -421,7 +421,7 @@ final class FreenodeMerge
$aMerge = array_unique($aMerge); $aMerge = array_unique($aMerge);
$aMerge = array_values($aMerge); $aMerge = array_values($aMerge);
return $aMerge; return $aMerge;
} }// 这是做了什么
public static function strReplace($sStr, $sFromName) public static function strReplace($sStr, $sFromName)
{ {

4
app/Services/ServiceFnPoolV2rayTo.php
View File

@ -177,7 +177,7 @@ class ServiceFnPoolV2rayTo
return $aV2ray; return $aV2ray;
} }
private function mod_to_hysteria2__($aV2ray) private function mod_to_hysteria2($aV2ray)
{ {
$sConfig = $aV2ray["config"] ?? ''; $sConfig = $aV2ray["config"] ?? '';
@ -285,7 +285,7 @@ class ServiceFnPoolV2rayTo
return $aV2ray; return $aV2ray;
} }
private function mod_to_vmess__($aV2ray) private function mod_to_vmess($aV2ray)
{ {
$aNode = []; $aNode = [];
$aConfig = $aV2ray["config"]; $aConfig = $aV2ray["config"];

7647
public/freenode/template/test.text Normal file
View File

File diff suppressed because it is too large Load Diff