fix: module

ultrazg · Aug 1, 2024 · 14673ba · 14673ba
1 parent 0978836
commit 14673ba
Show file tree

Hide file tree

Showing 58 changed files with 20 additions and 12 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,9 @@ WORKDIR /app
 
 COPY go.mod go.sum ./
 
-RUN go mod download && go mod verify
+RUN go clean -modcache && \
+    go mod download -x && \
+    go mod verify
 
 COPY . .
 

diff --git a/doc/doc.go b/doc/doc.go
@@ -0,0 +1,6 @@
+package docs
+
+import "embed"
+
+//go:embed docs/*
+var Fs embed.FS
diff --git a/docs/.nojekyll → doc/docs/.nojekyll b/docs/.nojekyll → doc/docs/.nojekyll
diff --git a/docs/README.md → doc/docs/README.md b/docs/README.md → doc/docs/README.md
diff --git a/docs/_sidebar.md → doc/docs/_sidebar.md b/docs/_sidebar.md → doc/docs/_sidebar.md
diff --git a/docs/categoryList.md → doc/docs/categoryList.md b/docs/categoryList.md → doc/docs/categoryList.md
diff --git a/docs/categoryListTab.md → doc/docs/categoryListTab.md b/docs/categoryListTab.md → doc/docs/categoryListTab.md
diff --git a/docs/categoryPodcastList.md → doc/docs/categoryPodcastList.md b/docs/categoryPodcastList.md → doc/docs/categoryPodcastList.md
diff --git a/docs/commentCollectCreate.md → doc/docs/commentCollectCreate.md b/docs/commentCollectCreate.md → doc/docs/commentCollectCreate.md
diff --git a/docs/commentCollectList.md → doc/docs/commentCollectList.md b/docs/commentCollectList.md → doc/docs/commentCollectList.md
diff --git a/docs/commentCollectRemove.md → doc/docs/commentCollectRemove.md b/docs/commentCollectRemove.md → doc/docs/commentCollectRemove.md
diff --git a/docs/commentLikeUpdate.md → doc/docs/commentLikeUpdate.md b/docs/commentLikeUpdate.md → doc/docs/commentLikeUpdate.md
diff --git a/docs/commentPrimary.md → doc/docs/commentPrimary.md b/docs/commentPrimary.md → doc/docs/commentPrimary.md
diff --git a/docs/commentThread.md → doc/docs/commentThread.md b/docs/commentThread.md → doc/docs/commentThread.md
diff --git a/docs/discovery.md → doc/docs/discovery.md b/docs/discovery.md → doc/docs/discovery.md
diff --git a/docs/episodeClap.md → doc/docs/episodeClap.md b/docs/episodeClap.md → doc/docs/episodeClap.md
diff --git a/docs/episodeClapCreate.md → doc/docs/episodeClapCreate.md b/docs/episodeClapCreate.md → doc/docs/episodeClapCreate.md
diff --git a/docs/episodeDetail.md → doc/docs/episodeDetail.md b/docs/episodeDetail.md → doc/docs/episodeDetail.md
diff --git a/docs/episodeFavoriteList.md → doc/docs/episodeFavoriteList.md b/docs/episodeFavoriteList.md → doc/docs/episodeFavoriteList.md
diff --git a/docs/episodeList.md → doc/docs/episodeList.md b/docs/episodeList.md → doc/docs/episodeList.md
diff --git a/docs/episodeLiveCount.md → doc/docs/episodeLiveCount.md b/docs/episodeLiveCount.md → doc/docs/episodeLiveCount.md
diff --git a/docs/episodePlayProgress.md → doc/docs/episodePlayProgress.md b/docs/episodePlayProgress.md → doc/docs/episodePlayProgress.md
diff --git a/docs/episodePlayedHistoryList.md → doc/docs/episodePlayedHistoryList.md b/docs/episodePlayedHistoryList.md → doc/docs/episodePlayedHistoryList.md
diff --git a/docs/episode_clap.jpeg → doc/docs/episode_clap.jpeg b/docs/episode_clap.jpeg → doc/docs/episode_clap.jpeg
diff --git a/docs/follower.md → doc/docs/follower.md b/docs/follower.md → doc/docs/follower.md
diff --git a/docs/following.md → doc/docs/following.md b/docs/following.md → doc/docs/following.md
diff --git a/docs/getProfile.md → doc/docs/getProfile.md b/docs/getProfile.md → doc/docs/getProfile.md
diff --git a/docs/inboxList.md → doc/docs/inboxList.md b/docs/inboxList.md → doc/docs/inboxList.md
diff --git a/docs/index.html → doc/docs/index.html b/docs/index.html → doc/docs/index.html
diff --git a/docs/login.md → doc/docs/login.md b/docs/login.md → doc/docs/login.md
diff --git a/docs/mileage.md → doc/docs/mileage.md b/docs/mileage.md → doc/docs/mileage.md
diff --git a/docs/mileageList.md → doc/docs/mileageList.md b/docs/mileageList.md → doc/docs/mileageList.md
diff --git a/docs/nonStarredSubscription.md → doc/docs/nonStarredSubscription.md b/docs/nonStarredSubscription.md → doc/docs/nonStarredSubscription.md
diff --git a/docs/ownedPodcasts.md → doc/docs/ownedPodcasts.md b/docs/ownedPodcasts.md → doc/docs/ownedPodcasts.md
diff --git a/docs/pickHistory.md → doc/docs/pickHistory.md b/docs/pickHistory.md → doc/docs/pickHistory.md
diff --git a/docs/pickRecent.md → doc/docs/pickRecent.md b/docs/pickRecent.md → doc/docs/pickRecent.md
diff --git a/docs/playedList.md → doc/docs/playedList.md b/docs/playedList.md → doc/docs/playedList.md
diff --git a/docs/podcastDetail.md → doc/docs/podcastDetail.md b/docs/podcastDetail.md → doc/docs/podcastDetail.md
diff --git a/docs/podcastRelated.md → doc/docs/podcastRelated.md b/docs/podcastRelated.md → doc/docs/podcastRelated.md
diff --git a/docs/profile.md → doc/docs/profile.md b/docs/profile.md → doc/docs/profile.md
diff --git a/docs/refreshEpisodeRecommend.md → doc/docs/refreshEpisodeRecommend.md b/docs/refreshEpisodeRecommend.md → doc/docs/refreshEpisodeRecommend.md
diff --git a/docs/refreshToken.md → doc/docs/refreshToken.md b/docs/refreshToken.md → doc/docs/refreshToken.md
diff --git a/docs/search.md → doc/docs/search.md b/docs/search.md → doc/docs/search.md
diff --git a/docs/searchPreset.md → doc/docs/searchPreset.md b/docs/searchPreset.md → doc/docs/searchPreset.md
diff --git a/docs/sendCode.md → doc/docs/sendCode.md b/docs/sendCode.md → doc/docs/sendCode.md
diff --git a/docs/starSubscription.md → doc/docs/starSubscription.md b/docs/starSubscription.md → doc/docs/starSubscription.md
diff --git a/docs/sticker.md → doc/docs/sticker.md b/docs/sticker.md → doc/docs/sticker.md
diff --git a/docs/stickerBoard.md → doc/docs/stickerBoard.md b/docs/stickerBoard.md → doc/docs/stickerBoard.md
diff --git a/docs/subscription.md → doc/docs/subscription.md b/docs/subscription.md → doc/docs/subscription.md
diff --git a/docs/topList.md → doc/docs/topList.md b/docs/topList.md → doc/docs/topList.md
diff --git a/docs/type.md → doc/docs/type.md b/docs/type.md → doc/docs/type.md
diff --git a/docs/unreadCount.md → doc/docs/unreadCount.md b/docs/unreadCount.md → doc/docs/unreadCount.md
diff --git a/docs/updateEpisodeFavorite.md → doc/docs/updateEpisodeFavorite.md b/docs/updateEpisodeFavorite.md → doc/docs/updateEpisodeFavorite.md
diff --git a/docs/updateStarSubscription.md → doc/docs/updateStarSubscription.md b/docs/updateStarSubscription.md → doc/docs/updateStarSubscription.md
diff --git a/docs/userStats.md → doc/docs/userStats.md b/docs/userStats.md → doc/docs/userStats.md
diff --git a/main.go b/main.go
@@ -1,7 +1,9 @@
 package main
 
+import "github.com/ultrazg/xyz/service"
+
 func main() {
-	err := Start()
+	err := service.Start()
 	if err != nil {
 		panic(err)
 	}

diff --git a/route.go → router/router.go b/route.go → router/router.go
@@ -1,19 +1,16 @@
-package main
+package router
 
 import (
-	"embed"
 	"github.com/gin-gonic/gin"
+	"github.com/ultrazg/xyz/doc"
 	"github.com/ultrazg/xyz/handlers"
 	"github.com/ultrazg/xyz/utils"
 	"net/http"
 )
 
-//go:embed docs/*
-var fs embed.FS
-
 func RegisterRouters(engine *gin.Engine) {
 	engine.GET("/docs/*filepath", func(context *gin.Context) {
-		server := http.FileServer(http.FS(fs))
+		server := http.FileServer(http.FS(docs.Fs))
 		server.ServeHTTP(context.Writer, context.Request)
 	})
 	engine.GET("/ping", handlers.Pong)

diff --git a/server.go → service/service.go b/server.go → service/service.go
@@ -1,14 +1,15 @@
-package main
+package service
 
 import (
 	"fmt"
 	"github.com/gin-gonic/gin"
+	"github.com/ultrazg/xyz/router"
 	"github.com/ultrazg/xyz/utils"
 	"log"
 	"net/http"
 )
 
-func Start() (err error) {
+func Start() error {
 	p, d := utils.InitFlag()
 	port := fmt.Sprintf("%d", p)
 
@@ -26,7 +27,7 @@ func Start() (err error) {
 
 	engine.Use(Cors())
 
-	RegisterRouters(engine)
+	router.RegisterRouters(engine)
 
 	log.Printf("server start on %s", port)
 
@@ -39,7 +40,7 @@ func Start() (err error) {
 		}
 	}
 
-	err = engine.Run(":" + port)
+	err := engine.Run(":" + port)
 	if err != nil {
 		log.Println("server start fail")