yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2025-10-30 17:02:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

update: opt code

Browse Source
This commit is contained in:
tokumeikoi
2021-08-06 01:43:01 +09:00
parent 0f0f726269
commit e6a7c2c11c
32 changed files with 72 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Services/CouponService.php
View File

@@ -44,8 +44,7 @@ class CouponService
}
}
if ($this->coupon->limit_plan_ids) {
$limitPlanIds = json_decode($this->coupon->limit_plan_ids);
if (!in_array($order->plan_id, $limitPlanIds)) {
if (!in_array($order->plan_id, $this->coupon->limit_plan_ids)) {
return false;
}
}

6
app/Services/OrderService.php
View File

@@ -37,7 +37,7 @@ class OrderService
DB::beginTransaction();
if ($order->surplus_order_ids) {
try {
Order::whereIn('id', json_decode($order->surplus_order_ids))->update([
Order::whereIn('id', $order->surplus_order_ids)->update([
'status' => 4
]);
} catch (\Exception $e) {
@@ -190,7 +190,7 @@ class OrderService
$result = $trafficUnitPrice * $notUsedTraffic;
$orderModel = Order::where('user_id', $user->id)->where('cycle', '!=', 'reset_price')->where('status', 3);
$order->surplus_amount = $result > 0 ? $result : 0;
$order->surplus_order_ids = json_encode(array_column($orderModel->get()->toArray(), 'id'));
$order->surplus_order_ids = array_column($orderModel->get()->toArray(), 'id');
}
private function orderIsUsed(Order $order):bool
@@ -229,7 +229,7 @@ class OrderService
return;
}
$order->surplus_amount = $orderSurplusAmount > 0 ? $orderSurplusAmount : 0;
$order->surplus_order_ids = json_encode(array_column($orders->toArray(), 'id'));
$order->surplus_order_ids = array_column($orders->toArray(), 'id');
}
public function success(string $callbackNo)

2
app/Services/PaymentService.php
View File

@@ -22,7 +22,7 @@ class PaymentService
if ($uuid) $payment = Payment::where('uuid', $uuid)->first()->toArray();
$this->config = [];
if (isset($payment)) {
$this->config = json_decode($payment['config'], true);
$this->config = $payment['config'];
$this->config['enable'] = $payment['enable'];
$this->config['id'] = $payment['id'];
$this->config['uuid'] = $payment['uuid'];

47
app/Services/ServerService.php
View File

@@ -25,7 +25,7 @@ class ServerService
$v2ray = $model->get();
for ($i = 0; $i < count($v2ray); $i++) {
$v2ray[$i]['type'] = 'v2ray';
$groupId = json_decode($v2ray[$i]['group_id']);
$groupId = $v2ray[$i]['group_id'];
if (in_array($user->group_id, $groupId)) {
if ($v2ray[$i]['parent_id']) {
$v2ray[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $v2ray[$i]['parent_id']));
@@ -50,7 +50,7 @@ class ServerService
$trojan = $model->get();
for ($i = 0; $i < count($trojan); $i++) {
$trojan[$i]['type'] = 'trojan';
$groupId = json_decode($trojan[$i]['group_id']);
$groupId = $trojan[$i]['group_id'];
if (in_array($user->group_id, $groupId)) {
if ($trojan[$i]['parent_id']) {
$trojan[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_TROJAN_LAST_CHECK_AT', $trojan[$i]['parent_id']));
@@ -73,7 +73,7 @@ class ServerService
$shadowsocks = $model->get();
for ($i = 0; $i < count($shadowsocks); $i++) {
$shadowsocks[$i]['type'] = 'shadowsocks';
$groupId = json_decode($shadowsocks[$i]['group_id']);
$groupId = $shadowsocks[$i]['group_id'];
if (in_array($user->group_id, $groupId)) {
if ($shadowsocks[$i]['parent_id']) {
$shadowsocks[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_SHADOWSOCKS_LAST_CHECK_AT', $shadowsocks[$i]['parent_id']));
@@ -159,7 +159,7 @@ class ServerService
private function setDns(Server $server, object $json)
{
if ($server->dnsSettings) {
$dns = json_decode($server->dnsSettings);
$dns = $server->dnsSettings;
if (isset($dns->servers)) {
array_push($dns->servers, '1.1.1.1');
array_push($dns->servers, 'localhost');
@@ -174,25 +174,25 @@ class ServerService
if ($server->networkSettings) {
switch ($server->network) {
case 'tcp':
$json->inbound->streamSettings->tcpSettings = json_decode($server->networkSettings);
$json->inbound->streamSettings->tcpSettings = $server->networkSettings;
break;
case 'kcp':
$json->inbound->streamSettings->kcpSettings = json_decode($server->networkSettings);
$json->inbound->streamSettings->kcpSettings = $server->networkSettings;
break;
case 'ws':
$json->inbound->streamSettings->wsSettings = json_decode($server->networkSettings);
$json->inbound->streamSettings->wsSettings = $server->networkSettings;
break;
case 'http':
$json->inbound->streamSettings->httpSettings = json_decode($server->networkSettings);
$json->inbound->streamSettings->httpSettings = $server->networkSettings;
break;
case 'domainsocket':
$json->inbound->streamSettings->dsSettings = json_decode($server->networkSettings);
$json->inbound->streamSettings->dsSettings = $server->networkSettings;
break;
case 'quic':
$json->inbound->streamSettings->quicSettings = json_decode($server->networkSettings);
$json->inbound->streamSettings->quicSettings = $server->networkSettings;
break;
case 'grpc':
$json->inbound->streamSettings->grpcSettings = json_decode($server->networkSettings);
$json->inbound->streamSettings->grpcSettings = $server->networkSettings;
break;
}
}
@@ -203,7 +203,7 @@ class ServerService
$domainRules = array_filter(explode(PHP_EOL, config('v2board.server_v2ray_domain')));
$protocolRules = array_filter(explode(PHP_EOL, config('v2board.server_v2ray_protocol')));
if ($server->ruleSettings) {
$ruleSettings = json_decode($server->ruleSettings);
$ruleSettings = $server->ruleSettings;
// domain
if (isset($ruleSettings->domain)) {
$ruleSettings->domain = array_filter($ruleSettings->domain);
@@ -241,7 +241,7 @@ class ServerService
private function setTls(Server $server, object $json)
{
if ((int)$server->tls) {
$tlsSettings = json_decode($server->tlsSettings);
$tlsSettings = $server->tlsSettings;
$json->inbound->streamSettings->security = 'tls';
$tls = (object)[
'certificateFile' => '/root/.cert/server.crt',
@@ -292,10 +292,6 @@ class ServerService
$server = ServerShadowsocks::orderBy('sort', 'ASC')->get();
for ($i = 0; $i < count($server); $i++) {
$server[$i]['type'] = 'shadowsocks';
if (!empty($server[$i]['tags'])) {
$server[$i]['tags'] = json_decode($server[$i]['tags']);
}
$server[$i]['group_id'] = json_decode($server[$i]['group_id']);
}
return $server->toArray();
}
@@ -305,19 +301,6 @@ class ServerService
$server = Server::orderBy('sort', 'ASC')->get();
for ($i = 0; $i < count($server); $i++) {
$server[$i]['type'] = 'v2ray';
if (!empty($server[$i]['tags'])) {
$server[$i]['tags'] = json_decode($server[$i]['tags']);
}
if (!empty($server[$i]['dnsSettings'])) {
$server[$i]['dnsSettings'] = json_decode($server[$i]['dnsSettings']);
}
if (!empty($server[$i]['tlsSettings'])) {
$server[$i]['tlsSettings'] = json_decode($server[$i]['tlsSettings']);
}
if (!empty($server[$i]['ruleSettings'])) {
$server[$i]['ruleSettings'] = json_decode($server[$i]['ruleSettings']);
}
$server[$i]['group_id'] = json_decode($server[$i]['group_id']);
}
return $server->toArray();
}
@@ -327,10 +310,6 @@ class ServerService
$server = ServerTrojan::orderBy('sort', 'ASC')->get();
for ($i = 0; $i < count($server); $i++) {
$server[$i]['type'] = 'trojan';
if (!empty($server[$i]['tags'])) {
$server[$i]['tags'] = json_decode($server[$i]['tags']);
}
$server[$i]['group_id'] = json_decode($server[$i]['group_id']);
}
return $server->toArray();
}