diff --git a/swagger_ui.go b/swagger_ui.go index bab5f24..0235dbb 100644 --- a/swagger_ui.go +++ b/swagger_ui.go @@ -8,7 +8,6 @@ package api_doc import ( - "embed" "fmt" "net/http" "path/filepath" @@ -16,6 +15,7 @@ import ( "git.zhangdeman.cn/gateway/api-doc/define" "git.zhangdeman.cn/gateway/api-doc/enums" + "git.zhangdeman.cn/gateway/api-doc/theme" "git.zhangdeman.cn/zhangdeman/consts" "github.com/gin-gonic/gin" knife4goFiles "github.com/go-webtools/knife4go" @@ -24,12 +24,6 @@ import ( ginSwagger "github.com/swaggo/gin-swagger" ) -//go:embed ydoc-lucky-ui/* -var ydocUIFiles embed.FS - -//go:embed redoc-free/index.html -var redocFreeIndexContent string - // NewSwaggerUI ... func NewSwaggerUI(info *define.Info, servers []*define.ServerItem, uiTheme enums.SwaggerUITheme) *SwaggerUI { return &SwaggerUI{ @@ -112,7 +106,7 @@ func (su *SwaggerUI) HandleLuckyUI() func(ctx *gin.Context) { // su.router.StaticFS(su.baseUri+"/assets", http.FS(ydocUIFiles)) return func(ctx *gin.Context) { fileRealPath := strings.TrimPrefix(ctx.Request.RequestURI, su.baseUri) - byteData, _ := ydocUIFiles.ReadFile(filepath.Join(enums.SwaggerUIThemeYDocLucky.String(), fileRealPath)) + byteData, _ := theme.YdocUIFiles.ReadFile(filepath.Join(enums.SwaggerUIThemeYDocLucky.String(), fileRealPath)) if strings.HasSuffix(ctx.Request.RequestURI, "html") { byteData = []byte(strings.ReplaceAll(string(byteData), "{{BASE_URI}}", su.baseUri)) } @@ -156,10 +150,10 @@ func (su *SwaggerUI) HandleRedocFreeUI() func(ctx *gin.Context) { "{{REDOC_STANDALONE_JS}}": "https://cdn.redoc.ly/redoc/latest/bundles/redoc.standalone.js", } for k, v := range replaceTable { - redocFreeIndexContent = strings.ReplaceAll(redocFreeIndexContent, k, v) + theme.RedocFreeIndexContent = strings.ReplaceAll(theme.RedocFreeIndexContent, k, v) } ctx.Header(consts.HeaderKeyContentType.String(), "text/html; charset=utf-8") - ctx.String(http.StatusOK, redocFreeIndexContent) + ctx.String(http.StatusOK, theme.RedocFreeIndexContent) ctx.Abort() } } diff --git a/theme/embed.go b/theme/embed.go new file mode 100644 index 0000000..1c7698f --- /dev/null +++ b/theme/embed.go @@ -0,0 +1,16 @@ +// Package theme ... +// +// Description : theme ... +// +// Author : go_developer@163.com<白茶清欢> +// +// Date : 2025-08-23 09:23 +package theme + +import "embed" + +//go:embed ydoc-lucky-ui/* +var YdocUIFiles embed.FS + +//go:embed redoc-free/index.html +var RedocFreeIndexContent string diff --git a/redoc-free/index.html b/theme/redoc-free/index.html similarity index 100% rename from redoc-free/index.html rename to theme/redoc-free/index.html diff --git a/ydoc-lucky-ui/assets/Api.525b760d.css b/theme/ydoc-lucky-ui/assets/Api.525b760d.css similarity index 100% rename from ydoc-lucky-ui/assets/Api.525b760d.css rename to theme/ydoc-lucky-ui/assets/Api.525b760d.css diff --git a/ydoc-lucky-ui/assets/Api.73b14880.js b/theme/ydoc-lucky-ui/assets/Api.73b14880.js similarity index 100% rename from ydoc-lucky-ui/assets/Api.73b14880.js rename to theme/ydoc-lucky-ui/assets/Api.73b14880.js diff --git a/ydoc-lucky-ui/assets/FirstPage.1d240e81.js b/theme/ydoc-lucky-ui/assets/FirstPage.1d240e81.js similarity index 100% rename from ydoc-lucky-ui/assets/FirstPage.1d240e81.js rename to theme/ydoc-lucky-ui/assets/FirstPage.1d240e81.js diff --git a/ydoc-lucky-ui/assets/FirstPage.48bcf13f.css b/theme/ydoc-lucky-ui/assets/FirstPage.48bcf13f.css similarity index 100% rename from ydoc-lucky-ui/assets/FirstPage.48bcf13f.css rename to theme/ydoc-lucky-ui/assets/FirstPage.48bcf13f.css diff --git a/ydoc-lucky-ui/assets/Manager.02a611ee.js b/theme/ydoc-lucky-ui/assets/Manager.02a611ee.js similarity index 100% rename from ydoc-lucky-ui/assets/Manager.02a611ee.js rename to theme/ydoc-lucky-ui/assets/Manager.02a611ee.js diff --git a/ydoc-lucky-ui/assets/MethodTrace.9051cb05.js b/theme/ydoc-lucky-ui/assets/MethodTrace.9051cb05.js similarity index 100% rename from ydoc-lucky-ui/assets/MethodTrace.9051cb05.js rename to theme/ydoc-lucky-ui/assets/MethodTrace.9051cb05.js diff --git a/ydoc-lucky-ui/assets/Models.a928c1a8.js b/theme/ydoc-lucky-ui/assets/Models.a928c1a8.js similarity index 100% rename from ydoc-lucky-ui/assets/Models.a928c1a8.js rename to theme/ydoc-lucky-ui/assets/Models.a928c1a8.js diff --git a/ydoc-lucky-ui/assets/Share.3315ee0c.js b/theme/ydoc-lucky-ui/assets/Share.3315ee0c.js similarity index 100% rename from ydoc-lucky-ui/assets/Share.3315ee0c.js rename to theme/ydoc-lucky-ui/assets/Share.3315ee0c.js diff --git a/ydoc-lucky-ui/assets/icon.a080a8a4.svg b/theme/ydoc-lucky-ui/assets/icon.a080a8a4.svg similarity index 100% rename from ydoc-lucky-ui/assets/icon.a080a8a4.svg rename to theme/ydoc-lucky-ui/assets/icon.a080a8a4.svg diff --git a/ydoc-lucky-ui/assets/index.4ac3587a.js b/theme/ydoc-lucky-ui/assets/index.4ac3587a.js similarity index 100% rename from ydoc-lucky-ui/assets/index.4ac3587a.js rename to theme/ydoc-lucky-ui/assets/index.4ac3587a.js diff --git a/ydoc-lucky-ui/assets/index.5b18e4ae.css b/theme/ydoc-lucky-ui/assets/index.5b18e4ae.css similarity index 100% rename from ydoc-lucky-ui/assets/index.5b18e4ae.css rename to theme/ydoc-lucky-ui/assets/index.5b18e4ae.css diff --git a/ydoc-lucky-ui/assets/title.8b763cb0.png b/theme/ydoc-lucky-ui/assets/title.8b763cb0.png similarity index 100% rename from ydoc-lucky-ui/assets/title.8b763cb0.png rename to theme/ydoc-lucky-ui/assets/title.8b763cb0.png diff --git a/ydoc-lucky-ui/assets/vendor.0513d345.css b/theme/ydoc-lucky-ui/assets/vendor.0513d345.css similarity index 100% rename from ydoc-lucky-ui/assets/vendor.0513d345.css rename to theme/ydoc-lucky-ui/assets/vendor.0513d345.css diff --git a/ydoc-lucky-ui/assets/vendor.08310185.js b/theme/ydoc-lucky-ui/assets/vendor.08310185.js similarity index 100% rename from ydoc-lucky-ui/assets/vendor.08310185.js rename to theme/ydoc-lucky-ui/assets/vendor.08310185.js diff --git a/ydoc-lucky-ui/favicon.ico b/theme/ydoc-lucky-ui/favicon.ico similarity index 100% rename from ydoc-lucky-ui/favicon.ico rename to theme/ydoc-lucky-ui/favicon.ico diff --git a/ydoc-lucky-ui/index.html b/theme/ydoc-lucky-ui/index.html similarity index 100% rename from ydoc-lucky-ui/index.html rename to theme/ydoc-lucky-ui/index.html diff --git a/util/tool.go b/util/tool.go index 5cdb977..1bcf568 100644 --- a/util/tool.go +++ b/util/tool.go @@ -10,6 +10,8 @@ package util import ( "net/http" "strings" + + "git.zhangdeman.cn/zhangdeman/consts" ) // GetParameterDefaultLocation 获取参数的默认位置