dashboard 备注 客户端管理优化 多客户端支持 流量显示支持 热更新支持 404错误页支持

web/controllers/base.go

@@ -27,14 +27,18 @@ func (s *BaseController) Prepare() {
 //加载模板
 func (s *BaseController) display(tpl ...string) {
 	var tplname string
+	if s.Data["menu"] == nil {
+		s.Data["menu"] = s.actionName
+	}
 	if len(tpl) > 0 {
 		tplname = strings.Join([]string{tpl[0], "html"}, ".")
 	} else {
 		tplname = s.controllerName + "/" + s.actionName + ".html"
 	}
-	s.Data["menu"] = s.actionName
 	ip := s.Ctx.Request.Host
-	s.Data["ip"] = utils.GetHostByName(ip[0:strings.LastIndex(ip, ":")])
+	if strings.LastIndex(ip, ":") > 0 {
+		s.Data["ip"] = utils.GetHostByName(ip[0:])
+	}
 	s.Data["p"] = server.Bridge.TunnelPort
 	s.Data["proxyPort"] = beego.AppConfig.String("hostPort")
 	s.Layout = "public/layout.html"

web/controllers/client.go

@@ -0,0 +1,100 @@
+package controllers
+
+import (
+	"github.com/cnlh/easyProxy/server"
+	"github.com/cnlh/easyProxy/utils"
+)
+
+type ClientController struct {
+	BaseController
+}
+
+func (s *ClientController) Client() {
+	if s.Ctx.Request.Method == "GET" {
+		s.Data["menu"] = "client"
+		s.SetInfo("客户端管理")
+		s.display("client/list")
+		return
+	}
+	start, length := s.GetAjaxParams()
+	list, cnt := server.GetClientList(start, length)
+	s.AjaxTable(list, cnt, cnt)
+}
+
+//添加客户端
+func (s *ClientController) Add() {
+	if s.Ctx.Request.Method == "GET" {
+		s.Data["menu"] = "client"
+		s.SetInfo("新增")
+		s.display()
+	} else {
+		t := &utils.Client{
+			VerifyKey: utils.GetRandomString(16),
+			Id:        server.CsvDb.GetClientId(),
+			Status:    true,
+			Remark:    s.GetString("Remark"),
+			Cnf: &utils.ServerConfig{
+				U:        s.GetString("u"),
+				P:        s.GetString("p"),
+				Compress: s.GetString("compress"),
+				Crypt:    s.GetBoolNoErr("crypt"),
+				Mux:      s.GetBoolNoErr("mux"),
+			},
+		}
+		server.CsvDb.NewClient(t)
+		s.AjaxOk("添加成功")
+	}
+}
+
+//修改客户端
+func (s *ClientController) Edit() {
+	if s.Ctx.Request.Method == "GET" {
+		s.Data["menu"] = "client"
+		id := s.GetIntNoErr("id")
+		if c, err := server.CsvDb.GetClient(id); err != nil {
+			s.error()
+		} else {
+			s.Data["c"] = c
+		}
+		s.SetInfo("修改")
+		s.display()
+	} else {
+		id := s.GetIntNoErr("Id")
+		if c, err := server.CsvDb.GetClient(id); err != nil {
+			s.error()
+		} else {
+			c.Remark = s.GetString("Remark")
+			c.Cnf.U = s.GetString("u")
+			c.Cnf.P = s.GetString("p")
+			c.Cnf.Compress = s.GetString("compress")
+			c.Cnf.Crypt = s.GetBoolNoErr("crypt")
+			c.Cnf.Mux = s.GetBoolNoErr("mux")
+			server.CsvDb.UpdateClient(c)
+		}
+		s.AjaxOk("修改成功")
+	}
+}
+
+//更改状态
+func (s *ClientController) ChangeStatus() {
+	id := s.GetIntNoErr("id")
+	if client, err := server.CsvDb.GetClient(id); err == nil {
+		client.Status = s.GetBoolNoErr("status")
+		if client.Status == false {
+			server.DelClientConnect(client.Id)
+		}
+		s.AjaxOk("修改成功")
+	}
+	s.AjaxErr("修改失败")
+}
+
+//删除客户端
+func (s *ClientController) Del() {
+	id := s.GetIntNoErr("id")
+	if err := server.CsvDb.DelClient(id); err != nil {
+		s.AjaxErr("删除失败")
+	}
+	server.DelTunnelAndHostByClientId(id)
+	server.DelClientConnect(id)
+	s.AjaxOk("删除成功")
+}

web/controllers/index.go

@@ -10,9 +10,14 @@ type IndexController struct {
 }
 
 func (s *IndexController) Index() {
-	s.SetInfo("使用说明")
+	s.Data["data"] = server.GetDashboardData()
+	s.SetInfo("dashboard")
 	s.display("index/index")
 }
+func (s *IndexController) Help() {
+	s.SetInfo("使用说明")
+	s.display("index/help")
+}
 
 func (s *IndexController) Tcp() {
 	s.SetInfo("tcp隧道管理")
@@ -44,30 +49,44 @@ func (s *IndexController) Host() {
 	s.display("index/list")
 }
 
+func (s *IndexController) All() {
+	s.Data["menu"] = "client"
+	clientId := s.GetString("client_id")
+	s.Data["client_id"] = clientId
+	s.SetInfo("客户端" + clientId + "的所有隧道")
+	s.display("index/list")
+}
+
 func (s *IndexController) GetServerConfig() {
 	start, length := s.GetAjaxParams()
 	taskType := s.GetString("type")
-	list, cnt := server.GetServerConfig(start, length, taskType)
+	clientId := s.GetIntNoErr("client_id")
+	list, cnt := server.GetServerConfig(start, length, taskType, clientId)
 	s.AjaxTable(list, cnt, cnt)
 }
 
 func (s *IndexController) Add() {
 	if s.Ctx.Request.Method == "GET" {
 		s.Data["type"] = s.GetString("type")
+		s.Data["client_id"] = s.GetString("client_id")
 		s.SetInfo("新增")
 		s.display()
 	} else {
-		t := &server.ServerConfig{
-			TcpPort:   s.GetIntNoErr("port"),
-			Mode:      s.GetString("type"),
-			Target:    s.GetString("target"),
-			VerifyKey: utils.GetRandomString(16),
-			U:         s.GetString("u"),
-			P:         s.GetString("p"),
-			Compress:  s.GetString("compress"),
-			Crypt:     utils.GetBoolByStr(s.GetString("crypt")),
-			Mux:       utils.GetBoolByStr(s.GetString("mux")),
-			IsRun:     0,
+		t := &utils.ServerConfig{
+			TcpPort:      s.GetIntNoErr("port"),
+			Mode:         s.GetString("type"),
+			Target:       s.GetString("target"),
+			U:            s.GetString("u"),
+			P:            s.GetString("p"),
+			Compress:     s.GetString("compress"),
+			Crypt:        s.GetBoolNoErr("crypt"),
+			Mux:          s.GetBoolNoErr("mux"),
+			IsRun:        0,
+			Id:           server.CsvDb.GetTaskId(),
+			ClientId:     s.GetIntNoErr("client_id"),
+			UseClientCnf: s.GetBoolNoErr("use_client"),
+			Start:        1,
+			Remark:       s.GetString("remark"),
 		}
 		server.CsvDb.NewTask(t)
 		if err := server.AddTask(t); err != nil {
@@ -79,9 +98,9 @@ func (s *IndexController) Add() {
 }
 
 func (s *IndexController) Edit() {
+	id := s.GetIntNoErr("id")
 	if s.Ctx.Request.Method == "GET" {
-		vKey := s.GetString("vKey")
-		if t, err := server.CsvDb.GetTask(vKey); err != nil {
+		if t, err := server.CsvDb.GetTask(id); err != nil {
 			s.error()
 		} else {
 			s.Data["t"] = t
@@ -89,44 +108,46 @@ func (s *IndexController) Edit() {
 		s.SetInfo("修改")
 		s.display()
 	} else {
-		vKey := s.GetString("vKey")
-		if t, err := server.CsvDb.GetTask(vKey); err != nil {
+		if t, err := server.CsvDb.GetTask(id); err != nil {
 			s.error()
 		} else {
 			t.TcpPort = s.GetIntNoErr("port")
 			t.Mode = s.GetString("type")
 			t.Target = s.GetString("target")
+			t.Id = id
+			t.ClientId = s.GetIntNoErr("client_id")
 			t.U = s.GetString("u")
 			t.P = s.GetString("p")
 			t.Compress = s.GetString("compress")
-			t.Crypt = utils.GetBoolByStr(s.GetString("crypt"))
-			t.Mux = utils.GetBoolByStr(s.GetString("mux"))
+			t.Crypt = s.GetBoolNoErr("crypt")
+			t.Mux = s.GetBoolNoErr("mux")
+			t.UseClientCnf = s.GetBoolNoErr("use_client")
+			t.Remark = s.GetString("remark")
 			server.CsvDb.UpdateTask(t)
-			server.StopServer(t.VerifyKey)
-			server.StartTask(t.VerifyKey)
 		}
 		s.AjaxOk("修改成功")
 	}
 }
 
 func (s *IndexController) Stop() {
-	vKey := s.GetString("vKey")
-	if err := server.StopServer(vKey); err != nil {
+	id := s.GetIntNoErr("id")
+	if err := server.StopServer(id); err != nil {
 		s.AjaxErr("停止失败")
 	}
 	s.AjaxOk("停止成功")
 }
+
 func (s *IndexController) Del() {
-	vKey := s.GetString("vKey")
-	if err := server.DelTask(vKey); err != nil {
+	id := s.GetIntNoErr("id")
+	if err := server.DelTask(id); err != nil {
 		s.AjaxErr("删除失败")
 	}
 	s.AjaxOk("删除成功")
 }
 
 func (s *IndexController) Start() {
-	vKey := s.GetString("vKey")
-	if err := server.StartTask(vKey); err != nil {
+	id := s.GetIntNoErr("id")
+	if err := server.StartTask(id); err != nil {
 		s.AjaxErr("开启失败")
 	}
 	s.AjaxOk("开启成功")
@@ -134,13 +155,14 @@ func (s *IndexController) Start() {
 
 func (s *IndexController) HostList() {
 	if s.Ctx.Request.Method == "GET" {
-		s.Data["vkey"] = s.GetString("vkey")
+		s.Data["client_id"] = s.GetString("client_id")
+		s.Data["menu"] = "host"
 		s.SetInfo("域名列表")
 		s.display("index/hlist")
 	} else {
 		start, length := s.GetAjaxParams()
-		vkey := s.GetString("vkey")
-		list, cnt := server.CsvDb.GetHostList(start, length, vkey)
+		clientId := s.GetIntNoErr("client_id")
+		list, cnt := server.CsvDb.GetHostList(start, length, clientId)
 		s.AjaxTable(list, cnt, cnt)
 	}
 }
@@ -155,16 +177,18 @@ func (s *IndexController) DelHost() {
 
 func (s *IndexController) AddHost() {
 	if s.Ctx.Request.Method == "GET" {
-		s.Data["vkey"] = s.GetString("vkey")
+		s.Data["client_id"] = s.GetString("client_id")
+		s.Data["menu"] = "host"
 		s.SetInfo("新增")
 		s.display("index/hadd")
 	} else {
-		h := &server.HostList{
-			Vkey:         s.GetString("vkey"),
+		h := &utils.HostList{
+			ClientId:     s.GetIntNoErr("client_id"),
 			Host:         s.GetString("host"),
 			Target:       s.GetString("target"),
 			HeaderChange: s.GetString("header"),
 			HostChange:   s.GetString("hostchange"),
+			Remark:       s.GetString("remark"),
 		}
 		server.CsvDb.NewHost(h)
 		s.AjaxOk("添加成功")
@@ -172,26 +196,26 @@ func (s *IndexController) AddHost() {
 }
 
 func (s *IndexController) EditHost() {
+	host := s.GetString("host")
 	if s.Ctx.Request.Method == "GET" {
-		host := s.GetString("host")
-		if h, t, err := server.GetKeyByHost(host); err != nil {
+		s.Data["menu"] = "host"
+		if h, _, err := server.GetKeyByHost(host); err != nil {
 			s.error()
 		} else {
-			s.Data["t"] = t
 			s.Data["h"] = h
 		}
 		s.SetInfo("修改")
 		s.display("index/hedit")
 	} else {
-		host := s.GetString("host")
 		if h, _, err := server.GetKeyByHost(host); err != nil {
 			s.error()
 		} else {
-			h.Vkey = s.GetString("vkey")
+			h.ClientId = s.GetIntNoErr("client_id")
 			h.Host = s.GetString("nhost")
 			h.Target = s.GetString("target")
 			h.HeaderChange = s.GetString("header")
 			h.HostChange = s.GetString("hostchange")
+			h.Remark = s.GetString("remark")
 			server.CsvDb.UpdateHost(h)
 		}
 		s.AjaxOk("修改成功")