1.去除删除账号，如果要禁用则进去编辑账号状态

2.添加、编辑账号信息优化

app/Http/Controllers/AdminController.php

@@ -142,7 +142,7 @@ class AdminController extends BaseController
             $transfer_enable = $request->get('transfer_enable');
             $enable = $request->get('enable');
             $method = $request->get('method');
-            $custom_method = $request->get('custom_method');
+            //$custom_method = $request->get('custom_method');
             $protocol = $request->get('protocol');
             $protocol_param = $request->get('protocol_param');
             $obfs = $request->get('obfs');
@@ -152,6 +152,7 @@ class AdminController extends BaseController
             $usage = $request->get('usage');
             $pay_way = $request->get('pay_way');
             $balance = $request->get('balance');
+            $score = $request->get('score');
             $enable_time = $request->get('enable_time');
             $expire_time = $request->get('expire_time');
             $remark = $request->get('remark');
@@ -179,7 +180,7 @@ class AdminController extends BaseController
                 'transfer_enable' => $this->toGB($transfer_enable),
                 'enable' => $enable,
                 'method' => $method,
-                'custom_method' => $custom_method,
+                'custom_method' => $method,
                 'protocol' => $protocol,
                 'protocol_param' => $protocol_param,
                 'obfs' => $obfs,
@@ -189,6 +190,7 @@ class AdminController extends BaseController
                 'usage' => $usage,
                 'pay_way' => $pay_way,
                 'balance' => $balance,
+                'score' => $score,
                 'enable_time' => empty($enable_time) ? date('Y-m-d') : $enable_time,
                 'expire_time' => empty($expire_time) ? date('Y-m-d', strtotime("+365 days")) : $expire_time,
                 'remark' => $remark,
@@ -235,7 +237,7 @@ class AdminController extends BaseController
             $transfer_enable = $request->get('transfer_enable');
             $enable = $request->get('enable');
             $method = $request->get('method');
-            $custom_method = $request->get('custom_method');
+            //$custom_method = $request->get('custom_method');
             $protocol = $request->get('protocol');
             $protocol_param = $request->get('protocol_param');
             $obfs = $request->get('obfs');
@@ -247,6 +249,7 @@ class AdminController extends BaseController
             $usage = $request->get('usage');
             $pay_way = $request->get('pay_way');
             $balance = $request->get('balance');
+            $score = $request->get('score');
             $status = $request->get('status');
             $enable_time = $request->get('enable_time');
             $expire_time = $request->get('expire_time');
@@ -260,7 +263,7 @@ class AdminController extends BaseController
                 'transfer_enable' => $this->toGB($transfer_enable),
                 'enable' => $enable,
                 'method' => $method,
-                'custom_method' => $custom_method,
+                'custom_method' => $method,
                 'protocol' => $protocol,
                 'protocol_param' => $protocol_param,
                 'obfs' => $obfs,
@@ -272,6 +275,7 @@ class AdminController extends BaseController
                 'usage' => $usage,
                 'pay_way' => $pay_way,
                 'balance' => $balance,
+                'score' => $score,
                 'status' => $status,
                 'enable_time' => empty($enable_time) ? date('Y-m-d') : $enable_time,
                 'expire_time' => empty($expire_time) ? date('Y-m-d', strtotime("+365 days")) : $expire_time,

resources/views/admin/addUser.blade.php

@@ -91,11 +91,17 @@
                                                 </div>
                                             </div>
                                             <div class="form-group">
-                                                <label for="balance" class="col-md-3 control-label">金额</label>
+                                                <label for="balance" class="col-md-3 control-label">余额</label>
                                                 <div class="col-md-8">
                                                     <input type="text" class="form-control" name="balance" value="0" id="balance" placeholder="" required>
                                                 </div>
                                             </div>
+                                            <div class="form-group">
+                                                <label for="score" class="col-md-3 control-label">积分</label>
+                                                <div class="col-md-8">
+                                                    <input type="text" class="form-control" name="score" value="0" id="score" placeholder="" required>
+                                                </div>
+                                            </div>
                                             <div class="form-group">
                                                 <label class="col-md-3 control-label">有效期</label>
                                                 <div class="col-md-8">
@@ -176,16 +182,6 @@
                                                     </select>
                                                 </div>
                                             </div>
-                                            <div class="form-group">
-                                                <label for="custom_method" class="col-md-3 control-label">自定义加密方式</label>
-                                                <div class="col-md-8">
-                                                    <select class="form-control" name="custom_method" id="custom_method">
-                                                        @foreach ($method_list as $method)
-                                                            <option value="{{$method->name}}" @if($method->is_default) selected @endif>{{$method->name}}</option>
-                                                        @endforeach
-                                                    </select>
-                                                </div>
-                                            </div>
                                             <div class="form-group">
                                                 <label for="transfer_enable" class="col-md-3 control-label">可用流量</label>
                                                 <div class="col-md-8">
@@ -307,6 +303,7 @@
             var usage = $("input:radio[name='usage']:checked").val();
             var pay_way = $("input:radio[name='pay_way']:checked").val();
             var balance = $('#balance').val();
+            var score = $('#score').val();
             var enable_time = $('#enable_time').val();
             var expire_time = $('#expire_time').val();
             var wechat = $('#wechat').val();
@@ -330,7 +327,7 @@
                 type: "POST",
                 url: "{{url('admin/addUser')}}",
                 async: false,
-                data: {_token:_token, username: username, password:password, usage:usage, pay_way:pay_way, balance:balance, enable_time:enable_time, expire_time:expire_time, wechat:wechat, qq:qq, is_admin:is_admin, remark:remark, port:port, passwd:passwd, method:method, custom_method:custom_method, transfer_enable:transfer_enable, enable:enable, protocol:protocol, protocol_param:protocol_param, obfs:obfs, obfs_param:obfs_param, speed_limit_per_con:speed_limit_per_con, speed_limit_per_user:speed_limit_per_user},
+                data: {_token:_token, username: username, password:password, usage:usage, pay_way:pay_way, balance:balance, score:score, enable_time:enable_time, expire_time:expire_time, wechat:wechat, qq:qq, is_admin:is_admin, remark:remark, port:port, passwd:passwd, method:method, custom_method:custom_method, transfer_enable:transfer_enable, enable:enable, protocol:protocol, protocol_param:protocol_param, obfs:obfs, obfs_param:obfs_param, speed_limit_per_con:speed_limit_per_con, speed_limit_per_user:speed_limit_per_user},
                 dataType: 'json',
                 success: function (ret) {
                     if (ret.status == 'success') {

resources/views/admin/editUser.blade.php

@@ -92,11 +92,17 @@
                                                 </div>
                                             </div>
                                             <div class="form-group">
-                                                <label for="balance" class="col-md-3 control-label">金额</label>
+                                                <label for="balance" class="col-md-3 control-label">余额</label>
                                                 <div class="col-md-8">
                                                     <input type="text" class="form-control" name="balance" value="{{$user->balance}}" id="balance" placeholder="" required>
                                                 </div>
                                             </div>
+                                            <div class="form-group">
+                                                <label for="score" class="col-md-3 control-label">积分</label>
+                                                <div class="col-md-8">
+                                                    <input type="text" class="form-control" name="score" value="{{$user->score}}" id="score" placeholder="" required>
+                                                </div>
+                                            </div>
                                             <div class="form-group">
                                                 <label class="col-md-3 control-label">有效期</label>
                                                 <div class="col-md-8">
@@ -187,16 +193,6 @@
                                                     </select>
                                                 </div>
                                             </div>
-                                            <div class="form-group">
-                                                <label for="custom_method" class="col-md-3 control-label">自定义加密方式</label>
-                                                <div class="col-md-8">
-                                                    <select class="form-control" name="custom_method" id="custom_method">
-                                                        @foreach ($method_list as $method)
-                                                            <option value="{{$method->name}}" @if($method->name == $user->method) selected @endif>{{$method->name}}</option>
-                                                        @endforeach
-                                                    </select>
-                                                </div>
-                                            </div>
                                             <div class="form-group">
                                                 <label for="transfer_enable" class="col-md-3 control-label">可用流量</label>
                                                 <div class="col-md-8">
@@ -316,6 +312,7 @@
             var usage = $("input:radio[name='usage']:checked").val();
             var pay_way = $("input:radio[name='pay_way']:checked").val();
             var balance = $('#balance').val();
+            var score = $('#score').val();
             var status = $('#status').val();
             var enable_time = $('#enable_time').val();
             var expire_time = $('#expire_time').val();
@@ -340,7 +337,7 @@
                 type: "POST",
                 url: "{{url('admin/editUser')}}",
                 async: false,
-                data: {_token:_token, id:id, username: username, password:password, usage:usage, pay_way:pay_way, balance:balance, status:status, enable_time:enable_time, expire_time:expire_time, wechat:wechat, qq:qq, is_admin:is_admin, remark:remark, port:port, passwd:passwd, method:method, custom_method:custom_method, transfer_enable:transfer_enable, enable:enable, protocol:protocol, protocol_param:protocol_param, obfs:obfs, obfs_param:obfs_param, speed_limit_per_con:speed_limit_per_con, speed_limit_per_user:speed_limit_per_user},
+                data: {_token:_token, id:id, username: username, password:password, usage:usage, pay_way:pay_way, balance:balance, score:score, status:status, enable_time:enable_time, expire_time:expire_time, wechat:wechat, qq:qq, is_admin:is_admin, remark:remark, port:port, passwd:passwd, method:method, custom_method:custom_method, transfer_enable:transfer_enable, enable:enable, protocol:protocol, protocol_param:protocol_param, obfs:obfs, obfs_param:obfs_param, speed_limit_per_con:speed_limit_per_con, speed_limit_per_user:speed_limit_per_user},
                 dataType: 'json',
                 success: function (ret) {
                     if (ret.status == 'success') {

resources/views/admin/userList.blade.php

@@ -125,7 +125,7 @@
                                             </td>
                                             <td>
                                                 <button type="button" class="btn btn-sm blue btn-outline" onclick="editUser('{{$user->id}}')">编辑</button>
-                                                @if ($user->id != 1) <button type="button" class="btn btn-sm red btn-outline" onclick="delUser('{{$user->id}}')">删除</button> @endif
+                                                <!--<button type="button" class="btn btn-sm red btn-outline" onclick="delUser('{{$user->id}}')">删除</button>-->
                                                 <button type="button" class="btn btn-sm green btn-outline" onclick="do_export('{{$user->id}}')">配置信息</button>
                                                 <button type="button" class="btn btn-sm purple btn-outline" onclick="do_monitor('{{$user->id}}')">流量监控</button>
                                             </td>

sql/db.sql

@@ -415,6 +415,9 @@ CREATE TABLE `ticket_reply` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 
+-- ----------------------------
+-- Table structure for `user_score_log`
+-- ----------------------------
 CREATE TABLE `user_score_log` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
   `user_id` int(11) NOT NULL DEFAULT '0',