1.修复编辑用户BUG

2.当节点兼容SS时，账号处可以显示出SS的二维码

app/Http/Controllers/AdminController.php

@@ -187,6 +187,8 @@ class AdminController extends BaseController
             $protocol_param = $request->get('protocol_param');
             $obfs = $request->get('obfs');
             $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');
             $wechat = $request->get('wechat');
             $qq = $request->get('qq');
             $usage = $request->get('usage');
@@ -209,6 +211,8 @@ class AdminController extends BaseController
                 '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,
                 'wechat' => $wechat,
                 'qq' => $qq,
                 'usage' => $usage,
@@ -625,16 +629,23 @@ class AdminController extends BaseController
 
         $nodeList = SsNode::paginate(10);
         foreach ($nodeList as &$node) {
-            // 生成scheme
-            $str = '';
-            $str .= $node->server . ':' . $user->port;
-            $str .= ':' . $user->protocol . ':' . $user->method;
-            $str .= ':' . $user->obfs . ':' . base64_encode($user->passwd);
-            $str .= '/?obfsparam=' . $user->obfs_param;
-            $str .= '&=protoparam' . $user->protocol_param;
-            $str .= '&remarks=' . base64_encode('VPN');
-            $str = $this->base64url_encode($str);
-            $scheme = 'ssr://' . $str;
+            // 生成ssr scheme
+            $ssr_str = '';
+            $ssr_str .= $node->server . ':' . $user->port;
+            $ssr_str .= ':' . $user->protocol . ':' . $user->method;
+            $ssr_str .= ':' . $user->obfs . ':' . base64_encode($user->passwd);
+            $ssr_str .= '/?obfsparam=' . $user->obfs_param;
+            $ssr_str .= '&=protoparam' . $user->protocol_param;
+            $ssr_str .= '&remarks=' . base64_encode('VPN');
+            $ssr_str = $this->base64url_encode($ssr_str);
+            $ssr_scheme = 'ssr://' . $ssr_str;
+
+            // 生成ss scheme
+            $ss_str = '';
+            $ss_str .= $user->method . ':' . $user->passwd . '@';
+            $ss_str .= $node->server . ':' . $user->port;
+            $ss_str .= $this->base64url_encode($ss_str);
+            $ss_scheme = 'ss://' . $ss_str;
 
             // 生成json配置信息
             $config = <<<CONFIG
@@ -670,7 +681,8 @@ TXT;
 
             $node->txt = $txt;
             $node->json = $config;
-            $node->scheme = $scheme;
+            $node->ssr_scheme = $ssr_scheme;
+            $node->ss_scheme = $ss_scheme;
         }
 
         $view['nodeList'] = $nodeList;

resources/views/admin/editUser.blade.php

@@ -152,7 +152,7 @@
                                             <div class="form-group">
                                                 <label for="remark" class="col-md-3 control-label">备注</label>
                                                 <div class="col-md-8">
-                                                    <textarea class="form-control" rows="3" name="remark" value="{{$user->remark}}" id="remark"></textarea>
+                                                    <textarea class="form-control" rows="3" name="remark" id="remark">{{$user->remark}}</textarea>
                                                 </div>
                                             </div>
                                         </div>
@@ -262,7 +262,7 @@
                                                 <label for="speed_limit_per_con" class="col-md-3 control-label">单连接限速</label>
                                                 <div class="col-md-8">
                                                     <div class="input-group">
-                                                        <input type="text" class="form-control" name="speed_limit_per_con" value="204800" id="speed_limit_per_con" placeholder="" required>
+                                                        <input type="text" class="form-control" name="speed_limit_per_con" value="{{$user->speed_limit_per_con}}" id="speed_limit_per_con" placeholder="" required>
                                                         <span class="input-group-addon">KB</span>
                                                     </div>
                                                 </div>
@@ -271,7 +271,7 @@
                                                 <label for="speed_limit_per_user" class="col-md-3 control-label">单用户限速</label>
                                                 <div class="col-md-8">
                                                     <div class="input-group">
-                                                        <input type="text" class="form-control" name="speed_limit_per_user" value="204800" id="speed_limit_per_user" placeholder="" required>
+                                                        <input type="text" class="form-control" name="speed_limit_per_user" value="{{$user->speed_limit_per_user}}" id="speed_limit_per_user" placeholder="" required>
                                                         <span class="input-group-addon">KB</span>
                                                     </div>
                                                 </div>

resources/views/admin/export.blade.php

@@ -85,15 +85,26 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="modal fade bs-modal-sm" id="qrcode_{{$node->id}}" tabindex="-1" role="dialog" aria-hidden="true">
-                                <div class="modal-dialog modal-sm">
+                            <div class="modal fade" id="qrcode_{{$node->id}}" tabindex="-1" role="dialog" aria-hidden="true">
+                                <div class="modal-dialog">
                                     <div class="modal-content">
                                         <div class="modal-header">
                                             <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
-                                            <h4 class="modal-title">请使用客户端扫描本二维码</h4>
+                                            <h4 class="modal-title">请使用客户端扫描二维码</h4>
                                         </div>
                                         <div class="modal-body">
-                                            <div id="qrcode_img_{{$node->id}}"></div>
+                                            <div class="row">
+                                                <div class="col-md-6">
+                                                    <div style="font-size:16px;text-align:center;padding-bottom:10px;"><span>SSR</span></div>
+                                                    <div id="qrcode_ssr_img_{{$node->id}}"></div>
+                                                </div>
+                                                <div class="col-md-6">
+                                                    @if ($node->compatible)
+                                                        <div style="font-size:16px;text-align:center;padding-bottom:10px;"><span>SS</span></div>
+                                                        <div id="qrcode_ss_img_{{$node->id}}"></div>
+                                                    @endif
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
@@ -136,7 +147,8 @@
 
         // 循环输出节点scheme用于生成二维码
         @foreach ($nodeList as $node)
-            $('#qrcode_img_{{$node->id}}').qrcode("{{$node->scheme}}");
+            $('#qrcode_ssr_img_{{$node->id}}').qrcode("{{$node->ssr_scheme}}");
+            $('#qrcode_ss_img_{{$node->id}}').qrcode("{{$node->ss_scheme}}");
         @endforeach
     </script>
 @endsection

resources/views/admin/nodeList.blade.php

@@ -49,7 +49,6 @@
                                     <th> 在线人数 </th>
                                     <th> 产生流量/可用流量 </th>
                                     <th> 流量比例 </th>
-                                    <th> 兼容SS </th>
                                     <th> 协议 </th>
                                     <th> 混淆 </th>
                                     <th> 操作 </th>
@@ -64,13 +63,12 @@
                                         @foreach($nodeList as $node)
                                             <tr class="odd gradeX">
                                                 <td> {{$node->id}} </td>
-                                                <td> {{$node->name}} </td>
+                                                <td> {{$node->name}} @if ($node->compatible) <span class="label label-warning"> 兼容SS </span> @endif </td>
                                                 <td> {{$node->bandwidth}}M </td>
                                                 <td> <span class="label label-danger"> {{$node->load}} </span> </td>
                                                 <td> <span class="label label-danger"> {{$node->online_users}} </span> </td>
                                                 <td> {{$node->transfer}} / {{$node->traffic}}G </td>
                                                 <td> {{$node->traffic_rate}} </td>
-                                                <td> <span class="label label-info"> {{$node->compatible ? '是' : '否'}} </span> </td>
                                                 <td> <span class="label label-info"> {{$node->protocol}} </span> </td>
                                                 <td> <span class="label label-info"> {{$node->obfs}} </span> </td>
                                                 <td>