阶段性提交

internal/nodes/listener.go

@@ -3,7 +3,7 @@ package nodes
 import (
 	"context"
 	"errors"
-	"github.com/TeaOSLab/EdgeNode/internal/configs/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/logs"
 	"net"
 	"sync"

internal/nodes/listener_base.go

@@ -3,8 +3,8 @@ package nodes
 import (
 	"crypto/tls"
 	"errors"
-	"github.com/TeaOSLab/EdgeNode/internal/configs/serverconfigs"
-	"github.com/TeaOSLab/EdgeNode/internal/configs/serverconfigs/sslconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"
 	http2 "golang.org/x/net/http2"
 	"sync"
 )

internal/nodes/listener_http.go

@@ -1,7 +1,7 @@
 package nodes
 
 import (
-	"github.com/TeaOSLab/EdgeNode/internal/configs/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/logs"
 	"golang.org/x/net/http2"
 	"net"

internal/nodes/listener_tcp.go

@@ -2,7 +2,7 @@ package nodes
 
 import (
 	"errors"
-	"github.com/TeaOSLab/EdgeNode/internal/configs/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/logs"
 	"net"
 )

internal/nodes/listener_udp.go

@@ -1,7 +1,7 @@
 package nodes
 
 import (
-	"github.com/TeaOSLab/EdgeNode/internal/configs/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"net"
 )
 

internal/nodes/listener_unix.go

@@ -1,7 +1,7 @@
 package nodes
 
 import (
-	"github.com/TeaOSLab/EdgeNode/internal/configs/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"net"
 )
 

internal/nodes/named_server.go

@@ -1,6 +1,6 @@
 package nodes
 
-import "github.com/TeaOSLab/EdgeNode/internal/configs/serverconfigs"
+import "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 
 // 域名和服务映射
 type NamedServer struct {

internal/nodes/node.go

@@ -3,9 +3,9 @@ package nodes
 import (
 	"encoding/json"
 	"errors"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeNode/internal/configs"
 	"github.com/TeaOSLab/EdgeNode/internal/rpc"
-	"github.com/TeaOSLab/EdgeNode/internal/rpc/pb"
 	"github.com/TeaOSLab/EdgeNode/internal/utils"
 	"github.com/iwind/TeaGo/logs"
 	"time"

internal/nodes/node_status_executor.go

@@ -2,9 +2,9 @@ package nodes
 
 import (
 	"encoding/json"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
 	"github.com/TeaOSLab/EdgeNode/internal/rpc"
-	"github.com/TeaOSLab/EdgeNode/internal/rpc/pb"
 	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/logs"
 	"github.com/shirou/gopsutil/cpu"