From c6ff5e437730a9475d3e16e482272ba37f0e257e Mon Sep 17 00:00:00 2001 From: CGDF <17256673+CGDF-Github@users.noreply.github.com> Date: Thu, 8 Nov 2018 10:18:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dnode.tpl=E5=92=8CSSD=E8=AE=A2?= =?UTF-8?q?=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Utils/URL.php | 82 +++++++++++++------------- resources/views/material/user/node.tpl | 3 +- 2 files changed, 42 insertions(+), 43 deletions(-) diff --git a/app/Utils/URL.php b/app/Utils/URL.php index e83f493f..1026c6c6 100644 --- a/app/Utils/URL.php +++ b/app/Utils/URL.php @@ -374,7 +374,6 @@ class URL foreach($nodes as $node){ $server=array(); $server['id']=$server_index; - $server_index++; $server['server']=$node->server; //判断是否是中转起源节点 $relay_rule = Relay::where('source_node_id', $node->id)->where( @@ -384,55 +383,54 @@ class URL } )->orderBy('priority','DESC')->orderBy('id')->first(); if ($relay_rule != null) { - //是中转起源节点 + //是中转起源节点 $server['remarks']=$node->name.' => '.$relay_rule->dist_node()->name; $server['ratio']=$node->traffic_rate+$relay_rule->dist_node()->traffic_rate; array_push($array_server,$server); + $server_index++; continue; } - else{ - //不是中转起源节点 - $server['ratio']=$node->traffic_rate; + + //不是中转起源节点 - //单多 - if($node->mu_only==0||$node->mu_only==-1){ - $server['remarks']=$node->name; + $server['ratio']=$node->traffic_rate; + //单多 + if($node->mu_only==0||$node->mu_only==-1){ + $server['remarks']=$node->name; + array_push($array_server,$server); + $server_index++; + } + //普通 + if($node->mu_only==0||$node->mu_only==1){ + $nodes_muport=Node::where('type','1')->where('sort', '=', 9) + ->where(function ($query) use ($user) { + $query->Where('node_group', '=', $user->group) + ->orWhere('node_group', '=', 0); + }) + ->where('node_class', '<=', $user->class) + ->orderBy('server')->get(); + foreach($nodes_muport as $node_muport){ + $muport_user=User::where('port','=',$node_muport->server)->first(); + if(!URL::SSCanConnect($muport_user)){ + continue; + } + $server['id']=$server_index; + $server['remarks']=$node->name.' - 单多'.$node_muport->server.'端口'; + $server['port']=$node_muport->server; + $server['encryption']=$muport_user->method; + $server['password']=$muport_user->passwd; + $server['plugin']='simple-obfs';//目前只支持这个 + $plugin_options=''; + if(strpos($muport_user->obfs,'http')!=FALSE){ + $plugin_options='obfs=http'; + } + if(strpos($muport_user->obfs,'tls')!=FALSE){ + $plugin_options='obfs=tls'; + } + $server['plugin_options']=$plugin_options.';obfs-host='.$user->getMuMd5(); array_push($array_server,$server); $server_index++; - } - - //普通 - if($node->mu_only==0||$node->mu_only==1){ - $nodes_muport=Node::where('type','1')->where('sort', '=', 9) - ->where(function ($query) use ($user) { - $query->Where('node_group', '=', $user->group) - ->orWhere('node_group', '=', 0); - }) - ->where('node_class', '<=', $user->class) - ->orderBy('server')->get(); - foreach($nodes_muport as $node_muport){ - $muport_user=User::where('port','=',$node_muport->server)->first(); - if(!URL::SSCanConnect($muport_user)){ - continue; - } - $server['id']=$server_index; - $server['remarks']=$node->name.' - 单多'.$node_muport->server.'端口'; - $server['port']=$node_muport->server; - $server['encryption']=$muport_user->method; - $server['password']=$muport_user->passwd; - $server['plugin']='simple-obfs';//目前只支持这个 - $plugin_options=''; - if(strpos($muport_user->obfs,'http')!=FALSE){ - $plugin_options='obfs=http'; - } - if(strpos($muport_user->obfs,'tls')!=FALSE){ - $plugin_options='obfs=tls'; - } - $server['plugin_options']=$plugin_options.';obfs-host='.$user->getMuMd5(); - array_push($array_server,$server); - $server_index++; - } - } + } } } diff --git a/resources/views/material/user/node.tpl b/resources/views/material/user/node.tpl index 1df02af1..a639b581 100755 --- a/resources/views/material/user/node.tpl +++ b/resources/views/material/user/node.tpl @@ -158,7 +158,8 @@