[优化] 目录调整

openflare-agent/Dockerfile

@@ -18,6 +18,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
 
 COPY openflare-server ./openflare-server
 COPY openflare-agent ./openflare-agent
+COPY pkg ./pkg
 RUN --mount=type=cache,target=/go/pkg/mod \
     --mount=type=cache,target=/root/.cache/go-build \
     go build -trimpath -ldflags "-s -w -X 'github.com/rain-kl/openflare/openflare-agent/internal/config.Version=$VERSION'" -o /build/bin/openflare-agent ./openflare-agent/cmd/agent
@@ -37,4 +38,3 @@ COPY --from=builder /build/bin/openflare-agent /usr/local/bin/openflare-agent
 EXPOSE 80 443 18081
 ENTRYPOINT ["/usr/local/bin/openflare-agent"]
 CMD ["-config", "/etc/openflare/agent.json"]
-

openflare-agent/internal/config/config.go

@@ -13,9 +13,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/utils"
-	"github.com/rain-kl/openflare/openflare-server/utils/geoip"
-	"github.com/rain-kl/openflare/openflare-server/utils/geoip/iputil"
+	"github.com/rain-kl/openflare/pkg/geoip"
+	"github.com/rain-kl/openflare/pkg/geoip/iputil"
+	"github.com/rain-kl/openflare/pkg/utils"
 )
 
 const (

openflare-agent/internal/config/config_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/utils/geoip"
+	"github.com/rain-kl/openflare/pkg/geoip"
 )
 
 func TestLoadDefaultsToManagedBinaryPaths(t *testing.T) {

openflare-agent/internal/geoipupdate/updater.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/rain-kl/openflare/openflare-agent/internal/geoipdata"
-	"github.com/rain-kl/openflare/openflare-server/utils/geoip"
+	"github.com/rain-kl/openflare/pkg/geoip"
 )
 
 type Updater struct {

openflare-agent/internal/nginx/manager.go

@@ -20,8 +20,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/utils"
-	openrestyrender "github.com/rain-kl/openflare/openflare-server/utils/render/openresty"
+	openrestyrender "github.com/rain-kl/openflare/pkg/render/openresty"
+	"github.com/rain-kl/openflare/pkg/utils"
 
 	"github.com/rain-kl/openflare/openflare-agent/internal/protocol"
 )

openflare-agent/internal/sync/service.go

@@ -11,7 +11,7 @@ import (
 	"sort"
 	"strings"
 
-	openrestyrender "github.com/rain-kl/openflare/openflare-server/utils/render/openresty"
+	openrestyrender "github.com/rain-kl/openflare/pkg/render/openresty"
 
 	"github.com/rain-kl/openflare/openflare-agent/internal/nginx"
 	"github.com/rain-kl/openflare/openflare-agent/internal/protocol"

openflare-agent/internal/updater/updater.go

@@ -14,7 +14,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/utils"
+	"github.com/rain-kl/openflare/pkg/utils"
 
 	"github.com/rain-kl/openflare/openflare-agent/internal/agent"
 	"github.com/rain-kl/openflare/openflare-agent/internal/config"

openflare-agent/internal/wsclient/client.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/rain-kl/openflare/openflare-agent/internal/protocol"
-	shared "github.com/rain-kl/openflare/openflare-server/utils/wsclient"
+	shared "github.com/rain-kl/openflare/pkg/wsclient"
 )
 
 type WSMessage = shared.WSMessage