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

Merge pull request #522 from ehang-io/pull/508, close #507

Browse Source 
Pull/508
This commit is contained in:
ffdfgdfg
2020-04-30 23:47:26 +08:00
committed by GitHub
parent 96e7b0255f 7e60ed14b5
commit 878c717f89
4 changed files with 72 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/nps/nps.go
View File

@@ -1,14 +1,6 @@
package main
import (
"ehang.io/nps/lib/crypt"
"ehang.io/nps/lib/file"
"ehang.io/nps/lib/install"
"ehang.io/nps/lib/version"
"ehang.io/nps/server"
"ehang.io/nps/server/connection"
"ehang.io/nps/server/tool"
"ehang.io/nps/web/routers"
"flag"
"log"
"os"
@@ -18,7 +10,16 @@ import (
"strings"
"sync"
"ehang.io/nps/lib/file"
"ehang.io/nps/lib/install"
"ehang.io/nps/lib/version"
"ehang.io/nps/server"
"ehang.io/nps/server/connection"
"ehang.io/nps/server/tool"
"ehang.io/nps/web/routers"
"ehang.io/nps/lib/common"
"ehang.io/nps/lib/crypt"
"ehang.io/nps/lib/daemon"
"github.com/astaxie/beego"
"github.com/astaxie/beego/logs"
@@ -200,7 +201,8 @@ func run() {
}
logs.Info("the version of server is %s ,allow client core version to be %s", version.VERSION, version.GetVersion())
connection.InitConnectionService()
crypt.InitTls(filepath.Join(common.GetRunPath(), "conf", "server.pem"), filepath.Join(common.GetRunPath(), "conf", "server.key"))
//crypt.InitTls(filepath.Join(common.GetRunPath(), "conf", "server.pem"), filepath.Join(common.GetRunPath(), "conf", "server.key"))
crypt.InitTls()
tool.InitAllowPort()
tool.StartSystemInfo()
go server.StartNewServer(bridgePort, task, beego.AppConfig.String("bridge_type"))