diff --git a/Dockerfile b/Dockerfile index 156d67e..0d01918 100644 --- 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 new file mode 100644 index 0000000..d0d73aa --- /dev/null +++ b/doc/doc.go @@ -0,0 +1,6 @@ +package docs + +import "embed" + +//go:embed docs/* +var Fs embed.FS diff --git a/docs/.nojekyll b/doc/docs/.nojekyll similarity index 100% rename from docs/.nojekyll rename to doc/docs/.nojekyll diff --git a/docs/README.md b/doc/docs/README.md similarity index 100% rename from docs/README.md rename to doc/docs/README.md diff --git a/docs/_sidebar.md b/doc/docs/_sidebar.md similarity index 100% rename from docs/_sidebar.md rename to doc/docs/_sidebar.md diff --git a/docs/categoryList.md b/doc/docs/categoryList.md similarity index 100% rename from docs/categoryList.md rename to doc/docs/categoryList.md diff --git a/docs/categoryListTab.md b/doc/docs/categoryListTab.md similarity index 100% rename from docs/categoryListTab.md rename to doc/docs/categoryListTab.md diff --git a/docs/categoryPodcastList.md b/doc/docs/categoryPodcastList.md similarity index 100% rename from docs/categoryPodcastList.md rename to doc/docs/categoryPodcastList.md diff --git a/docs/commentCollectCreate.md b/doc/docs/commentCollectCreate.md similarity index 100% rename from docs/commentCollectCreate.md rename to doc/docs/commentCollectCreate.md diff --git a/docs/commentCollectList.md b/doc/docs/commentCollectList.md similarity index 100% rename from docs/commentCollectList.md rename to doc/docs/commentCollectList.md diff --git a/docs/commentCollectRemove.md b/doc/docs/commentCollectRemove.md similarity index 100% rename from docs/commentCollectRemove.md rename to doc/docs/commentCollectRemove.md diff --git a/docs/commentLikeUpdate.md b/doc/docs/commentLikeUpdate.md similarity index 100% rename from docs/commentLikeUpdate.md rename to doc/docs/commentLikeUpdate.md diff --git a/docs/commentPrimary.md b/doc/docs/commentPrimary.md similarity index 100% rename from docs/commentPrimary.md rename to doc/docs/commentPrimary.md diff --git a/docs/commentThread.md b/doc/docs/commentThread.md similarity index 100% rename from docs/commentThread.md rename to doc/docs/commentThread.md diff --git a/docs/discovery.md b/doc/docs/discovery.md similarity index 100% rename from docs/discovery.md rename to doc/docs/discovery.md diff --git a/docs/episodeClap.md b/doc/docs/episodeClap.md similarity index 100% rename from docs/episodeClap.md rename to doc/docs/episodeClap.md diff --git a/docs/episodeClapCreate.md b/doc/docs/episodeClapCreate.md similarity index 100% rename from docs/episodeClapCreate.md rename to doc/docs/episodeClapCreate.md diff --git a/docs/episodeDetail.md b/doc/docs/episodeDetail.md similarity index 100% rename from docs/episodeDetail.md rename to doc/docs/episodeDetail.md diff --git a/docs/episodeFavoriteList.md b/doc/docs/episodeFavoriteList.md similarity index 100% rename from docs/episodeFavoriteList.md rename to doc/docs/episodeFavoriteList.md diff --git a/docs/episodeList.md b/doc/docs/episodeList.md similarity index 100% rename from docs/episodeList.md rename to doc/docs/episodeList.md diff --git a/docs/episodeLiveCount.md b/doc/docs/episodeLiveCount.md similarity index 100% rename from docs/episodeLiveCount.md rename to doc/docs/episodeLiveCount.md diff --git a/docs/episodePlayProgress.md b/doc/docs/episodePlayProgress.md similarity index 100% rename from docs/episodePlayProgress.md rename to doc/docs/episodePlayProgress.md diff --git a/docs/episodePlayedHistoryList.md b/doc/docs/episodePlayedHistoryList.md similarity index 100% rename from docs/episodePlayedHistoryList.md rename to doc/docs/episodePlayedHistoryList.md diff --git a/docs/episode_clap.jpeg b/doc/docs/episode_clap.jpeg similarity index 100% rename from docs/episode_clap.jpeg rename to doc/docs/episode_clap.jpeg diff --git a/docs/follower.md b/doc/docs/follower.md similarity index 100% rename from docs/follower.md rename to doc/docs/follower.md diff --git a/docs/following.md b/doc/docs/following.md similarity index 100% rename from docs/following.md rename to doc/docs/following.md diff --git a/docs/getProfile.md b/doc/docs/getProfile.md similarity index 100% rename from docs/getProfile.md rename to doc/docs/getProfile.md diff --git a/docs/inboxList.md b/doc/docs/inboxList.md similarity index 100% rename from docs/inboxList.md rename to doc/docs/inboxList.md diff --git a/docs/index.html b/doc/docs/index.html similarity index 100% rename from docs/index.html rename to doc/docs/index.html diff --git a/docs/login.md b/doc/docs/login.md similarity index 100% rename from docs/login.md rename to doc/docs/login.md diff --git a/docs/mileage.md b/doc/docs/mileage.md similarity index 100% rename from docs/mileage.md rename to doc/docs/mileage.md diff --git a/docs/mileageList.md b/doc/docs/mileageList.md similarity index 100% rename from docs/mileageList.md rename to doc/docs/mileageList.md diff --git a/docs/nonStarredSubscription.md b/doc/docs/nonStarredSubscription.md similarity index 100% rename from docs/nonStarredSubscription.md rename to doc/docs/nonStarredSubscription.md diff --git a/docs/ownedPodcasts.md b/doc/docs/ownedPodcasts.md similarity index 100% rename from docs/ownedPodcasts.md rename to doc/docs/ownedPodcasts.md diff --git a/docs/pickHistory.md b/doc/docs/pickHistory.md similarity index 100% rename from docs/pickHistory.md rename to doc/docs/pickHistory.md diff --git a/docs/pickRecent.md b/doc/docs/pickRecent.md similarity index 100% rename from docs/pickRecent.md rename to doc/docs/pickRecent.md diff --git a/docs/playedList.md b/doc/docs/playedList.md similarity index 100% rename from docs/playedList.md rename to doc/docs/playedList.md diff --git a/docs/podcastDetail.md b/doc/docs/podcastDetail.md similarity index 100% rename from docs/podcastDetail.md rename to doc/docs/podcastDetail.md diff --git a/docs/podcastRelated.md b/doc/docs/podcastRelated.md similarity index 100% rename from docs/podcastRelated.md rename to doc/docs/podcastRelated.md diff --git a/docs/profile.md b/doc/docs/profile.md similarity index 100% rename from docs/profile.md rename to doc/docs/profile.md diff --git a/docs/refreshEpisodeRecommend.md b/doc/docs/refreshEpisodeRecommend.md similarity index 100% rename from docs/refreshEpisodeRecommend.md rename to doc/docs/refreshEpisodeRecommend.md diff --git a/docs/refreshToken.md b/doc/docs/refreshToken.md similarity index 100% rename from docs/refreshToken.md rename to doc/docs/refreshToken.md diff --git a/docs/search.md b/doc/docs/search.md similarity index 100% rename from docs/search.md rename to doc/docs/search.md diff --git a/docs/searchPreset.md b/doc/docs/searchPreset.md similarity index 100% rename from docs/searchPreset.md rename to doc/docs/searchPreset.md diff --git a/docs/sendCode.md b/doc/docs/sendCode.md similarity index 100% rename from docs/sendCode.md rename to doc/docs/sendCode.md diff --git a/docs/starSubscription.md b/doc/docs/starSubscription.md similarity index 100% rename from docs/starSubscription.md rename to doc/docs/starSubscription.md diff --git a/docs/sticker.md b/doc/docs/sticker.md similarity index 100% rename from docs/sticker.md rename to doc/docs/sticker.md diff --git a/docs/stickerBoard.md b/doc/docs/stickerBoard.md similarity index 100% rename from docs/stickerBoard.md rename to doc/docs/stickerBoard.md diff --git a/docs/subscription.md b/doc/docs/subscription.md similarity index 100% rename from docs/subscription.md rename to doc/docs/subscription.md diff --git a/docs/topList.md b/doc/docs/topList.md similarity index 100% rename from docs/topList.md rename to doc/docs/topList.md diff --git a/docs/type.md b/doc/docs/type.md similarity index 100% rename from docs/type.md rename to doc/docs/type.md diff --git a/docs/unreadCount.md b/doc/docs/unreadCount.md similarity index 100% rename from docs/unreadCount.md rename to doc/docs/unreadCount.md diff --git a/docs/updateEpisodeFavorite.md b/doc/docs/updateEpisodeFavorite.md similarity index 100% rename from docs/updateEpisodeFavorite.md rename to doc/docs/updateEpisodeFavorite.md diff --git a/docs/updateStarSubscription.md b/doc/docs/updateStarSubscription.md similarity index 100% rename from docs/updateStarSubscription.md rename to doc/docs/updateStarSubscription.md diff --git a/docs/userStats.md b/doc/docs/userStats.md similarity index 100% rename from docs/userStats.md rename to doc/docs/userStats.md diff --git a/main.go b/main.go index 98ac215..df4c19f 100644 --- 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 b/router/router.go similarity index 98% rename from route.go rename to router/router.go index 76f34d1..feead07 100644 --- a/route.go +++ b/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 b/service/service.go similarity index 90% rename from server.go rename to service/service.go index bf51eb8..9bf8d24 100644 --- a/server.go +++ b/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")