Browse Source

Fix WebApi限速单位错误 & PayJs 支付二维码出错

兔姬桑 4 years ago
parent
commit
7a37c4671b

+ 2 - 2
app/Http/Controllers/Api/WebApi/TrojanController.php

@@ -15,7 +15,7 @@ class TrojanController extends BaseController
         return $this->returnData('获取节点信息成功', 'success', 200, [
             'id'           => $node->id,
             'is_udp'       => $node->is_udp ? true : false,
-            'speed_limit'  => $node->speed_limit,
+            'speed_limit'  => $node->getRawOriginal('speed_limit'),
             'client_limit' => $node->client_limit,
             'push_port'    => $node->push_port,
             'redirect_url' => sysConfig('redirect_url'),
@@ -35,7 +35,7 @@ class TrojanController extends BaseController
             $data[] = [
                 'uid'         => $user->id,
                 'password'    => $user->passwd,
-                'speed_limit' => $user->speed_limit,
+                'speed_limit' => $user->getRawOriginal('speed_limit'),
             ];
         }
 

+ 2 - 2
app/Http/Controllers/Api/WebApi/V2RayController.php

@@ -22,7 +22,7 @@ class V2RayController extends BaseController
         return $this->returnData('获取节点信息成功', 'success', 200, [
             'id'              => $node->id,
             'is_udp'          => $node->is_udp ? true : false,
-            'speed_limit'     => $node->speed_limit,
+            'speed_limit'     => $node->getRawOriginal('speed_limit'),
             'client_limit'    => $node->client_limit,
             'push_port'       => $node->push_port,
             'redirect_url'    => (string) sysConfig('redirect_url'),
@@ -52,7 +52,7 @@ class V2RayController extends BaseController
             $data[] = [
                 'uid'         => $user->id,
                 'vmess_uid'   => $user->vmess_id,
-                'speed_limit' => $user->speed_limit,
+                'speed_limit' => $user->getRawOriginal('speed_limit'),
             ];
         }
 

+ 2 - 2
app/Http/Controllers/Api/WebApi/VNetController.php

@@ -19,7 +19,7 @@ class VNetController extends BaseController
             'obfs'         => $node->obfs,
             'obfs_param'   => $node->obfs_param ?? '',
             'is_udp'       => $node->is_udp,
-            'speed_limit'  => $node->speed_limit,
+            'speed_limit'  => $node->getRawOriginal('speed_limit'),
             'client_limit' => $node->client_limit,
             'single'       => $node->single,
             'port'         => (string) $node->port,
@@ -46,7 +46,7 @@ class VNetController extends BaseController
                 'protocol'    => $user->protocol,
                 'obfs'        => $user->obfs,
                 'obfs_param'  => $node->obfs_param,
-                'speed_limit' => $user->speed_limit,
+                'speed_limit' => $user->getRawOriginal('speed_limit'),
                 'enable'      => $user->enable,
             ];
         }

+ 1 - 1
resources/views/user/payment.blade.php

@@ -43,7 +43,7 @@
         <script type="text/javascript">
             $(document).ready(function () {
                 new QArt({
-                    value: '{{$payment->url}}',
+                    value: @json($payment->url),
                     imagePath: '{{asset($pay_type_icon)}}',
                     filter: 'color',
                     version: 10,