账号添加性别字段

app/Http/Controllers/AdminController.php

@@ -131,6 +131,7 @@ class AdminController extends BaseController
             $protocol_param = $request->get('protocol_param');
             $obfs = $request->get('obfs');
             $obfs_param = $request->get('obfs_param');
+            $gender = $request->get('gender');
             $wechat = $request->get('wechat');
             $qq = $request->get('qq');
             $usage = $request->get('usage');
@@ -170,6 +171,7 @@ class AdminController extends BaseController
                 'protocol_param'  => $protocol_param,
                 'obfs'            => $obfs,
                 'obfs_param'      => $obfs_param,
+                'gender'          => $gender,
                 'wechat'          => $wechat,
                 'qq'              => $qq,
                 'usage'           => $usage,
@@ -222,6 +224,7 @@ class AdminController extends BaseController
             $obfs_param = $request->get('obfs_param');
             $speed_limit_per_con = $request->get('speed_limit_per_con');
             $speed_limit_per_user = $request->get('speed_limit_per_user');
+            $gender = $request->get('gender');
             $wechat = $request->get('wechat');
             $qq = $request->get('qq');
             $usage = $request->get('usage');
@@ -249,6 +252,7 @@ class AdminController extends BaseController
                 'obfs_param'           => $obfs_param,
                 'speed_limit_per_con'  => $speed_limit_per_con,
                 'speed_limit_per_user' => $speed_limit_per_user,
+                'gender'               => $gender,
                 'wechat'               => $wechat,
                 'qq'                   => $qq,
                 'usage'                => $usage,

app/Http/Models/User.php

@@ -29,6 +29,7 @@ class User extends Model
         'protocol_param',
         'obfs',
         'obfs_param',
+        'gender',
         'wechat',
         'qq',
         'usage',

resources/views/admin/addUser.blade.php

@@ -132,6 +132,15 @@
                                                 </div>
                                             </div>
                                             <hr>
+                                            <div class="form-group">
+                                                <label for="gender" class="col-md-3 control-label">性别</label>
+                                                <div class="col-md-8">
+                                                    <select class="form-control" name="gender" id="gender">
+                                                        <option value="1" selected>男</option>
+                                                        <option value="0">女</option>
+                                                    </select>
+                                                </div>
+                                            </div>
                                             <div class="form-group">
                                                 <label for="wechat" class="col-md-3 control-label">微信</label>
                                                 <div class="col-md-8">
@@ -324,6 +333,7 @@
             var score = $('#score').val();
             var enable_time = $('#enable_time').val();
             var expire_time = $('#expire_time').val();
+            var gender = $('#gender').val();
             var wechat = $('#wechat').val();
             var qq = $('#qq').val();
             var is_admin = $('#is_admin').val();
@@ -346,7 +356,7 @@
                 type: "POST",
                 url: "{{url('admin/addUser')}}",
                 async: false,
-                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, level:level, 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, gender:gender, wechat:wechat, qq:qq, is_admin:is_admin, remark:remark, level:level, 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

@@ -135,7 +135,7 @@
                                             <div class="form-group">
                                                 <label for="status" class="col-md-3 control-label">状态</label>
                                                 <div class="col-md-8">
-                                                    <select class="form-control" name="status" value="{{$user->status}}" id="status">
+                                                    <select class="form-control" name="status" id="status">
                                                         <option value="1" @if($user->status == '1') selected @endif>正常</option>
                                                         <option value="0" @if($user->status == '0') selected @endif>未激活</option>
                                                         <option value="-1" @if($user->status == '-1') selected @endif>禁用</option>
@@ -143,6 +143,15 @@
                                                 </div>
                                             </div>
                                             <hr>
+                                            <div class="form-group">
+                                                <label for="gender" class="col-md-3 control-label">性别</label>
+                                                <div class="col-md-8">
+                                                    <select class="form-control" name="gender" id="gender">
+                                                        <option value="1" @if($user->gender == '1') selected @endif>男</option>
+                                                        <option value="0" @if($user->gender == '0') selected @endif>女</option>
+                                                    </select>
+                                                </div>
+                                            </div>
                                             <div class="form-group">
                                                 <label for="wechat" class="col-md-3 control-label">微信</label>
                                                 <div class="col-md-8">
@@ -334,6 +343,7 @@
             var status = $('#status').val();
             var enable_time = $('#enable_time').val();
             var expire_time = $('#expire_time').val();
+            var gender = $('#gender').val();
             var wechat = $('#wechat').val();
             var qq = $('#qq').val();
             var is_admin = $('#is_admin').val();
@@ -356,7 +366,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, score:score, status:status, enable_time:enable_time, expire_time:expire_time, wechat:wechat, qq:qq, is_admin:is_admin, remark:remark, level:level, 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, gender:gender, wechat:wechat, qq:qq, is_admin:is_admin, remark:remark, level:level, 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/export.blade.php

@@ -36,7 +36,7 @@
                                 <tbody>
                                     @foreach ($nodeList as $node)
                                         <tr>
-                                            <td> {{$node->name}} @if ($node->compatible) <span class="label label-warning"> 兼容SS </span> @endif </td>
+                                            <td> {{$node->name}} @if ($node->compatible) <span class="label label-warning"> 兼容 </span> @endif </td>
                                             <td>
                                                 <a class="btn btn-sm green btn-outline" data-toggle="modal" href="#txt_{{$node->id}}"> 文本 </a>
                                                 <a class="btn btn-sm green btn-outline" data-toggle="modal" href="#scheme_{{$node->id}}"> SCHEME </a>
@@ -68,7 +68,7 @@
                                             <h4 class="modal-title">配置信息</h4>
                                         </div>
                                         <div class="modal-body">
-                                            <textarea class="form-control" rows="10" onclick="this.focus();this.select()" readonly="readonly"> {{$node->txt}} </textarea>
+                                            <textarea class="form-control" rows="10" readonly="readonly"> {{$node->txt}} </textarea>
                                         </div>
                                     </div>
                                 </div>
@@ -81,7 +81,7 @@
                                             <h4 class="modal-title">Url Scheme</h4>
                                         </div>
                                         <div class="modal-body">
-                                            <textarea class="form-control" rows="7" onclick="this.focus();this.select()" readonly="readonly">
+                                            <textarea class="form-control" rows="7" readonly="readonly">
                                                 {{$node->ssr_scheme}}
                                                 @if ($node->compatible)
                                                     {{$node->ss_scheme}}
@@ -99,7 +99,7 @@
                                             <h4 class="modal-title">请复制以下信息，添加至gui-config.json</h4>
                                         </div>
                                         <div class="modal-body">
-                                            <textarea class="form-control" rows="16" onclick="this.focus();this.select()" readonly="readonly"> {{$node->json}} </textarea>
+                                            <textarea class="form-control" rows="16" readonly="readonly"> {{$node->json}} </textarea>
                                         </div>
                                     </div>
                                 </div>

resources/views/admin/system.blade.php

@@ -104,7 +104,7 @@
                                                         <label for="is_reset_password" class="col-md-2 control-label">重置密码</label>
                                                         <div class="col-md-6">
                                                             <input type="checkbox" class="make-switch" @if($is_reset_password) checked @endif id="is_reset_password" 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>

resources/views/user/nodeList.blade.php

@@ -56,7 +56,7 @@
                                     @foreach($nodeList as $node)
                                         <tr class="odd gradeX">
                                             <td> {{$node->id}} </td>
-                                            <td> {{$node->name}} @if ($node->compatible) <span class="label label-warning"> 兼容SS </span> @endif </td>
+                                            <td> {{$node->name}} </td>
                                             <td> <span class="label label-danger"> {{$node->online_users}} </span> </td>
                                             <td> {{$node->traffic_rate}} </td>
                                             <td>
@@ -90,7 +90,7 @@
                                             <h4 class="modal-title">配置信息</h4>
                                         </div>
                                         <div class="modal-body">
-                                            <textarea class="form-control" rows="10" onclick="this.focus();this.select()" readonly="readonly"> {{$node->txt}} </textarea>
+                                            <textarea class="form-control" rows="10" readonly="readonly"> {{$node->txt}} </textarea>
                                         </div>
                                     </div>
                                 </div>
@@ -103,7 +103,7 @@
                                             <h4 class="modal-title">Url Scheme</h4>
                                         </div>
                                         <div class="modal-body">
-                                            <textarea class="form-control" rows="7" onclick="this.focus();this.select()" readonly="readonly">
+                                            <textarea class="form-control" rows="7" readonly="readonly">
                                                 {{$node->ssr_scheme}}
                                                 @if ($node->compatible)
                                                     {{$node->ss_scheme}}

sql/db.sql

@@ -101,6 +101,7 @@ CREATE TABLE `user` (
   `obfs_param` varchar(255) DEFAULT '' COMMENT '混淆参数',
   `speed_limit_per_con` int(255) NOT NULL DEFAULT '204800' COMMENT '单连接限速，默认200M，单位KB',
   `speed_limit_per_user` int(255) NOT NULL DEFAULT '204800' COMMENT '单用户限速，默认200M，单位KB',
+  `gender` tinyint(4) NOT NULL DEFAULT '1' COMMENT '性别：0-女、1-男',
   `wechat` varchar(30) DEFAULT '' COMMENT '微信',
   `qq` varchar(20) DEFAULT '' COMMENT 'QQ',
   `usage` tinyint(4) NOT NULL DEFAULT '4' COMMENT '用途：1-手机、2-电脑、3-路由器、4-其他',

sql/update/20171017.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `user`
+ADD COLUMN `gender`  tinyint NOT NULL DEFAULT 1 COMMENT '性别：0-女、1-男' AFTER `speed_limit_per_user`;
+