no message

app/Services/Cron/FreenodeMerge.php

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

app/Services/ServiceFnPoolV2rayTo.php

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