added #19

app/Components/Helpers.php

@@ -18,7 +18,7 @@ class Helpers
 {
 
     // 不生成的端口
-    private static array $denyPorts = [
+    private static $denyPorts = [
         1068, 1109, 1434, 3127, 3128, 3129, 3130, 3332, 4444, 5554, 6669, 8080, 8081, 8082, 8181, 8282, 9996, 17185, 24554, 35601, 60177, 60179,
     ];
 

app/Components/Namesilo.php

@@ -8,7 +8,7 @@ use LSS\XML2Array;
 
 class Namesilo
 {
-    private static string $host = 'https://www.namesilo.com/api/';
+    private static $host = 'https://www.namesilo.com/api/';
 
     // 列出账号下所有域名　Todo Debug测试
     public function listDomains()

app/Http/Controllers/Admin/ToolsController.php

@@ -98,7 +98,7 @@ class ToolsController extends Controller
             return Response::json(['status' => 'success', 'data' => $json, 'message' => '转换成功']);
         }
 
-        return view('admin.tools.convert', $view);
+        return view('admin.tools.convert');
     }
 
     // 下载转换好的JSON文件

app/Http/Controllers/Admin/UserController.php

@@ -34,6 +34,8 @@ class UserController extends Controller
         $wechat = $request->input('wechat');
         $qq = $request->input('qq');
         $port = $request->input('port');
+        $group = $request->input('group');
+        $level = $request->input('level');
         $status = $request->input('status');
         $enable = $request->input('enable');
         $online = $request->input('online');
@@ -70,6 +72,14 @@ class UserController extends Controller
             $query->whereEnable($enable);
         }
 
+        if (isset($group)) {
+            $query->whereGroupId($group);
+        }
+
+        if (isset($level)) {
+            $query->whereLevel($level);
+        }
+
         // 流量超过100G的
         if ($largeTraffic) {
             $query->whereIn('status', [0, 1])->whereRaw('(u + d) >= 107374182400');
@@ -116,9 +126,11 @@ class UserController extends Controller
             $user->link = (sysConfig('subscribe_domain') ?: sysConfig('website_url')).'/s/'.$user->subscribe->code;
         }
 
-        $view['userList'] = $userList;
-
-        return view('admin.user.index', $view);
+        return view('admin.user.index', [
+            'userList'   => $userList,
+            'userGroups' => UserGroup::all()->pluck('name', 'id')->toArray(),
+            'levels'     => Level::all()->pluck('name', 'level')->toArray(),
+        ]);
     }
 
     // 1小时内流量异常用户
@@ -142,14 +154,10 @@ class UserController extends Controller
     // 添加账号页面
     public function create()
     {
-        // 生成一个可用端口
-        $view['methodList'] = Helpers::methodList();
-        $view['protocolList'] = Helpers::protocolList();
-        $view['obfsList'] = Helpers::obfsList();
-        $view['levelList'] = Level::orderBy('level')->get();
-        $view['groupList'] = UserGroup::orderBy('id')->get();
-
-        return view('admin.user.info', $view);
+        return view('admin.user.info', [
+            'levelList' => Level::orderBy('level')->get(),
+            'groupList' => UserGroup::orderBy('id')->get(),
+        ]);
     }
 
     // 添加账号
@@ -188,14 +196,11 @@ class UserController extends Controller
     {
         $user = User::find($id);
 
-        $view['user'] = $user->load('inviter:id,email');
-        $view['methodList'] = Helpers::methodList();
-        $view['protocolList'] = Helpers::protocolList();
-        $view['obfsList'] = Helpers::obfsList();
-        $view['levelList'] = Level::orderBy('level')->get();
-        $view['groupList'] = UserGroup::orderBy('id')->get();
-
-        return view('admin.user.info', $view);
+        return view('admin.user.info', [
+            'user'      => $user->load('inviter:id,email'),
+            'levelList' => Level::orderBy('level')->get(),
+            'groupList' => UserGroup::orderBy('id')->get(),
+        ]);
     }
 
     // 编辑账号

app/Http/Controllers/AdminController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Components\Helpers;
 use App\Models\Country;
 use App\Models\Invite;
 use App\Models\Label;
@@ -184,4 +185,6 @@ class AdminController extends Controller
 
         return view('admin.config.config', $view);
     }
+
+    public function getPort(): int { return Helpers::getPort(); }
 }

app/Http/Controllers/Gateway/F2Fpay.php

@@ -14,7 +14,7 @@ use Response;
 
 class F2Fpay extends AbstractPayment
 {
-    private static array $aliConfig;
+    private static $aliConfig;
 
     public function __construct()
     {

app/Http/Controllers/Gateway/PayJs.php

@@ -10,7 +10,7 @@ use Xhat\Payjs\Payjs as Pay;
 
 class PayJs extends AbstractPayment
 {
-    private static array $config;
+    private static $config;
 
     public function __construct()
     {

app/Http/Controllers/Gateway/PayPal.php

@@ -15,7 +15,7 @@ use Srmklive\PayPal\Services\ExpressCheckout;
 
 class PayPal extends AbstractPayment
 {
-    protected ExpressCheckout $provider;
+    protected $provider;
     protected $exChange;
 
     public function __construct()

app/Http/Controllers/PaymentController.php

@@ -30,7 +30,7 @@ use Response;
  */
 class PaymentController extends Controller
 {
-    private static string $method;
+    private static $method;
 
     public static function notify(Request $request): int
     {

app/Http/Controllers/User/SubscribeController.php

@@ -13,7 +13,7 @@ use Response;
 
 class SubscribeController extends Controller
 {
-    private int $subType;
+    private $subType;
 
     // 通过订阅码获取订阅信息
     public function getSubscribeByCode(Request $request, $code)

app/Jobs/VNet/addUser.php

@@ -17,7 +17,7 @@ class addUser implements ShouldQueue
     use Queueable;
     use SerializesModels;
 
-    private array $data;
+    private $data;
     private $nodes;
 
     public function __construct($userIds, $nodes)

app/Jobs/VNet/editUser.php

@@ -17,7 +17,7 @@ class editUser implements ShouldQueue
     use Queueable;
     use SerializesModels;
 
-    private array $data;
+    private $data;
     private $nodes;
 
     public function __construct(User $user, $nodes)

resources/views/admin/aff/index.blade.php

@@ -11,7 +11,7 @@
             <div class="panel-body">
                 <div class="form-row">
                     <div class="form-group col-lg-2 col-sm-4">
-                        <input type="text" class="form-control" name="email" value="{{Request::get('email')}}" id="email" placeholder="申请账号"/>
+                        <input type="text" class="form-control" name="email" value="{{Request::input('email')}}" id="email" placeholder="申请账号"/>
                     </div>
                     <div class="form-group col-lg-2 col-sm-4">
                         <select class="form-control" name="status" id="status" onChange="Search()">
@@ -107,7 +107,7 @@
     <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js" type="text/javascript"></script>
     <script type="text/javascript">
         $(document).ready(function() {
-            $('#status').val({{Request::get('status')}});
+            $('#status').val({{Request::input('status')}});
         });
 
         //回车检测

resources/views/admin/aff/rebate.blade.php

@@ -11,10 +11,10 @@
             <div class="panel-body">
                 <div class="form-row">
                     <div class="form-group col-lg-4 col-sm-6">
-                        <input type="text" class="form-control" name="invitee_email" id="invitee_email" value="{{Request::get('invitee_email')}}" placeholder="消费者"/>
+                        <input type="text" class="form-control" name="invitee_email" id="invitee_email" value="{{Request::input('invitee_email')}}" placeholder="消费者"/>
                     </div>
                     <div class="form-group col-lg-4 col-sm-6">
-                        <input type="text" class="form-control" name="inviter_email" id="inviter_email" value="{{Request::get('inviter_email')}}" placeholder="邀请人"/>
+                        <input type="text" class="form-control" name="inviter_email" id="inviter_email" value="{{Request::input('inviter_email')}}" placeholder="邀请人"/>
                     </div>
                     <div class="form-group col-lg-2 col-sm-6">
                         <select name="status" id="status" class="form-control" onChange="Search()">
@@ -102,7 +102,7 @@
             type="text/javascript"></script>
     <script type="text/javascript">
         $(document).ready(function() {
-            $('#status').val({{Request::get('status')}});
+            $('#status').val({{Request::input('status')}});
         });
 
         //回车检测

resources/views/admin/article/edit.blade.php

@@ -102,7 +102,7 @@
                     </div>
                     <div class="form-actions text-right">
                         <div class="btn-group">
-                            <a href="{{route('admin.article.index', ['page'=>Request::get('page')])}}" class="btn btn-danger">
+                            <a href="{{route('admin.article.index', ['page'=>Request::input('page')])}}" class="btn btn-danger">
                                 返 回
                             </a>
                             <button type="submit" class="btn btn-success">提 交</button>

resources/views/admin/article/index.blade.php

@@ -45,7 +45,7 @@
                             <td> {{$article->created_at}} </td>
                             <td>
                                 <div class="btn-group">
-                                    <a href="{{route('admin.article.edit',['article'=>$article->id, 'page'=>Request::get('page')])}}" class="btn btn-outline-primary">
+                                    <a href="{{route('admin.article.edit',['article'=>$article->id, 'page'=>Request::input('page')])}}" class="btn btn-outline-primary">
                                         <i class="icon wb-edit"></i></a>
                                     <button class="btn btn-outline-danger" onclick="delArticle('{{route('admin.article.destroy',$article->id)}}')">
                                         <i class="icon wb-close"></i></button>

resources/views/admin/config/system.blade.php

@@ -1761,7 +1761,7 @@
 
         // 生成网站安全码
         function makeWebsiteSecurityCode() {
-            $.get('{{route('createSecurityCode')}}', function(ret) {
+            $.get('{{route('createStr')}}', function(ret) {
                 $('#website_security_code').val(ret);
             });
         }

resources/views/admin/coupon/index.blade.php

@@ -15,7 +15,7 @@
             <div class="panel-body">
                 <div class="form-row">
                     <div class="form-group col-lg-3 col-sm-4">
-                        <input type="text" class="form-control" name="sn" id="sn" value="{{Request::get('sn')}}" placeholder="券码" autocomplete="off"/>
+                        <input type="text" class="form-control" name="sn" id="sn" value="{{Request::input('sn')}}" placeholder="券码" autocomplete="off"/>
                     </div>
                     <div class="form-group col-lg-3 col-sm-4">
                         <select class="form-control" name="type" id="type" onChange="Search()">
@@ -115,9 +115,9 @@
     <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js" type="text/javascript"></script>
     <script type="text/javascript">
         $(document).ready(function() {
-            $('#sn').val({{Request::get('sn')}});
-            $('#type').val({{Request::get('type')}});
-            $('#status').val({{Request::get('status')}});
+            $('#sn').val({{Request::input('sn')}});
+            $('#type').val({{Request::input('type')}});
+            $('#status').val({{Request::input('status')}});
         });
 
         //回车检测

resources/views/admin/logs/callback.blade.php

@@ -14,11 +14,11 @@
                 <div class="form-row">
                     <div class="form-group col-lg-3 col-sm-6">
                         <input type="number" class="form-control" name="out_trade_no" id="out_trade_no"
-                               value="{{Request::get('out_trade_no')}}" placeholder="本地订单号" autocomplete="off"/>
+                               value="{{Request::input('out_trade_no')}}" placeholder="本地订单号" autocomplete="off"/>
                     </div>
                     <div class="form-group col-lg-3 col-sm-6">
                         <input type="number" class="form-control" name="trade_no" id="trade_no"
-                               value="{{Request::get('trade_no')}}" placeholder="外部订单号" autocomplete="off"/>
+                               value="{{Request::input('trade_no')}}" placeholder="外部订单号" autocomplete="off"/>
                     </div>
                     <div class="form-group col-lg-2 col-sm-4">
                         <select class="form-control" name="type" id="type" onChange="Search()">
@@ -92,8 +92,8 @@
     <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js" type="text/javascript"></script>
     <script type="text/javascript">
         $(document).ready(function() {
-            $('#type').val({{Request::get('type')}});
-            $('#trade_status').val({{Request::get('trade_status')}});
+            $('#type').val({{Request::input('type')}});
+            $('#trade_status').val({{Request::input('trade_status')}});
         });
 
         //回车检测

resources/views/admin/logs/notification.blade.php

@@ -12,7 +12,7 @@
                 <div class="form-row">
                     <div class="form-group col-lg-3 col-sm-4">
                         <input type="text" class="form-control" name="email" id="email"
-                               value="{{Request::get('email')}}" placeholder="用户名"/>
+                               value="{{Request::input('email')}}" placeholder="用户名"/>
                     </div>
                     <div class="form-group col-lg-2 col-sm-4">
                         <select class="form-control" name="type" id="type" onChange="Search()">
@@ -84,7 +84,7 @@
             type="text/javascript"></script>
     <script type="text/javascript">
         $(document).ready(function() {
-            $('#type').val({{Request::get('type')}});
+            $('#type').val({{Request::input('type')}});
         });
 
         // 搜索

resources/views/admin/logs/onlineIPMonitor.blade.php

@@ -13,27 +13,27 @@
             <div class="panel-body">
                 <div class="form-row">
                     <div class="form-group col-lg-2 col-sm-2">
-                        <input type="number" class="form-control" name="id" id="id" value="{{Request::get('id')}}"
+                        <input type="number" class="form-control" name="id" id="id" value="{{Request::input('id')}}"
                                placeholder="ID"/>
                     </div>
                     <div class="form-group col-lg-2 col-sm-5">
                         <input type="text" class="form-control" name="email" id="email"
-                               value="{{Request::get('email')}}" placeholder="用户名"/>
+                               value="{{Request::input('email')}}" placeholder="用户名"/>
                     </div>
                     <div class="form-group col-lg-2 col-sm-5">
-                        <input type="text" class="form-control" name="ip" id="ip" value="{{Request::get('ip')}}"
+                        <input type="text" class="form-control" name="ip" id="ip" value="{{Request::input('ip')}}"
                                placeholder="IP"/>
                     </div>
                     <div class="form-group col-lg-2 col-sm-3">
-                        <input type="number" class="form-control" name="port" id="port" value="{{Request::get('port')}}"
+                        <input type="number" class="form-control" name="port" id="port" value="{{Request::input('port')}}"
                                placeholder="端口"/>
                     </div>
                     <div class="form-group col-lg-2 col-sm-5">
                         <select name="nodeId" id="nodeId" class="form-control" onChange="Search()">
-                            <option value="" @if(Request::get('nodeId') == '') selected @endif hidden>选择节点</option>
+                            <option value="" @if(Request::input('nodeId') == '') selected @endif hidden>选择节点</option>
                             @foreach($nodeList as $node)
                                 <option value="{{$node->id}}"
-                                        @if(Request::get('nodeId') == $node->id) selected @endif>{{$node->name}}</option>
+                                        @if(Request::input('nodeId') == $node->id) selected @endif>{{$node->name}}</option>
                             @endforeach
                         </select>
                     </div>

resources/views/admin/logs/order.blade.php

@@ -13,10 +13,10 @@
             <div class="panel-body">
                 <div class="form-row">
                     <div class="form-group col-lg-2 col-sm-6">
-                        <input type="text" class="form-control" name="email" id="email" value="{{Request::get('email')}}" placeholder="用户名"/>
+                        <input type="text" class="form-control" name="email" id="email" value="{{Request::input('email')}}" placeholder="用户名"/>
                     </div>
                     <div class="form-group col-lg-2 col-sm-6">
-                        <input type="number" class="form-control" name="order_sn" id="order_sn" value="{{Request::get('order_sn')}}" placeholder="订单号"/>
+                        <input type="number" class="form-control" name="order_sn" id="order_sn" value="{{Request::input('order_sn')}}" placeholder="订单号"/>
                     </div>
                     <div class="form-group col-lg-6 col-sm-12">
                         <div class="input-group input-daterange" data-plugin="datepicker">
@@ -73,7 +73,7 @@
                                 <label for="type">降序</label>
                             </div>
                             <div class="radio-custom radio-primary radio-inline">
-                                <input type="radio" name="sort" value="1" @if(Request::get('sort') === '1') checked @endif/>
+                                <input type="radio" name="sort" value="1" @if(Request::input('sort') === '1') checked @endif/>
                                 <label for="type">升序</label>
                             </div>
                         </div>
@@ -159,10 +159,10 @@
     <script src="/assets/global/js/Plugin/bootstrap-datepicker.js" type="text/javascript"></script>
     <script type="text/javascript">
         $(document).ready(function() {
-            $('#is_expire').val({{Request::get('is_expire')}});
-            $('#is_coupon').val({{Request::get('is_coupon')}});
-            $('#pay_way').val({{Request::get('pay_way')}});
-            $('#status').val({{Request::get('status')}});
+            $('#is_expire').val({{Request::input('is_expire')}});
+            $('#is_coupon').val({{Request::input('is_coupon')}});
+            $('#pay_way').val({{Request::input('pay_way')}});
+            $('#status').val({{Request::input('status')}});
         });
 
         // 有效期

resources/views/admin/logs/traffic.blade.php

@@ -13,19 +13,19 @@
             <div class="panel-body">
                 <div class="form-row">
                     <div class="form-group col-lg-2 col-sm-4">
-                        <input type="number" class="form-control" name="user_id" id="user_id" value="{{Request::get('user_id')}}" placeholder="用户ID"/>
+                        <input type="number" class="form-control" name="user_id" id="user_id" value="{{Request::input('user_id')}}" placeholder="用户ID"/>
                     </div>
                     <div class="form-group col-lg-3 col-sm-8">
-                        <input type="text" class="form-control" name="email" id="email" value="{{Request::get('email')}}" placeholder="用户名"/>
+                        <input type="text" class="form-control" name="email" id="email" value="{{Request::input('email')}}" placeholder="用户名"/>
                     </div>
                     <div class="form-group col-lg-2 col-sm-4">
-                        <input type="number" class="form-control" name="port" id="port" value="{{Request::get('port')}}" placeholder="用户端口"/>
+                        <input type="number" class="form-control" name="port" id="port" value="{{Request::input('port')}}" placeholder="用户端口"/>
                     </div>
                     <div class="form-group col-lg-3 col-sm-8">
                         <select class="form-control" name="nodeId" id="nodeId" onChange="Search()">
-                            <option value="" @if(Request::get('nodeId') == '') selected @endif hidden>选择节点</option>
+                            <option value="" @if(Request::input('nodeId') == '') selected @endif hidden>选择节点</option>
                             @foreach($nodeList as $node)
-                                <option value="{{$node->id}}" @if(Request::get('nodeId') == $node->id) selected @endif>
+                                <option value="{{$node->id}}" @if(Request::input('nodeId') == $node->id) selected @endif>
                                     {{$node->name}}
                                 </option>
                             @endforeach
@@ -38,11 +38,11 @@
                                     <i class="icon wb-calendar" aria-hidden="true"></i>
                                 </span>
                             </div>
-                            <input type="text" class="form-control" name="start" id="start" value="{{Request::get('startTime')}}" placeholder="{{date("Y-m-d")}}"/>
+                            <input type="text" class="form-control" name="start" id="start" value="{{Request::input('startTime')}}" placeholder="{{date("Y-m-d")}}"/>
                             <div class="input-group-prepend">
                                 <span class="input-group-text">至</span>
                             </div>
-                            <input type="text" class="form-control" name="end" id="end" value="{{Request::get('endTime')}}" placeholder="{{date("Y-m-d",strtotime("+1 month"))}}"/>
+                            <input type="text" class="form-control" name="end" id="end" value="{{Request::input('endTime')}}" placeholder="{{date("Y-m-d",strtotime("+1 month"))}}"/>
                         </div>
                     </div>
                     <div class="form-group col-lg-2 col-sm-4 btn-group">

resources/views/admin/logs/userBanHistory.blade.php

@@ -11,7 +11,7 @@
             <div class="panel-body">
                 <div class="form-row">
                     <div class="form-group col-lg-3 col-sm-6">
-                        <input type="text" class="form-control" name="email" id="email" value="{{Request::get('email')}}" placeholder="用户名"/>
+                        <input type="text" class="form-control" name="email" id="email" value="{{Request::input('email')}}" placeholder="用户名"/>
                     </div>
                     <div class="form-group col-lg-2 col-sm-6 btn-group">
                         <button class="btn btn-primary" onclick="Search()">搜 索</button>

resources/views/admin/logs/userCreditHistory.blade.php

@@ -11,7 +11,7 @@
             <div class="panel-body">
                 <div class="form-row">
                     <div class="form-group col-lg-3 col-sm-6">
-                        <input type="text" class="form-control" name="email" id="email" value="{{Request::get('email')}}" placeholder="用户名"/>
+                        <input type="text" class="form-control" name="email" id="email" value="{{Request::input('email')}}" placeholder="用户名"/>
                     </div>
                     <div class="form-group col-lg-2 col-sm-6 btn-group">
                         <button class="btn btn-primary" onclick="Search()">搜 索</button>

resources/views/admin/logs/userOnlineIP.blade.php

@@ -13,23 +13,23 @@
             <div class="panel-body">
                 <div class="form-row">
                     <div class="form-group col-lg-1 col-sm-4">
-                        <input type="number" class="form-control" id="id" name="id" value="{{Request::get('id')}}"
+                        <input type="number" class="form-control" id="id" name="id" value="{{Request::input('id')}}"
                                placeholder="ID"/>
                     </div>
                     <div class="form-group col-lg-3 col-sm-8">
                         <input type="text" class="form-control" name="email" id="email"
-                               value="{{Request::get('email')}}" placeholder="用户名"/>
+                               value="{{Request::input('email')}}" placeholder="用户名"/>
                     </div>
                     <div class="form-group col-lg-2 col-sm-6">
                         <input type="text" class="form-control" name="wechat" id="wechat"
-                               value="{{Request::get('wechat')}}" placeholder="微信"/>
+                               value="{{Request::input('wechat')}}" placeholder="微信"/>
                     </div>
                     <div class="form-group col-lg-2 col-sm-6">
-                        <input type="number" class="form-control" name="qq" id="qq" value="{{Request::get('qq')}}"
+                        <input type="number" class="form-control" name="qq" id="qq" value="{{Request::input('qq')}}"
                                placeholder="QQ"/>
                     </div>
                     <div class="form-group col-lg-1 col-sm-6">
-                        <input type="number" class="form-control" name="port" id="port" value="{{Request::get('port')}}"
+                        <input type="number" class="form-control" name="port" id="port" value="{{Request::input('port')}}"
                                placeholder="端口"/>
                     </div>
                     <div class="form-group col-lg-2 col-sm-6 btn-group">

resources/views/admin/logs/userTraffic.blade.php

@@ -11,7 +11,7 @@
             <div class="panel-body">
                 <div class="form-row">
                     <div class="form-group col-lg-4 col-sm-6">
-                        <input type="text" class="form-control" name="email" id="email" value="{{Request::get('email')}}" placeholder="用户名"/>
+                        <input type="text" class="form-control" name="email" id="email" value="{{Request::input('email')}}" placeholder="用户名"/>
                     </div>
                     <div class="form-group col-lg-2 col-sm-6 btn-group">
                         <button class="btn btn-primary" onclick="Search()">搜 索</button>

resources/views/admin/marketing/emailList.blade.php

@@ -71,7 +71,7 @@
     <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js" type="text/javascript"></script>
     <script type="text/javascript">
         $(document).ready(function() {
-            $('#status').val({{Request::get('status')}});
+            $('#status').val({{Request::input('status')}});
         });
 
         // 发送邮件

resources/views/admin/marketing/pushList.blade.php

@@ -123,7 +123,7 @@
     <script src="/assets/global/vendor/to-markdown/to-markdown.js" type="text/javascript"></script>
     <script type="text/javascript">
         $(document).ready(function() {
-            $('#status').val({{Request::get('status')}});
+            $('#status').val({{Request::input('status')}});
         });
 
         // 发送通道消息

resources/views/admin/node/index.blade.php

@@ -80,7 +80,7 @@
                                         <i class="icon wb-wrench" aria-hidden="true"></i>
                                     </button>
                                     <div class="dropdown-menu" role="menu">
-                                        <a class="dropdown-item" href="{{route('admin.node.edit', [$node->id, 'page' => Request::get('page', 1)])}}" role="menuitem">
+                                        <a class="dropdown-item" href="{{route('admin.node.edit', [$node->id, 'page' => Request::input('page', 1)])}}" role="menuitem">
                                             <i class="icon wb-edit" aria-hidden="true"></i> 编辑
                                         </a>
                                         <a class="dropdown-item" href="javascript:delNode('{{$node->id}}', '{{$node->name}}')" role="menuitem">

resources/views/admin/node/ping.blade.php

@@ -12,9 +12,9 @@
                 <div class="form-row">
                     <div class="form-group col-lg-2 col-sm-5">
                         <select name="nodeId" id="nodeId" class="form-control" onChange="Search()">
-                            <option value="" @if(Request::get('nodeId') === '') selected @endif hidden>选择节点</option>
+                            <option value="" @if(Request::input('nodeId') === '') selected @endif hidden>选择节点</option>
                             @foreach($nodeList as $node)
-                                <option value="{{$node->id}}" @if((int) Request::get('nodeId') === $node->id) selected @endif>
+                                <option value="{{$node->id}}" @if((int) Request::input('nodeId') === $node->id) selected @endif>
                                     {{$node->name}}
                                 </option>
                             @endforeach

resources/views/admin/rule/index.blade.php

@@ -132,7 +132,7 @@
     <script src="/assets/global/js/Plugin/bootstrap-select.js" type="text/javascript"></script>
     <script type="text/javascript">
         $(document).ready(function() {
-            $('#type').selectpicker('val', {{Request::get('type')}});
+            $('#type').selectpicker('val', {{Request::input('type')}});
         });
 
         // 添加规则

resources/views/admin/rule/log.blade.php

@@ -16,25 +16,25 @@
             <div class="panel-body">
                 <div class="form-row">
                     <div class="form-group col-xxl-1 col-lg-2 col-md-1 col-sm-4">
-                        <input type="number" class="form-control" name="uid" value="{{Request::get('uid')}}" id="uid" placeholder="用户ID"/>
+                        <input type="number" class="form-control" name="uid" value="{{Request::input('uid')}}" id="uid" placeholder="用户ID"/>
                     </div>
                     <div class="form-group col-xxl-2 col-lg-3 col-md-3 col-sm-4">
                         <input type="text" class="form-control" id="email" name="email"
-                               value="{{Request::get('email')}}" placeholder="用户名"/>
+                               value="{{Request::input('email')}}" placeholder="用户名"/>
                     </div>
                     <div class="form-group col-xxl-1 col-lg-3 col-md-3 col-4">
                         <select class="form-control" id="node_id" name="node_id" onChange="Search()">
-                            <option value="" @if(Request::get('node_id') == '') selected @endif>节点</option>
+                            <option value="" @if(Request::input('node_id') == '') selected @endif>节点</option>
                             @foreach($nodeList as $node)
-                                <option value="{{$node->id}}" @if(Request::get('node_id') == $node->id) selected @endif>{{$node->id . ' - ' . $node->name}}</option>
+                                <option value="{{$node->id}}" @if(Request::input('node_id') == $node->id) selected @endif>{{$node->id . ' - ' . $node->name}}</option>
                             @endforeach
                         </select>
                     </div>
                     <div class="form-group col-xxl-1 col-lg-3 col-md-3 col-4">
                         <select class="form-control" id="rule_id" name="rule_id" onChange="Search()">
-                            <option value="" @if(Request::get('rule_id') == '') selected @endif>规则</option>
+                            <option value="" @if(Request::input('rule_id') == '') selected @endif>规则</option>
                             @foreach($ruleList as $rule)
-                                <option value="{{$rule->id}}" @if(Request::get('rule_id') == $rule->id) selected @endif>{{$rule->name}}</option>
+                                <option value="{{$rule->id}}" @if(Request::input('rule_id') == $rule->id) selected @endif>{{$rule->name}}</option>
                             @endforeach
                         </select>
                     </div>

resources/views/admin/shop/index.blade.php

@@ -125,8 +125,8 @@
             type="text/javascript"></script>
     <script type="text/javascript">
         $(document).ready(function() {
-            $('#type').val({{Request::get('type')}});
-            $('#status').val({{Request::get('status')}});
+            $('#type').val({{Request::input('type')}});
+            $('#status').val({{Request::input('status')}});
         });
 
         // 搜索

resources/views/admin/subscribe/index.blade.php

@@ -12,11 +12,11 @@
                 <div class="form-row">
                     <div class="form-group col-lg-2 col-sm-6">
                         <input type="number" class="form-control" name="user_id" id="user_id"
-                               value="{{Request::get('user_id')}}" placeholder="ID"/>
+                               value="{{Request::input('user_id')}}" placeholder="ID"/>
                     </div>
                     <div class="form-group col-lg-4 col-sm-6">
                         <input type="text" class="form-control" name="email" id="email"
-                               value="{{Request::get('email')}}" placeholder="用户名"/>
+                               value="{{Request::input('email')}}" placeholder="用户名"/>
                     </div>
                     <div class="form-group col-lg-3 col-sm-6">
                         <select name="status" id="status" class="form-control" onChange="Search()">
@@ -92,7 +92,7 @@
     <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js" type="text/javascript"></script>
     <script type="text/javascript">
         $(document).ready(function() {
-            $('#status').val({{Request::get('status')}});
+            $('#status').val({{Request::input('status')}});
         });
 
         //回车检测

resources/views/admin/ticket/index.blade.php

@@ -18,7 +18,7 @@
             <div class="panel-body">
                 <div class="form-row">
                     <div class="form-group col-lg-3 col-sm-6">
-                        <input type="text" class="form-control" name="email" id="email" value="{{Request::get('email')}}" placeholder="用户名" autocomplete="off"/>
+                        <input type="text" class="form-control" name="email" id="email" value="{{Request::input('email')}}" placeholder="用户名" autocomplete="off"/>
                     </div>
                     <div class="form-group col-lg-2 col-sm-6 btn-group">
                         <button class="btn btn-primary" onclick="Search()">搜 索</button>

resources/views/admin/user/index.blade.php

@@ -25,19 +25,35 @@
             <div class="panel-body">
                 <div class="form-row">
                     <div class="form-group col-xxl-1 col-lg-1 col-md-1 col-sm-4">
-                        <input type="number" class="form-control" id="id" name="id" value="{{Request::get('id')}}" placeholder="ID"/>
+                        <input type="number" class="form-control" id="id" name="id" value="{{Request::input('id')}}" placeholder="ID"/>
                     </div>
                     <div class="form-group col-xxl-2 col-lg-3 col-md-3 col-sm-4">
-                        <input type="text" class="form-control" id="email" name="email" value="{{Request::get('email')}}" placeholder="用户名"/>
+                        <input type="text" class="form-control" id="email" name="email" value="{{Request::input('email')}}" placeholder="用户名"/>
                     </div>
                     <div class="form-group col-xxl-2 col-lg-3 col-md-3 col-sm-4">
-                        <input type="text" class="form-control" id="wechat" name="wechat" value="{{Request::get('wechat')}}" placeholder="微信"/>
+                        <input type="text" class="form-control" id="wechat" name="wechat" value="{{Request::input('wechat')}}" placeholder="微信"/>
                     </div>
                     <div class="form-group col-xxl-2 col-lg-3 col-md-3 col-sm-4">
-                        <input type="number" class="form-control" id="qq" name="qq" value="{{Request::get('qq')}}" placeholder="QQ"/>
+                        <input type="number" class="form-control" id="qq" name="qq" value="{{Request::input('qq')}}" placeholder="QQ"/>
                     </div>
                     <div class="form-group col-xxl-1 col-lg-2 col-md-2 col-sm-4">
-                        <input type="number" class="form-control" id="port" name="port" value="{{Request::get('port')}}" placeholder="端口"/>
+                        <input type="number" class="form-control" id="port" name="port" value="{{Request::input('port')}}" placeholder="端口"/>
+                    </div>
+                    <div class="form-group col-xxl-1 col-lg-3 col-md-3 col-4">
+                        <select class="form-control" id="group" name="group" onChange="Search()">
+                            <option value="" hidden>用户分组</option>
+                            @foreach($userGroups as $key => $group)
+                                <option value="{{$key}}">{{$group}}</option>
+                            @endforeach
+                        </select>
+                    </div>
+                    <div class="form-group col-xxl-1 col-lg-3 col-md-3 col-4">
+                        <select class="form-control" id="level" name="level" onChange="Search()">
+                            <option value="" hidden>用户分组</option>
+                            @foreach($levels as $key => $level)
+                                <option value="{{$key}}">{{$level}}</option>
+                            @endforeach
+                        </select>
                     </div>
                     <div class="form-group col-xxl-1 col-lg-3 col-md-3 col-4">
                         <select class="form-control" id="status" name="status" onChange="Search()">
@@ -91,11 +107,11 @@
                             <td> {{$user->t? date('Y-m-d H:i', $user->t): '未使用'}} </td>
 
                             <td>
-                                @if ($user->expireWarning == '-1')
+                                @if ($user->expireWarning === -1)
                                     <span class="badge badge-lg badge-danger"> {{$user->expired_at}} </span>
-                                @elseif ($user->expireWarning == '0')
+                                @elseif ($user->expireWarning === 0)
                                     <span class="badge badge-lg badge-warning"> {{$user->expired_at}} </span>
-                                @elseif ($user->expireWarning == '1')
+                                @elseif ($user->expireWarning === 1)
                                     <span class="badge badge-lg badge-default"> {{$user->expired_at}} </span>
                                 @else
                                     {{$user->expired_at}}
@@ -177,9 +193,11 @@
     <script src="/assets/custom/Plugin/clipboardjs/clipboard.min.js" type="text/javascript"></script>
     <script type="text/javascript">
         $(document).ready(function() {
-            $('#pay_way').val({{Request::get('pay_way')}});
-            $('#status').val({{Request::get('status')}});
-            $('#enable').val({{Request::get('enable')}});
+            $('#group').val({{Request::input('group')}});
+            $('#level').val({{Request::input('level')}});
+            $('#pay_way').val({{Request::input('pay_way')}});
+            $('#status').val({{Request::input('status')}});
+            $('#enable').val({{Request::input('enable')}});
         });
 
         // 批量生成账号
@@ -218,10 +236,9 @@
 
         // 搜索
         function Search() {
-            window.location.href = '{{route('admin.user.index')}}' + '?id=' + $('#id').val() + '&email=' +
-                $('#email').val() +
-                '&wechat=' + $('#wechat').val() + '&qq=' + $('#qq').val() + '&port=' + $('#port').val() + '&status=' +
-                $('#status option:selected').val() + '&enable=' + $('#enable option:selected').val();
+            window.location.href = '{{route('admin.user.index')}}' + '?id=' + $('#id').val() + '&email=' + $('#email').val() + '&wechat=' +
+                $('#wechat').val() + '&qq=' + $('#qq').val() + '&port=' + $('#port').val() + '&group=' + $('#group option:selected').val() + '&level='
+                + $('#level option:selected').val() + '&status=' + $('#status option:selected').val() + '&enable=' + $('#enable option:selected').val();
         }
 
         // 删除账号

resources/views/admin/user/info.blade.php

@@ -229,7 +229,7 @@
                                 <label class="col-md-2 col-sm-3 col-form-label" for="method">加密方式</label>
                                 <div class="col-xl-5 col-sm-8">
                                     <select class="form-control" name="method" id="method" data-plugin="selectpicker" data-style="btn-outline btn-primary">
-                                        @foreach ($methodList as $method)
+                                        @foreach (Helpers::methodList() as $method)
                                             <option value="{{$method->name}}">{{$method->name}}</option>
                                         @endforeach
                                     </select>
@@ -268,7 +268,7 @@
                                 <label class="col-md-2 col-sm-3 col-form-label" for="protocol">协议</label>
                                 <div class="col-xl-5 col-sm-8">
                                     <select class="form-control" name="protocol" id="protocol" data-plugin="selectpicker" data-style="btn-outline btn-primary">
-                                        @foreach ($protocolList as $protocol)
+                                        @foreach (Helpers::protocolList() as $protocol)
                                             <option value="{{$protocol->name}}"
                                                     @if($protocol->is_default) selected @endif>{{$protocol->name}}</option>
                                         @endforeach
@@ -279,7 +279,7 @@
                                 <label class="col-md-2 col-sm-3 col-form-label" for="obfs">混淆</label>
                                 <div class="col-xl-5 col-sm-8">
                                     <select data-plugin="selectpicker" data-style="btn-outline btn-primary" class="form-control" name="obfs" id="obfs">
-                                        @foreach ($obfsList as $obfs)
+                                        @foreach (Helpers::obfsList() as $obfs)
                                             <option value="{{$obfs->name}}"
                                                     @if($obfs->is_default) selected @endif>{{$obfs->name}}</option>
                                         @endforeach
@@ -517,21 +517,21 @@
 
         // 生成随机端口
         function makePort() {
-            $.get('{{route('admin.user.getPort')}}', function(ret) {
+            $.get('{{route('admin.getPort')}}', function(ret) {
                 $('#port').val(ret);
             });
         }
 
         // 生成UUID
         function makeUUID() {
-            $.get('{{route('generateUUID')}}', function(ret) {
+            $.get('{{route('createUUID')}}', function(ret) {
                 $('#uuid').val(ret);
             });
         }
 
         // 生成随机密码
         function makePasswd() {
-            $.get('{{route('generateString')}}', function(ret) {
+            $.get('{{route('createStr')}}', function(ret) {
                 $('#passwd').val(ret);
             });
         }

resources/views/auth/activeUser.blade.php

@@ -14,7 +14,7 @@
                 <span class="form-title">{{trans('auth.active_account')}}</span>
             </div>
             <div class="form-group form-material floating" data-plugin="formMaterial">
-                <input type="email" class="form-control" name="email" value="{{Request::get('email')}}" required/>
+                <input type="email" class="form-control" name="email" value="{{Request::input('email')}}" required/>
                 <label class="floating-label" for="email">{{trans('auth.email')}}</label>
             </div>
         @else

resources/views/auth/register.blade.php

@@ -11,11 +11,11 @@
                 <x-alert type="danger" :message="$errors->all()"/>
             @endif
             @csrf
-            <input type="hidden" name="register_token" value="{{Session::get('register_token')}}"/>
-            <input type="hidden" name="aff" value="{{Session::get('register_aff')}}"/>
+            <input type="hidden" name="register_token" value="{{Session::input('register_token')}}"/>
+            <input type="hidden" name="aff" value="{{Session::input('register_aff')}}"/>
             <div class="form-group form-material floating" data-plugin="formMaterial">
                 <input type="text" class="form-control" name="username"
-                       value="{{Request::old('username') ? : Request::get('username')}}" required/>
+                       value="{{Request::old('username') ? : Request::input('username')}}" required/>
                 <label class="floating-label" for="username">{{trans('auth.username')}}</label>
             </div>
             <div class="form-group form-material floating" data-plugin="formMaterial">
@@ -66,7 +66,7 @@
             @if(sysConfig('is_invite_register'))
                 <div class="form-group form-material floating" data-plugin="formMaterial">
                     <input type="password" class="form-control" name="code"
-                           value="{{Request::old('code') ? : Request::get('code')}}"
+                           value="{{Request::old('code') ? : Request::input('code')}}"
                            @if(sysConfig('is_invite_register') == 2) required @endif/>
                     <label class="floating-label"
                            for="code">{{trans('auth.code')}}@if(sysConfig('is_invite_register') == 1)

routes/web.php

@@ -1,14 +1,14 @@
 <?php
 
-use App\Components\Helpers;
-
 Route::get('s/{code}', 'User\SubscribeController@getSubscribeByCode'); // 节点订阅地址
 
+// 支付回调相关
 Route::prefix('callback')->group(function () {
     Route::get('checkout', 'Gateway\PayPal@getCheckout');
     Route::get('notify', 'PaymentController@notify'); //支付回调
-}); // 支付回调相关
+});
 
+// 登录相关
 Route::middleware(['isForbidden', 'affiliate', 'isMaintenance'])->group(function () {
     Route::get('lang/{locale}', 'AuthController@switchLang')->name('lang'); // 语言切换
     Route::any('login', 'AuthController@login')->middleware('isSecurity')->name('login'); // 登录
@@ -20,18 +20,12 @@ Route::middleware(['isForbidden', 'affiliate', 'isMaintenance'])->group(function
     Route::get('active/{token}', 'AuthController@active')->name('activeAccount'); // 激活账号
     Route::post('send', 'AuthController@sendCode')->name('sendVerificationCode'); // 发送注册验证码
     Route::get('free', 'AuthController@free')->name('freeInvitationCode'); // 免费邀请码
-    Route::get('createPasswd', function () {
-        return Str::random();
-    })->name('generateString'); // 生成随机密码
-    Route::get('createUUID', function () {
-        return Str::uuid();
-    })->name('generateUUID'); // 生成UUID
-    Route::get('createSecurityCode', function () {
-        return strtolower(Str::random(8));
-    })->name('createSecurityCode'); // 生成网站安全码
-}); // 登录相关
+    Route::get('create/string', '\Illuminate\Support\Str@random')->name('createStr'); // 生成随机密码
+    Route::get('create/uuid', '\Illuminate\Support\Str@uuid')->name('createUUID'); // 生成UUID
+});
 Route::any('admin/login', 'AuthController@login')->middleware('isForbidden', 'isSecurity'); // 管理登录
 
+// 用户相关
 Route::middleware(['isForbidden', 'isMaintenance', 'isLogin'])->group(function () {
     Route::get('/', 'UserController@index')->name('home'); // 用户首页
     Route::get('article', 'UserController@article'); // 文章详情
@@ -67,8 +61,9 @@ Route::middleware(['isForbidden', 'isMaintenance', 'isLogin'])->group(function (
         Route::get('getStatus', 'PaymentController@getStatus'); // 获取支付单状态
         Route::get('{trade_no}', 'PaymentController@detail'); // 支付单详情
     });
-}); // 用户相关
+});
 
+// 管理相关
 Route::middleware(['isForbidden', 'isAdminLogin', 'isAdmin'])->prefix('admin')->name('admin.')->group(function () {
     Route::get('/', 'AdminController@index')->name('index'); // 后台首页
     Route::any('profile', 'AdminController@profile')->name('profile'); // 修改个人信息
@@ -76,6 +71,7 @@ Route::middleware(['isForbidden', 'isAdminLogin', 'isAdmin'])->prefix('admin')->
     Route::get('invite', 'AdminController@inviteList')->name('invite'); // 邀请码列表
     Route::post('invite', 'AdminController@makeInvite')->name('invite.create'); // 生成邀请码
     Route::get('Invite/export', 'AdminController@exportInvite')->name('invite.export'); // 导出邀请码
+    Route::get('getPort', 'AdminController@getPort')->name('getPort'); // 生成端口
 
     Route::namespace('Admin')->group(function () {
         Route::resource('user', 'UserController')->except('show');
@@ -85,7 +81,6 @@ Route::middleware(['isForbidden', 'isAdminLogin', 'isAdmin'])->prefix('admin')->
             Route::get('monitor/{id}', 'LogsController@userTrafficMonitor')->name('monitor'); // 用户流量监控
             Route::get("online/{id}", "LogsController@onlineIPMonitor")->name('online'); // 在线IP监控
             Route::post("switch", "UserController@switchToUser")->name('switch'); // 转换成某个用户的身份
-            Route::get('getPort', function () { return Helpers::getPort(); })->name('getPort'); // 生成端口
             Route::post('updateCredit', 'UserController@handleUserCredit')->name('updateCredit'); // 用户余额充值
             Route::post('reset', 'UserController@resetTraffic')->name('reset'); // 重置用户流量
             Route::get('export/{id}', 'UserController@export')->name('export'); // 导出(查看)配置信息
@@ -184,4 +179,4 @@ Route::middleware(['isForbidden', 'isAdminLogin', 'isAdmin'])->prefix('admin')->
     });
 
     Route::get('logs', '\Rap2hpoutre\LaravelLogViewer\LogViewerController@index')->name('log.viewer'); // 系统运行日志
-}); // 管理相关
+});