From a55647ab7a356fda4227542ecd8c949019d36ebf Mon Sep 17 00:00:00 2001 From: tokumeikoi Date: Fri, 8 Jan 2021 01:33:11 +0900 Subject: [PATCH] update: config --- .../Controllers/Admin/ConfigController.php | 3 ++- app/Http/Controllers/User/CommController.php | 4 +++- app/Http/Controllers/User/TicketController.php | 18 +++++++++++------- app/Http/Requests/Admin/ConfigSave.php | 3 ++- app/Http/Requests/User/TicketWithdraw.php | 2 +- app/Utils/Dict.php | 5 +++++ resources/rules/app.clash.yaml | 18 +++++++++++------- 7 files changed, 35 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/Admin/ConfigController.php b/app/Http/Controllers/Admin/ConfigController.php index 00f361e9..5f834697 100755 --- a/app/Http/Controllers/Admin/ConfigController.php +++ b/app/Http/Controllers/Admin/ConfigController.php @@ -47,7 +47,8 @@ class ConfigController extends Controller 'invite_never_expire' => config('v2board.invite_never_expire', 0), 'commission_first_time_enable' => config('v2board.commission_first_time_enable', 1), 'commission_auto_check_enable' => config('v2board.commission_auto_check_enable', 1), - 'commission_withdraw_limit' => config('v2board.commission_withdraw_limit', 100) + 'commission_withdraw_limit' => config('v2board.commission_withdraw_limit', 100), + 'commission_withdraw_method' => config('v2board.commission_withdraw_method', Dict::WITHDRAW_METHOD_WHITELIST_DEFAULT) ], 'site' => [ 'safe_mode_enable' => (int)config('v2board.safe_mode_enable', 0), diff --git a/app/Http/Controllers/User/CommController.php b/app/Http/Controllers/User/CommController.php index 8f0a9bd9..01b47a1b 100644 --- a/app/Http/Controllers/User/CommController.php +++ b/app/Http/Controllers/User/CommController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers\User; +use App\Utils\Dict; use Illuminate\Http\Request; use App\Http\Controllers\Controller; @@ -12,7 +13,8 @@ class CommController extends Controller return response([ 'data' => [ 'isTelegram' => (int)config('v2board.telegram_bot_enable', 0), - 'stripePk' => config('v2board.stripe_pk_live') + 'stripePk' => config('v2board.stripe_pk_live'), + 'withdraw_methods' => config('v2board.commission_withdraw_method', Dict::WITHDRAW_METHOD_WHITELIST_DEFAULT) ] ]); } diff --git a/app/Http/Controllers/User/TicketController.php b/app/Http/Controllers/User/TicketController.php index 2f49fe67..91ccb7d9 100644 --- a/app/Http/Controllers/User/TicketController.php +++ b/app/Http/Controllers/User/TicketController.php @@ -8,6 +8,7 @@ use App\Http\Requests\User\TicketWithdraw; use App\Jobs\SendTelegramJob; use App\Models\User; use App\Services\TelegramService; +use App\Utils\Dict; use Illuminate\Http\Request; use App\Models\Ticket; use App\Models\TicketMessage; @@ -152,6 +153,15 @@ class TicketController extends Controller public function withdraw(TicketWithdraw $request) { + if (!in_array( + $request->input('withdraw_method'), + config( + 'v2board.commission_withdraw_method', + Dict::WITHDRAW_METHOD_WHITELIST_DEFAULT + ) + )) { + abort(500, '不支持的提现方式'); + } $user = User::find($request->session()->get('id')); $limit = config('v2board.commission_withdraw_limit', 100); if ($limit > ($user->commission_balance / 100)) { @@ -169,13 +179,7 @@ class TicketController extends Controller DB::rollback(); abort(500, '工单创建失败'); } - $methodText = [ - 'alipay' => '支付宝', - 'paypal' => '贝宝(Paypal)', - 'usdt' => 'USDT', - 'btc' => '比特币' - ]; - $message = "提现方式：{$methodText[$request->input('withdraw_method')]}\r\n提现账号：{$request->input('withdraw_account')}\r\n"; + $message = "提现方式：{$request->input('withdraw_method')}\r\n提现账号：{$request->input('withdraw_account')}\r\n"; $ticketMessage = TicketMessage::create([ 'user_id' => $request->session()->get('id'), 'ticket_id' => $ticket->id, diff --git a/app/Http/Requests/Admin/ConfigSave.php b/app/Http/Requests/Admin/ConfigSave.php index d1f40f2a..00783ba5 100755 --- a/app/Http/Requests/Admin/ConfigSave.php +++ b/app/Http/Requests/Admin/ConfigSave.php @@ -23,6 +23,7 @@ class ConfigSave extends FormRequest 'commission_first_time_enable' => 'in:0,1', 'commission_auto_check_enable' => 'in:0,1', 'commission_withdraw_limit' => 'nullable|numeric', + 'commission_withdraw_method' => 'nullable|array', // site 'stop_register' => 'in:0,1', 'email_verify' => 'in:0,1', @@ -34,7 +35,7 @@ class ConfigSave extends FormRequest 'try_out_plan_id' => 'integer', 'try_out_hour' => 'numeric', 'email_whitelist_enable' => 'in:0,1', - 'email_whitelist_suffix' => '', + 'email_whitelist_suffix' => 'nullable|array', 'email_gmail_limit_enable' => 'in:0,1', 'recaptcha_enable' => 'in:0,1', 'recaptcha_key' => '', diff --git a/app/Http/Requests/User/TicketWithdraw.php b/app/Http/Requests/User/TicketWithdraw.php index e1ddfc33..84c4c951 100644 --- a/app/Http/Requests/User/TicketWithdraw.php +++ b/app/Http/Requests/User/TicketWithdraw.php @@ -14,7 +14,7 @@ class TicketWithdraw extends FormRequest public function rules() { return [ - 'withdraw_method' => 'required|in:alipay,paypal,usdt,btc', + 'withdraw_method' => 'required', 'withdraw_account' => 'required' ]; } diff --git a/app/Utils/Dict.php b/app/Utils/Dict.php index 236c6360..e0e6fe64 100644 --- a/app/Utils/Dict.php +++ b/app/Utils/Dict.php @@ -15,4 +15,9 @@ class Dict 'yeah.net', 'foxmail.com' ]; + CONST WITHDRAW_METHOD_WHITELIST_DEFAULT = [ + '支付宝', + 'USDT', + 'Paypal' + ]; } diff --git a/resources/rules/app.clash.yaml b/resources/rules/app.clash.yaml index fe9fa929..87992229 100644 --- a/resources/rules/app.clash.yaml +++ b/resources/rules/app.clash.yaml @@ -1,11 +1,14 @@ -port: 8890 -socks-port: 8891 -allow-lan: false +port: 7890 +socks-port: 7891 +# redir-port: 7892 +# tproxy-port: 7893 +# mixed-port: 7890 +allow-lan: true +bind-address: "*" mode: rule log-level: info -external-controller: 127.0.0.1:9091 -experimental: - ignore-resolve-fail: true +external-controller: 127.0.0.1:9090 + dns: enable: true # listen: 0.0.0.0:53 @@ -18,15 +21,16 @@ dns: fake-ip-range: 198.18.0.1/16 use-hosts: true nameserver: - - https://dns.alidns.com/dns-query - https://doh.pub/dns-query fallback: - tls://1.0.0.1:853 + - https://cloudflare-dns.com/dns-query - https://dns.google/dns-query fallback-filter: geoip: true ipcidr: - 240.0.0.0/4 + - 0.0.0.0/32 proxies: