public key bug and multiuser enhancement and server ip support and config file of client optimization

This commit is contained in:
刘河
2019-03-26 23:34:55 +08:00
parent 00a4a33c5f
commit 42a73fa392
22 changed files with 155 additions and 70 deletions

View File

@@ -15,15 +15,18 @@
</a>
</div>
</div>
<div class="content">
<div class="table-responsive">
<div id="toolbar">
<a href="/client/add" class="btn btn-primary dim" type="button" langtag="info-new">新增</a>
</div>
<table id="taskList_table" class="table-striped table-hover"
data-mobile-responsive="true"></table>
<div class="content">
{{if eq true .isAdmin}}
<div class="table-responsive">
<div id="toolbar">
<a href="/client/add" class="btn btn-primary dim" type="button" langtag="info-new">新增</a>
</div>
<table id="taskList_table" class="table-striped table-hover"
data-mobile-responsive="true"></table>
</div>
</div>
{{end}}
<div class="ibox-content">
<table id="table"></table>
@@ -225,11 +228,12 @@
sortable: true,//启用排序
formatter: function (value, row, index) {
btn_group = '<div class="btn-group">'
btn = `<button onclick="del(` + row.Id + `)" class="btn-danger"><i class="fa fa-trash"></i></button><button onclick="edit(` + row.Id + `)" class="btn-primary"><i class="fa fa-edit"></i></button></div>`
btn = ` {{if eq true .isAdmin}}<button onclick="del(` + row.Id + `)" class="btn-danger"><i class="fa fa-trash"></i></button>{{end}}<button onclick="edit(` + row.Id + `)" class="btn-primary"><i class="fa fa-edit"></i></button></div>`
if (row.Status) {
return btn_group + `<button onclick="stop(` + row.Id + `)" class="btn-warning"><i class="fa fa-close"></i></button>` + btn
return btn_group {{if eq true .isAdmin}}+ `<button onclick="stop(` + row.Id + `)" class="btn-warning"><i class="fa fa-close"></i></button>` {{end}}+ btn
} else {
return btn_group + `<button onclick="start(` + row.Id + `)" class="btn-warning"><i class="fa fa-check"></i></button>` + btn
return btn_group {{if eq true .isAdmin}}+ `<button onclick="start(` + row.Id + `)" class="btn-warning"><i class="fa fa-check"></i></button>` {{end}}+ btn
}
}
},

View File

@@ -28,6 +28,14 @@
</div>
</div>
<div class="form-group" id="server_ip">
<label class="col-sm-2 control-label" langtag="info-server-ip">服务端ip</label>
<div class="col-sm-10">
<input class="form-control" type="text" value="0.0.0.0" name="server_ip"
placeholder="such as 0.0.0.0">
</div>
</div>
<div class="form-group" id="port">
<label class="col-sm-2 control-label" langtag="info-server-port">服务端端口</label>
<div class="col-sm-10">

View File

@@ -28,7 +28,13 @@
placeholder="empty means to be unrestricted">
</div>
</div>
<div class="form-group" id="server_ip">
<label class="col-sm-2 control-label" langtag="info-server-ip">服务端ip</label>
<div class="col-sm-10">
<input class="form-control" type="text" value="{{.t.ServerIp}}" name="server_ip"
placeholder="such as 0.0.0.0">
</div>
</div>
<div class="form-group" id="port">
<label class="col-sm-2 control-label" langtag="info-server-port">服务端端口</label>
<div class="col-sm-10">

View File

@@ -38,7 +38,13 @@
{{/*<img alt="image" class="img-circle" src="/static/img/profile_small.jpg"/>*/}}
</span>
<a href="#">
<span class="clear"> <span class="block m-t-xs"> <strong class="font-bold">admin</strong>
<span class="clear"> <span class="block m-t-xs"> <strong class="font-bold">
{{if eq true .isAdmin}}
admin
{{else}}
user
{{end}}
</strong>
</span> <span class="text-muted text-xs block">system </span> </span>
</a>
</div>
@@ -46,7 +52,6 @@
NPS
</div>
</li>
{{if eq true .isAdmin}}
<li class="{{if eq "index" .menu}}active{{end}}">
<a href="/"><i class="fa fa-dashboard"></i> <span langtag="menu-dashboard"
class="nav-label">仪表盘</span></a>
@@ -55,7 +60,6 @@
<a href="/client/list"><i class="fa fa-clipboard"></i> <span langtag="menu-client"
class="nav-label">客户端</span></a>
</li>
{{end}}
<li class="{{if eq "host" .menu}}active{{end}}">
<a href="/index/hostlist"><i class="fa fa-paperclip"></i> <span langtag="menu-host"
class="nav-label">域名解析</span></a>