1.注册账号邮箱验证

2.修正添加、编辑用户时有效期BUG
3.优化添加、编辑节点界面

app/Http/Controllers/RegisterController.php

@@ -47,6 +47,10 @@ class RegisterController extends BaseController
                 $request->session()->flash('errorMsg', '两次输入密码不一致，请重新输入');
 
                 return Redirect::back()->withInput($request->except(['password', 'repassword']));
+            } else if (false === filter_var($username, FILTER_VALIDATE_EMAIL)) {
+                $request->session()->flash('errorMsg', '用户名必须是合法邮箱，请重新输入');
+
+                return Redirect::back()->withInput();
             }
 
             // 是否开启注册

resources/views/admin/addNode.blade.php

@@ -20,149 +20,183 @@
         <!-- END PAGE BREADCRUMB -->
         <!-- BEGIN PAGE BASE CONTENT -->
         <div class="row">
-            <div class="col-md-6">
-                <div class="tab-pane active" id="tab_0">
-            <div class="portlet light bordered">
-                <div class="portlet-body form">
-                    <!-- BEGIN FORM-->
-                    <form action="{{url('admin/addNode')}}" method="post" class="form-horizontal" onsubmit="return do_submit();">
-                        <div class="form-body">
-                            <div class="form-group">
-                                <label for="name" class="col-md-3 control-label"> 节点名称 </label>
-                                <div class="col-md-8">
-                                    <input type="text" class="form-control" name="name" id="name" placeholder="" autofocus required>
-                                    <input type="hidden" name="_token" value="{{csrf_token()}}">
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="server" class="col-md-3 control-label"> 服务器地址 </label>
-                                <div class="col-md-8">
-                                    <input type="text" class="form-control" name="server" id="server" placeholder="" required>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="method" class="col-md-3 control-label">加密方式</label>
-                                <div class="col-md-8">
-                                    <select class="form-control" name="method" id="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="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="traffic_rate" class="col-md-3 control-label"> 流量比例 </label>
-                                <div class="col-md-8">
-                                    <input type="text" class="form-control" name="traffic_rate" value="1.0" id="traffic_rate" placeholder="" required>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="protocol" class="col-md-3 control-label">协议</label>
-                                <div class="col-md-8">
-                                    <select class="form-control" name="protocol" id="protocol">
-                                        @foreach ($protocol_list as $protocol)
-                                            <option value="{{$protocol->name}}" @if($protocol->is_default) selected @endif>{{$protocol->name}}</option>
-                                        @endforeach
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="protocol_param" class="col-md-3 control-label"> 协议参数 </label>
-                                <div class="col-md-8">
-                                    <input type="text" class="form-control" name="protocol_param" id="protocol_param" placeholder="">
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="obfs" class="col-md-3 control-label">混淆</label>
-                                <div class="col-md-8">
-                                    <select class="form-control" name="obfs" id="obfs">
-                                        @foreach ($obfs_list as $obfs)
-                                            <option value="{{$obfs->name}}" @if($obfs->is_default) selected @endif>{{$obfs->name}}</option>
-                                        @endforeach
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="obfs_param" class="col-md-3 control-label"> 混淆参数 </label>
-                                <div class="col-md-8">
-                                    <textarea class="form-control" rows="5" name="obfs_param" id="obfs_param"></textarea>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="bandwidth" class="col-md-3 control-label">出口带宽</label>
-                                <div class="col-md-8">
-                                    <div class="input-group">
-                                        <input type="text" class="form-control" name="bandwidth" id="bandwidth" placeholder="" required>
-                                        <span class="input-group-addon">M</span>
+            <div class="col-md-12">
+                <div class="tab-pane active">
+                    <div class="portlet light bordered">
+
+                        <div class="portlet-body form">
+                            <!-- BEGIN FORM-->
+                            <form action="{{url('admin/addNode')}}" method="post" class="form-horizontal" onsubmit="return do_submit();">
+                                <div class="form-body">
+                                    <div class="row">
+                                        <div class="col-md-6">
+                                            <!-- BEGIN SAMPLE FORM PORTLET-->
+                                            <div class="portlet light bordered">
+                                                <div class="portlet-title">
+                                                    <div class="caption">
+                                                        <span class="caption-subject font-dark bold uppercase">基础信息</span>
+                                                    </div>
+                                                </div>
+                                                <div class="portlet-body">
+                                                    <div class="form-group">
+                                                        <label for="name" class="col-md-3 control-label"> 节点名称 </label>
+                                                        <div class="col-md-8">
+                                                            <input type="text" class="form-control" name="name" id="name" placeholder="" autofocus required>
+                                                            <input type="hidden" name="_token" value="{{csrf_token()}}">
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="server" class="col-md-3 control-label"> 服务器地址 </label>
+                                                        <div class="col-md-8">
+                                                            <input type="text" class="form-control" name="server" id="server" placeholder="" required>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="method" class="col-md-3 control-label">加密方式</label>
+                                                        <div class="col-md-8">
+                                                            <select class="form-control" name="method" id="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="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="bandwidth" class="col-md-3 control-label">出口带宽</label>
+                                                        <div class="col-md-8">
+                                                            <div class="input-group">
+                                                                <input type="text" class="form-control" name="bandwidth" id="bandwidth" placeholder="" required>
+                                                                <span class="input-group-addon">M</span>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="traffic" class="col-md-3 control-label">每月可用流量</label>
+                                                        <div class="col-md-8">
+                                                            <div class="input-group">
+                                                                <input type="text" class="form-control right" name="traffic" id="traffic" placeholder="" required>
+                                                                <span class="input-group-addon">G</span>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="sort" class="col-md-3 control-label">排序</label>
+                                                        <div class="col-md-8">
+                                                            <input type="text" class="form-control" name="sort" value="0" id="sort" placeholder="">
+                                                            <span class="help-block"> 值越大排越前 </span>
+                                                        </div>
+                                                    </div>
+                                                    <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" id="status">
+                                                                <option value="1" selected>正常</option>
+                                                                <option value="0">维护</option>
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <!-- END SAMPLE FORM PORTLET-->
+                                        </div>
+                                        <div class="col-md-6">
+                                            <!-- BEGIN SAMPLE FORM PORTLET-->
+                                            <div class="portlet light bordered">
+                                                <div class="portlet-title">
+                                                    <div class="caption">
+                                                        <span class="caption-subject font-dark bold">扩展信息</span>
+                                                    </div>
+                                                </div>
+                                                <div class="portlet-body">
+                                                    <div class="form-group">
+                                                        <label for="compatible" class="col-md-3 control-label">兼容SS</label>
+                                                        <div class="col-md-8">
+                                                            <select class="form-control" name="compatible" id="compatible">
+                                                                <option value="0" selected>否</option>
+                                                                <option value="1">是</option>
+                                                            </select>
+                                                            <span class="help-block"> 请在服务端配置协议和混淆时加上<span style="color:red">_compatible</span> </span>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="traffic_rate" class="col-md-3 control-label"> 流量比例 </label>
+                                                        <div class="col-md-8">
+                                                            <input type="text" class="form-control" name="traffic_rate" value="1.0" id="traffic_rate" placeholder="" required>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="protocol" class="col-md-3 control-label">协议</label>
+                                                        <div class="col-md-8">
+                                                            <select class="form-control" name="protocol" id="protocol">
+                                                                @foreach ($protocol_list as $protocol)
+                                                                    <option value="{{$protocol->name}}" @if($protocol->is_default) selected @endif>{{$protocol->name}}</option>
+                                                                @endforeach
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="protocol_param" class="col-md-3 control-label"> 协议参数 </label>
+                                                        <div class="col-md-8">
+                                                            <input type="text" class="form-control" name="protocol_param" id="protocol_param" placeholder="">
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="obfs" class="col-md-3 control-label">混淆</label>
+                                                        <div class="col-md-8">
+                                                            <select class="form-control" name="obfs" id="obfs">
+                                                                @foreach ($obfs_list as $obfs)
+                                                                    <option value="{{$obfs->name}}" @if($obfs->is_default) selected @endif>{{$obfs->name}}</option>
+                                                                @endforeach
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="obfs_param" class="col-md-3 control-label"> 混淆参数 </label>
+                                                        <div class="col-md-8">
+                                                            <textarea class="form-control" rows="5" name="obfs_param" id="obfs_param"></textarea>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="monitor_url" class="col-md-3 control-label">监控地址</label>
+                                                        <div class="col-md-8">
+                                                            <input type="text" class="form-control right" name="monitor_url" value="" id="monitor_url" placeholder="">
+                                                            <span class="help-block"> 例如：http://us1.xxx.com/monitor.php </span>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <!-- END SAMPLE FORM PORTLET-->
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="traffic" class="col-md-3 control-label">每月可用流量</label>
-                                <div class="col-md-8">
-                                    <div class="input-group">
-                                        <input type="text" class="form-control right" name="traffic" id="traffic" placeholder="" required>
-                                        <span class="input-group-addon">G</span>
+                                <div class="form-actions">
+                                    <div class="row">
+                                        <div class="col-md-6">
+                                            <div class="row">
+                                                <div class="col-md-offset-11 col-md-4">
+                                                    <button type="submit" class="btn green">提 交</button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col-md-6"> </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="monitor_url" class="col-md-3 control-label">监控地址</label>
-                                <div class="col-md-8">
-                                    <input type="text" class="form-control right" name="monitor_url" value="" id="monitor_url" placeholder="">
-                                    <span class="help-block"> 例如：http://us1.xxx.com/monitor.php </span>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="compatible" class="col-md-3 control-label">兼容SS</label>
-                                <div class="col-md-8">
-                                    <select class="form-control" name="compatible" id="compatible">
-                                        <option value="0" selected>否</option>
-                                        <option value="1">是</option>
-                                    </select>
-                                    <span class="help-block"> 请在服务端配置协议和混淆时加上<span style="color:red">_compatible</span> </span>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="sort" class="col-md-3 control-label">排序</label>
-                                <div class="col-md-8">
-                                    <input type="text" class="form-control" name="sort" value="0" id="sort" placeholder="">
-                                    <span class="help-block"> 值越大排越前 </span>
-                                </div>
-                            </div>
-                            <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" id="status">
-                                        <option value="1" selected>正常</option>
-                                        <option value="0">维护</option>
-                                    </select>
-                                </div>
-                            </div>
+                            </form>
+                            <!-- END FORM-->
                         </div>
-                        <div class="form-actions">
-                            <div class="row">
-                                <div class="col-md-offset-6 col-md-4">
-                                    <button type="submit" class="btn green"> 提 交 </button>
-                                </div>
-                            </div>
-                        </div>
-                    </form>
-                    <!-- END FORM-->
+                    </div>
                 </div>
             </div>
-        </div>
-            </div>
         </div>
         <!-- END PAGE BASE CONTENT -->
     </div>

resources/views/admin/addUser.blade.php

@@ -99,7 +99,7 @@
                                             <div class="form-group">
                                                 <label class="col-md-3 control-label">有效期</label>
                                                 <div class="col-md-8">
-                                                    <div class="input-group input-large date-picker input-daterange" data-date="2017-10-10" data-date-format="yyyy-mm-dd">
+                                                    <div class="input-group input-large input-daterange">
                                                         <input type="text" class="form-control" name="enable_time" id="enable_time">
                                                         <span class="input-group-addon"> 至 </span>
                                                         <input type="text" class="form-control" name="expire_time" id="expire_time">
@@ -289,11 +289,14 @@
     <script src="/assets/global/plugins/bootbox/bootbox.min.js" type="text/javascript"></script>
 
     <script type="text/javascript">
-        // 过期时间
-        $(".date-picker").datepicker({
-            language: 'zh-CN',
-            autoclose: true,
-            todayHighlight: true
+        // 有效期
+        $('.input-daterange input').each(function() {
+            $(this).datepicker({
+                language: 'zh-CN',
+                autoclose: true,
+                todayHighlight: true,
+                format: 'yyyy-mm-dd'
+            });
         });
 
         // ajax同步提交

resources/views/admin/editNode.blade.php

@@ -19,7 +19,7 @@
         </ul>
         <!-- END PAGE BREADCRUMB -->
         <div class="row">
-            <div class="col-md-6">
+            <div class="col-md-12">
                 <!-- BEGIN PAGE BASE CONTENT -->
                 <div class="tab-pane active">
                     <div class="portlet light bordered">
@@ -28,136 +28,167 @@
                             <form action="{{url('admin/editNode')}}" method="post" class="form-horizontal" onsubmit="return do_submit();">
                                 <div class="form-body">
                                     <div class="row">
-                                        <div class="form-group">
-                                            <label for="name" class="col-md-3 control-label"> 节点名称 </label>
-                                            <div class="col-md-8">
-                                                <input type="text" class="form-control" name="name" value="{{$node->name}}" id="name" placeholder="" autofocus required>
-                                                <input type="hidden" name="id" value="{{$node->id}}">
-                                                <input type="hidden" name="_token" value="{{csrf_token()}}">
+                                        <div class="col-md-6">
+                                            <!-- BEGIN SAMPLE FORM PORTLET-->
+                                            <div class="portlet light bordered">
+                                                <div class="portlet-title">
+                                                    <div class="caption">
+                                                        <span class="caption-subject font-dark bold uppercase">基础信息</span>
+                                                    </div>
+                                                </div>
+                                                <div class="portlet-body">
+                                                    <div class="form-group">
+                                                        <label for="name" class="col-md-3 control-label"> 节点名称 </label>
+                                                        <div class="col-md-8">
+                                                            <input type="text" class="form-control" name="name" value="{{$node->name}}" id="name" placeholder="" autofocus required>
+                                                            <input type="hidden" name="id" value="{{$node->id}}">
+                                                            <input type="hidden" name="_token" value="{{csrf_token()}}">
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="server" class="col-md-3 control-label"> 服务器地址 </label>
+                                                        <div class="col-md-8">
+                                                            <input type="text" class="form-control" name="server" value="{{$node->server}}" id="server" placeholder="" required>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="method" class="col-md-3 control-label">加密方式</label>
+                                                        <div class="col-md-8">
+                                                            <select class="form-control" name="method" id="method">
+                                                                @foreach ($method_list as $method)
+                                                                    <option value="{{$method->name}}" @if($method->name == $node->method) selected @endif>{{$method->name}}</option>
+                                                                @endforeach
+                                                            </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 == $node->method) selected @endif>{{$method->name}}</option>
+                                                                @endforeach
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="bandwidth" class="col-md-3 control-label">出口带宽</label>
+                                                        <div class="col-md-8">
+                                                            <div class="input-group">
+                                                                <input type="text" class="form-control" name="bandwidth" value="{{$node->bandwidth}}" id="bandwidth" placeholder="" required>
+                                                                <span class="input-group-addon">M</span>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="traffic" class="col-md-3 control-label">每月可用流量</label>
+                                                        <div class="col-md-8">
+                                                            <div class="input-group">
+                                                                <input type="text" class="form-control right" name="traffic" value="{{$node->traffic}}" id="traffic" placeholder="" required>
+                                                                <span class="input-group-addon">G</span>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="sort" class="col-md-3 control-label">排序</label>
+                                                        <div class="col-md-8">
+                                                            <input type="text" class="form-control" name="sort" value="{{$node->sort}}" id="sort" placeholder="">
+                                                            <span class="help-block"> 值越大排越前 </span>
+                                                        </div>
+                                                    </div>
+                                                    <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" id="status">
+                                                                <option value="1" {{$node->status == '1' ? 'selected' : ''}}>正常</option>
+                                                                <option value="0" {{$node->status == '0' ? 'selected' : ''}}>维护</option>
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                </div>
                                             </div>
-                                        </div>
-                                        <div class="form-group">
-                                            <label for="server" class="col-md-3 control-label"> 服务器地址 </label>
-                                            <div class="col-md-8">
-                                                <input type="text" class="form-control" name="server" value="{{$node->server}}" id="server" placeholder="" required>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="method" class="col-md-3 control-label">加密方式</label>
-                                        <div class="col-md-8">
-                                            <select class="form-control" name="method" id="method">
-                                                @foreach ($method_list as $method)
-                                                    <option value="{{$method->name}}" @if($method->name == $node->method) selected @endif>{{$method->name}}</option>
-                                                @endforeach
-                                            </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 == $node->method) selected @endif>{{$method->name}}</option>
-                                                @endforeach
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="traffic_rate" class="col-md-3 control-label"> 流量比例 </label>
-                                        <div class="col-md-8">
-                                            <input type="text" class="form-control" name="traffic_rate" value="{{$node->traffic_rate}}" value="1.0" id="traffic_rate" placeholder="" required>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="protocol" class="col-md-3 control-label">协议</label>
-                                        <div class="col-md-8">
-                                            <select class="form-control" name="protocol" id="protocol">
-                                                @foreach ($protocol_list as $protocol)
-                                                    <option value="{{$protocol->name}}" @if($protocol->name == $node->protocol) selected @endif>{{$protocol->name}}</option>
-                                                @endforeach
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="protocol_param" class="col-md-3 control-label"> 协议参数 </label>
-                                        <div class="col-md-8">
-                                            <input type="text" class="form-control" name="protocol_param" value="{{$node->protocol_param}}" id="protocol_param" placeholder="">
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="obfs" class="col-md-3 control-label">混淆</label>
-                                        <div class="col-md-8">
-                                            <select class="form-control" name="obfs" id="obfs">
-                                                @foreach ($obfs_list as $obfs)
-                                                    <option value="{{$obfs->name}}" @if($obfs->name == $node->obfs) selected @endif>{{$obfs->name}}</option>
-                                                @endforeach
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="obfs_param" class="col-md-3 control-label"> 混淆参数 </label>
-                                        <div class="col-md-8">
-                                            <textarea class="form-control" rows="5" name="obfs_param" id="obfs_param">{{$node->obfs_param}}</textarea>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="bandwidth" class="col-md-3 control-label">出口带宽</label>
-                                        <div class="col-md-8">
-                                            <div class="input-group">
-                                                <input type="text" class="form-control" name="bandwidth" value="{{$node->bandwidth}}" id="bandwidth" placeholder="" required>
-                                                <span class="input-group-addon">M</span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="traffic" class="col-md-3 control-label">每月可用流量</label>
-                                        <div class="col-md-8">
-                                            <div class="input-group">
-                                                <input type="text" class="form-control right" name="traffic" value="{{$node->traffic}}" id="traffic" placeholder="" required>
-                                                <span class="input-group-addon">G</span>
+                                            <!-- END SAMPLE FORM PORTLET-->
+                                        </div>
+                                        <div class="col-md-6">
+                                            <!-- BEGIN SAMPLE FORM PORTLET-->
+                                            <div class="portlet light bordered">
+                                                <div class="portlet-title">
+                                                    <div class="caption">
+                                                        <span class="caption-subject font-dark bold">扩展信息</span>
+                                                    </div>
+                                                </div>
+                                                <div class="portlet-body">
+                                                    <div class="form-group">
+                                                        <label for="compatible" class="col-md-3 control-label">兼容SS</label>
+                                                        <div class="col-md-8">
+                                                            <select class="form-control" name="compatible" id="compatible">
+                                                                <option value="0" {{!$node->compatible ? 'selected' : ''}}>否</option>
+                                                                <option value="1" {{$node->compatible ? 'selected' : ''}}>是</option>
+                                                            </select>
+                                                            <span class="help-block"> 请在服务端配置协议和混淆时加上<span style="color:red">_compatible</span> </span>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="traffic_rate" class="col-md-3 control-label"> 流量比例 </label>
+                                                        <div class="col-md-8">
+                                                            <input type="text" class="form-control" name="traffic_rate" value="{{$node->traffic_rate}}" value="1.0" id="traffic_rate" placeholder="" required>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="protocol" class="col-md-3 control-label">协议</label>
+                                                        <div class="col-md-8">
+                                                            <select class="form-control" name="protocol" id="protocol">
+                                                                @foreach ($protocol_list as $protocol)
+                                                                    <option value="{{$protocol->name}}" @if($protocol->name == $node->protocol) selected @endif>{{$protocol->name}}</option>
+                                                                @endforeach
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="protocol_param" class="col-md-3 control-label"> 协议参数 </label>
+                                                        <div class="col-md-8">
+                                                            <input type="text" class="form-control" name="protocol_param" value="{{$node->protocol_param}}" id="protocol_param" placeholder="">
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="obfs" class="col-md-3 control-label">混淆</label>
+                                                        <div class="col-md-8">
+                                                            <select class="form-control" name="obfs" id="obfs">
+                                                                @foreach ($obfs_list as $obfs)
+                                                                    <option value="{{$obfs->name}}" @if($obfs->name == $node->obfs) selected @endif>{{$obfs->name}}</option>
+                                                                @endforeach
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="obfs_param" class="col-md-3 control-label"> 混淆参数 </label>
+                                                        <div class="col-md-8">
+                                                            <textarea class="form-control" rows="5" name="obfs_param" id="obfs_param">{{$node->obfs_param}}</textarea>
+                                                        </div>
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label for="monitor_url" class="col-md-3 control-label">监控地址</label>
+                                                        <div class="col-md-8">
+                                                            <input type="text" class="form-control right" name="monitor_url" value="{{$node->monitor_url}}" id="monitor_url" placeholder="">
+                                                            <span class="help-block"> 例如：http://us1.xxx.com/monitor.php </span>
+                                                        </div>
+                                                    </div>
+                                                </div>
                                             </div>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="monitor_url" class="col-md-3 control-label">监控地址</label>
-                                        <div class="col-md-8">
-                                            <input type="text" class="form-control right" name="monitor_url" value="{{$node->monitor_url}}" id="monitor_url" placeholder="">
-                                            <span class="help-block"> 例如：http://us1.xxx.com/monitor.php </span>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="compatible" class="col-md-3 control-label">兼容SS</label>
-                                        <div class="col-md-8">
-                                            <select class="form-control" name="compatible" id="compatible">
-                                                <option value="0" {{!$node->compatible ? 'selected' : ''}}>否</option>
-                                                <option value="1" {{$node->compatible ? 'selected' : ''}}>是</option>
-                                            </select>
-                                            <span class="help-block"> 请在服务端配置协议和混淆时加上<span style="color:red">_compatible</span> </span>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="sort" class="col-md-3 control-label">排序</label>
-                                        <div class="col-md-8">
-                                            <input type="text" class="form-control" name="sort" value="{{$node->sort}}" id="sort" placeholder="">
-                                            <span class="help-block"> 值越大排越前 </span>
-                                        </div>
-                                    </div>
-                                    <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" id="status">
-                                                <option value="1" {{$node->status == '1' ? 'selected' : ''}}>正常</option>
-                                                <option value="0" {{$node->status == '0' ? 'selected' : ''}}>维护</option>
-                                            </select>
+                                            <!-- END SAMPLE FORM PORTLET-->
                                         </div>
                                     </div>
                                 </div>
                                 <div class="form-actions">
                                     <div class="row">
-                                        <div class="col-md-offset-6 col-md-4">
-                                            <button type="submit" class="btn green"> 提 交 </button>
+                                        <div class="col-md-6">
+                                            <div class="row">
+                                                <div class="col-md-offset-11 col-md-4">
+                                                    <button type="submit" class="btn green">提 交</button>
+                                                </div>
+                                            </div>
                                         </div>
+                                        <div class="col-md-6"> </div>
                                     </div>
                                 </div>
                             </form>

resources/views/admin/editUser.blade.php

@@ -100,7 +100,7 @@
                                             <div class="form-group">
                                                 <label class="col-md-3 control-label">有效期</label>
                                                 <div class="col-md-8">
-                                                    <div class="input-group input-large date-picker input-daterange" data-date="2017-10-10" data-date-format="yyyy-mm-dd">
+                                                    <div class="input-group input-large input-daterange">
                                                         <input type="text" class="form-control" name="enable_time" value="{{$user->enable_time}}" id="enable_time">
                                                         <span class="input-group-addon"> 至 </span>
                                                         <input type="text" class="form-control" name="expire_time" value="{{$user->expire_time}}" id="expire_time">
@@ -287,11 +287,14 @@
     <script src="/assets/global/plugins/bootbox/bootbox.min.js" type="text/javascript"></script>
 
     <script type="text/javascript">
-        // 过期时间
-        $(".date-picker").datepicker({
-            language: 'zh-CN',
-            autoclose: true,
-            todayHighlight: true
+        // 有效期
+        $('.input-daterange input').each(function() {
+            $(this).datepicker({
+                language: 'zh-CN',
+                autoclose: true,
+                todayHighlight: true,
+                format: 'yyyy-mm-dd'
+            });
         });
 
         // ajax同步提交

resources/views/admin/system.blade.php

@@ -84,14 +84,14 @@
                                                         <label for="is_active_register" class="col-md-2 control-label">激活账号</label>
                                                         <div class="col-md-6">
                                                             <input type="checkbox" class="make-switch" @if($is_active_register) checked @endif id="is_active_register" 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_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/register.blade.php

@@ -48,7 +48,7 @@
             @endif
             <div class="form-group">
                 <label class="control-label visible-ie8 visible-ie9">用户名</label>
-                <input class="form-control placeholder-no-fix" type="text" autocomplete="off" placeholder="用户名" name="username" value="{{Request::old('username')}}" required />
+                <input class="form-control placeholder-no-fix" type="text" autocomplete="off" placeholder="请输入邮箱" name="username" value="{{Request::old('username')}}" required />
                 <input type="hidden" name="_token" value="{{csrf_token()}}" />
             </div>
             <div class="form-group">
@@ -98,9 +98,6 @@
 <script src="/assets/global/plugins/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
 <!-- END CORE PLUGINS -->
 <!-- BEGIN PAGE LEVEL PLUGINS -->
-<script src="/assets/global/plugins/jquery-validation/js/jquery.validate.min.js" type="text/javascript"></script>
-<script src="/assets/global/plugins/jquery-validation/js/additional-methods.min.js" type="text/javascript"></script>
-<script src="/assets/global/plugins/jquery-validation/js/localization/messages_zh.min.js" type="text/javascript"></script>
 <!-- END PAGE LEVEL PLUGINS -->
 <script type="text/javascript">
     // 登录