Merge pull request #611 from GeekQu/Anankke_dev

bug fixes
A-dev
Anankke 8 years ago committed by GitHub
commit 88fbe80f76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -30,7 +30,12 @@ class RelayController extends AdminController
public function create($request, $response, $args)
{
$user = Auth::getUser();
$source_nodes = Node::where('sort', 10)->orwhere("sort",12)->orderBy('name')->get();
$source_nodes = Node::where(
function ($query) {
$query->Where('sort', 10)
->orWhere('sort', 12);
}
)->orderBy('name')->get();
foreach($source_nodes as $node){
if ($node->sort==12){
$node->name = $node->name." 正在使用V2ray后端 ";
@ -39,23 +44,21 @@ class RelayController extends AdminController
$dist_nodes = Node::where(
function ($query) {
$query->Where('sort', 0)
->orWhere('sort', 10)->orWhere('sort',12)->orWhere('sort',11);
->orWhere('sort', 10)
->orWhere('sort', 11)
->orWhere('sort', 12);
}
)->orderBy('name')->get();
foreach ($dist_nodes as $node){
if ($node->sort==11 or $node->sort==12){
$node_explode = explode(';', $node->server);
if ($node_explode[1]=="" || $node_explode[1]=="0"){
$node_explode[1]="443";
}
$node->name = $node->name." 如果是V2ray后端 请设置成 ".$node_explode[1];
$node_explode = Tools::ssv2Array($node->server);
$node->name = $node->name." 如果是V2ray后端 请设置成 ".$node_explode['port'];
}else {
$node->name = $node->name." 如果是V2ray后端 请不要设置,用户页面设置 ";
}
}
return $this->view()->assign('source_nodes', $source_nodes)->assign('dist_nodes', $dist_nodes)->display('admin/relay/add.tpl');
}
@ -137,7 +140,12 @@ class RelayController extends AdminController
exit(0);
}
$source_nodes = Node::where('sort', 10)->orwhere('sort',12)->orderBy('name')->get();
$source_nodes = Node::where(
function ($query) {
$query->Where('sort', 10)
->orWhere('sort', 12);
}
)->orderBy('name')->get();
foreach($source_nodes as $node){
if ($node->sort==12){
$node->name = $node->name." 正在使用V2ray后端 ";
@ -147,17 +155,16 @@ class RelayController extends AdminController
$dist_nodes = Node::where(
function ($query) {
$query->Where('sort', 0)
->orWhere('sort', 10)->orWhere('sort',12)->orWhere('sort',11);
->orWhere('sort', 10)
->orWhere('sort', 11)
->orWhere('sort', 12);
}
)->orderBy('name')->get();
foreach ($dist_nodes as $node){
if ($node->sort==11 or $node->sort==12){
$node_explode = explode(';', $node->server);
if ($node_explode[1]=="" || $node_explode[1]=="0"){
$node_explode[1]="443";
}
$node->name = $node->name." 如果是V2ray后端 请设置成".$node_explode[1];
$node_explode = Tools::ssv2Array($node->server);
$node->name = $node->name." 如果是V2ray后端 请设置成".$node_explode['port'];
}else {
$node->name = $node->name." 如果是V2ray后端 请不要设置,用户页面设置 ";
}
@ -267,9 +274,14 @@ class RelayController extends AdminController
$nodes = Node::where(
function ($query) use ($user) {
$query->Where("node_group", "=", $user->node_group)
->orWhere("node_group", "=", 0);
->orWhere("node_group", "=", 0);
}
)->where(
function ($query) {
$query->Where('sort', 10)
->orWhere('sort', 12);
}
)->where("sort", "=", 10)-orwhere("sort","=",12)->where("node_class", "<=", $user->class)->orderBy('name')->get();
)->where("node_class", "<=", $user->class)->orderBy('name')->get();
$pathset = new \ArrayObject();
@ -366,4 +378,4 @@ class RelayController extends AdminController
$body = $response->getBody();
$body->write($datatables->generate());
}
}
}

@ -29,9 +29,14 @@ class RelayController extends UserController
$nodes = Node::where(
function ($query) use ($user) {
$query->Where("node_group", "=", $user->node_group)
->orWhere("node_group", "=", 0);
->orWhere("node_group", "=", 0);
}
)->where('type', 1)->where("sort", "=", 10)->orwhere("sort","=",12)->where("node_class", "<=", $user->class)->orderBy('name')->get();
)->where('type', 1)->where(
function ($query) {
$query->Where('sort', 10)
->orWhere('sort', 12);
}
)->where("node_class", "<=", $user->class)->orderBy('name')->get();
$pathset = new \ArrayObject();
@ -119,7 +124,12 @@ class RelayController extends UserController
$query->Where("node_group", "=", $user->node_group)
->orWhere("node_group", "=", 0);
}
)->where('type', 1)->where('sort', 10)->orwhere('sort',12)->where("node_class", "<=", $user->class)->orderBy('name')->get();
)->where('type', 1)->where(
function ($query) {
$query->Where('sort', 10)
->orWhere('sort', 12);
}
)->where("node_class", "<=", $user->class)->orderBy('name')->get();
foreach($source_nodes as $node){
if ($node->sort==12){
$node->name = $node->name." 正在使用V2ray后端 ";
@ -133,7 +143,9 @@ class RelayController extends UserController
)->where('type', 1)->where(
function ($query) {
$query->Where('sort', 0)
->orWhere('sort', 10)->orWhere('sort',12)->orWhere('sort',11);
->orWhere('sort', 10)
->orWhere('sort', 11)
->orWhere('sort', 12);
}
)->where("node_class", "<=", $user->class)->orderBy('name')->get();
@ -154,12 +166,9 @@ class RelayController extends UserController
foreach ($dist_nodes as $node){
if ($node->sort==11 or $node->sort==12){
$node_explode = explode(';', $node->server);
if ($node_explode[1]=="" || $node_explode[1]=="0"){
$node_explode[1]="443";
}
array_push($ports, $node_explode[1]);
$node->name = $node->name." 如果是V2ray后端 请设置成 ".$node_explode[1];
$node_explode = Tools::ssv2Array($node->server);
array_push($ports, $node_explode['port']);
$node->name = $node->name." 如果是V2ray后端 请设置成 ".$node_explode['port'];
}else {
$node->name = $node->name." 如果是V2ray后端 请设置成 ".$user->port;
}
@ -184,7 +193,12 @@ class RelayController extends UserController
$query->Where("node_group", "=", $user->node_group)
->orWhere("node_group", "=", 0);
}
)->where('type', 1)->where('sort', 10)->orwhere('sort',12)->where("node_class", "<=", $user->class)->first();
)->where('type', 1)->where(
function ($query) {
$query->Where('sort', 10)
->orWhere('sort', 12);
}
)->where("node_class", "<=", $user->class)->first();
if ($source_node == null) {
$rs['ret'] = 0;
$rs['msg'] = "起源节点错误";
@ -208,7 +222,9 @@ class RelayController extends UserController
)->where('type', 1)->where(
function ($query) {
$query->Where('sort', 0)
->orWhere('sort', 10)->orWhere('sort',12)->orWhere('sort',11);
->orWhere('sort', 10)
->orWhere('sort', 11)
->orWhere('sort', 12);
}
)->where("node_class", "<=", $user->class)->first();
@ -225,7 +241,6 @@ class RelayController extends UserController
return $response->getBody()->write(json_encode($rs));
}
$port_raw = Node::where('server', $port)->where(
function ($query) use ($user) {
$query->Where("node_group", "=", $user->node_group)
@ -234,19 +249,16 @@ class RelayController extends UserController
)->where('type', 1)->where('sort', 9)->where("node_class", "<=", $user->class)->first();
$v2ray_port_raw="";
if ($dist_node->sort ==12 || $dist_node->sort==11) {
$node_explode = explode(';', $dist_node->server);
$v2ray_port_raw= $node_explode[1];
if ($v2ray_port_raw=="" || $v2ray_port_raw=="0"){
$v2ray_port_raw="443";
}
$node_explode = Tools::ssv2Array($dist_node->server);
$v2ray_port_raw = $node_explode['port'];
}
if (($port_raw == null && $port != $user->port)||($v2ray_port_raw!="" && ($port!=$user->port && $port!=$v2ray_port_raw))) {
if (($port_raw == null && $port != $user->port && $v2ray_port_raw=="")||($v2ray_port_raw!="" && ($port!=$user->port && $port!=$v2ray_port_raw))) {
$rs['ret'] = 0;
$rs['msg'] = "端口错误";
return $response->getBody()->write(json_encode($rs));
}
if (!Tools::is_protocol_relay($user)) {
if (!Tools::is_protocol_relay($user)) {
$rs['ret'] = 0;
$rs['msg'] = "为了中转的稳定,您需要在<a href='/user/edit'>资料编辑</a>处设置协议为 auth_aes128_md5 或 auth_aes128_sha1 后方可设置中转规则!";
return $response->getBody()->write(json_encode($rs));
@ -302,7 +314,12 @@ class RelayController extends UserController
$query->Where("node_group", "=", $user->node_group)
->orWhere("node_group", "=", 0);
}
)->where('type', 1)->where('sort', 10)->orwhere("sort",12)->where("node_class", "<=", $user->class)->orderBy('name')->get();
)->where('type', 1)->where(
function ($query) {
$query->Where('sort', 10)
->orWhere('sort', 12);
}
)->where("node_class", "<=", $user->class)->orderBy('name')->get();
foreach($source_nodes as $node){
if ($node->sort==12){
$node->name = $node->name." 正在使用V2ray后端 ";
@ -316,7 +333,9 @@ class RelayController extends UserController
)->where('type', 1)->where(
function ($query) {
$query->Where('sort', 0)
->orWhere('sort', 10)->orWhere('sort',12)->orWhere('sort',11);
->orWhere('sort', 10)
->orWhere('sort', 11)
->orWhere('sort', 12);
}
)->where("node_class", "<=", $user->class)->orderBy('name')->get();
@ -336,12 +355,9 @@ class RelayController extends UserController
}
foreach ($dist_nodes as $node){
if ($node->sort==11 or $node->sort==12){
$node_explode = explode(';', $node->server);
if ($node_explode[1]=="" || $node_explode[1]=="0"){
$node_explode[1]="443";
}
array_push($ports, $node_explode[1]);
$node->name = $node->name." 如果是V2ray后端 请设置成: ".$node_explode[1];
$node_explode = Tools::ssv2Array($node->server);
array_push($ports, $node_explode['port']);
$node->name = $node->name." 如果是V2ray后端 请设置成: ".$node_explode['port'];
}else {
$node->name = $node->name." 如果是V2ray后端 请设置成 ".$user->port;
}
@ -372,7 +388,12 @@ class RelayController extends UserController
$query->Where("node_group", "=", $user->node_group)
->orWhere("node_group", "=", 0);
}
)->where('type', 1)->where('sort', 10)->orwhere("sort",12)->where("node_class", "<=", $user->class)->first();
)->where('type', 1)->where(
function ($query) {
$query->Where('sort', 10)
->orWhere('sort', 12);
}
)->where("node_class", "<=", $user->class)->first();
if ($source_node == null) {
$rs['ret'] = 0;
$rs['msg'] = "起源节点错误";
@ -387,7 +408,9 @@ class RelayController extends UserController
)->where('type', 1)->where(
function ($query) {
$query->Where('sort', 0)
->orWhere('sort', 10)->orWhere('sort',12)->orWhere('sort',11);
->orWhere('sort', 10)
->orWhere('sort', 11)
->orWhere('sort', 12);
}
)->where("node_class", "<=", $user->class)->first();
@ -412,13 +435,10 @@ class RelayController extends UserController
)->where('type', 1)->where('sort', 9)->where("node_class", "<=", $user->class)->first();
$v2ray_port_raw="";
if ($dist_node->sort ==12 || $dist_node->sort==11) {
$node_explode = explode(';', $dist_node->server);
$v2ray_port_raw= $node_explode[1];
if ($v2ray_port_raw=="" || $v2ray_port_raw=="0"){
$v2ray_port_raw="443";
}
$node_explode = Tools::ssv2Array($dist_node->server);
$v2ray_port_raw= $node_explode['port'];
}
if (($port_raw == null && $port != $user->port)||($v2ray_port_raw!="" && ($port!=$user->port && $port!=$v2ray_port_raw))) {
if (($port_raw == null && $port != $user->port && $v2ray_port_raw=="" )||($v2ray_port_raw!="" && ($port!=$user->port && $port!=$v2ray_port_raw))) {
$rs['ret'] = 0;
$rs['msg'] = "端口错误";
return $response->getBody()->write(json_encode($rs));
@ -482,4 +502,4 @@ class RelayController extends UserController
$rs['msg'] = "删除成功";
return $response->getBody()->write(json_encode($rs));
}
}
}

@ -482,8 +482,8 @@ class UserController extends BaseController
$array_node['class']=$node->node_class;
$array_node['name']=$node->name;
if ($node->sort == 13) {
$server = explode(';', $node->server);
$array_node['server']=$server[1];
$server = Tools::ssv2Array($node->server);
$array_node['server']=$server['add'];
} else {
$array_node['server']=$node->server;
}

@ -385,8 +385,8 @@ class VueController extends BaseController
$array_node['server'] = '***.***.***.***';
} else {
if ($node->sort == 13) {
$server = explode(';', $node->server);
$array_node['server'] = $server[1];
$server = Tools::ssv2Array($node->server);
$array_node['server']=$server['add'];
} else {
$array_node['server'] = $node->server;
}

@ -303,7 +303,12 @@ class URL
}
public static function getAllVMessUrl($user, $arrout = 0) {
$nodes = Node::where('sort', 11)->orwhere('sort',12)->where(
$nodes = Node::where(
function ($query) {
$query->where('sort', 11)
->orwhere('sort', 12);
}
)->where(
function ($query) use ($user){
$query->where("node_group", "=", $user->node_group)
->orWhere("node_group", "=", 0);
@ -315,14 +320,13 @@ class URL
foreach ($nodes as $node) {
$result .= (URL::getV2Url($user, $node, $arrout) . "\n");
}
return $result;
} else {
$result = [];
foreach ($nodes as $node) {
array_push($result, URL::getV2Url($user, $node, $arrout));
}
return $result;
}
return $result;
}
public static function getAllSSDUrl($user){

@ -33,16 +33,16 @@ secret: ''
Proxy:
{foreach $confs as $conf}
- {json_encode($conf,JSON_UNESCAPED_SLASHES)}
- {json_encode($conf,320)}
{/foreach}
Proxy Group:
- { name: "Auto", type: fallback, proxies: {$proxies|json_encode}, url: "http://www.gstatic.com/generate_204", interval: 300 }
{append var='proxies' value='Auto'}
- { name: "Proxy", type: select, proxies: {$proxies|json_encode} }
- { name: "Auto", type: fallback, proxies: {json_encode($proxies,320)}, url: "http://www.gstatic.com/generate_204", interval: 300 }
{append var='proxies' value='Auto' index=0}
- { name: "Proxy", type: select, proxies: {json_encode($proxies,320)} }
- { name: "Domestic", type: select, proxies: ["DIRECT","Proxy"] }
{$China_media=["Domestic","Proxy"]}
- { name: "China_media", type: select, proxies: {$China_media|json_encode} }
- { name: "China_media", type: select, proxies: {json_encode($China_media,320)} }
- { name: "Global_media", type: select, proxies: ["Proxy"]}
- { name: "Others", type: select, proxies: ["Proxy","Domestic"]}
@ -587,30 +587,3 @@ Rule:
- GEOIP,CN,Domestic
- MATCH,Others
# Clash for Windows 自定义系统代理需要绕过的域名或IP。
cfw-bypass:
- 'music.163.com'
- '*.music.126.net'
- localhost
- 127.*
- 10.*
- 172.16.*
- 172.17.*
- 172.18.*
- 172.19.*
- 172.20.*
- 172.21.*
- 172.22.*
- 172.23.*
- 172.24.*
- 172.25.*
- 172.26.*
- 172.27.*
- 172.28.*
- 172.29.*
- 172.30.*
- 172.31.*
- 192.168.*
- <local>

@ -57,6 +57,8 @@
<label class="floating-label" for="sspwd">新连接密码</label>
<input class="form-control maxwidth-edit" id="sspwd" type="text">
</div>
<br/>
<p>您需要了解的是,修改此密码同时也会变更您 V2Ray 节点的 UUID,请注意及时更新托管订阅。</p>
</div>
</div>
</div>

Loading…
Cancel
Save