项目迁移

bridge/bridge.go

@@ -2,7 +2,7 @@ package bridge
 
 import (
 	"errors"
-	"github.com/cnlh/easyProxy/utils"
+	"github.com/cnlh/nps/utils"
 	"net"
 	"sync"
 	"time"

client/client.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/cnlh/easyProxy/utils"
+	"github.com/cnlh/nps/utils"
 	"net"
 	"sync"
 	"time"

cmd/npc/npc.go

@@ -2,80 +2,32 @@ package main
 
 import (
 	"flag"
-	"github.com/astaxie/beego"
-	"github.com/cnlh/easyProxy/server"
-	"github.com/cnlh/easyProxy/utils"
-	_ "github.com/cnlh/easyProxy/web/routers"
-	"os"
+	"github.com/cnlh/nps/client"
+	"github.com/cnlh/nps/utils"
+	_ "github.com/cnlh/nps/utils"
+	"strings"
 )
 
 const VERSION = "v0.0.13"
 
 var (
-	TcpPort      = flag.Int("tcpport", 0, "客户端与服务端通信端口")
-	httpPort     = flag.Int("httpport", 8024, "对外监听的端口")
-	rpMode       = flag.String("mode", "webServer", "启动模式")
-	tunnelTarget = flag.String("target", "127.0.0.1:80", "远程目标")
-	VerifyKey    = flag.String("vkey", "", "验证密钥")
-	u            = flag.String("u", "", "验证用户名(socks5和web)")
-	p            = flag.String("p", "", "验证密码(socks5和web)")
-	compress     = flag.String("compress", "", "数据压缩方式（snappy）")
-	crypt        = flag.String("crypt", "false", "是否加密(true|false)")
-	logType      = flag.String("log", "stdout", "日志输出方式（stdout|file）")
+	serverAddr = flag.String("server", "", "服务器地址ip:端口")
+	verifyKey  = flag.String("vkey", "", "验证密钥")
+	logType    = flag.String("log", "stdout", "日志输出方式（stdout|file）")
 )
 
 func main() {
 	flag.Parse()
-	var test bool
-	if len(os.Args) > 1 && os.Args[1] == "test" {
-		test = true
-	}
-	utils.InitDaemon("server")
-	if *logType == "stdout" || test {
-		utils.InitLogFile("server", true)
+	utils.InitDaemon("client")
+	if *logType == "stdout" {
+		utils.InitLogFile("client", true)
 	} else {
-		utils.InitLogFile("server", false)
-	}
-	task := &utils.Tunnel{
-		TcpPort: *httpPort,
-		Mode:    *rpMode,
-		Target:  *tunnelTarget,
-		Config: &utils.Config{
-			U:        *u,
-			P:        *p,
-			Compress: *compress,
-			Crypt:    utils.GetBoolByStr(*crypt),
-		},
-		Flow:         &utils.Flow{},
-		UseClientCnf: false,
-	}
-	if *VerifyKey != "" {
-		c := &utils.Client{
-			Id:        0,
-			VerifyKey: *VerifyKey,
-			Addr:      "",
-			Remark:    "",
-			Status:    true,
-			IsConnect: false,
-			Cnf:       &utils.Config{},
-			Flow:      &utils.Flow{},
-		}
-		c.Cnf.CompressDecode, c.Cnf.CompressEncode = utils.GetCompressType(c.Cnf.Compress)
-		server.CsvDb.Clients[0] = c
-		task.Client = c
-	}
-	if *TcpPort == 0 {
-		p, err := beego.AppConfig.Int("tcpport")
-		if err == nil && *rpMode == "webServer" {
-			*TcpPort = p
-		} else {
-			*TcpPort = 8284
-		}
+		utils.InitLogFile("client", false)
 	}
-	utils.Println("服务端启动，监听tcp服务端端口：", *TcpPort)
-	task.Config.CompressDecode, task.Config.CompressEncode = utils.GetCompressType(task.Config.Compress)
-	if *rpMode != "webServer" {
-		server.CsvDb.Tasks[0] = task
+	stop := make(chan int)
+	for _, v := range strings.Split(*verifyKey, ",") {
+		utils.Println("客户端启动，连接：", *serverAddr, " 验证令牌：", v)
+		go client.NewRPClient(*serverAddr, v).Start()
 	}
-	server.StartNewServer(*TcpPort, task, test)
+	<-stop
 }

cmd/nps/nps.go

@@ -2,32 +2,80 @@ package main
 
 import (
 	"flag"
-	"github.com/cnlh/easyProxy/client"
-	"github.com/cnlh/easyProxy/utils"
-	_ "github.com/cnlh/easyProxy/utils"
-	"strings"
+	"github.com/astaxie/beego"
+	"github.com/cnlh/nps/server"
+	"github.com/cnlh/nps/utils"
+	_ "github.com/cnlh/nps/web/routers"
+	"os"
 )
 
 const VERSION = "v0.0.13"
 
 var (
-	serverAddr = flag.String("server", "", "服务器地址ip:端口")
-	verifyKey  = flag.String("vkey", "", "验证密钥")
-	logType    = flag.String("log", "stdout", "日志输出方式（stdout|file）")
+	TcpPort      = flag.Int("tcpport", 0, "客户端与服务端通信端口")
+	httpPort     = flag.Int("httpport", 8024, "对外监听的端口")
+	rpMode       = flag.String("mode", "webServer", "启动模式")
+	tunnelTarget = flag.String("target", "127.0.0.1:80", "远程目标")
+	VerifyKey    = flag.String("vkey", "", "验证密钥")
+	u            = flag.String("u", "", "验证用户名(socks5和web)")
+	p            = flag.String("p", "", "验证密码(socks5和web)")
+	compress     = flag.String("compress", "", "数据压缩方式（snappy）")
+	crypt        = flag.String("crypt", "false", "是否加密(true|false)")
+	logType      = flag.String("log", "stdout", "日志输出方式（stdout|file）")
 )
 
 func main() {
 	flag.Parse()
-	utils.InitDaemon("client")
-	if *logType == "stdout" {
-		utils.InitLogFile("client", true)
+	var test bool
+	if len(os.Args) > 1 && os.Args[1] == "test" {
+		test = true
+	}
+	utils.InitDaemon("server")
+	if *logType == "stdout" || test {
+		utils.InitLogFile("server", true)
 	} else {
-		utils.InitLogFile("client", false)
+		utils.InitLogFile("server", false)
+	}
+	task := &utils.Tunnel{
+		TcpPort: *httpPort,
+		Mode:    *rpMode,
+		Target:  *tunnelTarget,
+		Config: &utils.Config{
+			U:        *u,
+			P:        *p,
+			Compress: *compress,
+			Crypt:    utils.GetBoolByStr(*crypt),
+		},
+		Flow:         &utils.Flow{},
+		UseClientCnf: false,
+	}
+	if *VerifyKey != "" {
+		c := &utils.Client{
+			Id:        0,
+			VerifyKey: *VerifyKey,
+			Addr:      "",
+			Remark:    "",
+			Status:    true,
+			IsConnect: false,
+			Cnf:       &utils.Config{},
+			Flow:      &utils.Flow{},
+		}
+		c.Cnf.CompressDecode, c.Cnf.CompressEncode = utils.GetCompressType(c.Cnf.Compress)
+		server.CsvDb.Clients[0] = c
+		task.Client = c
+	}
+	if *TcpPort == 0 {
+		p, err := beego.AppConfig.Int("tcpport")
+		if err == nil && *rpMode == "webServer" {
+			*TcpPort = p
+		} else {
+			*TcpPort = 8284
+		}
 	}
-	stop := make(chan int)
-	for _, v := range strings.Split(*verifyKey, ",") {
-		utils.Println("客户端启动，连接：", *serverAddr, " 验证令牌：", v)
-		go client.NewRPClient(*serverAddr, v).Start()
+	utils.Println("服务端启动，监听tcp服务端端口：", *TcpPort)
+	task.Config.CompressDecode, task.Config.CompressEncode = utils.GetCompressType(task.Config.Compress)
+	if *rpMode != "webServer" {
+		server.CsvDb.Tasks[0] = task
 	}
-	<-stop
+	server.StartNewServer(*TcpPort, task, test)
 }

server/base.go

@@ -2,8 +2,8 @@ package server
 
 import (
 	"errors"
-	"github.com/cnlh/easyProxy/bridge"
-	"github.com/cnlh/easyProxy/utils"
+	"github.com/cnlh/nps/bridge"
+	"github.com/cnlh/nps/utils"
 	"net"
 	"net/http"
 	"sync"

server/http.go

@@ -4,8 +4,8 @@ import (
 	"bufio"
 	"crypto/tls"
 	"github.com/astaxie/beego"
-	"github.com/cnlh/easyProxy/bridge"
-	"github.com/cnlh/easyProxy/utils"
+	"github.com/cnlh/nps/bridge"
+	"github.com/cnlh/nps/utils"
 	"net"
 	"net/http"
 	"net/http/httputil"

server/server.go

@@ -2,8 +2,8 @@ package server
 
 import (
 	"errors"
-	"github.com/cnlh/easyProxy/bridge"
-	"github.com/cnlh/easyProxy/utils"
+	"github.com/cnlh/nps/bridge"
+	"github.com/cnlh/nps/utils"
 	"log"
 	"os"
 	"reflect"

server/socks5.go

@@ -3,8 +3,8 @@ package server
 import (
 	"encoding/binary"
 	"errors"
-	"github.com/cnlh/easyProxy/bridge"
-	"github.com/cnlh/easyProxy/utils"
+	"github.com/cnlh/nps/bridge"
+	"github.com/cnlh/nps/utils"
 	"io"
 	"net"
 	"strconv"

server/tcp.go

@@ -3,8 +3,8 @@ package server
 import (
 	"errors"
 	"github.com/astaxie/beego"
-	"github.com/cnlh/easyProxy/bridge"
-	"github.com/cnlh/easyProxy/utils"
+	"github.com/cnlh/nps/bridge"
+	"github.com/cnlh/nps/utils"
 	"net"
 	"strings"
 )

server/udp.go

@@ -1,8 +1,8 @@
 package server
 
 import (
-	"github.com/cnlh/easyProxy/bridge"
-	"github.com/cnlh/easyProxy/utils"
+	"github.com/cnlh/nps/bridge"
+	"github.com/cnlh/nps/utils"
 	"net"
 	"strings"
 )

web/controllers/base.go

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

web/controllers/client.go

@@ -1,8 +1,8 @@
 package controllers
 
 import (
-	"github.com/cnlh/easyProxy/server"
-	"github.com/cnlh/easyProxy/utils"
+	"github.com/cnlh/nps/server"
+	"github.com/cnlh/nps/utils"
 )
 
 type ClientController struct {

web/controllers/index.go

@@ -1,8 +1,8 @@
 package controllers
 
 import (
-	"github.com/cnlh/easyProxy/server"
-	"github.com/cnlh/easyProxy/utils"
+	"github.com/cnlh/nps/server"
+	"github.com/cnlh/nps/utils"
 )
 
 type IndexController struct {

web/routers/router.go

@@ -2,7 +2,7 @@ package routers
 
 import (
 	"github.com/astaxie/beego"
-	"github.com/cnlh/easyProxy/web/controllers"
+	"github.com/cnlh/nps/web/controllers"
 )
 
 func init() {