ZWYGDNZ · ZWYGDNZ · Apr 16, 2019 · Jan 9, 2019 · Jan 30, 2019 · Jan 30, 2019
diff --git a/app/Components/Helpers.php b/app/Components/Helpers.php
@@ -141,7 +141,6 @@ public static function addEmailLog($address, $title, $content, $status = 1, $err
         $log->content = $content;
         $log->status = $status;
         $log->error = $error;
-        $log->created_at = date('Y-m-d H:i:s');
 
         return $log->save();
     }

diff --git a/app/Components/ServerChan.php b/app/Components/ServerChan.php
@@ -52,7 +52,6 @@ private static function addLog($title, $content, $status = 1, $error = '')
         $log->content = $content;
         $log->status = $status;
         $log->error = $error;
-        $log->created_at = date('Y-m-d H:i:s');
 
         return $log->save();
     }

diff --git a/app/Console/Commands/AutoClearLog.php b/app/Console/Commands/AutoClearLog.php
@@ -10,6 +10,7 @@
 use App\Http\Models\SsNodeTrafficDaily;
 use App\Http\Models\UserBanLog;
 use App\Http\Models\UserLoginLog;
+use App\Http\Models\UserSubscribeLog;
 use App\Http\Models\UserTrafficDaily;
 use App\Http\Models\UserTrafficLog;
 use App\Http\Models\UserTrafficHourly;
@@ -75,6 +76,9 @@ private function clearLog()
 
         // 自动清除3个月以前用户登陆日志
         UserLoginLog::query()->where('created_at', '<=', date('Y-m-d H:i:s', strtotime("-3 month")))->delete();
+
+        // 自动清除1个月前的用户订阅记录
+        UserSubscribeLog::query()->where('request_time', '<=', date('Y-m-d H:i:s', strtotime("-1 month")))->delete();
     }
 
 }
diff --git a/app/Console/Commands/upgradeUserSpeedLimit.php b/app/Console/Commands/upgradeUserSpeedLimit.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Http\Models\User;
+use Illuminate\Console\Command;
+use Log;
+
+class upgradeUserSpeedLimit extends Command
+{
+    protected $signature = 'upgradeUserSpeedLimit';
+    protected $description = '升级用户限速字段，重置初始值';
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    public function handle()
+    {
+        Log::info('----------------------------【重置用户限速字段】开始----------------------------');
+
+        $userList = User::query()->get();
+        foreach ($userList as $user) {
+            $data = [
+                'speed_limit_per_con'  => 10737418240,
+                'speed_limit_per_user' => 10737418240
+            ];
+
+            User::query()->where('id', $user->id)->update($data);
+            Log::info('---用户[ID：' . $user->id . ' - ' . $user->username . ']的限速字段值被重置为10G---');
+        }
+
+        Log::info('----------------------------【重置用户限速字段】结束----------------------------');
+    }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -26,6 +26,8 @@ class Kernel extends ConsoleKernel
         \App\Console\Commands\UserExpireAutoWarning::class,
         \App\Console\Commands\UserTrafficAutoWarning::class,
         \App\Console\Commands\upgradeUserPassword::class,
+        \App\Console\Commands\upgradeUserSpeedLimit::class,
+        \App\Console\Commands\upgradeUserSubscribe::class,
         \App\Console\Commands\upgradeUserVmessId::class,
         \App\Console\Commands\AutoReportNode::class,
     ];

diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
@@ -2373,22 +2373,16 @@ public function userRebateList(Request $request)
     public function userOnlineIPList(Request $request)
     {
         $username = trim($request->get('username'));
-        $status = $request->get('status');
         $port = intval($request->get('port'));
         $wechat = trim($request->get('wechat'));
         $qq = trim($request->get('qq'));
-        $enable = intval($request->get('enable'));
 
-        $query = User::query();
+        $query = User::query()->where('status', '>=', 0)->where('enable', 1);
 
         if ($username) {
             $query->where('username', 'like', '%' . $username . '%');
         }
 
-        if ($status != '') {
-            $query->where('status', intval($status));
-        }
-
         if (!empty($wechat)) {
             $query->where('wechat', 'like', '%' . $wechat . '%');
         }
@@ -2397,19 +2391,15 @@ public function userOnlineIPList(Request $request)
             $query->where('qq', 'like', '%' . $qq . '%');
         }
 
-        if (!empty($port)) {
-            $query->where('port', intval($port));
-        }
-
-        if ($enable != '') {
-            $query->where('enable', intval($enable));
+        if ($port) {
+            $query->where('port', $port);
         }
 
         $userList = $query->paginate(15)->appends($request->except('page'));
         if (!$userList->isEmpty()) {
             foreach ($userList as &$user) {
-                // 最近10条在线IP记录，如果后端设置为60秒上报一次，则为10分钟内的在线IP
-                $user->onlineIPList = SsNodeIp::query()->with(['node', 'user'])->where('type', 'tcp')->where('port', $user->port)->where('created_at', '>=', strtotime("-10 minutes"))->orderBy('id', 'desc')->limit(10)->get();
+                // 最近5条在线IP记录，如果后端设置为60秒上报一次，则为10分钟内的在线IP
+                $user->onlineIPList = SsNodeIp::query()->with(['node'])->where('type', 'tcp')->where('port', $user->port)->where('created_at', '>=', strtotime("-10 minutes"))->orderBy('id', 'desc')->limit(5)->get();
             }
         }
 
@@ -2522,11 +2512,12 @@ public function onlineIPMonitor(Request $request)
         $username = trim($request->get('username'));
         $port = intval($request->get('port'));
         $nodeId = intval($request->get('nodeId'));
+        $userId = intval($request->get('id'));
 
         $query = SsNodeIp::query()->with(['node', 'user'])->where('type', 'tcp')->where('created_at', '>=', strtotime("-120 seconds"));
 
         if ($ip) {
-            $query->where('ip', 'like', '%' . $ip . '%');
+            $query->where('ip', $ip);
         }
 
         if ($username) {
@@ -2547,6 +2538,12 @@ public function onlineIPMonitor(Request $request)
             });
         }
 
+        if ($userId) {
+            $query->whereHas('user', function ($q) use ($userId) {
+                $q->where('id', $userId);
+            });
+        }
+
         $list = $query->groupBy('port')->orderBy('id', 'desc')->paginate(20)->appends($request->except('page'));
 
         foreach ($list as $vo) {

diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
@@ -77,15 +77,15 @@ public function login(Request $request)
                 if (Auth::user()->status < 0) {
                     Session::flash('errorMsg', '账号已禁用');
 
-                    Auth::logout(); // 强制退出会话，因为Auth::attempt的时候会产生会话
+                    Auth::logout(); // 强制销毁会话，因为Auth::attempt的时候会产生会话
 
                     return Redirect::back()->withInput();
                 }
 
                 if (Auth::user()->status == 0 && self::$systemConfig['is_active_register']) {
                     Session::flash('errorMsg', '账号未激活，请点击<a href="/activeUser?username=' . Auth::user()->username . '" target="_blank"><span style="color:#000">【激活账号】</span></a>');
 
-                    Auth::logout(); // 强制退出会话，因为Auth::attempt的时候会产生会话
+                    Auth::logout(); // 强制销毁会话，因为Auth::attempt的时候会产生会话
 
                     return Redirect::back()->withInput();
                 }

diff --git a/app/Http/Models/EmailLog.php b/app/Http/Models/EmailLog.php
@@ -16,6 +16,5 @@ class EmailLog extends Model
 {
     protected $table = 'email_log';
     protected $primaryKey = 'id';
-    public $timestamps = false;
 
 }
diff --git a/queue.sh b/queue.sh
@@ -1,2 +1,9 @@
 #!/bin/bash
-nohup php artisan queue:work database --queue=default --timeout=60 --sleep=5 --tries=3 >> ./storage/logs/queue.log 2>&1 &
+ps -ef | grep queue:work | grep -v grep
+if [ $? -ne 0 ]
+then
+    echo "start queue process successfully....."
+    nohup php artisan queue:work database --queue=default --timeout=60 --sleep=5 --tries=3 >> ./queue.log 2>&1 &
+else
+    echo "queue is running....."
+fi
diff --git a/resources/views/admin/addUser.blade.php b/resources/views/admin/addUser.blade.php
@@ -280,18 +280,20 @@
                                                 <label for="speed_limit_per_con" class="col-md-3 control-label">单连接限速</label>
                                                 <div class="col-md-8">
                                                     <div class="input-group">
-                                                        <input type="text" class="form-control" name="speed_limit_per_con" value="204800" id="speed_limit_per_con" autocomplete="off" />
-                                                        <span class="input-group-addon">KB</span>
+                                                        <input type="text" class="form-control" name="speed_limit_per_con" value="10737418240" id="speed_limit_per_con" autocomplete="off" />
+                                                        <span class="input-group-addon">Byte</span>
                                                     </div>
+                                                    <span class="help-block"> 为 0 时不限速 </span>
                                                 </div>
                                             </div>
                                             <div class="form-group">
                                                 <label for="speed_limit_per_user" class="col-md-3 control-label">单用户限速</label>
                                                 <div class="col-md-8">
                                                     <div class="input-group">
-                                                        <input type="text" class="form-control" name="speed_limit_per_user" value="204800" id="speed_limit_per_user" autocomplete="off" />
-                                                        <span class="input-group-addon">KB</span>
+                                                        <input type="text" class="form-control" name="speed_limit_per_user" value="10737418240" id="speed_limit_per_user" autocomplete="off" />
+                                                        <span class="input-group-addon">Byte</span>
                                                     </div>
+                                                    <span class="help-block"> 为 0 时不限速 </span>
                                                 </div>
                                             </div>
                                             <hr>

diff --git a/resources/views/admin/config.blade.php b/resources/views/admin/config.blade.php
@@ -36,8 +36,8 @@
                                         <button class="btn sbold blue" data-toggle="modal" data-target="#add_config_modal"> 新增 <i class="fa fa-plus"></i> </button>
                                     </div>
                                 </div>
-                                <div class="table-scrollable">
-                                    <table class="table table-striped table-bordered table-hover table-checkable order-column">
+                                <div class="table-scrollable table-scrollable-borderless">
+                                    <table class="table table-hover table-light table-checkable">
                                         <thead>
                                             <tr>
                                                 <th style="width: 50%;"> 名称 </th>
@@ -74,8 +74,8 @@
                                         <button class="btn sbold blue" data-toggle="modal" data-target="#add_config_modal"> 新增 <i class="fa fa-plus"></i> </button>
                                     </div>
                                 </div>
-                                <div class="table-scrollable">
-                                    <table class="table table-striped table-bordered table-hover table-checkable order-column">
+                                <div class="table-scrollable table-scrollable-borderless">
+                                    <table class="table table-hover table-light table-checkable">
                                         <thead>
                                             <tr>
                                                 <th style="width: 50%;"> 名称 </th>
@@ -112,8 +112,8 @@
                                         <button class="btn sbold blue" data-toggle="modal" data-target="#add_config_modal"> 新增 <i class="fa fa-plus"></i> </button>
                                     </div>
                                 </div>
-                                <div class="table-scrollable">
-                                    <table class="table table-striped table-bordered table-hover table-checkable order-column">
+                                <div class="table-scrollable table-scrollable-borderless">
+                                    <table class="table table-hover table-light table-checkable">
                                         <thead>
                                         <tr>
                                             <th style="width: 50%;"> 名称 </th>
@@ -150,8 +150,8 @@
                                         <button class="btn sbold blue" data-toggle="modal" data-target="#add_level_modal"> 新增 <i class="fa fa-plus"></i> </button>
                                     </div>
                                 </div>
-                                <div class="table-scrollable">
-                                    <table class="table table-striped table-bordered table-hover table-checkable order-column">
+                                <div class="table-scrollable table-scrollable-borderless">
+                                    <table class="table table-hover table-light table-checkable">
                                         <thead>
                                             <tr>
                                                 <th style="width: 35%;"> 等级 </th>
@@ -188,8 +188,8 @@
                                         <button class="btn sbold blue" data-toggle="modal" data-target="#add_country_modal"> 新增 <i class="fa fa-plus"></i> </button>
                                     </div>
                                 </div>
-                                <div class="table-scrollable">
-                                    <table class="table table-striped table-bordered table-hover table-checkable order-column">
+                                <div class="table-scrollable table-scrollable-borderless">
+                                    <table class="table table-hover table-light table-checkable">
                                         <thead>
                                             <tr>
                                                 <th style="width: 20%;"> 图标 </th>

diff --git a/resources/views/admin/editUser.blade.php b/resources/views/admin/editUser.blade.php
@@ -217,7 +217,7 @@
                                             </div>
                                             <hr>
                                             <div class="form-group">
-                                                <label for="speed_limit_per_user" class="col-md-3 control-label">邀请人</label>
+                                                <label for="referral_uid" class="col-md-3 control-label">邀请人</label>
                                                 <div class="col-md-8">
                                                     <p class="form-control-static"> {{empty($user->referral) ? '无邀请人' : $user->referral->username}} </p>
                                                 </div>
@@ -328,17 +328,19 @@
                                                 <div class="col-md-8">
                                                     <div class="input-group">
                                                         <input type="text" class="form-control" name="speed_limit_per_con" value="{{$user->speed_limit_per_con}}" id="speed_limit_per_con" autocomplete="off">
-                                                        <span class="input-group-addon">KB</span>
+                                                        <span class="input-group-addon">Byte</span>
                                                     </div>
+                                                    <span class="help-block"> 为 0 时不限速 </span>
                                                 </div>
                                             </div>
                                             <div class="form-group">
                                                 <label for="speed_limit_per_user" class="col-md-3 control-label">单用户限速</label>
                                                 <div class="col-md-8">
                                                     <div class="input-group">
                                                         <input type="text" class="form-control" name="speed_limit_per_user" value="{{$user->speed_limit_per_user}}" id="speed_limit_per_user" autocomplete="off">
-                                                        <span class="input-group-addon">KB</span>
+                                                        <span class="input-group-addon">Byte</span>
                                                     </div>
+                                                    <span class="help-block"> 为 0 时不限速 </span>
                                                 </div>
                                             </div>
                                             <hr>

diff --git a/resources/views/admin/onlineIPMonitor.blade.php b/resources/views/admin/onlineIPMonitor.blade.php
@@ -23,6 +23,9 @@
                     </div>
                     <div class="portlet-body">
                         <div class="row">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <input type="text" class="col-md-4 col-sm-4 col-xs-12 form-control" name="id" value="{{Request::get('id')}}" id="id" placeholder="用户ID" onkeydown="if(event.keyCode==13){doSearch();}">
+                            </div>
                             <div class="col-md-3 col-sm-4 col-xs-12">
                                 <input type="text" class="col-md-4 col-sm-4 col-xs-12 form-control" name="ip" value="{{Request::get('ip')}}" id="ip" placeholder="IP" onkeydown="if(event.keyCode==13){doSearch();}">
                             </div>
@@ -71,7 +74,7 @@
                                                 <td>{{$vo->type}}</td>
                                                 <td>{{$vo->node ? $vo->node->name : '【节点已删除】'}}</td>
                                                 <td>{{$vo->user ? $vo->user->username : '【用户已删除】'}}</td>
-                                                <td>{{$vo->ip}}</td>
+                                                <td><a href="https://www.ipip.net/ip/{{$vo->ip}}.html" target="_blank">{{$vo->ip}}</a></td>
                                                 <td>{{$vo->ipInfo}}</td>
                                             </tr>
                                         @endforeach
@@ -103,12 +106,13 @@
     <script type="text/javascript">
         // 搜索
         function doSearch() {
+            var id = $("#id").val();
             var ip = $("#ip").val();
             var username = $("#username").val();
             var port = $("#port").val();
             var nodeId = $("#nodeId option:checked").val();
 
-            window.location.href = '{{url('admin/onlineIPMonitor')}}' + '?ip=' + ip + '&username=' + username + '&port=' + port + '&nodeId=' + nodeId;
+            window.location.href = '{{url('admin/onlineIPMonitor')}}' + '?id=' + id + '&ip=' + ip + '&username=' + username + '&port=' + port + '&nodeId=' + nodeId;
         }
 
         // 重置