yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2024-11-10 09:39:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
root 2020-01-18 18:41:02 +08:00
parent e576d82955
commit f03dbd1dcb
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/AppController.php
View File

@ -12,7 +12,7 @@ use App\Utils\Helper;
class AppController extends Controller 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 SOCKS_PORT = 10010;
CONST HTTP_PORT = 10011; CONST HTTP_PORT = 10011;

6
app/Http/Controllers/Guest/OrderController.php
View File

@ -137,10 +137,10 @@ class OrderController extends Controller
$payTaro = new PayTaro(config('v2board.paytaro_app_id'), config('v2board.paytaro_app_secret')); $payTaro = new PayTaro(config('v2board.paytaro_app_id'), config('v2board.paytaro_app_secret'));
if (!$payTaro->verify($request->input())) { if (!$payTaro->verify($request->input())) {
abort('fail'); abort(500, 'fail');
} }
if (!$this->handle($request->input('out_trade_no'), $request->input('trade_no'))) { if (!$this->handle($request->input('out_trade_no'), $request->input('trade_no'))) {
abort('fail'); abort(500, 'fail');
} }
die('success'); die('success');
} }
@ -152,7 +152,7 @@ class OrderController extends Controller
abort(500, 'order is not found'); abort(500, 'order is not found');
} }
if ($order->status !== 0) { if ($order->status !== 0) {
abort(500, 'order is paid'); return true;
} }
$order->status = 1; $order->status = 1;
$order->callback_no = $callbackNo; $order->callback_no = $callbackNo;

2
app/Http/Controllers/Passport/CommController.php
View File

@ -54,7 +54,7 @@ class CommController extends Controller
abort(500, '发送失败'); abort(500, '发送失败');
} }
Cache::put($cacheKey, $code, 600); Cache::put($cacheKey, $code, 60);
return response([ return response([
'data' => true 'data' => true
]); ]);

2
resources/views/mail/sendEmailVerify.blade.php
View File

@ -72,7 +72,7 @@
<tbody> <tbody>
<tr> <tr>
<td style="font:14px/19px Open Sans, Arial, Verdana, sans-serif; color:#5c5c5c; font-weight:300; padding:0 0 19px;"> <td style="font:14px/19px Open Sans, Arial, Verdana, sans-serif; color:#5c5c5c; font-weight:300; padding:0 0 19px;">
感谢您使用「{{$name}}」，请在 10 分钟内填写验证码完成验证操作。<br><br> 感谢您使用「{{$name}}」，请在 1 分钟内填写验证码完成验证操作。<br><br>
<p style="text-align:center"> <p style="text-align:center">
<span <span
style="font-size:48px"> style="font-size:48px">

1
routes/api.php
View File

@ -134,6 +134,7 @@ Route::prefix('v1')
Route::post('order/alipayNotify', 'Guest\\OrderController@alipayNotify'); Route::post('order/alipayNotify', 'Guest\\OrderController@alipayNotify');
Route::post('order/stripeNotify', 'Guest\\OrderController@stripeNotify'); Route::post('order/stripeNotify', 'Guest\\OrderController@stripeNotify');
Route::post('order/bitpayXNotify', 'Guest\\OrderController@bitpayXNotify'); Route::post('order/bitpayXNotify', 'Guest\\OrderController@bitpayXNotify');
Route::post('order/payTaroNotify', 'Guest\\OrderController@payTaroNotify');
}); });
// Client // Client
Route::prefix('client') Route::prefix('client')