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("修改失败")
}
}