日常开发

app/Http/Controllers/AdminController.php

@@ -31,7 +31,7 @@ class AdminController extends BaseController
 
     public function index(Request $request)
     {
-        $past = strtotime(date('Y-m-d', strtotime("-7 days")));
+        $past = strtotime(date('Y-m-d', strtotime("-" . self::$config['expire_days'] . " days")));
         $online = time() - 3600;
 
         $view['userCount'] = User::count();
@@ -190,7 +190,7 @@ class AdminController extends BaseController
                 return Response::json(['status' => 'fail', 'data' => '', 'message' => '添加失败']);
             }
         } else {
-            // 最后一个可用端口
+            // 生成一个可用端口
             $last_user = User::orderBy('id', 'desc')->first();
             $view['last_port'] = self::$config['is_rand_port'] ? $this->getRandPort() : $last_user->port + 1;
 
@@ -1105,114 +1105,12 @@ TXT;
             }
         }
 
-        $ret = Config::where('name', $name)->update(['value' => $value]);
-        if (!$ret) {
-            return Response::json(['status' => 'fail', 'data' => '', 'message' => '设置失败']);
-        }
+        // 更新配置
+        Config::where('name', $name)->update(['value' => $value]);
 
         return Response::json(['status' => 'success', 'data' => '', 'message' => '操作成功']);
     }
 
-    // 设置注册时默认可用流量
-    public function setDefaultTraffic(Request $request)
-    {
-        $value = intval($request->get('value'));
-
-        Config::where('name', 'default_traffic')->update(['value' => $value]);
-
-        return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
-    }
-
-    // 设置可生成邀请码数
-    public function setInviteNum(Request $request)
-    {
-        $value = intval($request->get('value'));
-
-        Config::where('name', 'invite_num')->update(['value' => $value]);
-
-        return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
-    }
-
-    // 设置网站名称
-    public function setWebsiteName(Request $request)
-    {
-        $value = trim($request->get('value'));
-
-        Config::where('name', 'website_name')->update(['value' => $value]);
-
-        return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
-    }
-
-    // 设置网站地址
-    public function setWebsiteUrl(Request $request)
-    {
-        $value = trim($request->get('value'));
-
-        Config::where('name', 'website_url')->update(['value' => $value]);
-
-        return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
-    }
-
-    // 设置重置密码次数
-    public function setResetPasswordTimes(Request $request)
-    {
-        $value = intval($request->get('value'));
-
-        Config::where('name', 'reset_password_times')->update(['value' => $value]);
-
-        return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
-    }
-
-    // 设置激活账号次数
-    public function setActiveTimes(Request $request)
-    {
-        $value = intval($request->get('value'));
-
-        Config::where('name', 'active_times')->update(['value' => $value]);
-
-        return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
-    }
-
-    // 设置激活账号次数
-    public function setTrafficWarningPercent(Request $request)
-    {
-        $value = intval($request->get('value'));
-
-        Config::where('name', 'traffic_warning_percent')->update(['value' => $value]);
-
-        return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
-    }
-
-    // 设置账号过期提醒阈值
-    public function setExpireDays(Request $request)
-    {
-        $value = intval($request->get('value'));
-
-        Config::where('name', 'expire_days')->update(['value' => $value]);
-
-        return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
-    }
-
-    // 设置激活账号次数
-    public function setAddScoreRange(Request $request)
-    {
-        $value = intval($request->get('value'));
-
-        Config::where('name', 'login_add_score_range')->update(['value' => $value]);
-
-        return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
-    }
-
-    // 设置注册送流量值
-    public function setReferralTraffic(Request $request)
-    {
-        $value = intval($request->get('value'));
-
-        Config::where('name', 'referral_traffic')->update(['value' => $value]);
-
-        return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
-    }
-
     // 设置返利比例
     public function setReferralPercent(Request $request)
     {
@@ -1224,16 +1122,6 @@ TXT;
         return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
     }
 
-    // 设置返利满多少可提现
-    public function setReferralMoney(Request $request)
-    {
-        $value = intval($request->get('value'));
-
-        Config::where('name', 'referral_money')->update(['value' => $value]);
-
-        return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
-    }
-
     // 设置微信、支付宝二维码
     public function setQrcode(Request $request)
     {

app/Http/Controllers/BaseController.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace App\Http\Controllers;
+
 use App\Http\Models\Config;
 use App\Http\Models\EmailLog;
 use App\Http\Models\SsConfig;
@@ -112,10 +113,12 @@ class BaseController extends Controller
     // 获取一个随机端口
     public function getRandPort()
     {
-        $port = mt_rand(10000,30000);
+        $port = mt_rand(10000, 40000);
+        $deny_port = [17185, 28281];
+
         $exists_port = User::query()->pluck('port')->toArray();
-        if (in_array($port, $exists_port)) {
-            $this->getRandPort();
+        if (in_array($port, $exists_port) || in_array($port, $deny_port)) {
+            $port = $this->getRandPort();
         }
 
         return $port;

app/Http/Controllers/RegisterController.php

@@ -111,7 +111,7 @@ class RegisterController extends BaseController
             $user->passwd = $this->makeRandStr();
             $user->transfer_enable = $transfer_enable;
             $user->enable_time = date('Y-m-d H:i:s');
-            $user->expire_time = date('Y-m-d H:i:s', strtotime("+1 days"));
+            $user->expire_time = date('Y-m-d H:i:s', strtotime("+" . self::$config['default_days'] . " days"));
             $user->reg_ip = $request->getClientIp();
             $user->referral_uid = $referral_uid;
             $user->save();

resources/views/admin/system.blade.php

@@ -117,9 +117,10 @@
                                                         <label for="is_rand_port" class="col-md-2 control-label">随机端口</label>
                                                         <div class="col-md-6">
                                                             <input type="checkbox" class="make-switch" @if($is_rand_port) checked @endif id="is_rand_port" data-on-color="success" data-off-color="danger" data-on-text="启用" data-off-text="关闭">
-                                                            <span class="help-block"> 随机生成端口 </span>
+                                                            <span class="help-block"> 添加账号时随机生成端口 </span>
                                                         </div>
                                                     </div>
+                                                    <!--
                                                     <div class="form-group">
                                                         <label for="is_user_rand_port" class="col-md-2 control-label">自定义端口</label>
                                                         <div class="col-md-6">
@@ -127,8 +128,22 @@
                                                             <span class="help-block"> 用户可以自定义端口 </span>
                                                         </div>
                                                     </div>
+                                                    -->
                                                     <div class="form-group">
-                                                        <label for="default_traffic" class="col-md-2 control-label">注册初始流量</label>
+                                                        <label for="default_days" class="col-md-2 control-label">初始有效期</label>
+                                                        <div class="col-md-3">
+                                                            <div class="input-group">
+                                                                <input class="form-control" type="text" name="default_days" value="{{$default_days}}" id="default_days" />
+                                                                <span class="input-group-addon">天</span>
+                                                                <span class="input-group-btn">
+                                                                    <button class="btn btn-success" type="button" onclick="setDefaultDays()">修改</button>
+                                                                </span>
+                                                            </div>
+                                                            <span class="help-block"> 用户注册时默认SS(R)有效天数 </span>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="default_traffic" class="col-md-2 control-label">初始流量</label>
                                                         <div class="col-md-3">
                                                             <div class="input-group">
                                                                 <input class="form-control" type="text" name="default_traffic" value="{{$default_traffic}}" id="default_traffic" />
@@ -563,11 +578,24 @@
             });
         });
 
+        // 设置注册时默认有效期
+        function setDefaultDays() {
+            var default_days = $("#default_days").val();
+
+            $.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'default_days', value:default_days}, function (ret) {
+                if (ret.status == 'success') {
+                    bootbox.alert(ret.message, function() {
+                        window.location.reload();
+                    });
+                }
+            });
+        }
+
         // 设置注册时默认流量
         function setDefaultTraffic() {
             var default_traffic = $("#default_traffic").val();
 
-            $.post("{{url('admin/setDefaultTraffic')}}", {_token:'{{csrf_token()}}', value:default_traffic}, function (ret) {
+            $.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'default_traffic', value:default_traffic}, function (ret) {
                 if (ret.status == 'success') {
                     bootbox.alert(ret.message, function() {
                         window.location.reload();
@@ -580,7 +608,7 @@
         function setInviteNum() {
             var invite_num = $("#invite_num").val();
 
-            $.post("{{url('admin/setInviteNum')}}", {_token:'{{csrf_token()}}', value:invite_num}, function (ret) {
+            $.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'invite_num', value:invite_num}, function (ret) {
                 if (ret.status == 'success') {
                     bootbox.alert(ret.message, function() {
                         window.location.reload();
@@ -593,7 +621,7 @@
         function setResetPasswordTimes() {
             var reset_password_times = $("#reset_password_times").val();
 
-            $.post("{{url('admin/setResetPasswordTimes')}}", {_token:'{{csrf_token()}}', value:reset_password_times}, function (ret) {
+            $.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'reset_password_times', value:reset_password_times}, function (ret) {
                 if (ret.status == 'success') {
                     bootbox.alert(ret.message, function() {
                         window.location.reload();
@@ -606,7 +634,7 @@
         function setActiveTimes() {
             var active_times = $("#active_times").val();
 
-            $.post("{{url('admin/setActiveTimes')}}", {_token:'{{csrf_token()}}', value:active_times}, function (ret) {
+            $.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'active_times', value:active_times}, function (ret) {
                 if (ret.status == 'success') {
                     bootbox.alert(ret.message, function() {
                         window.location.reload();
@@ -619,7 +647,7 @@
         function setTrafficWarningPercent() {
             var traffic_warning_percent = $("#traffic_warning_percent").val();
 
-            $.post("{{url('admin/setTrafficWarningPercent')}}", {_token:'{{csrf_token()}}', value:traffic_warning_percent}, function (ret) {
+            $.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'traffic_warning_percent', value:traffic_warning_percent}, function (ret) {
                 if (ret.status == 'success') {
                     bootbox.alert(ret.message, function() {
                         window.location.reload();
@@ -633,7 +661,7 @@
         function setExpireDays() {
             var expire_days = $("#expire_days").val();
 
-            $.post("{{url('admin/setExpireDays')}}", {_token:'{{csrf_token()}}', value:expire_days}, function (ret) {
+            $.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'expire_days', value:expire_days}, function (ret) {
                 if (ret.status == 'success') {
                     bootbox.alert(ret.message, function() {
                         window.location.reload();
@@ -646,7 +674,7 @@
         function setWebsiteName() {
             var website_name = $("#website_name").val();
 
-            $.post("{{url('admin/setWebsiteName')}}", {_token:'{{csrf_token()}}', value:website_name}, function (ret) {
+            $.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'website_name', value:website_name}, function (ret) {
                 if (ret.status == 'success') {
                     bootbox.alert(ret.message, function() {
                         window.location.reload();
@@ -659,7 +687,7 @@
         function setWebsiteUrl() {
             var website_url = $("#website_url").val();
 
-            $.post("{{url('admin/setWebsiteUrl')}}", {_token:'{{csrf_token()}}', value:website_url}, function (ret) {
+            $.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'website_url', value:website_url}, function (ret) {
                 if (ret.status == 'success') {
                     bootbox.alert(ret.message, function() {
                         window.location.reload();
@@ -672,7 +700,7 @@
         function setLoginAddScoreRange() {
             var login_add_score_range = $("#login_add_score_range").val();
 
-            $.post("{{url('admin/setAddScoreRange')}}", {_token:'{{csrf_token()}}', value:login_add_score_range}, function (ret) {
+            $.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'login_add_score_range', value:login_add_score_range}, function (ret) {
                 if (ret.status == 'success') {
                     bootbox.alert(ret.message, function() {
                         window.location.reload();
@@ -685,7 +713,7 @@
         function setReferralTraffic() {
             var referral_traffic = $("#referral_traffic").val();
 
-            $.post("{{url('admin/setReferralTraffic')}}", {_token:'{{csrf_token()}}', value:referral_traffic}, function (ret) {
+            $.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'referral_traffic', value:referral_traffic}, function (ret) {
                 if (ret.status == 'success') {
                     bootbox.alert(ret.message, function() {
                         window.location.reload();
@@ -711,7 +739,7 @@
         function setReferralMoney() {
             var referral_money = $("#referral_money").val();
 
-            $.post("{{url('admin/setReferralMoney')}}", {_token:'{{csrf_token()}}', value:referral_money}, function (ret) {
+            $.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'referral_money', value:referral_money}, function (ret) {
                 if (ret.status == 'success') {
                     bootbox.alert(ret.message, function() {
                         window.location.reload();

resources/views/coupon/couponList.blade.php

@@ -48,7 +48,6 @@
                                     <th> 名称 </th>
                                     <th> LOGO </th>
                                     <th> 券码 </th>
-                                    <th> 类型 </th>
                                     <th> 用途 </th>
                                     <th> 优惠 </th>
                                     <th> 有效期 </th>
@@ -59,7 +58,7 @@
                                 <tbody>
                                 @if($couponList->isEmpty())
                                     <tr>
-                                        <td colspan="11">暂无数据</td>
+                                        <td colspan="9">暂无数据</td>
                                     </tr>
                                 @else
                                     @foreach($couponList as $coupon)
@@ -68,24 +67,23 @@
                                             <td> {{$coupon->name}} </td>
                                             <td> @if($coupon->logo) <a href="{{$coupon->logo}}" class="fancybox"><img src="{{$coupon->logo}}"/></a> @endif </td>
                                             <td> <span class="label label-info">{{$coupon->sn}}</span> </td>
-                                            <td> <span class="label label-danger">{{$coupon->type == '1' ? '现金优惠' : '折扣优惠'}}</span> </td>
-                                            <td> <span class="label label-danger">{{$coupon->usage == '1' ? '仅限一次性使用' : '可重复使用'}}</span> </td>
+                                            <td> {{$coupon->usage == '1' ? '一次性' : '可重复'}} </td>
                                             <td>
                                                 @if($coupon->type == '1')
-                                                    <span class="label label-danger">{{$coupon->amount}}元</span>
+                                                    {{$coupon->amount}}元
                                                 @else
-                                                    <span class="label label-danger">{{$coupon->discount * 10}}折</span>
+                                                    {{$coupon->discount * 10}}折
                                                 @endif
                                             </td>
                                             <td> {{date('Y-m-d', $coupon->available_start)}} ~ {{date('Y-m-d', $coupon->available_end)}} </td>
                                             <td>
                                                 @if ($coupon->usage == 1)
                                                     @if($coupon->status == '1')
-                                                        已使用
+                                                        <span class="label label-default"> 已使用 </span>
                                                     @elseif ($coupon->status == '2')
-                                                        已失效
+                                                        <span class="label label-default"> 已失效 </span>
                                                     @else
-                                                        未使用
+                                                        <span class="label label-success"> 未使用 </span>
                                                     @endif
                                                 @endif
                                             </td>

routes/web.php

@@ -48,18 +48,7 @@ Route::group(['middleware' => ['user', 'admin']], function() {
     Route::get('admin/analysis', 'AdminController@analysis'); // 日志分析
     Route::get('admin/system', 'AdminController@system'); // 系统设置
     Route::post('admin/setConfig', 'AdminController@setConfig'); // 设置某个配置项
-    Route::post('admin/setDefaultTraffic', 'AdminController@setDefaultTraffic'); // 设置注册时默认可用流量
-    Route::post('admin/setInviteNum', 'AdminController@setInviteNum'); // 可生成邀请码数
-    Route::post('admin/setWebsiteName', 'AdminController@setWebsiteName'); // 设置网站名称
-    Route::post('admin/setWebsiteUrl', 'AdminController@setWebsiteUrl'); // 设置网站地址
-    Route::post('admin/setResetPasswordTimes', 'AdminController@setResetPasswordTimes'); // 设置重置密码次数
-    Route::post('admin/setActiveTimes', 'AdminController@setActiveTimes'); // 设置激活账号次数
-    Route::post('admin/setTrafficWarningPercent', 'AdminController@setTrafficWarningPercent'); // 设置流量警告阈值
-    Route::post('admin/setExpireDays', 'AdminController@setExpireDays'); // 设置账号过期提醒阈值
-    Route::post('admin/setAddScoreRange', 'AdminController@setAddScoreRange'); // 设置登录加积分时间间隔
-    Route::post('admin/setReferralTraffic', 'AdminController@setReferralTraffic'); // 设置注册送流量值
     Route::post('admin/setReferralPercent', 'AdminController@setReferralPercent'); // 设置返利比例
-    Route::post('admin/setReferralMoney', 'AdminController@setReferralMoney'); // 设置返利满多少可提现
     Route::post('admin/setQrcode', 'AdminController@setQrcode'); // 设置充值二维码
     Route::post('admin/resetUserTraffic', 'AdminController@resetUserTraffic'); // 重置用户流量
     Route::get('admin/makePasswd', 'AdminController@makePasswd'); // 获取随机密码

sql/db.sql

@@ -243,6 +243,8 @@ INSERT INTO `config` VALUES ('23', 'traffic_warning', 0);
 INSERT INTO `config` VALUES ('24', 'traffic_warning_percent', 80);
 INSERT INTO `config` VALUES ('25', 'expire_warning', 0);
 INSERT INTO `config` VALUES ('26', 'expire_days', 15);
+INSERT INTO `config` VALUES ('27', 'reset_traffic', 1);
+INSERT INTO `config` VALUES ('28', 'default_days', 7);
 
 
 -- ----------------------------

sql/update/20171012.sql

@@ -0,0 +1,2 @@
+INSERT INTO `config` VALUES ('27', 'reset_traffic', 1);
+INSERT INTO `config` VALUES ('28', 'default_days', 7);