diff --git a/config/config.go b/internal/config/config.go similarity index 100% rename from config/config.go rename to internal/config/config.go diff --git a/internal/controller/dataController.go b/internal/controller/dataController.go index d2634e8..2f75af2 100644 --- a/internal/controller/dataController.go +++ b/internal/controller/dataController.go @@ -1,8 +1,8 @@ package controller import ( - "dypid/global" "dypid/internal/db" + "dypid/internal/global" "fmt" "net/http" "strings" diff --git a/internal/controller/tokenController.go b/internal/controller/tokenController.go index d291df7..4c860ed 100644 --- a/internal/controller/tokenController.go +++ b/internal/controller/tokenController.go @@ -1,8 +1,8 @@ package controller import ( - "dypid/global" "dypid/internal/db" + "dypid/internal/global" "net/http" "strconv" diff --git a/internal/db/redis.go b/internal/db/redis.go index c45f13d..2efdbbc 100644 --- a/internal/db/redis.go +++ b/internal/db/redis.go @@ -1,8 +1,8 @@ package db import ( - "dypid/config" - "dypid/global" + "dypid/internal/config" + "dypid/internal/global" "fmt" "github.com/redis/go-redis/v9" diff --git a/global/global.go b/internal/global/global.go similarity index 100% rename from global/global.go rename to internal/global/global.go diff --git a/api/api.go b/internal/service/service.go similarity index 80% rename from api/api.go rename to internal/service/service.go index 52ebca7..7f15ee0 100644 --- a/api/api.go +++ b/internal/service/service.go @@ -1,8 +1,8 @@ -package api +package service import ( - "dypid/global" "dypid/internal/controller" + "dypid/internal/global" "embed" "fmt" "io/fs" @@ -11,7 +11,7 @@ import ( "github.com/gin-gonic/gin" ) -func RegRoutes(r *gin.Engine) { +func RegAPIService(r *gin.Engine) { g := r.Group("/api") //初始化路由组 /api/xxxx { g.GET("/test", func(context *gin.Context) { @@ -35,16 +35,16 @@ func RegRoutes(r *gin.Engine) { } } -func RegWebService(r *gin.Engine, webDir embed.FS) { - assets, _ := fs.Sub(webDir, "web/dist/assets") +func RegWebService(r *gin.Engine, webFiles embed.FS) { + assets, _ := fs.Sub(webFiles, "web/dist/assets") r.StaticFS("/assets", http.FS(assets)) - icon, _ := fs.ReadFile(webDir, "web/dist/favicon.ico") + icon, _ := fs.ReadFile(webFiles, "web/dist/favicon.ico") r.GET("/favicon.ico", func(c *gin.Context) { c.Data(200, "image/x-icon", icon) }) - indexHtml, _ := fs.ReadFile(webDir, "web/dist/index.html") + indexHtml, _ := fs.ReadFile(webFiles, "web/dist/index.html") r.NoRoute(func(c *gin.Context) { c.Data(200, "text/html; charset=utf-8", indexHtml) }) diff --git a/main.go b/main.go index 483f578..81e4712 100644 --- a/main.go +++ b/main.go @@ -1,9 +1,9 @@ package main import ( - "dypid/api" - "dypid/config" + "dypid/internal/config" "dypid/internal/db" + "dypid/internal/service" "embed" "fmt" @@ -12,22 +12,23 @@ import ( ) //go:embed web/dist/* -var webDir embed.FS +var webFiles embed.FS func main() { config.InitConfig() db.InitRedis() db.InitLocalDB() + //初始化一个http服务对象 gin.SetMode(config.APPConfig.RunMode) - r := gin.Default() + r := gin.New() + r.Use(gin.Recovery()) + r.Use(cors.Default()) //跨域设置 - //跨域设置 - r.Use(cors.Default()) //注册网页服务(Vue) - api.RegWebService(r, webDir) + service.RegWebService(r, webFiles) //注册API接口 - api.RegRoutes(r) + service.RegAPIService(r) // 监听并在 0.0.0.0:8080 上启动服务 fmt.Printf("服务器正在运行:http://%s\n", config.APPConfig.Host)