tcjlj/Xboard
1
0
Fork 0
mirror of https://github.com/cedar2025/Xboard.git synced 2025-01-22 18:48:14 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'cedar2025:dev' into dev

Browse Source
This commit is contained in:
大大白 2024-06-13 18:39:03 +08:00 committed by GitHub
commit 5cc0b77982
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/V1/Guest/PaymentController.php
View File

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

39
resources/rules/default.sing-box.json
View File

@ -5,11 +5,6 @@
"outbound": ["any"], "outbound": ["any"],
"server": "local" "server": "local"
}, },
{
"disable_cache": false,
"geosite": ["category-ads-all"],
"server": "block"
},
{ {
"clash_mode": "global", "clash_mode": "global",
"server": "remote" "server": "remote"
@ -19,7 +14,7 @@
"server": "local" "server": "local"
}, },
{ {
"geosite": "cn", "rule_set": ["geosite-cn"],
"server": "local" "server": "local"
} }
], ],
@ -42,9 +37,11 @@
"strategy": "prefer_ipv4" "strategy": "prefer_ipv4"
}, },
"experimental": { "experimental": {
"clash_api": { "cache_file": {
"external_controller": "127.0.0.1:9090", "enabled": true,
"secret": "" "path": "cache.db",
"cache_id": "cache_db",
"store_fakeip": true
} }
}, },
"inbounds": [ "inbounds": [
@ -101,10 +98,6 @@
"route": { "route": {
"auto_detect_interface": true, "auto_detect_interface": true,
"rules": [ "rules": [
{
"geosite": "category-ads-all",
"outbound": "block"
},
{ {
"outbound": "dns-out", "outbound": "dns-out",
"protocol": "dns" "protocol": "dns"
@ -118,13 +111,29 @@
"outbound": "节点选择" "outbound": "节点选择"
}, },
{ {
"geoip": ["cn", "private"], "ip_is_private": true,
"outbound": "direct" "outbound": "direct"
}, },
{ {
"geosite": "cn", "rule_set": ["geosite-cn", "geoip-cn"],
"outbound": "direct" "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": "节点选择"
}
] ]
} }
} }