优化端口处理

Jrohy · Jul 28, 2020 · f70157d · f70157d
1 parent f596447
commit f70157d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/core/client.go b/core/client.go
@@ -27,7 +27,7 @@ type ClientTCP struct {
 }
 
 // WriteClient 生成客户端json
-func WriteClient(password string, domain string, writePath string) bool {
+func WriteClient(port int, password, domain, writePath string) bool {
 	box := packr.New("client.json", "../asset")
 	data, err := box.Find("client.json")
 	if err != nil {
@@ -40,6 +40,7 @@ func WriteClient(password string, domain string, writePath string) bool {
 		return false
 	}
 	config.RemoteAddr = domain
+	config.RemotePort = port
 	config.Password = []string{password}
 	outData, err := json.MarshalIndent(config, "", "    ")
 	if err != nil {

diff --git a/trojan/client.go b/trojan/client.go
@@ -13,7 +13,7 @@ var clientPath = "/root/config.json"
 func GenClientJson() {
 	fmt.Println()
 	var user core.User
-	domain := GetDomain()
+	domain, port := GetDomainAndPort()
 	mysql := core.GetMysql()
 	userList := mysql.GetData()
 	if userList == nil {
@@ -35,7 +35,7 @@ func GenClientJson() {
 		fmt.Println(util.Red("Base64解码失败: " + err.Error()))
 		return
 	}
-	if !core.WriteClient(string(pass), domain, clientPath) {
+	if !core.WriteClient(port, string(pass), domain, clientPath) {
 		fmt.Println(util.Red("生成配置文件失败!"))
 	} else {
 		fmt.Println("成功生成配置文件: " + util.Green(clientPath))

diff --git a/trojan/trojan.go b/trojan/trojan.go
@@ -157,7 +157,8 @@ func SetDomain(domain string) {
 	}
 }
 
-// GetDomain 获取域名
-func GetDomain() string {
-	return core.Load("").SSl.Sni
+// GetDomainAndPort 获取域名和端口
+func GetDomainAndPort() (string, int) {
+	config := core.Load("")
+	return config.SSl.Sni, config.LocalPort
 }
diff --git a/trojan/user.go b/trojan/user.go
@@ -109,7 +109,7 @@ func UserList(ids ...string) []*core.User {
 		fmt.Println("连接mysql失败!")
 		return nil
 	}
-	domain := GetDomain()
+	domain, port := GetDomainAndPort()
 	for i, k := range userList {
 		pass, err := base64.StdEncoding.DecodeString(k.Password)
 		if err != nil {
@@ -125,7 +125,7 @@ func UserList(ids ...string) []*core.User {
 		} else {
 			fmt.Println("流量限额: " + util.Cyan(util.Bytefmt(uint64(k.Quota))))
 		}
-		fmt.Println("分享链接: " + util.Green(fmt.Sprintf("trojan://%s@%s:443", string(pass), domain)))
+		fmt.Println("分享链接: " + util.Green(fmt.Sprintf("trojan://%s@%s:%d", string(pass), domain, port)))
 		fmt.Println()
 	}
 	return userList

diff --git a/web/controller/user.go b/web/controller/user.go
@@ -26,9 +26,10 @@ func UserList(findUser string) *ResponseBody {
 		responseBody.Msg = "连接mysql失败!"
 		return &responseBody
 	}
-	domain := trojan.GetDomain()
+	domain, port := trojan.GetDomainAndPort()
 	responseBody.Data = map[string]interface{}{
 		"domain":   domain,
+		"port":     port,
 		"userList": userList,
 	}
 	return &responseBody
@@ -44,9 +45,10 @@ func PageUserList(curPage int, pageSize int) *ResponseBody {
 		responseBody.Msg = "连接mysql失败!"
 		return &responseBody
 	}
-	domain := trojan.GetDomain()
+	domain, port := trojan.GetDomainAndPort()
 	responseBody.Data = map[string]interface{}{
 		"domain":   domain,
+		"port":     port,
 		"pageData": pageData,
 	}
 	return &responseBody