Merge branch 'lichang' into lite

src/framework/config/config.go

@@ -171,6 +171,13 @@ func Get(key string) any {
 	return conf.Get(key)
 }
 
+// Set 设置配置信息
+//
+// Set("redis.defaultDataSourceName", "std")
+func Set(key string, value any) {
+	conf.Set(key, value)
+}
+
 // GetAssetsDirFS 访问程序内全局资源访问
 func GetAssetsDirFS() *embed.FS {
 	return conf.Get("AssetsDir").(*embed.FS)

src/framework/socket/tcp_client.go

@@ -27,7 +27,7 @@ func (c *ConnTCP) New() (*ConnTCP, error) {
 		proto = "tcp6"
 		c.Addr = fmt.Sprintf("[%s]", c.Addr)
 	}
-	address := fmt.Sprintf("%s:%d", c.Addr, c.Port)
+	address := net.JoinHostPort(c.Addr, fmt.Sprint(c.Port))
 
 	// 默认等待5s
 	if c.DialTimeOut == 0 {

src/framework/socket/tcp_server.go

@@ -57,8 +57,14 @@ func (s *SocketTCP) Resolve(callback func(conn *net.Conn, err error)) {
 		callback(nil, fmt.Errorf("tcp service not created"))
 		return
 	}
-	listener := *s.Listener
 
+	defer func() {
+		if err := recover(); err != nil {
+			callback(nil, fmt.Errorf("tcp service panic err"))
+		}
+	}()
+
+	listener := *s.Listener
 	for {
 		select {
 		case <-s.StopChan:

src/framework/socket/udp_client.go

@@ -27,7 +27,7 @@ func (c *ConnUDP) New() (*ConnUDP, error) {
 		proto = "udp6"
 		c.Addr = fmt.Sprintf("[%s]", c.Addr)
 	}
-	address := fmt.Sprintf("%s:%d", c.Addr, c.Port)
+	address := net.JoinHostPort(c.Addr, fmt.Sprint(c.Port))
 
 	// 默认等待5s
 	if c.DialTimeOut == 0 {

src/framework/socket/udp_server.go

@@ -56,10 +56,17 @@ func (s *SocketUDP) Resolve(callback func(*net.UDPConn, error)) {
 		return
 	}
 
+	defer func() {
+		if err := recover(); err != nil {
+			callback(nil, fmt.Errorf("udp service panic err"))
+		}
+	}()
+
 	for {
 		select {
 		case <-s.StopChan:
 			callback(nil, fmt.Errorf("udp service not created"))
+			return
 		default:
 			callback(s.Conn, nil)
 		}