优化代码

main_cmd.go

@@ -7,7 +7,7 @@ import (
 	"goodlink/pro"
 	_ "goodlink/pro"
 	"goodlink/stun2"
-	"goodlink/tools"
+	"goodlink/utils"
 	"log"
 	"net/http"
 	_ "net/http/pprof"
@@ -63,11 +63,11 @@ func main2() {
 func main() {
 	config.Help()
 
-	tools.GuardStart(main2, 500*time.Millisecond, func(err error) {
+	utils.GuardStart(main2, 500*time.Millisecond, func(err error) {
 		// if 0: err==nil; -1: err==255; -2: err==254; err==1: 1; err==2
 		if err != nil {
 			log.Printf("   异常退出: %v", err)
-			tools.DingF("error: %v", err)
+			utils.DingF("error: %v", err)
 		}
 	})
 }

main_windows.go

@@ -6,8 +6,8 @@ import (
 	"goodlink/config"
 	_ "goodlink/pro"
 	"goodlink/theme"
-	"goodlink/tools"
 	"goodlink/ui2"
+	"goodlink/utils"
 	"log"
 	"os"
 	"time"
@@ -51,12 +51,12 @@ func main2() {
 func main() {
 	config.Help()
 
-	tools.GuardStart(main2, 500*time.Millisecond, func(err error) {
+	utils.GuardStart(main2, 500*time.Millisecond, func(err error) {
 		// if 0: err==nil; -1: err==255; -2: err==254; err==1: 1; err==2
 		if err == nil {
 			os.Exit(0)
 		}
 		log.Printf("   异常退出: %v", err)
-		tools.DingF("error: %v", err)
+		utils.DingF("error: %v", err)
 	})
 }

pro/local.go

@@ -5,7 +5,7 @@ import (
 	"goodlink/md5"
 	"goodlink/proxy"
 	"goodlink/stun2"
-	"goodlink/tools"
+	"goodlink/utils"
 	"goodlink2/tun"
 	_ "goodlink2/tun"
 	"log"
@@ -27,14 +27,14 @@ func GetLocalQuicConn(conn_type int, count int) (quic.Connection, quic.Stream, e
 		ConnectCount: count,
 	}
 
-	conn := tools.GetListenUDP()
+	conn := utils.GetListenUDP()
 
 	ClientIP, ClientPort1, ClientPort2 := stun2.GetWanIpPort2(conn)
 	if ClientPort1 == ClientPort2 {
 		conn_type = 0
 	}
 
-	SessionID := string(tools.RandomBytes(24))
+	SessionID := string(utils.RandomBytes(24))
 	redisJson.SessionID = SessionID
 	gogo.Log().DebugF("   会话ID: %s", SessionID)
 

pro/remote.go

@@ -5,7 +5,7 @@ import (
 	"goodlink/md5"
 	"goodlink/proxy"
 	"goodlink/stun2"
-	"goodlink/tools"
+	"goodlink/utils"
 	"goodlink2/tun"
 	_ "goodlink2/tun"
 	"log"
@@ -69,7 +69,7 @@ func GetRemoteQuicConn(time_out time.Duration) (quic.Connection, quic.Stream) {
 		case 0:
 			gogo.Log().DebugF("%d: 收到对端请求: %v", redisJson.State, redisJson)
 
-			conn := tools.GetListenUDP()
+			conn := utils.GetListenUDP()
 			redisJson.ServerIP, redisJson.ServerPort1, redisJson.ServerPort2 = stun2.GetWanIpPort2(conn)
 
 			switch redisJson.ClientPort1 {
@@ -171,7 +171,7 @@ func RunRemote(remote_addr string, tun_key string, time_out time.Duration) error
 
 	if remote_addr == "" {
 		log.Println("   开启本地代理")
-		remote_addr = tools.GetFreeLocalAddr()
+		remote_addr = utils.GetFreeLocalAddr()
 		if remote_addr == "" {
 			return errors.New("   获取本地端口失败")
 		}

stun2/cli.go

@@ -6,7 +6,7 @@ import (
 	"encoding/binary"
 	"fmt"
 	"goodlink/config"
-	"goodlink/tools"
+	"goodlink/utils"
 	"log"
 	"math/big"
 	"net"
@@ -224,13 +224,13 @@ func GetWanIpPort2(conn *net.UDPConn) (string, int, int) {
 }
 
 func GetWanIpPort() (string, int, int) {
-	conn := tools.GetListenUDP()
+	conn := utils.GetListenUDP()
 	defer conn.Close()
 	return GetWanIpPort2(conn)
 }
 
 func TestStun() {
-	conn := tools.GetListenUDP()
+	conn := utils.GetListenUDP()
 
 	for {
 		for _, stun_svr := range config.GetConfig().StunList {

ui2/ui.go

@@ -13,7 +13,7 @@ import (
 	"goodlink/config"
 	"goodlink/pro"
 	_ "goodlink/pro"
-	"goodlink/tools"
+	"goodlink/utils"
 
 	_ "embed"
 	_ "net/http/pprof"
@@ -84,7 +84,7 @@ func GetMainUI(myWindow *fyne.Window) *fyne.Container {
 	}
 
 	m_button_key_create = widget.NewButton("生成密钥", func() {
-		m_validated_key.SetText(string(tools.RandomBytes(24)))
+		m_validated_key.SetText(string(utils.RandomBytes(24)))
 	})
 	key_copy_button := widget.NewButton("复制密钥", func() {
 		clipboard.WriteAll(m_validated_key.Text)

utils/dingding.go

@@ -1,4 +1,4 @@
-package tools
+package utils
 
 import (
 	"fmt"

utils/guard.go

@@ -1,4 +1,4 @@
-package tools
+package utils
 
 import (
 	"log"

utils/net.go

@@ -1,4 +1,4 @@
-package tools
+package utils
 
 import (
 	"fmt"

utils/tools.go

@@ -1,4 +1,4 @@
-package tools
+package utils
 
 import (
 	"crypto/rand"