分割配置文件，添加环境变量

Txray.go

@@ -2,20 +2,22 @@ package main
 
 import (
 	"Txray/cmd"
+	"Txray/core/config"
+	"Txray/core/service"
 	"Txray/log"
 	"Txray/tools"
 	"github.com/abiosoft/ishell"
 	"os"
 )
 
 const (
-	version = "v2.0.1"
+	version = "v2.1.0"
 	name    = "Txray"
 )
 
 func init() {
 	// 初始化日志
-	absPath := tools.PathJoin(tools.GetRunPath(), "info.log")
+	absPath := tools.PathJoin(config.GetConfigDir(), "info.log")
 	log.Init(
 		log.GetConsoleZapcore(log.INFO),
 		log.GetFileZapcore(absPath, log.INFO, 5),
@@ -33,5 +35,5 @@ func main() {
 		shell.Printf("%s - Xray Shell Client - %s\n", name, version)
 		shell.Run()
 	}
-	defer cmd.Kill()
+	defer service.Stop()
 }

build.py

@@ -47,7 +47,7 @@ def build(goos, goarch, path, cgo=0):
                                                                            path)
     os.system(cmd)
     shutil.copy("README.md", "build/"+"-".join([Name, syst, arch]))
-    make_zip("build/"+"-".join([Name, syst, arch]),"build/"+"-".join([Name, syst, arch])+".zip")
+    make_zip("build/"+"-".join([Name, syst, arch]), "build/"+"-".join([Name, syst, arch])+".zip")
 
 if __name__ == '__main__':
     if get_os() == 'win':

cmd/base_setting_shell.go

@@ -0,0 +1,141 @@
+package cmd
+
+import (
+	"Txray/core/setting"
+	"Txray/tools"
+	"Txray/tools/format"
+	"github.com/abiosoft/ishell"
+	"os"
+)
+
+func InitSettingShell(shell *ishell.Shell) {
+	baseSettingCmd := &ishell.Cmd{
+		Name: "base",
+		Help: "查看基础设置",
+		Func: func(c *ishell.Context) {
+			base := setting.Base()
+			data := []string{tools.UintToStr(base.Socks),
+				tools.UintToStr(base.Http),
+				tools.BoolToStr(base.UDP),
+				tools.BoolToStr(base.Sniffing),
+				tools.BoolToStr(base.Mux),
+				tools.BoolToStr(base.AllowLANConn),
+				tools.BoolToStr(base.BypassLanAndContinent),
+				base.DomainStrategy,
+			}
+			format.ShowSetting(os.Stdout, data)
+		},
+	}
+	baseSettingCmd.AddCmd(&ishell.Cmd{
+		Name: "help",
+		Help: "基础设置help文档",
+		Func: func(c *ishell.Context) {
+			c.Println(HelpSetting())
+		},
+	})
+	baseSettingCmd.AddCmd(&ishell.Cmd{
+		Name: "socks",
+		Help: "修改socks端口",
+		Func: func(c *ishell.Context) {
+			if len(c.Args) == 1 && tools.IsNetPort(c.Args[0]) {
+				setting.SetSocksPort(tools.StrToUint(c.Args[0]))
+			}
+		},
+	})
+	baseSettingCmd.AddCmd(&ishell.Cmd{
+		Name: "http",
+		Help: "修改http端口",
+		Func: func(c *ishell.Context) {
+			if len(c.Args) == 1 && tools.IsNetPort(c.Args[0]) {
+				setting.SetHttpPort(tools.StrToUint(c.Args[0]))
+			}
+		},
+	})
+	baseSettingCmd.AddCmd(&ishell.Cmd{
+		Name: "udp",
+		Help: "是否启用udp",
+		Func: func(c *ishell.Context) {
+			if len(c.Args) == 1 {
+				key := c.Args[0]
+				if key == "y" {
+					setting.SetUDP(true)
+				} else if key == "n" {
+					setting.SetUDP(false)
+				}
+			}
+		},
+	})
+	baseSettingCmd.AddCmd(&ishell.Cmd{
+		Name: "sniffing",
+		Help: "是否启用流量监听",
+		Func: func(c *ishell.Context) {
+			if len(c.Args) == 1 {
+				key := c.Args[0]
+				if key == "y" {
+					setting.SetSniffing(true)
+				} else if key == "n" {
+					setting.SetSniffing(false)
+				}
+			}
+		},
+	})
+	baseSettingCmd.AddCmd(&ishell.Cmd{
+		Name: "lanconn",
+		Help: "是否启用局域网连接",
+		Func: func(c *ishell.Context) {
+			if len(c.Args) == 1 {
+				key := c.Args[0]
+				if key == "y" {
+					setting.SetLANConn(true)
+				} else if key == "n" {
+					setting.SetLANConn(false)
+				}
+			}
+		},
+	})
+	baseSettingCmd.AddCmd(&ishell.Cmd{
+		Name: "mux",
+		Help: "是否启用多路复用",
+		Func: func(c *ishell.Context) {
+			if len(c.Args) == 1 {
+				key := c.Args[0]
+				if key == "y" {
+					setting.SetMux(true)
+				} else if key == "n" {
+					setting.SetMux(false)
+				}
+			}
+		},
+	})
+	baseSettingCmd.AddCmd(&ishell.Cmd{
+		Name: "bypass",
+		Help: "是否绕过局域网及大陆",
+		Func: func(c *ishell.Context) {
+			if len(c.Args) == 1 {
+				key := c.Args[0]
+				if key == "y" {
+					setting.SetBypassLanAndContinent(true)
+				} else if key == "n" {
+					setting.SetBypassLanAndContinent(false)
+				}
+			}
+		},
+	})
+	baseSettingCmd.AddCmd(&ishell.Cmd{
+		Name: "routing",
+		Help: "设置路由策略",
+		Func: func(c *ishell.Context) {
+			if len(c.Args) == 1 {
+				key := c.Args[0]
+				if key == "1" {
+					setting.SetDomainStrategy(1)
+				} else if key == "2" {
+					setting.SetDomainStrategy(2)
+				} else if key == "3" {
+					setting.SetDomainStrategy(3)
+				}
+			}
+		},
+	})
+	shell.AddCmd(baseSettingCmd)
+}

cmd/dns_setting_shell.go

@@ -0,0 +1,64 @@
+package cmd
+
+import (
+	"Txray/core/setting"
+	"Txray/tools"
+	"Txray/tools/format"
+	"github.com/abiosoft/ishell"
+	"os"
+	"strings"
+)
+
+func InitDNSShell(shell *ishell.Shell) {
+	dnsCmd := &ishell.Cmd{
+		Name: "dns",
+		Help: "查看DNS设置",
+		Func: func(c *ishell.Context) {
+			data := []string{
+				tools.UintToStr(setting.DNSPort()),
+				setting.OutlandDNS(),
+				setting.InlandDNS(),
+				strings.Join(setting.BackupDNS(), ","),
+			}
+			format.ShowDNS(os.Stdout, data)
+		},
+	}
+	dnsCmd.AddCmd(&ishell.Cmd{
+		Name: "help",
+		Help: "查看帮助",
+		Func: func(c *ishell.Context) {
+			c.Println(HelpDNS())
+		},
+	})
+	dnsCmd.AddCmd(&ishell.Cmd{
+		Name: "port",
+		Help: "设置dns端口",
+		Func: func(c *ishell.Context) {
+			if len(c.Args) == 1 && tools.IsNetPort(c.Args[0]) {
+				setting.SetDNSPort(tools.StrToUint(c.Args[0]))
+			}
+		},
+	})
+	dnsCmd.AddCmd(&ishell.Cmd{
+		Name: "inland",
+		Help: "设置境内DNS",
+		Func: func(c *ishell.Context) {
+			setting.SetInlandDNS(c.Args[0])
+		},
+	})
+	dnsCmd.AddCmd(&ishell.Cmd{
+		Name: "outland",
+		Help: "设置境外DNS",
+		Func: func(c *ishell.Context) {
+			setting.SetOutlandDNS(c.Args[0])
+		},
+	})
+	dnsCmd.AddCmd(&ishell.Cmd{
+		Name: "backup",
+		Help: "设置备用DNS",
+		Func: func(c *ishell.Context) {
+			setting.SetBackupDNS(strings.Join(c.Args, ","))
+		},
+	})
+	shell.AddCmd(dnsCmd)
+}