diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6cf0452..b28ebc9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,8 +39,6 @@ jobs: bun install bun run build cd .. - mkdir -p pkg/server/dist - mv frontend/dist/* pkg/server/dist/ # 安装 go - uses: actions/setup-go@v5 diff --git a/.gitignore b/.gitignore index 37d8608..76e150a 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,3 @@ go.work build/ -pkg/server/dist/ diff --git a/build.ps1 b/build.ps1 index c7e1046..ca96e85 100644 --- a/build.ps1 +++ b/build.ps1 @@ -3,10 +3,7 @@ cd frontend bun install bun run build cd .. -rm pkg/server/dist -r -xcopy frontend\dist\ pkg\server\dist\ /E /Y go mod tidy - Write-Output "编译 windows 版本" go build -ldflags="-s -w" -o build/smq.exe diff --git a/frontend/embed.go b/frontend/embed.go new file mode 100644 index 0000000..5ef36c9 --- /dev/null +++ b/frontend/embed.go @@ -0,0 +1,8 @@ +package frontend + +import ( + "embed" +) + +//go:embed dist +var Dist embed.FS diff --git a/pkg/server/server.go b/pkg/server/server.go index 798d388..5e892ea 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -1,7 +1,6 @@ package server import ( - "embed" _ "embed" "encoding/json" "fmt" @@ -12,12 +11,10 @@ import ( "strconv" "sync" + "github.com/nopdan/gosmq/frontend" "github.com/nopdan/gosmq/pkg/util" ) -//go:embed dist -var dist embed.FS - // 上传的文件列表 var files [][]byte = make([][]byte, 0) @@ -25,7 +22,7 @@ var textList = make([]string, 0) func Serve(port int, silent bool, prefix string) { mux := http.NewServeMux() - dist, _ := fs.Sub(dist, "dist") + dist, _ := fs.Sub(frontend.Dist, "dist") mux.Handle("GET /", http.FileServer(http.FS(dist))) mux.HandleFunc("GET /list", func(w http.ResponseWriter, r *http.Request) { setHeader(&w)