diff --git a/app/Http/Controllers/V1/Guest/PaymentController.php b/app/Http/Controllers/V1/Guest/PaymentController.php index 5eca10a..07a8bb0 100644 --- a/app/Http/Controllers/V1/Guest/PaymentController.php +++ b/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; } diff --git a/resources/rules/default.sing-box.json b/resources/rules/default.sing-box.json index 21d3817..2c83de5 100644 --- a/resources/rules/default.sing-box.json +++ b/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": "่Š‚็‚น้€‰ๆ‹ฉ" + } ] } }