[优化] 目录调整

openflare-server/Dockerfile

@@ -21,12 +21,13 @@ COPY go.mod go.sum ./
 RUN --mount=type=cache,target=/go/pkg/mod \
     go mod download
 COPY openflare-server ./openflare-server
+COPY pkg ./pkg
 COPY --from=web-builder /build/build ./openflare-server/web/build
 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-server/common.Version=$VERSION'" \
-      -o openflare ./openflare-server
+      -ldflags "-s -w -X 'github.com/rain-kl/openflare/openflare-server/internal/common.Version=$VERSION'" \
+      -o openflare ./openflare-server/cmd/server
 
 FROM alpine:latest
 RUN apk add --no-cache ca-certificates tzdata \

openflare-server/cmd/server/main.go

@@ -0,0 +1,7 @@
+package main
+
+import server "github.com/rain-kl/openflare/openflare-server"
+
+func main() {
+	server.Run()
+}

openflare-server/internal/controller/access_log.go

@@ -3,9 +3,9 @@ package controller
 import (
 	"strconv"
 
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/controller/acme_account.go

@@ -1,8 +1,8 @@
 package controller
 
 import (
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/model"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/model"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/controller/agent.go

@@ -7,11 +7,11 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/common"
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/model"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/model"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 
 	"github.com/gin-gonic/gin"
 	"golang.org/x/net/websocket"

openflare-server/internal/controller/auth_source.go

@@ -7,11 +7,11 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/rain-kl/openflare/openflare-server/common"
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/model"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/model"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"

openflare-server/internal/controller/bind/bind.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"github.com/rain-kl/openflare/openflare-server/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
 )
 
 // DecodeJSONBody decodes JSON reader to target

openflare-server/internal/controller/cap.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/service"
-	"github.com/rain-kl/openflare/openflare-server/utils/cap"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/utils/cap"
 )
 
 // GetCapChallenge generates a new CAPTCHA challenge

openflare-server/internal/controller/config_version.go

@@ -1,9 +1,9 @@
 package controller
 
 import (
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/controller/dashboard.go

@@ -1,8 +1,8 @@
 package controller
 
 import (
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/controller/database.go

@@ -1,9 +1,9 @@
 package controller
 
 import (
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/controller/dns_account.go

@@ -1,9 +1,9 @@
 package controller
 
 import (
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/model"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/model"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/controller/flared.go

@@ -5,11 +5,11 @@ import (
 	"net"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/common"
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/model"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/model"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 
 	"github.com/gin-gonic/gin"
 	"golang.org/x/net/websocket"

openflare-server/internal/controller/geoip.go

@@ -1,9 +1,9 @@
 package controller
 
 import (
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/controller/github.go

@@ -9,9 +9,9 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/common"
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/model"
+	"github.com/rain-kl/openflare/openflare-server/internal/common"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/model"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/controller/managed_domain.go

@@ -3,9 +3,9 @@ package controller
 import (
 	"strings"
 
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/controller/misc.go

@@ -3,14 +3,14 @@ package controller
 import (
 	"fmt"
 
-	"github.com/rain-kl/openflare/openflare-server/common"
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/model"
-	"github.com/rain-kl/openflare/openflare-server/service"
-	"github.com/rain-kl/openflare/openflare-server/utils/mail"
-	"github.com/rain-kl/openflare/openflare-server/utils/security"
-	"github.com/rain-kl/openflare/openflare-server/utils/validation"
+	"github.com/rain-kl/openflare/openflare-server/internal/common"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/model"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/utils/mail"
+	"github.com/rain-kl/openflare/openflare-server/internal/utils/security"
+	"github.com/rain-kl/openflare/openflare-server/internal/utils/validation"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/controller/node.go

@@ -1,9 +1,9 @@
 package controller
 
 import (
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/controller/option.go

@@ -6,13 +6,13 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/rain-kl/openflare/openflare-server/common"
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/model"
-	"github.com/rain-kl/openflare/openflare-server/service"
-	"github.com/rain-kl/openflare/openflare-server/utils"
-	"github.com/rain-kl/openflare/openflare-server/utils/geoip"
+	"github.com/rain-kl/openflare/openflare-server/internal/common"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/model"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
+	"github.com/rain-kl/openflare/pkg/geoip"
+	"github.com/rain-kl/openflare/pkg/utils"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/controller/origin.go

@@ -1,9 +1,9 @@
 package controller
 
 import (
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/controller/pages.go

@@ -1,9 +1,9 @@
 package controller
 
 import (
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/controller/proxy_route.go

@@ -1,9 +1,9 @@
 package controller
 
 import (
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/controller/relay.go

@@ -5,10 +5,10 @@ import (
 	"net"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/model"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/model"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 
 	"github.com/gin-gonic/gin"
 	"golang.org/x/net/websocket"

openflare-server/internal/controller/tls_certificate.go

@@ -1,9 +1,9 @@
 package controller
 
 import (
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/controller/update.go

@@ -3,9 +3,9 @@ package controller
 import (
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 
 	"github.com/gin-gonic/gin"
 	"golang.org/x/net/websocket"

openflare-server/internal/controller/uptimekuma.go

@@ -1,8 +1,8 @@
 package controller
 
 import (
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/controller/user.go

@@ -3,13 +3,13 @@ package controller
 import (
 	"strconv"
 
-	"github.com/rain-kl/openflare/openflare-server/common"
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/middleware"
-	"github.com/rain-kl/openflare/openflare-server/model"
-	"github.com/rain-kl/openflare/openflare-server/utils/security"
-	"github.com/rain-kl/openflare/openflare-server/utils/validation"
+	"github.com/rain-kl/openflare/openflare-server/internal/common"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/middleware"
+	"github.com/rain-kl/openflare/openflare-server/internal/model"
+	"github.com/rain-kl/openflare/openflare-server/internal/utils/security"
+	"github.com/rain-kl/openflare/openflare-server/internal/utils/validation"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/controller/waf.go

@@ -3,9 +3,9 @@ package controller
 import (
 	"strconv"
 
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/controller/bind"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller/bind"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/controller/wechat.go

@@ -9,9 +9,9 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/common"
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/model"
+	"github.com/rain-kl/openflare/openflare-server/internal/common"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/model"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/job/ssl_renew.go

@@ -4,8 +4,8 @@ import (
 	"log/slog"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/model"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/model"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 )
 
 type SSLRenewJob struct {

openflare-server/internal/job/uptimekuma.go

@@ -5,8 +5,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/common"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 )
 
 var lastUptimeKumaSyncTime time.Time

openflare-server/internal/job/waf_ip_group_sync.go

@@ -3,7 +3,7 @@ package job
 import (
 	"log/slog"
 
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 )
 
 type WAFIPGroupSyncJob struct{}

openflare-server/internal/middleware/agent-auth.go

@@ -2,8 +2,8 @@ package middleware
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 )
 
 func AgentAuth() func(c *gin.Context) {

openflare-server/internal/middleware/auth.go

@@ -1,9 +1,9 @@
 package middleware
 
 import (
-	"github.com/rain-kl/openflare/openflare-server/common"
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/model"
+	"github.com/rain-kl/openflare/openflare-server/internal/common"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/model"
 
 	jwt "github.com/appleboy/gin-jwt/v2"
 	"github.com/gin-gonic/gin"

openflare-server/internal/middleware/cap.go

@@ -2,8 +2,8 @@ package middleware
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/rain-kl/openflare/openflare-server/common"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 )
 
 // CapAuth wraps the core Cap middleware with OpenFlare's dynamic CapLoginEnabled configuration switch

openflare-server/internal/middleware/cors.go

@@ -3,7 +3,7 @@ package middleware
 import (
 	"strings"
 
-	"github.com/rain-kl/openflare/openflare-server/common"
+	"github.com/rain-kl/openflare/openflare-server/internal/common"
 
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"

openflare-server/internal/middleware/jwt.go

@@ -4,9 +4,9 @@ import (
 	"log"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/common"
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/model"
+	"github.com/rain-kl/openflare/openflare-server/internal/common"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/model"
 
 	jwt "github.com/appleboy/gin-jwt/v2"
 	"github.com/gin-gonic/gin"

openflare-server/internal/middleware/rate-limit.go

@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/common"
-	"github.com/rain-kl/openflare/openflare-server/utils/ratelimit"
+	"github.com/rain-kl/openflare/openflare-server/internal/common"
+	"github.com/rain-kl/openflare/openflare-server/internal/utils/ratelimit"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/middleware/relay-auth.go

@@ -2,8 +2,8 @@ package middleware
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 )
 
 // RelayAuth authenticates Relay requests using the shared agent token,

openflare-server/internal/middleware/tunnel-auth.go

@@ -1,8 +1,8 @@
 package middleware
 
 import (
-	"github.com/rain-kl/openflare/openflare-server/common/response"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common/response"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/model/auth_source.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/utils"
+	"github.com/rain-kl/openflare/pkg/utils"
 
 	"gorm.io/gorm"
 )

openflare-server/internal/model/database_schema_version.go

@@ -3,7 +3,7 @@ package model
 import (
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/model/migrate"
+	"github.com/rain-kl/openflare/openflare-server/internal/model/migrate"
 )
 
 const (

openflare-server/internal/model/main.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/rain-kl/openflare/openflare-server/common"
-	"github.com/rain-kl/openflare/openflare-server/utils/security"
+	"github.com/rain-kl/openflare/openflare-server/internal/common"
+	"github.com/rain-kl/openflare/openflare-server/internal/utils/security"
 
 	"github.com/glebarez/sqlite"
 	"gorm.io/driver/postgres"

openflare-server/internal/model/migrations.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 	"sync"
 
-	schemamigrate "github.com/rain-kl/openflare/openflare-server/model/migrate"
+	schemamigrate "github.com/rain-kl/openflare/openflare-server/internal/model/migrate"
 
 	"gorm.io/gorm"
 	"gorm.io/gorm/schema"

openflare-server/internal/model/node_metric_snapshot.go

@@ -3,7 +3,7 @@ package model
 import (
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/utils"
+	"github.com/rain-kl/openflare/pkg/utils"
 
 	"gorm.io/gorm"
 )

openflare-server/internal/model/node_observation_frpc.go

@@ -3,7 +3,7 @@ package model
 import (
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/utils"
+	"github.com/rain-kl/openflare/pkg/utils"
 
 	"gorm.io/gorm"
 )

openflare-server/internal/model/node_observation_frps.go

@@ -3,7 +3,7 @@ package model
 import (
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/utils"
+	"github.com/rain-kl/openflare/pkg/utils"
 
 	"gorm.io/gorm"
 )

openflare-server/internal/model/node_observation_openresty.go

@@ -3,7 +3,7 @@ package model
 import (
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/utils"
+	"github.com/rain-kl/openflare/pkg/utils"
 
 	"gorm.io/gorm"
 )

openflare-server/internal/model/node_request_report.go

@@ -3,7 +3,7 @@ package model
 import (
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/utils"
+	"github.com/rain-kl/openflare/pkg/utils"
 
 	"gorm.io/gorm"
 )

openflare-server/internal/model/option.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/common"
-	"github.com/rain-kl/openflare/openflare-server/utils/geoip"
+	"github.com/rain-kl/openflare/openflare-server/internal/common"
+	"github.com/rain-kl/openflare/pkg/geoip"
 
 	"gorm.io/gorm"
 )

openflare-server/internal/model/schema_migration_context.go

@@ -1,7 +1,7 @@
 package model
 
 import (
-	schemagoose "github.com/rain-kl/openflare/openflare-server/model/goose"
+	schemagoose "github.com/rain-kl/openflare/openflare-server/internal/model/goose"
 
 	"gorm.io/gorm"
 )

openflare-server/internal/model/user.go

@@ -3,8 +3,8 @@ package model
 import (
 	"errors"
 
-	"github.com/rain-kl/openflare/openflare-server/common"
-	"github.com/rain-kl/openflare/openflare-server/utils/security"
+	"github.com/rain-kl/openflare/openflare-server/internal/common"
+	"github.com/rain-kl/openflare/openflare-server/internal/utils/security"
 )
 
 // User if you add sensitive fields, don't forget to clean them in setupLogin function.

openflare-server/internal/router/api-router.go

@@ -1,8 +1,8 @@
 package router
 
 import (
-	"github.com/rain-kl/openflare/openflare-server/controller"
-	"github.com/rain-kl/openflare/openflare-server/middleware"
+	"github.com/rain-kl/openflare/openflare-server/internal/controller"
+	"github.com/rain-kl/openflare/openflare-server/internal/middleware"
 
 	"github.com/gin-gonic/gin"
 )

openflare-server/internal/router/api_flared_test.go

@@ -7,10 +7,10 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/rain-kl/openflare/openflare-server/common"
-	"github.com/rain-kl/openflare/openflare-server/model"
-	"github.com/rain-kl/openflare/openflare-server/router"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common"
+	"github.com/rain-kl/openflare/openflare-server/internal/model"
+	"github.com/rain-kl/openflare/openflare-server/internal/router"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-contrib/sessions/cookie"

openflare-server/internal/router/api_phase1_test.go

@@ -22,11 +22,11 @@ import (
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-contrib/sessions/cookie"
 	"github.com/gin-gonic/gin"
-	"github.com/rain-kl/openflare/openflare-server/common"
-	"github.com/rain-kl/openflare/openflare-server/middleware"
-	"github.com/rain-kl/openflare/openflare-server/model"
-	"github.com/rain-kl/openflare/openflare-server/router"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	"github.com/rain-kl/openflare/openflare-server/internal/common"
+	"github.com/rain-kl/openflare/openflare-server/internal/middleware"
+	"github.com/rain-kl/openflare/openflare-server/internal/model"
+	"github.com/rain-kl/openflare/openflare-server/internal/router"
+	"github.com/rain-kl/openflare/openflare-server/internal/service"
 )
 
 type apiResponse struct {
@@ -484,11 +484,14 @@ func setupTestDB(t *testing.T) {
 	dbPath := filepath.Join(t.TempDir(), "phase1.db")
 	common.SQLitePath = dbPath
 	common.AccessToken = "phase1-agent-token"
+	originalCapLoginEnabled := common.CapLoginEnabled
+	common.CapLoginEnabled = false
 	if err := model.InitDB(); err != nil {
 		t.Fatalf("failed to init db: %v", err)
 	}
 	middleware.InitJWTMiddleware()
 	t.Cleanup(func() {
+		common.CapLoginEnabled = originalCapLoginEnabled
 		if err := model.CloseDB(); err != nil {
 			t.Fatalf("failed to close db: %v", err)
 		}