From 7cb04d79eee9887e4c6ed9579a2f6058cddff3d8 Mon Sep 17 00:00:00 2001 From: naiba Date: Wed, 1 Jan 2025 01:02:02 +0800 Subject: [PATCH] feat: v1.5.2 --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- cmd/dashboard/controller/controller.go | 4 ++-- service/singleton/frontend-templates.yaml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 26e6b5587d..9af04e6d42 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,7 +48,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.23.1" + go-version: "1.23.x" - name: generate swagger docs run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9e837e024e..5828cbf02d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,7 +27,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: "1.23.1" + go-version: "1.23.x" - name: generate swagger docs run: | diff --git a/cmd/dashboard/controller/controller.go b/cmd/dashboard/controller/controller.go index 1d3e680a0f..7bb29a8db9 100644 --- a/cmd/dashboard/controller/controller.go +++ b/cmd/dashboard/controller/controller.go @@ -303,7 +303,7 @@ func (w *ginCustomWriter) WriteHeader(code int) { } func fileWithCustomStatusCode(c *gin.Context, filepath string, customCode int) { - http.ServeFile(newCustomWriter(c, customCode), c.Request, path.Clean(filepath)) + http.ServeFile(newCustomWriter(c, customCode), c.Request, filepath) } func fallbackToFrontend(frontendDist fs.FS) func(*gin.Context) { @@ -344,7 +344,7 @@ func fallbackToFrontend(frontendDist fs.FS) func(*gin.Context) { } return } - localFilePath := path.Join(singleton.Conf.UserTemplate, path.Clean(c.Request.URL.Path)) + localFilePath := path.Join(singleton.Conf.UserTemplate, c.Request.URL.Path) if checkLocalFileOrFs(c, frontendDist, localFilePath, http.StatusOK) { return } diff --git a/service/singleton/frontend-templates.yaml b/service/singleton/frontend-templates.yaml index 18fd2d3144..1eaafb9f65 100644 --- a/service/singleton/frontend-templates.yaml +++ b/service/singleton/frontend-templates.yaml @@ -2,7 +2,7 @@ name: "OfficialAdmin" repository: "https://github.com/nezhahq/admin-frontend" author: "nezhahq" - version: "v1.5.1" + version: "v1.5.2" isadmin: true isofficial: true - path: "user-dist" @@ -15,4 +15,4 @@ name: "Nazhua" repository: "https://github.com/hi2shark/nazhua" author: "hi2hi" - version: "v0.4.27" + version: "v0.5.1"