github/nps
1
0
Fork 0
mirror of https://github.com/ehang-io/nps.git synced 2025-09-02 03:16:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

安装 守护进程优化 web修改

Browse Source
This commit is contained in:
刘河
2019-02-06 00:35:23 +08:00
parent 74b262503e
commit 7af09a2f4c
28 changed files with 406 additions and 3706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/controllers/base.go
View File

@@ -2,8 +2,8 @@ package controllers
import (
"github.com/astaxie/beego"
"github.com/cnlh/nps/server"
"github.com/cnlh/nps/lib"
"github.com/cnlh/nps/server"
"strconv"
"strings"
)

18
web/controllers/client.go
View File

@@ -1,8 +1,8 @@
package controllers
import (
"github.com/cnlh/nps/server"
"github.com/cnlh/nps/lib"
"github.com/cnlh/nps/server"
)
type ClientController struct {
@@ -30,7 +30,7 @@ func (s *ClientController) Add() {
} else {
t := &lib.Client{
VerifyKey: lib.GetRandomString(16),
Id: server.CsvDb.GetClientId(),
Id: lib.GetCsvDb().GetClientId(),
Status: true,
Remark: s.GetString("remark"),
Cnf: &lib.Config{
@@ -50,7 +50,7 @@ func (s *ClientController) Add() {
t.Rate = lib.NewRate(int64(t.RateLimit * 1024))
t.Rate.Start()
}
server.CsvDb.NewClient(t)
lib.GetCsvDb().NewClient(t)
s.AjaxOk("添加成功")
}
}
@@ -58,7 +58,7 @@ func (s *ClientController) GetClient() {
if s.Ctx.Request.Method == "POST" {
id := s.GetIntNoErr("id")
data := make(map[string]interface{})
if c, err := server.CsvDb.GetClient(id); err != nil {
if c, err := lib.GetCsvDb().GetClient(id); err != nil {
data["code"] = 0
} else {
data["code"] = 1
@@ -74,7 +74,7 @@ func (s *ClientController) Edit() {
id := s.GetIntNoErr("id")
if s.Ctx.Request.Method == "GET" {
s.Data["menu"] = "client"
if c, err := server.CsvDb.GetClient(id); err != nil {
if c, err := lib.GetCsvDb().GetClient(id); err != nil {
s.error()
} else {
s.Data["c"] = c
@@ -82,7 +82,7 @@ func (s *ClientController) Edit() {
s.SetInfo("修改")
s.display()
} else {
if c, err := server.CsvDb.GetClient(id); err != nil {
if c, err := lib.GetCsvDb().GetClient(id); err != nil {
s.error()
} else {
c.Remark = s.GetString("remark")
@@ -101,7 +101,7 @@ func (s *ClientController) Edit() {
} else {
c.Rate = nil
}
server.CsvDb.UpdateClient(c)
lib.GetCsvDb().UpdateClient(c)
}
s.AjaxOk("修改成功")
}
@@ -110,7 +110,7 @@ func (s *ClientController) Edit() {
//更改状态
func (s *ClientController) ChangeStatus() {
id := s.GetIntNoErr("id")
if client, err := server.CsvDb.GetClient(id); err == nil {
if client, err := lib.GetCsvDb().GetClient(id); err == nil {
client.Status = s.GetBoolNoErr("status")
if client.Status == false {
server.DelClientConnect(client.Id)
@@ -123,7 +123,7 @@ func (s *ClientController) ChangeStatus() {
//删除客户端
func (s *ClientController) Del() {
id := s.GetIntNoErr("id")
if err := server.CsvDb.DelClient(id); err != nil {
if err := lib.GetCsvDb().DelClient(id); err != nil {
s.AjaxErr("删除失败")
}
server.DelTunnelAndHostByClientId(id)

30
web/controllers/index.go
View File

@@ -1,8 +1,8 @@
package controllers
import (
"github.com/cnlh/nps/server"
"github.com/cnlh/nps/lib"
"github.com/cnlh/nps/server"
)
type IndexController struct {
@@ -82,17 +82,17 @@ func (s *IndexController) Add() {
Compress: s.GetString("compress"),
Crypt: s.GetBoolNoErr("crypt"),
},
Id: server.CsvDb.GetTaskId(),
Id: lib.GetCsvDb().GetTaskId(),
UseClientCnf: s.GetBoolNoErr("use_client"),
Status: true,
Remark: s.GetString("remark"),
Flow: &lib.Flow{},
}
var err error
if t.Client, err = server.CsvDb.GetClient(s.GetIntNoErr("client_id")); err != nil {
if t.Client, err = lib.GetCsvDb().GetClient(s.GetIntNoErr("client_id")); err != nil {
s.AjaxErr(err.Error())
}
server.CsvDb.NewTask(t)
lib.GetCsvDb().NewTask(t)
if err := server.AddTask(t); err != nil {
s.AjaxErr(err.Error())
} else {
@@ -103,7 +103,7 @@ func (s *IndexController) Add() {
func (s *IndexController) GetOneTunnel() {
id := s.GetIntNoErr("id")
data := make(map[string]interface{})
if t, err := server.CsvDb.GetTask(id); err != nil {
if t, err := lib.GetCsvDb().GetTask(id); err != nil {
data["code"] = 0
} else {
data["code"] = 1
@@ -115,7 +115,7 @@ func (s *IndexController) GetOneTunnel() {
func (s *IndexController) Edit() {
id := s.GetIntNoErr("id")
if s.Ctx.Request.Method == "GET" {
if t, err := server.CsvDb.GetTask(id); err != nil {
if t, err := lib.GetCsvDb().GetTask(id); err != nil {
s.error()
} else {
s.Data["t"] = t
@@ -123,7 +123,7 @@ func (s *IndexController) Edit() {
s.SetInfo("修改")
s.display()
} else {
if t, err := server.CsvDb.GetTask(id); err != nil {
if t, err := lib.GetCsvDb().GetTask(id); err != nil {
s.error()
} else {
t.TcpPort = s.GetIntNoErr("port")
@@ -137,10 +137,10 @@ func (s *IndexController) Edit() {
t.Config.Crypt = s.GetBoolNoErr("crypt")
t.UseClientCnf = s.GetBoolNoErr("use_client")
t.Remark = s.GetString("remark")
if t.Client, err = server.CsvDb.GetClient(s.GetIntNoErr("client_id")); err != nil {
if t.Client, err = lib.GetCsvDb().GetClient(s.GetIntNoErr("client_id")); err != nil {
s.AjaxErr("修改失败")
}
server.CsvDb.UpdateTask(t)
lib.GetCsvDb().UpdateTask(t)
}
s.AjaxOk("修改成功")
}
@@ -179,7 +179,7 @@ func (s *IndexController) HostList() {
} else {
start, length := s.GetAjaxParams()
clientId := s.GetIntNoErr("client_id")
list, cnt := server.CsvDb.GetHost(start, length, clientId)
list, cnt := lib.GetCsvDb().GetHost(start, length, clientId)
s.AjaxTable(list, cnt, cnt)
}
}
@@ -200,7 +200,7 @@ func (s *IndexController) GetHost() {
func (s *IndexController) DelHost() {
host := s.GetString("host")
if err := server.CsvDb.DelHost(host); err != nil {
if err := lib.GetCsvDb().DelHost(host); err != nil {
s.AjaxErr("删除失败")
}
s.AjaxOk("删除成功")
@@ -222,10 +222,10 @@ func (s *IndexController) AddHost() {
Flow: &lib.Flow{},
}
var err error
if h.Client, err = server.CsvDb.GetClient(s.GetIntNoErr("client_id")); err != nil {
if h.Client, err = lib.GetCsvDb().GetClient(s.GetIntNoErr("client_id")); err != nil {
s.AjaxErr("添加失败")
}
server.CsvDb.NewHost(h)
lib.GetCsvDb().NewHost(h)
s.AjaxOk("添加成功")
}
}
@@ -251,9 +251,9 @@ func (s *IndexController) EditHost() {
h.HostChange = s.GetString("hostchange")
h.Remark = s.GetString("remark")
h.TargetArr = nil
server.CsvDb.UpdateHost(h)
lib.GetCsvDb().UpdateHost(h)
var err error
if h.Client, err = server.CsvDb.GetClient(s.GetIntNoErr("client_id")); err != nil {
if h.Client, err = lib.GetCsvDb().GetClient(s.GetIntNoErr("client_id")); err != nil {
s.AjaxErr("修改失败")
}
}

3477
web/static/js/chart.js
View File

File diff suppressed because it is too large Load Diff

22
web/static/js/echarts.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
web/views/client/edit.html
View File

@@ -1,7 +1,7 @@
<div class="row tile">
<div class="col-md-6 col-md-auto">
<div>
<h3 class="tile-title">添加</h3>
<h3 class="tile-title">修改</h3>
<div class="tile-body">
<form>
<input type="hidden" name="id" value="{{.c.Id}}">

8
web/views/index/add.html
View File

@@ -1,12 +1,4 @@
<div class="row tile">
<div class="col-lg-12">
<div class="bs-component">
<div class="alert alert-dismissible alert-success">
<button class="close" type="button" data-dismiss="alert">×</button>
<span id="info"></span>
</div>
</div>
</div>
<div class="col-md-6 col-md-auto">
<div>
<h3 class="tile-title">添加</h3>

2
web/views/index/edit.html
View File

@@ -1,7 +1,7 @@
<div class="row tile">
<div class="col-md-6 col-md-auto">
<div>
<h3 class="tile-title">添加</h3>
<h3 class="tile-title">修改</h3>
<div class="tile-body">
<form>
<input type="hidden" name="id" value="{{.t.Id}}">

2
web/views/index/hadd.html
View File

@@ -20,7 +20,7 @@
<div class="form-group">
<label class="control-label">内网目标</label>
<textarea class="form-control" rows="4" type="text" name="target"
placeholder="内网隧道目标，例如10.1.50.203:22，换行分隔"></textarea>
placeholder="内网隧道目标，例如10.1.50.203:22，如需负载均衡多个地址换行分隔"></textarea>
</div>
<div class="form-group" id="header">
<label class="control-label">header头修改(冒号分隔，多个请换行填写)</label>

130
web/views/index/index.html
View File

@@ -2,7 +2,7 @@
<div class="col-md-3">
<div class="widget-small warning coloured-icon"><i class="icon fa fa-html5 fa-3x"></i>
<div class="info">
<h4>HTTP端口</h4>
<h4>客户端连接端口</h4>
<p><b>{{.p}}</b></p>
</div>
</div>
@@ -36,69 +36,95 @@
<div class="col-md-6">
<div class="tile">
<h3 class="tile-title">流量</h3>
<div class="embed-responsive embed-responsive-16by9">
<canvas class="embed-responsive-item" id="flow"></canvas>
</div>
<div id="flow" style="width: 600px;height:400px;"></div>
</div>
</div>
<div class="col-md-6">
<div class="tile">
<h3 class="tile-title">代理类型</h3>
<div class="embed-responsive embed-responsive-16by9">
<canvas class="embed-responsive-item" id="types"></canvas>
</div>
<div id="tj" style="width: 600px;height:400px;"></div>
</div>
</div>
</div>
<script>
var pdataFlow = [
{
value: {{.data.inletFlowCount}},
color: "#46BFBD",
highlight: "#5AD3D1",
label: "入口流量"
option = {
title : {
x:'center'
},
{
value: {{.data.exportFlowCount}},
color: "#FDB45C",
highlight: "#FFC870",
label: "出口流量"
}
]
var pdataTypes = [
{
value: {{.data.tunnelServerCount}},
color: "#46BFBD",
highlight: "#5AD3D1",
label: "tcp隧道"
tooltip: {
trigger: 'item',
formatter: function (p) {
return p.seriesName + "<br>" + p.name + ":" + change(p.data.value);
},
},
{
value: {{.data.socks5ServerCount}},
color: "#85FEAA",
highlight: "#85FEAA",
label: "socks5隧道"
legend: {
orient: 'vertical',
left: 'left',
data: ['入口流量', '出口流量']
},
{
value: {{.data.httpProxyServerCount}},
color: "#4B653C",
highlight: "#4B653C",
label: "http代理"
series : [
{
name: '类型 统计',
type: 'pie',
radius : '55%',
center: ['50%', '60%'],
data:[
{value:{{.data.inletFlowCount}}, name: '入口流量'},
{value:{{.data.exportFlowCount}}, name: '出口流量'},
],
itemStyle: {
emphasis: {
shadowBlur: 10,
shadowOffsetX: 0,
shadowColor: 'rgba(0, 0, 0, 0.5)'
}
}
}
]
};
var myChart = echarts.init(document.getElementById('flow'));
myChart.setOption(option);
option = {
title : {
x:'center'
},
{
value: {{.data.udpServerCount}},
color: "#90653C",
highlight: "#90653C",
label: "udp代理"
tooltip : {
trigger: 'item',
formatter: "{a} <br/>{b} : {c} ({d}%)"
},
{
value: {{.data.hostCount}},
color: "#FDB45C",
highlight: "#FDB45C",
label: "域名解析"
}
]
var ctxp = $("#flow").get(0).getContext("2d");
var pieChart = new Chart(ctxp).Pie(pdataFlow);
var ctxd = $("#types").get(0).getContext("2d");
var doughnutChart = new Chart(ctxd).Doughnut(pdataTypes);
legend: {
orient: 'vertical',
left: 'left',
data: ['tcp隧道数','socks5隧道数','http代理隧道数','udp隧道数','域名解析数']
},
series : [
{
name: '类型 统计',
type: 'pie',
radius : '55%',
center: ['50%', '60%'],
data:[
{value:{{.data.tunnelServerCount}}, name:'tcp隧道数'},
{value:{{.data.socks5ServerCount}}, name:'socks5隧道数'},
{value:{{.data.httpProxyServerCount}}, name:'http隧道数'},
{value:{{.data.udpServerCount}}, name:'udp隧道数'},
{value:{{.data.hostCount}}, name:'域名解析数'}
],
itemStyle: {
emphasis: {
shadowBlur: 10,
shadowOffsetX: 0,
shadowColor: 'rgba(0, 0, 0, 0.5)'
}
}
}
]
};
var myChart = echarts.init(document.getElementById('tj'));
myChart.setOption(option);
</script>

2
web/views/login/index.html
View File

@@ -9,7 +9,7 @@
<link rel="stylesheet" type="text/css" href="/static/css/main.css">
<!-- Font-icon css-->
<link rel="stylesheet" type="text/css" href="/static/css/font-awesome.min.css">
<title>easyProxy内网穿透</title>
<title>nps内网穿透</title>
</head>
<body>
<section class="material-half-bg">

4
web/views/public/layout.html
View File

@@ -4,7 +4,7 @@
<meta name="description"
content="Vali is a responsive and free admin theme built with Bootstrap 4, SASS and PUG.js. It's fully customizable and modular.">
<link rel="shortcut icon" href="/static/img/favicon.ico">
<title>easyProxy内网穿透</title>
<title>nps内网穿透</title>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -61,7 +61,7 @@
<script type="text/javascript" src="/static/js/datatables.min.js"></script>
<script src="/static/js/main.js"></script>
<script src="/static/js/chart.js"></script>
<script src="/static/js/echarts.min.js"></script>
<main class="app-content">
<div class="app-title">
<div>