新增节点合租模式和NAT模式

节点自动分组
dumplin233 9 years ago
parent a1683e9495
commit 6c3e12aecd

@ -52,6 +52,31 @@ class NodeController extends AdminController
$node->node_speedlimit = $request->getParam('node_speedlimit');
$node->status = $request->getParam('status');
$node->sort = $request->getParam('sort');
$offset_mode = $request->getParam('offset_mode');
$offset = $request->getParam('offset');
$muport = $request->getParam('muport');
$subscribe = $request->getParam('subscribe');
if ($offset_mode == 1) {
if (is_numeric($offset)) {
$node->name .= ' : '.$offset;
} else {
$rs['ret'] = 0;
$rs['msg'] = "请输入正确的端口偏移值";
return $response->getBody()->write(json_encode($rs));
}
}
if ($offset_mode == 2) {
if (is_numeric($muport) && is_numeric($subscribe)) {
$node->name .= ' : '.$muport.'=>'.$subscribe;
} else {
$rs['ret'] = 0;
$rs['msg'] = "请输入正确的内网端口或公网端口";
return $response->getBody()->write(json_encode($rs));
}
}
if ($node->sort == 0 || $node->sort == 1 || $node->sort == 10 || $node->sort == 11) {
if ($request->getParam('node_ip') != '') {
$node->node_ip = $request->getParam('node_ip');
@ -91,6 +116,24 @@ class NodeController extends AdminController
{
$id = $args['id'];
$node = Node::find($id);
$temp = explode(' : ', $node->name);
$node->offset_mode = 0;
if (isset($temp[1])) {
$node->name = $temp[0];
if (is_numeric($temp[1])) {
$node->offset = $temp[1];
$node->mu_only = -1;
$node->offset_mode = 1;
} else {
$temp = explode('=>', $temp[1]);
if (is_numeric($temp[0]) && is_numeric($temp[1])) {
$node->mu_only = 1;
$node->muport = $temp[0];
$node->subscribe = $temp[1];
$node->offset_mode = 2;
}
}
}
if ($node == null) {
}
return $this->view()->assign('node', $node)->display('admin/node/edit.tpl');
@ -113,6 +156,30 @@ class NodeController extends AdminController
$node->node_speedlimit = $request->getParam('node_speedlimit');
$node->type = $request->getParam('type');
$node->sort = $request->getParam('sort');
$offset_mode = $request->getParam('offset_mode');
$offset = $request->getParam('offset');
$muport = $request->getParam('muport');
$subscribe = $request->getParam('subscribe');
if ($offset_mode == 1) {
if (is_numeric($offset)) {
$node->name .= ' : '.$offset;
} else {
$rs['ret'] = 0;
$rs['msg'] = "请输入正确的端口偏移值";
return $response->getBody()->write(json_encode($rs));
}
}
if ($offset_mode == 2) {
if (is_numeric($muport) && is_numeric($subscribe)) {
$node->name .= ' : '.$muport.'=>'.$subscribe;
} else {
$rs['ret'] = 0;
$rs['msg'] = "请输入正确的内网端口或公网端口";
return $response->getBody()->write(json_encode($rs));
}
}
if ($node->sort == 0 || $node->sort == 1 || $node->sort == 10 || $node->sort == 11) {
if ($request->getParam('node_ip') != '') {
@ -226,6 +293,11 @@ class NodeController extends AdminController
<a class="btn btn-brand-accent" '.($data['sort'] == 999 ? 'disabled' : 'id="delete" value="'.$data['id'].'" href="javascript:void(0);" onClick="delete_modal_show(\''.$data['id'].'\')"').'>删除</a>';
});
$datatables->edit('name', function ($data) {
$temp = explode(' : ', $data['name']);
return $temp[0];
});
$datatables->edit('node_bandwidth', function ($data) {
return Tools::flowToGB($data['node_bandwidth']);
});

@ -581,7 +581,8 @@ class UserController extends BaseController
{
$id = $args['id'];
$point_node=Node::find($id);
$prefix=explode(" - ", $point_node->name);
$temp = explode(' : ', $point_node->name);
$prefix=explode(" - ", $prefix[0]);
return $this->view()->assign('point_node', $point_node)->assign('prefix', $prefix[0])->assign('id', $id)->display('user/nodeajax.tpl');
}
@ -617,6 +618,22 @@ class UserController extends BaseController
foreach ($nodes as $node) {
if (((($user->node_group==$node->node_group||$node->node_group==0))||$user->is_admin)&&(!$node->isNodeTrafficOut())) {
$temp = explode(' : ', $node->name);
if (isset($temp[1])) {
$node->name = $temp[0];
if (is_numeric($temp[1])) {
$node->offset = $temp[1];
$node->mu_only = -1;
} else {
$temp = explode('=>', $temp[1]);
if (is_numeric($temp[0]) && is_numeric($temp[1])) {
$node->mu_only = 1;
$node->muport = $temp[0];
$node->subscribe = $temp[1];
}
}
}
if ($node->sort==9) {
$mu_user=User::where('port', '=', $node->server)->first();
$mu_user->obfs_param=$this->user->getMuMd5();

@ -167,6 +167,22 @@ class URL
$relay_rules = array();
}
foreach ($nodes as $node) {
$temp = explode(' : ', $node->name);
if (isset($temp[1])) {
$node->name = $temp[0];
if (is_numeric($temp[1])) {
$node->offset = $temp[1];
$node->mu_only = -1;
} else {
$temp = explode('=>', $temp[1]);
if (is_numeric($temp[0]) && is_numeric($temp[1])) {
$node->mu_only = 1;
$node->muport = $temp[0];
$node->subscribe = $temp[1];
}
}
}
if ($node->mu_only != 1 && $is_mu == 0) {
if ($node->sort == 10) {
$relay_rule_id = 0;
@ -324,6 +340,12 @@ class URL
if ($mu_user == null) {
return;
}
if (isset($node->subscribe)) {
if ($node->muport != $mu_port) {
return;
}
$mu_user->port = $node->subscribe;
}
$mu_user->obfs_param = $user->getMuMd5();
$mu_user->protocol_param = $user->id.":".$user->passwd;
$user = $mu_user;
@ -340,6 +362,10 @@ class URL
}
$user = URL::getSSRConnectInfo($user);
}
if (isset($node->offset)) {
$user->port = $user->port + $node->offset;
}
$return_array['address'] = $node->server;
$return_array['port'] = $user->port;
$return_array['passwd'] = $user->passwd;

@ -73,6 +73,40 @@
</label>
</div>
<div class="form-group form-group-label">
<label for="offset_mode">
<label class="floating-label" for="offset_mode">端口偏移</label>
<select id="offset_mode" class="form-control" onchange="change_offset_mode()">
<option value="0" selected>不开启</option>
<option value="1">合租模式(强制只启用普通端口)</option>
<option value="2">NAT模式(强制只启用单端口多用户)</option>
</select>
</label>
</div>
<div class="form-group form-group-label" id="offset_mode_1">
<label for="offset">
<label class="floating-label" for="offset">输入偏移量</label>
<input class="form-control" id="offset" type="number">
</label>
</div>
<div id="offset_mode_2">
<div class="form-group form-group-label">
<label for="muport">
<label class="floating-label" for="muport">内网端口</label>
<input class="form-control" id="muport" type="number">
</label>
</div>
<div class="form-group form-group-label">
<label for="subscribe">
<label class="floating-label" for="subscribe">映射外网端口</label>
<input class="form-control" id="subscribe" type="number">
</label>
</div>
</div>
</div>
</div>
@ -192,6 +226,33 @@
{include file='admin/footer.tpl'}
<script>
function change_offset_mode() {
offset_mode = $("#offset_mode").val();
if (offset_mode == 0)
{
document.getElementById('offset_mode_1').setAttribute('hidden','hidden');
document.getElementById('offset_mode_2').setAttribute('hidden','hidden');
document.getElementById('mu_only').removeAttribute('disabled');
}
if (offset_mode == 1)
{
document.getElementById('offset_mode_1').removeAttribute('hidden');
document.getElementById('offset_mode_2').setAttribute('hidden','hidden');
document.getElementById('mu_only').value = -1;
document.getElementById('mu_only').setAttribute('disabled','disabled');
}
if (offset_mode == 2)
{
document.getElementById('offset_mode_1').setAttribute('hidden','hidden');
document.getElementById('offset_mode_2').removeAttribute('hidden');
document.getElementById('mu_only').value = 1;
document.getElementById('mu_only').setAttribute('disabled','disabled');
}
}
change_offset_mode();
</script>
{literal}
<script>

@ -76,6 +76,39 @@
</label>
</div>
<div class="form-group form-group-label">
<label for="offset_mode">
<label class="floating-label" for="offset_mode">端口偏移</label>
<select id="offset_mode" class="form-control" onchange="change_offset_mode()">
<option value="0" selected>不开启</option>
<option value="1">合租模式(强制只启用普通端口)</option>
<option value="2">NAT模式(强制只启用单端口多用户)</option>
</select>
</label>
</div>
<div class="form-group form-group-label" id="offset_mode_1">
<label for="offset">
<label class="floating-label" for="offset">输入偏移量</label>
<input class="form-control" id="offset" type="number">
</label>
</div>
<div id="offset_mode_2">
<div class="form-group form-group-label">
<label for="muport">
<label class="floating-label" for="muport">内网端口</label>
<input class="form-control" id="muport" type="number">
</label>
</div>
<div class="form-group form-group-label">
<label for="subscribe">
<label class="floating-label" for="subscribe">映射外网端口</label>
<input class="form-control" id="subscribe" type="number">
</label>
</div>
</div>
</div>
</div>
@ -189,7 +222,37 @@
{include file='admin/footer.tpl'}
<script>
function change_offset_mode() {
offset_mode = $("#offset_mode").val();
if (offset_mode == 0)
{
document.getElementById('offset_mode_1').setAttribute('hidden','hidden');
document.getElementById('offset_mode_2').setAttribute('hidden','hidden');
document.getElementById('mu_only').removeAttribute('disabled');
}
if (offset_mode == 1)
{
document.getElementById('offset_mode_1').removeAttribute('hidden');
document.getElementById('offset_mode_2').setAttribute('hidden','hidden');
document.getElementById('mu_only').value = -1;
document.getElementById('mu_only').setAttribute('disabled','disabled');
}
if (offset_mode == 2)
{
document.getElementById('offset_mode_1').setAttribute('hidden','hidden');
document.getElementById('offset_mode_2').removeAttribute('hidden');
document.getElementById('mu_only').value = 1;
document.getElementById('mu_only').setAttribute('disabled','disabled');
}
}
$("#offset_mode").val({$node->offset_mode});
$("#offset").val({$node->offset});
$("#muport").val({$node->muport});
$("#subscribe").val({$node->subscribe});
change_offset_mode();
</script>
{literal}
<script>
@ -262,7 +325,11 @@
node_bandwidth_limit: $("#node_bandwidth_limit").val(),
bandwidthlimit_resetday: $("#bandwidthlimit_resetday").val(){/literal},
custom_rss: custom_rss,
mu_only: $("#mu_only").val()
mu_only: $("#mu_only").val(),
offset_mode: $("#offset_mode").val(),
offset: $("#offset").val(),
muport: $("#muport").val(),
subscribe: $("#subscribe").val()
{literal}
},
success: function (data) {

@ -109,8 +109,36 @@
<div class="card-main">
<div class="card-inner">
<p class="card-heading" >
<a href="javascript:void(0);" onClick="urlChange('{$node->id}',0,{if $relay_rule != null}{$relay_rule->id}{else}0{/if})">{$node->name}{if $relay_rule != null} - {$relay_rule->dist_node()->name}{/if}</a>
<span class="label label-brand-accent">←点击节点查看配置信息</span>
{if isset($node->offset)}
{if URL::SSCanConnect($user)}
{$ss_item = URL::getItem($user, $node, $mu, $relay_rule_id, 1)}
{/if}
{if URL::SSRCanConnect($user)}
{$ssr_item = URL::getItem($user, $node, $mu, $relay_rule_id, 0)}
{/if}
{$node->name}
<p>
服务器地址:{$ssr_item['address']}<br>
服务器端口:{$ssr_item['port']}<br>
加密方式:{$ssr_item['method']}<br>
密码:{$ssr_item['passwd']}<br>
协议:{$ssr_item['protocol']}<br>
协议参数:{$ssr_item['protocol_param']}<br>
混淆:{$ssr_item['obfs']}<br>
混淆参数:{$ssr_item['obfs_param']}<br>
{if isset($ss_item)}
ss://链接:<button class="copy-text btn btn-subscription" type="button" data-clipboard-text="{URL::getItemUrl($ss_item,1)}">点击复制</button><br>
{/if}
{if isset($ssr_item)}
ssr://链接:<button class="copy-text btn btn-subscription" type="button" data-clipboard-text="{URL::getItemUrl($ssr_item,0)}">点击复制</button><br>
{/if}
{$ss_item = null}
{$ssr_item = null}
</p>
{else}
<a href="javascript:void(0);" onClick="urlChange('{$node->id}',0,{if $relay_rule != null}{$relay_rule->id}{else}0{/if})">{$node->name}{if $relay_rule != null} - {$relay_rule->dist_node()->name}{/if}</a>
<span class="label label-brand-accent">←点击节点查看配置信息</span>
{/if}
</p>
<p>备注:{$node->info}</p>
</div>
@ -137,6 +165,35 @@
{$relay_rule = $tools->pick_out_relay_rule($node->id, $single_muport['server']->server, $relay_rules)}
{/if}
{if isset($node->subscribe)}
{if $single_muport['server']->server == $node->muport}
{$ssr_item = URL::getItem($user, $node, $node->muport, $relay_rule_id, 0)}
<div class="card">
<div class="card-main">
<div class="card-inner">
<p class="card-heading" >
{$prefix} - 单端口 Shadowsocks - {$node->subscribe} 端口</a>
</p>
<p>
服务器地址:{$ssr_item['address']}<br>
服务器端口:{$ssr_item['port']}<br>
加密方式:{$ssr_item['method']}<br>
密码:{$ssr_item['passwd']}<br>
协议:{$ssr_item['protocol']}<br>
协议参数:{$ssr_item['protocol_param']}<br>
混淆:{$ssr_item['obfs']}<br>
混淆参数:{$ssr_item['obfs_param']}<br>
ssr://链接:<button class="copy-text btn btn-subscription" type="button" data-clipboard-text="{URL::getItemUrl($ssr_item,0)}">点击复制</button><br>
{$ssr_item = null}
</p>
<p>{$node->info}</p>
</div>
</div>
</div>
{/if}
{continue}
{/if}
<div class="card">
<div class="card-main">
<div class="card-inner">
@ -194,7 +251,7 @@
</span></p>
<p>VMess链接:
<a class="copy-text" data-clipboard-text="{URL::getV2Url($user, $node)}">点击复制</a>
<button class="copy-text btn btn-subscription" type="button" data-clipboard-text="{URL::getV2Url($user, $node)}">点击复制</button>
</p>
<p>{$node->info}</p>
@ -240,6 +297,8 @@
</div>
</div>
{include file='dialog.tpl'}
</div>
</div>
</section>
@ -256,6 +315,15 @@
<script>
$(function(){
new Clipboard('.copy-text');
});
$(".copy-text").click(function () {
$("#result").modal();
$("#msg").html("已复制,请您继续接下来的操作。");
});
function urlChange(id,is_mu,rule_id) {
var site = './node/'+id+'?ismu='+is_mu+'&relay_rule='+rule_id;
if(id == 'guide')

Loading…
Cancel
Save