diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8fb15fa..777cb47 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,20 +40,9 @@ jobs: working-directory: web/ - name: Check build static - run: ls -la + run: ls dist/ -la working-directory: web/ -# goreleaser: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v3 -# with: -# fetch-depth: 0 -# - run: git fetch --force --tags -# - uses: actions/setup-go@v3 -# with: -# go-version: '>=1.20.2' -# cache: true # More assembly might be required: Docker logins, GPG, etc. It all depends # on your needs. - uses: goreleaser/goreleaser-action@v4 diff --git a/routers/router.go b/routers/router.go index c2baa48..4a09998 100644 --- a/routers/router.go +++ b/routers/router.go @@ -11,11 +11,19 @@ import ( "net/http" ) -// 打包集成静态资源 -func ServerStaticHtml(r *gin.Engine, f embed.FS) { +// AppendCors 添加是否跨域(debug模式开启) +func AppendCors(r *gin.Engine) { + if setting.ServerSetting.RunMode == "debug" { + r.Use(middleware.Cors()) + } +} + +// ServerStaticHtml 启用返回打包的静态文件 +func AppendServerStaticHtml(r *gin.Engine, f embed.FS) { if setting.ServerSetting.EmbedHtml == "disable" { return } + assets, _ := fs.Sub(f, "web/dist/assets") dist, _ := fs.Sub(f, "web/dist") @@ -31,10 +39,9 @@ func InitRouter(f embed.FS) *gin.Engine { r := gin.New() r.Use(middleware.LogMiddleware()) r.Use(gin.Recovery()) - r.Use(middleware.Cors()) - // 打包 - ServerStaticHtml(r, f) + AppendCors(r) + AppendServerStaticHtml(r, f) r.POST("/auth", api.GetAuth) apiv1 := r.Group("/api/v1")