no_ymq_dev
GeekQu 7 years ago
parent f1a7996979
commit 4e6002fcd6

@ -62,14 +62,19 @@ class FuncController extends BaseController
$server = null;
}
if (Config::get('mu_port_migration') == 'true') {
if (Config::get('relay_port_migration') == 'true') {
foreach ($rules as $rule) {
$dis = $this->get_dis_node_info($rule['dist_node_id']);
if ($dis != null) {
$rule['source_node_sort'] = $node->sort;
$rule['dist_node_sort'] = $dis->sort;
$rule['dist_node_server'] = $dis->server;
if (in_array($dis->sort, [0, 10])) {
$dis_server = explode(';', $dis->server);
$rule['dist_node_server'] = $dis_server[0];
} else {
$rule['dist_node_server'] = $dis->server;
}
if (in_array($dis->sort, [0, 10]) && strpos($dis->server, ';') !== false && $dis->mu_only != -1) {
$muPort = Tools::get_MuOutPortArray($dis->server);
$user = User::where('port', '=', $rule['port'])->first();
@ -85,7 +90,7 @@ class FuncController extends BaseController
}
}
}
} else {
$rule['source_node_sort'] = $node->sort;
$rule['dist_node_sort'] = null;
@ -98,7 +103,7 @@ class FuncController extends BaseController
if ($dis != null) {
$rule['source_node_sort'] = $node->sort;
$rule['dist_node_sort'] = $dis->sort;
$rule['dist_node_server'] = $dis->server;
$rule['dist_node_server'] = $dis->server;
} else {
$rule['source_node_sort'] = $node->sort;
$rule['dist_node_sort'] = null;

@ -54,6 +54,10 @@ class UserController extends BaseController
$mu_port_migration = 'false';
}
/*
* 1. 请不要把管理员作为单端口承载用户
* 2. 请不要把真实用户作为单端口承载用户
*/
$users_raw = User::where(
static function ($query) use ($node, $mu_port_migration) {
if ($mu_port_migration == 'true') {
@ -62,10 +66,12 @@ class UserController extends BaseController
if ($node->node_group != 0) {
$query1->where('class', '>=', $node->node_class)
->where('node_group', '=', $node->node_group)
->where('is_multi_user', '=', 0);
->where('is_multi_user', '=', 0)
->where('is_admin', 0);
} else {
$query1->where('class', '>=', $node->node_class)
->where('is_multi_user', '=', 0);
->where('is_multi_user', '=', 0)
->where('is_admin', 0);
}
}
);

@ -295,7 +295,7 @@ $System_Config['db_collation'] = 'utf8_general_ci';
$System_Config['db_prefix'] = '';
$System_Config['muKeyList'] = [' ']; //多 key 列表
$System_Config['mu_port_migration'] = 'false'; //为后端直接下发偏移后的端口
$System_Config['relay_port_migration'] = 'false'; //为中转规则下发偏移后的端口,一般与上一条同时启用
$System_Config['relay_port_migration'] = 'false'; //为中转规则下发偏移后的端口,此项未经测试
#aws
$System_Config['aws_access_key_id'] = '';

Loading…
Cancel
Save