refactor: 重构项目结构

- 将server端相关依赖单独防止在server中

cmd/server/main.go

@@ -9,9 +9,9 @@ import (
 	"syscall"
 	"time"
 
-	"git.jinshen.cn/remilia/push-server/interval/api"
+	"git.jinshen.cn/remilia/push-server/interval/server/api"
-	"git.jinshen.cn/remilia/push-server/interval/server"
+	"git.jinshen.cn/remilia/push-server/interval/server/httpserver"
-	"git.jinshen.cn/remilia/push-server/interval/ws"
+	"git.jinshen.cn/remilia/push-server/interval/server/ws"
 )
 
 func main() {
@@ -27,7 +27,7 @@ func main() {
 	h := ws.NewHub()
 	go h.Run(serverCtx)
 
-	httpServer := server.NewHTTPServer(":8080", api.NewRouter(h, serverCtx))
+	httpServer := httpserver.NewHTTPServer(":8080", api.NewRouter(h, serverCtx))
 
 	go func() {
 		log.Println("Starting HTTP server on :8080")

interval/hub/doc.go

@@ -1,2 +0,0 @@
-// Package hub implements the message distribution core of the push service.
-package hub

interval/server/api/dto/message.go

@@ -1,7 +1,7 @@
 package dto
 
 import (
-	"git.jinshen.cn/remilia/push-server/interval/model"
+	"git.jinshen.cn/remilia/push-server/interval/server/model"
 )
 
 type Message struct {

interval/server/api/dto/subscription.go

@@ -1,7 +1,7 @@
 package dto
 
 import (
-	"git.jinshen.cn/remilia/push-server/interval/model"
+	"git.jinshen.cn/remilia/push-server/interval/server/model"
 )
 
 type Subscription struct {

interval/server/api/handler/push.go

@@ -5,9 +5,9 @@ import (
 	"net/http"
 	"time"
 
-	"git.jinshen.cn/remilia/push-server/interval/api/dto"
+	"git.jinshen.cn/remilia/push-server/interval/server/api/dto"
-	"git.jinshen.cn/remilia/push-server/interval/model"
+	"git.jinshen.cn/remilia/push-server/interval/server/model"
-	"git.jinshen.cn/remilia/push-server/interval/ws"
+	"git.jinshen.cn/remilia/push-server/interval/server/ws"
 	"github.com/go-chi/chi/v5"
 )
 

interval/server/api/router.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"net/http"
 
-	"git.jinshen.cn/remilia/push-server/interval/api/handler"
+	"git.jinshen.cn/remilia/push-server/interval/server/api/handler"
-	"git.jinshen.cn/remilia/push-server/interval/ws"
+	"git.jinshen.cn/remilia/push-server/interval/server/ws"
 	"github.com/go-chi/chi/v5"
 )
 

interval/server/doc.go

@@ -1,2 +0,0 @@
-// Package server provides HTTP server abstractions.
-package server

interval/server/httpserver/doc.go

@@ -0,0 +1,2 @@
+// Package httpserver provides HTTP server abstractions.
+package httpserver

interval/server/httpserver/http.go

@@ -1,4 +1,4 @@
-package server
+package httpserver
 
 import (
 	"context"

interval/server/ws/hub.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"log"
 
-	"git.jinshen.cn/remilia/push-server/interval/model"
+	"git.jinshen.cn/remilia/push-server/interval/server/model"
 	"github.com/coder/websocket"
 )