From f03dbd1dcbe42295b416f4e3ac1b0633838c503a Mon Sep 17 00:00:00 2001 From: root Date: Sat, 18 Jan 2020 18:41:02 +0800 Subject: [PATCH] update --- app/Http/Controllers/AppController.php | 2 +- app/Http/Controllers/Guest/OrderController.php | 6 +++--- app/Http/Controllers/Passport/CommController.php | 2 +- resources/views/mail/sendEmailVerify.blade.php | 2 +- routes/api.php | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/AppController.php b/app/Http/Controllers/AppController.php index b7e9c99d..a60a6b3d 100644 --- a/app/Http/Controllers/AppController.php +++ b/app/Http/Controllers/AppController.php @@ -12,7 +12,7 @@ use App\Utils\Helper; class AppController extends Controller { - CONST CLIENT_CONFIG = '{"policy":{"levels":{"0":{"uplinkOnly":0}}},"dns":{"servers":["114.114.114.114","8.8.8.8"]},"outboundDetour":[{"protocol":"freedom","tag":"direct","settings":{}}],"inbound":{"listen":"0.0.0.0","port":31211,"protocol":"socks","settings":{"auth":"noauth","udp":true,"ip":"127.0.0.1"}},"inboundDetour":[{"listen":"0.0.0.0","allocate":{"strategy":"always","refresh":5,"concurrency":3},"port":31210,"protocol":"http","tag":"httpDetour","domainOverride":["http","tls"],"streamSettings":{},"settings":{"timeout":0}}],"routing":{"strategy":"rules","settings":{"domainStrategy":"IPIfNonMatch","rules":[{"port":"1-52","type":"field","outboundTag":"direct"},{"port":"54-79","type":"field","outboundTag":"direct"},{"port":"81-442","type":"field","outboundTag":"direct"},{"port":"444-65535","type":"field","outboundTag":"direct"},{"type":"field","ip":["0.0.0.0/8","10.0.0.0/8","100.64.0.0/10","127.0.0.0/8","169.254.0.0/16","172.16.0.0/12","192.0.0.0/24","192.0.2.0/24","192.168.0.0/16","198.18.0.0/15","198.51.100.0/24","203.0.113.0/24","::1/128","fc00::/7","fe80::/10"],"outboundTag":"direct"},{"type":"field","ip":["geoip:cn"],"outboundTag":"direct"}]}},"outbound":{"tag":"proxy","sendThrough":"0.0.0.0","mux":{"enabled":false,"concurrency":8},"protocol":"vmess","settings":{"vnext":[{"address":"server","port":443,"users":[{"id":"uuid","alterId":2,"security":"auto","level":0}],"remark":"remark"}]},"streamSettings":{"network":"tcp","tcpSettings":{"header":{"type":"none"}},"security":"none","tlsSettings":{"allowInsecure":true,"allowInsecureCiphers":true},"kcpSettings":{"header":{"type":"none"},"mtu":1350,"congestion":false,"tti":20,"uplinkCapacity":5,"writeBufferSize":1,"readBufferSize":1,"downlinkCapacity":20},"wsSettings":{"path":"","headers":{"Host":"server.cc"}}}}}'; + CONST CLIENT_CONFIG = '{"policy":{"levels":{"0":{"uplinkOnly":0}}},"dns":{"servers":["114.114.114.114","8.8.8.8"]},"outboundDetour":[{"protocol":"freedom","tag":"direct","settings":{}}],"inbound":{"listen":"0.0.0.0","port":31211,"protocol":"socks","settings":{"auth":"noauth","udp":true,"ip":"127.0.0.1"}},"inboundDetour":[{"listen":"0.0.0.0","allocate":{"strategy":"always","refresh":5,"concurrency":3},"port":31210,"protocol":"http","tag":"httpDetour","domainOverride":["http","tls"],"streamSettings":{},"settings":{"timeout":0}}],"routing":{"strategy":"rules","settings":{"domainStrategy":"IPIfNonMatch","rules":[{"type":"field","ip":["0.0.0.0/8","10.0.0.0/8","100.64.0.0/10","127.0.0.0/8","169.254.0.0/16","172.16.0.0/12","192.0.0.0/24","192.0.2.0/24","192.168.0.0/16","198.18.0.0/15","198.51.100.0/24","203.0.113.0/24","::1/128","fc00::/7","fe80::/10"],"outboundTag":"direct"},{"type":"field","ip":["geoip:cn"],"outboundTag":"direct"}]}},"outbound":{"tag":"proxy","sendThrough":"0.0.0.0","mux":{"enabled":false,"concurrency":8},"protocol":"vmess","settings":{"vnext":[{"address":"server","port":443,"users":[{"id":"uuid","alterId":2,"security":"auto","level":0}],"remark":"remark"}]},"streamSettings":{"network":"tcp","tcpSettings":{"header":{"type":"none"}},"security":"none","tlsSettings":{"allowInsecure":true,"allowInsecureCiphers":true},"kcpSettings":{"header":{"type":"none"},"mtu":1350,"congestion":false,"tti":20,"uplinkCapacity":5,"writeBufferSize":1,"readBufferSize":1,"downlinkCapacity":20},"wsSettings":{"path":"","headers":{"Host":"server.cc"}}}}}'; CONST SOCKS_PORT = 10010; CONST HTTP_PORT = 10011; diff --git a/app/Http/Controllers/Guest/OrderController.php b/app/Http/Controllers/Guest/OrderController.php index 3b1035e5..77634887 100644 --- a/app/Http/Controllers/Guest/OrderController.php +++ b/app/Http/Controllers/Guest/OrderController.php @@ -137,10 +137,10 @@ class OrderController extends Controller $payTaro = new PayTaro(config('v2board.paytaro_app_id'), config('v2board.paytaro_app_secret')); if (!$payTaro->verify($request->input())) { - abort('fail'); + abort(500, 'fail'); } if (!$this->handle($request->input('out_trade_no'), $request->input('trade_no'))) { - abort('fail'); + abort(500, 'fail'); } die('success'); } @@ -152,7 +152,7 @@ class OrderController extends Controller abort(500, 'order is not found'); } if ($order->status !== 0) { - abort(500, 'order is paid'); + return true; } $order->status = 1; $order->callback_no = $callbackNo; diff --git a/app/Http/Controllers/Passport/CommController.php b/app/Http/Controllers/Passport/CommController.php index b488046d..46a0208a 100644 --- a/app/Http/Controllers/Passport/CommController.php +++ b/app/Http/Controllers/Passport/CommController.php @@ -54,7 +54,7 @@ class CommController extends Controller abort(500, '发送失败'); } - Cache::put($cacheKey, $code, 600); + Cache::put($cacheKey, $code, 60); return response([ 'data' => true ]); diff --git a/resources/views/mail/sendEmailVerify.blade.php b/resources/views/mail/sendEmailVerify.blade.php index 18b0f307..da6ebdea 100644 --- a/resources/views/mail/sendEmailVerify.blade.php +++ b/resources/views/mail/sendEmailVerify.blade.php @@ -72,7 +72,7 @@ - 感谢您使用「{{$name}}」，请在 10 分钟内填写验证码完成验证操作。

+ 感谢您使用「{{$name}}」，请在 1 分钟内填写验证码完成验证操作。

diff --git a/routes/api.php b/routes/api.php index 082f4377..f0376253 100755 --- a/routes/api.php +++ b/routes/api.php @@ -134,6 +134,7 @@ Route::prefix('v1') Route::post('order/alipayNotify', 'Guest\\OrderController@alipayNotify'); Route::post('order/stripeNotify', 'Guest\\OrderController@stripeNotify'); Route::post('order/bitpayXNotify', 'Guest\\OrderController@bitpayXNotify'); + Route::post('order/payTaroNotify', 'Guest\\OrderController@payTaroNotify'); }); // Client Route::prefix('client')