Merge branch 'cedar2025:dev' into dev

app/Http/Controllers/V1/Guest/PaymentController.php

@@ -41,12 +41,22 @@ class PaymentController extends Controller
         if (!$orderService->paid($callbackNo)) {
             return false;
         }
+
+        $payment = Payment::where('id', $order->payment_id)->first();
         $telegramService = new TelegramService();
         $message = sprintf(
-            "💰成功收款%s元\n———————————————\n订单号：%s",
+            "💰成功收款%s元\n" .
+            "———————————————\n" .
+            "支付接口：%s\n" .
+            "支付渠道：%s\n" .
+            "本站订单：`%s`"
+            ,
             $order->total_amount / 100,
+            $payment->payment,
+            $payment->name,
             $order->trade_no
         );
+        
         $telegramService->sendMessageWithAdmin($message);
         return true;
     }

resources/rules/default.sing-box.json

@@ -5,11 +5,6 @@
                 "outbound": ["any"],
                 "server": "local"
             },
-            {
-                "disable_cache": false,
-                "geosite": ["category-ads-all"],
-                "server": "block"
-            },
             {
                 "clash_mode": "global",
                 "server": "remote"
@@ -19,7 +14,7 @@
                 "server": "local"
             },
             {
-                "geosite": "cn",
+                "rule_set": ["geosite-cn"],
                 "server": "local"
             }
         ],
@@ -42,9 +37,11 @@
         "strategy": "prefer_ipv4"
     },
     "experimental": {
-        "clash_api": {
-            "external_controller": "127.0.0.1:9090",
-            "secret": ""
+        "cache_file": {
+            "enabled": true,
+            "path": "cache.db",
+            "cache_id": "cache_db",
+            "store_fakeip": true
         }
     },
     "inbounds": [
@@ -101,10 +98,6 @@
     "route": {
         "auto_detect_interface": true,
         "rules": [
-            {
-                "geosite": "category-ads-all",
-                "outbound": "block"
-            },
             {
                 "outbound": "dns-out",
                 "protocol": "dns"
@@ -118,13 +111,29 @@
                 "outbound": "节点选择"
             },
             {
-                "geoip": ["cn", "private"],
+                "ip_is_private": true,
                 "outbound": "direct"
             },
             {
-                "geosite": "cn",
+                "rule_set": ["geosite-cn", "geoip-cn"],
                 "outbound": "direct"
             }
+        ],
+        "rule_set": [
+            {
+                "tag": "geosite-cn",
+                "type": "remote",
+                "format": "binary",
+                "url": "https://raw.githubusercontent.com/SagerNet/sing-geosite/rule-set/geosite-cn.srs",
+                "download_detour": "节点选择"
+            },
+            {
+                "tag": "geoip-cn",
+                "type": "remote",
+                "format": "binary",
+                "url": "https://raw.githubusercontent.com/SagerNet/sing-geoip/rule-set/geoip-cn.srs",
+                "download_detour": "节点选择"
+            }
         ]
     }
 }