From 42fe45aaf84098025be730344a80cc2a098223ad Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 21 Oct 2021 00:05:16 +0800 Subject: [PATCH] fix server bug --- Makefile | 3 +- data/bindata.go | 75 ++++++++++++++++++++++++++++++---------------- service/service.go | 8 ++--- 3 files changed, 55 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index 368397fb..9c19d4c6 100644 --- a/Makefile +++ b/Makefile @@ -150,7 +150,8 @@ release: clean # UI制品 git clone https://github.com/YaoApp/xiang-ui .tmp/ui - sed -ie "s/defineConfig({/defineConfig({base:'\/xiang\/', publicPath: '\/xiang\/',/" .tmp/ui/.umirc.ts +# sed -ie "s/defineConfig({/defineConfig({base:'\/xiang\/', publicPath: '\/xiang\/',/" .tmp/ui/.umirc.ts +# sed -ie 's/\/icon\/md_icon/\/xiang\/icon\/md_icon/g' .tmp/ui/.umirc.ts cd .tmp/ui && yarn install && yarn build rm -rf dist/release/ui mv .tmp/ui/dist dist/release/ui diff --git a/data/bindata.go b/data/bindata.go index fbf20220..f51f2edd 100644 --- a/data/bindata.go +++ b/data/bindata.go @@ -1,5 +1,6 @@ // Code generated for package data by go-bindata DO NOT EDIT. (@generated) // sources: +// .tmp/data/ui/foo/bar.html // .tmp/data/ui/index.html // .tmp/data/xiang/.DS_Store // .tmp/data/xiang/apis/README.md @@ -188,6 +189,26 @@ func AssetFile() http.FileSystem { return &assetOperator{} } +var _uiFooBarHtml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8a\xc8\x4c\xcc\x4b\x57\x70\x4c\xc9\xcd\xcc\x53\xd0\x4f\xcb\xcf\xd7\x4f\x4a\x2c\xe2\x02\x04\x00\x00\xff\xff\x91\x5d\xc6\xf4\x15\x00\x00\x00") + +func uiFooBarHtmlBytes() ([]byte, error) { + return bindataRead( + _uiFooBarHtml, + "ui/foo/bar.html", + ) +} + +func uiFooBarHtml() (*asset, error) { + bytes, err := uiFooBarHtmlBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "ui/foo/bar.html", size: 21, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + var _uiIndexHtml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8a\xc8\x4c\xcc\x4b\x57\x70\x4c\xc9\xcd\xcc\xe3\x02\x04\x00\x00\xff\xff\x64\x9f\x7b\xe8\x0c\x00\x00\x00") func uiIndexHtmlBytes() ([]byte, error) { @@ -203,7 +224,7 @@ func uiIndexHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/index.html", size: 12, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "ui/index.html", size: 12, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -223,7 +244,7 @@ func xiangDs_store() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/.DS_Store", size: 6148, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/.DS_Store", size: 6148, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -243,7 +264,7 @@ func xiangApisReadmeMd() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/apis/README.md", size: 13, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/apis/README.md", size: 13, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -263,7 +284,7 @@ func xiangApisChartHttpJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/apis/chart.http.json", size: 624, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/apis/chart.http.json", size: 624, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -283,7 +304,7 @@ func xiangApisPageHttpJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/apis/page.http.json", size: 609, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/apis/page.http.json", size: 609, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -303,7 +324,7 @@ func xiangApisStorageHttpJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/apis/storage.http.json", size: 1092, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/apis/storage.http.json", size: 1092, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -323,7 +344,7 @@ func xiangApisTableHttpJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/apis/table.http.json", size: 2632, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/apis/table.http.json", size: 2632, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -343,7 +364,7 @@ func xiangApisUserHttpJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/apis/user.http.json", size: 1453, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/apis/user.http.json", size: 1453, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -363,7 +384,7 @@ func xiangApisXiangHttpJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/apis/xiang.http.json", size: 797, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/apis/xiang.http.json", size: 797, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -383,7 +404,7 @@ func xiangDataAppJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/data/app.json", size: 245, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/data/app.json", size: 245, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -403,7 +424,7 @@ func xiangDataIconsDs_store() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/data/icons/.DS_Store", size: 6148, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/data/icons/.DS_Store", size: 6148, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -423,7 +444,7 @@ func xiangDataIcons404Png() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/data/icons/404.png", size: 9342, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/data/icons/404.png", size: 9342, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -443,7 +464,7 @@ func xiangDataIconsIconIcns() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/data/icons/icon.icns", size: 75636, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/data/icons/icon.icns", size: 75636, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -463,7 +484,7 @@ func xiangDataIconsIconIco() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/data/icons/icon.ico", size: 31310, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/data/icons/icon.ico", size: 31310, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -483,7 +504,7 @@ func xiangDataIconsIconPng() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/data/icons/icon.png", size: 22420, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/data/icons/icon.png", size: 22420, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -503,7 +524,7 @@ func xiangDataIndexHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/data/index.html", size: 302, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/data/index.html", size: 302, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -523,7 +544,7 @@ func xiangFlowsReadmeMd() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/flows/README.md", size: 12, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/flows/README.md", size: 12, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -543,7 +564,7 @@ func xiangFlowsMenuFlowJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/flows/menu.flow.json", size: 1045, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/flows/menu.flow.json", size: 1045, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -563,7 +584,7 @@ func xiangFlowsTableGetFlowJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/flows/table/get.flow.json", size: 541, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/flows/table/get.flow.json", size: 541, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -583,7 +604,7 @@ func xiangModelsReadmeMd() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/models/README.md", size: 15, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/models/README.md", size: 15, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -603,7 +624,7 @@ func xiangModelsMenuJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/models/menu.json", size: 2378, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/models/menu.json", size: 2378, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -623,7 +644,7 @@ func xiangModelsUserJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/models/user.json", size: 8826, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/models/user.json", size: 8826, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -643,7 +664,7 @@ func xiangTablesReadmeMd() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/tables/README.md", size: 15, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/tables/README.md", size: 15, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -663,7 +684,7 @@ func xiangTablesMenuJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/tables/menu.json", size: 10382, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/tables/menu.json", size: 10382, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -683,7 +704,7 @@ func xiangTablesUserJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xiang/tables/user.json", size: 1422, mode: os.FileMode(420), modTime: time.Unix(1634743584, 0)} + info := bindataFileInfo{name: "xiang/tables/user.json", size: 1422, mode: os.FileMode(420), modTime: time.Unix(1634745823, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -740,6 +761,7 @@ func AssetNames() []string { // _bindata is a table, holding each asset generator, mapped to its name. var _bindata = map[string]func() (*asset, error){ + "ui/foo/bar.html": uiFooBarHtml, "ui/index.html": uiIndexHtml, "xiang/.DS_Store": xiangDs_store, "xiang/apis/README.md": xiangApisReadmeMd, @@ -809,6 +831,9 @@ type bintree struct { var _bintree = &bintree{nil, map[string]*bintree{ "ui": {nil, map[string]*bintree{ + "foo": {nil, map[string]*bintree{ + "bar.html": {uiFooBarHtml, map[string]*bintree{}}, + }}, "index.html": {uiIndexHtml, map[string]*bintree{}}, }}, "xiang": {nil, map[string]*bintree{ diff --git a/service/service.go b/service/service.go index d2c7f318..9f3335f1 100644 --- a/service/service.go +++ b/service/service.go @@ -2,6 +2,7 @@ package service import ( "net/http" + "strings" "github.com/gin-gonic/gin" "github.com/yaoapp/gou" @@ -53,11 +54,8 @@ func router() *gin.Engine { }) // 数据管理后台 - router.Any("/xiang", func(c *gin.Context) { - html := data.MustAsset("ui/index.html") - c.String(200, string(html)) - }) - router.Any("/xiang/*action", func(c *gin.Context) { + router.Any("/xiang/*path", func(c *gin.Context) { + c.Request.URL.Path = strings.TrimPrefix(c.Request.URL.Path, "/xiang") AdminFileServer.ServeHTTP(c.Writer, c.Request) })