|
|
|
|
@ -126,15 +126,10 @@ class RelayController extends UserController
|
|
|
|
|
}
|
|
|
|
|
)->where('type', 1)->where(
|
|
|
|
|
static function ($query) {
|
|
|
|
|
$query->Where('sort', 10)
|
|
|
|
|
->orWhere('sort', 12);
|
|
|
|
|
$query->Where('sort', 10);
|
|
|
|
|
}
|
|
|
|
|
)->where('node_class', '<=', $user->class)->orderBy('name')->get();
|
|
|
|
|
foreach ($source_nodes as $node) {
|
|
|
|
|
if ($node->sort == 12) {
|
|
|
|
|
$node->name .= ' 正在使用V2ray后端 ';
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$dist_nodes = Node::where(
|
|
|
|
|
static function ($query) use ($user) {
|
|
|
|
|
$query->Where('node_group', '=', $user->node_group)
|
|
|
|
|
@ -143,9 +138,7 @@ class RelayController extends UserController
|
|
|
|
|
)->where('type', 1)->where(
|
|
|
|
|
static function ($query) {
|
|
|
|
|
$query->Where('sort', 0)
|
|
|
|
|
->orWhere('sort', 10)
|
|
|
|
|
->orWhere('sort', 11)
|
|
|
|
|
->orWhere('sort', 12);
|
|
|
|
|
->orWhere('sort', 10);
|
|
|
|
|
}
|
|
|
|
|
)->where('node_class', '<=', $user->class)->orderBy('name')->get();
|
|
|
|
|
|
|
|
|
|
@ -164,16 +157,6 @@ class RelayController extends UserController
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
foreach ($dist_nodes as $node) {
|
|
|
|
|
if ($node->sort == 11 || $node->sort == 12) {
|
|
|
|
|
$node_explode = Tools::v2Array($node->server);
|
|
|
|
|
$ports[] = $node_explode['port'];
|
|
|
|
|
$node->name = $node->name . ' 如果是V2ray后端 请设置成 ' . $node_explode['port'];
|
|
|
|
|
} else {
|
|
|
|
|
$node->name = $node->name . ' 如果是V2ray后端 请设置成 ' . $user->port;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$ports[] = $user->port;
|
|
|
|
|
$ports = array_unique($ports);
|
|
|
|
|
return $this->view()->assign('source_nodes', $source_nodes)->assign('dist_nodes', $dist_nodes)->assign('ports', $ports)->display('user/relay/add.tpl');
|
|
|
|
|
@ -195,8 +178,7 @@ class RelayController extends UserController
|
|
|
|
|
}
|
|
|
|
|
)->where('type', 1)->where(
|
|
|
|
|
static function ($query) {
|
|
|
|
|
$query->Where('sort', 10)
|
|
|
|
|
->orWhere('sort', 12);
|
|
|
|
|
$query->Where('sort', 10);
|
|
|
|
|
}
|
|
|
|
|
)->where('node_class', '<=', $user->class)->first();
|
|
|
|
|
if ($source_node == null) {
|
|
|
|
|
@ -223,8 +205,7 @@ class RelayController extends UserController
|
|
|
|
|
static function ($query) {
|
|
|
|
|
$query->Where('sort', 0)
|
|
|
|
|
->orWhere('sort', 10)
|
|
|
|
|
->orWhere('sort', 11)
|
|
|
|
|
->orWhere('sort', 12);
|
|
|
|
|
->orWhere('sort', 11);
|
|
|
|
|
}
|
|
|
|
|
)->where('node_class', '<=', $user->class)->first();
|
|
|
|
|
|
|
|
|
|
@ -247,12 +228,7 @@ class RelayController extends UserController
|
|
|
|
|
->orWhere('node_group', '=', 0);
|
|
|
|
|
}
|
|
|
|
|
)->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 = Tools::v2Array($dist_node->server);
|
|
|
|
|
$v2ray_port_raw = $node_explode['port'];
|
|
|
|
|
}
|
|
|
|
|
if (($port_raw == null && $port != $user->port && $v2ray_port_raw == '') || ($v2ray_port_raw != '' && ($port != $user->port && $port != $v2ray_port_raw))) {
|
|
|
|
|
if (($port_raw == null && $port != $user->port)) {
|
|
|
|
|
$rs['ret'] = 0;
|
|
|
|
|
$rs['msg'] = '端口错误';
|
|
|
|
|
return $response->getBody()->write(json_encode($rs));
|
|
|
|
|
@ -316,15 +292,10 @@ class RelayController extends UserController
|
|
|
|
|
}
|
|
|
|
|
)->where('type', 1)->where(
|
|
|
|
|
static function ($query) {
|
|
|
|
|
$query->Where('sort', 10)
|
|
|
|
|
->orWhere('sort', 12);
|
|
|
|
|
$query->Where('sort', 10);
|
|
|
|
|
}
|
|
|
|
|
)->where('node_class', '<=', $user->class)->orderBy('name')->get();
|
|
|
|
|
foreach ($source_nodes as $node) {
|
|
|
|
|
if ($node->sort == 12) {
|
|
|
|
|
$node->name .= ' 正在使用V2ray后端 ';
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$dist_nodes = Node::where(
|
|
|
|
|
static function ($query) use ($user) {
|
|
|
|
|
$query->Where('node_group', '=', $user->node_group)
|
|
|
|
|
@ -334,8 +305,7 @@ class RelayController extends UserController
|
|
|
|
|
static function ($query) {
|
|
|
|
|
$query->Where('sort', 0)
|
|
|
|
|
->orWhere('sort', 10)
|
|
|
|
|
->orWhere('sort', 11)
|
|
|
|
|
->orWhere('sort', 12);
|
|
|
|
|
->orWhere('sort', 11);
|
|
|
|
|
}
|
|
|
|
|
)->where('node_class', '<=', $user->class)->orderBy('name')->get();
|
|
|
|
|
|
|
|
|
|
@ -353,15 +323,7 @@ class RelayController extends UserController
|
|
|
|
|
$ports[] = $port_raw->server;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
foreach ($dist_nodes as $node) {
|
|
|
|
|
if ($node->sort == 11 || $node->sort == 12) {
|
|
|
|
|
$node_explode = Tools::v2Array($node->server);
|
|
|
|
|
$ports[] = $node_explode['port'];
|
|
|
|
|
$node->name = $node->name . ' 如果是V2ray后端 请设置成: ' . $node_explode['port'];
|
|
|
|
|
} else {
|
|
|
|
|
$node->name = $node->name . ' 如果是V2ray后端 请设置成 ' . $user->port;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$ports[] = $user->port;
|
|
|
|
|
$ports = array_unique($ports);
|
|
|
|
|
@ -390,8 +352,7 @@ class RelayController extends UserController
|
|
|
|
|
}
|
|
|
|
|
)->where('type', 1)->where(
|
|
|
|
|
static function ($query) {
|
|
|
|
|
$query->Where('sort', 10)
|
|
|
|
|
->orWhere('sort', 12);
|
|
|
|
|
$query->Where('sort', 10);
|
|
|
|
|
}
|
|
|
|
|
)->where('node_class', '<=', $user->class)->first();
|
|
|
|
|
if ($source_node == null) {
|
|
|
|
|
@ -409,8 +370,7 @@ class RelayController extends UserController
|
|
|
|
|
static function ($query) {
|
|
|
|
|
$query->Where('sort', 0)
|
|
|
|
|
->orWhere('sort', 10)
|
|
|
|
|
->orWhere('sort', 11)
|
|
|
|
|
->orWhere('sort', 12);
|
|
|
|
|
->orWhere('sort', 11);
|
|
|
|
|
}
|
|
|
|
|
)->where('node_class', '<=', $user->class)->first();
|
|
|
|
|
|
|
|
|
|
@ -433,12 +393,7 @@ class RelayController extends UserController
|
|
|
|
|
->orWhere('node_group', '=', 0);
|
|
|
|
|
}
|
|
|
|
|
)->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 = Tools::v2Array($dist_node->server);
|
|
|
|
|
$v2ray_port_raw = $node_explode['port'];
|
|
|
|
|
}
|
|
|
|
|
if (($port_raw == null && $port != $user->port && $v2ray_port_raw == '') || ($v2ray_port_raw != '' && ($port != $user->port && $port != $v2ray_port_raw))) {
|
|
|
|
|
if (($port_raw == null && $port != $user->port)) {
|
|
|
|
|
$rs['ret'] = 0;
|
|
|
|
|
$rs['msg'] = '端口错误';
|
|
|
|
|
return $response->getBody()->write(json_encode($rs));
|
|
|
|
|
|