From 53555a31c069046f138473c8a5d559fbb6e4cb98 Mon Sep 17 00:00:00 2001
From: R2m1liA <15258427350@163.com>
Date: Wed, 17 Dec 2025 12:32:21 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将server端相关依赖单独防止在server中
---
 cmd/server/main.go                            | 8 ++++----
 interval/hub/doc.go                           | 2 --
 interval/{ => server}/api/doc.go              | 0
 interval/{ => server}/api/dto/doc.go          | 0
 interval/{ => server}/api/dto/message.go      | 2 +-
 interval/{ => server}/api/dto/publish.go      | 0
 interval/{ => server}/api/dto/subscription.go | 2 +-
 interval/{ => server}/api/handler/doc.go      | 0
 interval/{ => server}/api/handler/health.go   | 0
 interval/{ => server}/api/handler/push.go     | 6 +++---
 interval/{ => server}/api/router.go           | 4 ++--
 interval/server/doc.go                        | 2 --
 interval/server/httpserver/doc.go             | 2 ++
 interval/server/{ => httpserver}/http.go      | 2 +-
 interval/{ => server}/model/doc.go            | 0
 interval/{ => server}/model/message.go        | 0
 interval/{ => server}/model/subscription.go   | 0
 interval/{ => server}/model/topic.go          | 0
 interval/{ => server}/ws/client.go            | 0
 interval/{ => server}/ws/doc.go               | 0
 interval/{ => server}/ws/handler.go           | 0
 interval/{ => server}/ws/heartbeat.go         | 0
 interval/{ => server}/ws/hub.go               | 2 +-
 23 files changed, 15 insertions(+), 17 deletions(-)
 delete mode 100644 interval/hub/doc.go
 rename interval/{ => server}/api/doc.go (100%)
 rename interval/{ => server}/api/dto/doc.go (100%)
 rename interval/{ => server}/api/dto/message.go (80%)
 rename interval/{ => server}/api/dto/publish.go (100%)
 rename interval/{ => server}/api/dto/subscription.go (82%)
 rename interval/{ => server}/api/handler/doc.go (100%)
 rename interval/{ => server}/api/handler/health.go (100%)
 rename interval/{ => server}/api/handler/push.go (84%)
 rename interval/{ => server}/api/router.go (70%)
 delete mode 100644 interval/server/doc.go
 create mode 100644 interval/server/httpserver/doc.go
 rename interval/server/{ => httpserver}/http.go (95%)
 rename interval/{ => server}/model/doc.go (100%)
 rename interval/{ => server}/model/message.go (100%)
 rename interval/{ => server}/model/subscription.go (100%)
 rename interval/{ => server}/model/topic.go (100%)
 rename interval/{ => server}/ws/client.go (100%)
 rename interval/{ => server}/ws/doc.go (100%)
 rename interval/{ => server}/ws/handler.go (100%)
 rename interval/{ => server}/ws/heartbeat.go (100%)
 rename interval/{ => server}/ws/hub.go (98%)

diff --git a/cmd/server/main.go b/cmd/server/main.go
index bb88cae..70ad628 100644
--- a/cmd/server/main.go
+++ b/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"
-	"git.jinshen.cn/remilia/push-server/interval/ws"
+	"git.jinshen.cn/remilia/push-server/interval/server/api"
+	"git.jinshen.cn/remilia/push-server/interval/server/httpserver"
+	"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")
diff --git a/interval/hub/doc.go b/interval/hub/doc.go
deleted file mode 100644
index c207cf1..0000000
--- a/interval/hub/doc.go
+++ /dev/null
@@ -1,2 +0,0 @@
-// Package hub implements the message distribution core of the push service.
-package hub
diff --git a/interval/api/doc.go b/interval/server/api/doc.go
similarity index 100%
rename from interval/api/doc.go
rename to interval/server/api/doc.go
diff --git a/interval/api/dto/doc.go b/interval/server/api/dto/doc.go
similarity index 100%
rename from interval/api/dto/doc.go
rename to interval/server/api/dto/doc.go
diff --git a/interval/api/dto/message.go b/interval/server/api/dto/message.go
similarity index 80%
rename from interval/api/dto/message.go
rename to interval/server/api/dto/message.go
index 387ae85..dfdd9a7 100644
--- a/interval/api/dto/message.go
+++ b/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 {
diff --git a/interval/api/dto/publish.go b/interval/server/api/dto/publish.go
similarity index 100%
rename from interval/api/dto/publish.go
rename to interval/server/api/dto/publish.go
diff --git a/interval/api/dto/subscription.go b/interval/server/api/dto/subscription.go
similarity index 82%
rename from interval/api/dto/subscription.go
rename to interval/server/api/dto/subscription.go
index 0d41707..4b314dd 100644
--- a/interval/api/dto/subscription.go
+++ b/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 {
diff --git a/interval/api/handler/doc.go b/interval/server/api/handler/doc.go
similarity index 100%
rename from interval/api/handler/doc.go
rename to interval/server/api/handler/doc.go
diff --git a/interval/api/handler/health.go b/interval/server/api/handler/health.go
similarity index 100%
rename from interval/api/handler/health.go
rename to interval/server/api/handler/health.go
diff --git a/interval/api/handler/push.go b/interval/server/api/handler/push.go
similarity index 84%
rename from interval/api/handler/push.go
rename to interval/server/api/handler/push.go
index 2289b9a..3dbcfd7 100644
--- a/interval/api/handler/push.go
+++ b/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/model"
-	"git.jinshen.cn/remilia/push-server/interval/ws"
+	"git.jinshen.cn/remilia/push-server/interval/server/api/dto"
+	"git.jinshen.cn/remilia/push-server/interval/server/model"
+	"git.jinshen.cn/remilia/push-server/interval/server/ws"
 	"github.com/go-chi/chi/v5"
 )
 
diff --git a/interval/api/router.go b/interval/server/api/router.go
similarity index 70%
rename from interval/api/router.go
rename to interval/server/api/router.go
index 1047a5d..ef9fecd 100644
--- a/interval/api/router.go
+++ b/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/ws"
+	"git.jinshen.cn/remilia/push-server/interval/server/api/handler"
+	"git.jinshen.cn/remilia/push-server/interval/server/ws"
 	"github.com/go-chi/chi/v5"
 )
 
diff --git a/interval/server/doc.go b/interval/server/doc.go
deleted file mode 100644
index 67aaa4d..0000000
--- a/interval/server/doc.go
+++ /dev/null
@@ -1,2 +0,0 @@
-// Package server provides HTTP server abstractions.
-package server
diff --git a/interval/server/httpserver/doc.go b/interval/server/httpserver/doc.go
new file mode 100644
index 0000000..c7e0b77
--- /dev/null
+++ b/interval/server/httpserver/doc.go
@@ -0,0 +1,2 @@
+// Package httpserver provides HTTP server abstractions.
+package httpserver
diff --git a/interval/server/http.go b/interval/server/httpserver/http.go
similarity index 95%
rename from interval/server/http.go
rename to interval/server/httpserver/http.go
index 6b3e73b..5414735 100644
--- a/interval/server/http.go
+++ b/interval/server/httpserver/http.go
@@ -1,4 +1,4 @@
-package server
+package httpserver
 
 import (
 	"context"
diff --git a/interval/model/doc.go b/interval/server/model/doc.go
similarity index 100%
rename from interval/model/doc.go
rename to interval/server/model/doc.go
diff --git a/interval/model/message.go b/interval/server/model/message.go
similarity index 100%
rename from interval/model/message.go
rename to interval/server/model/message.go
diff --git a/interval/model/subscription.go b/interval/server/model/subscription.go
similarity index 100%
rename from interval/model/subscription.go
rename to interval/server/model/subscription.go
diff --git a/interval/model/topic.go b/interval/server/model/topic.go
similarity index 100%
rename from interval/model/topic.go
rename to interval/server/model/topic.go
diff --git a/interval/ws/client.go b/interval/server/ws/client.go
similarity index 100%
rename from interval/ws/client.go
rename to interval/server/ws/client.go
diff --git a/interval/ws/doc.go b/interval/server/ws/doc.go
similarity index 100%
rename from interval/ws/doc.go
rename to interval/server/ws/doc.go
diff --git a/interval/ws/handler.go b/interval/server/ws/handler.go
similarity index 100%
rename from interval/ws/handler.go
rename to interval/server/ws/handler.go
diff --git a/interval/ws/heartbeat.go b/interval/server/ws/heartbeat.go
similarity index 100%
rename from interval/ws/heartbeat.go
rename to interval/server/ws/heartbeat.go
diff --git a/interval/ws/hub.go b/interval/server/ws/hub.go
similarity index 98%
rename from interval/ws/hub.go
rename to interval/server/ws/hub.go
index 7df38bc..d91033e 100644
--- a/interval/ws/hub.go
+++ b/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"
 )