From 7ab38ec81f3a3b03d63ba7e58eb1fc65d3f014f0 Mon Sep 17 00:00:00 2001 From: shy Date: Tue, 24 Sep 2024 13:10:56 +0800 Subject: [PATCH] add some --- base/web/cache.go | 7 ++++- base/web/render.go | 75 ++++++++++++++++++++++------------------------ base/web/space.go | 2 +- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/base/web/cache.go b/base/web/cache.go index 717e5e5f..c9ded492 100644 --- a/base/web/cache.go +++ b/base/web/cache.go @@ -187,7 +187,12 @@ func init() { func Upload(m *ice.Message) []string { if up := kit.Simple(m.Optionv(ice.MSG_UPLOAD)); len(up) == 1 { if m.Cmdy(CACHE, UPLOAD).Optionv(ice.MSG_UPLOAD, kit.Simple(m.Append(mdb.HASH), m.Append(mdb.NAME), m.Append(nfs.SIZE))); m.Option(ice.MSG_USERPOD) != "" { - m.Cmd(SPACE, m.Option(ice.MSG_USERPOD), SPIDE, ice.DEV, SPIDE_CACHE, http.MethodGet, tcp.PublishLocalhost(m, m.MergeLink(PP(SHARE, CACHE, m.Append(mdb.HASH))))) + if nfs.Exists(m, "usr/local/work/"+m.Option(ice.MSG_USERPOD)) { + m.Cmd(nfs.LINK, path.Join("usr/local/work/"+m.Option(ice.MSG_USERPOD), m.Append(nfs.FILE)), m.Append(nfs.FILE)) + m.Cmd(SPACE, m.Option(ice.MSG_USERPOD), CACHE, mdb.CREATE, m.AppendSimple(mdb.NAME, mdb.TEXT, nfs.FILE, nfs.SIZE)) + } else { + m.Cmd(SPACE, m.Option(ice.MSG_USERPOD), SPIDE, ice.DEV, SPIDE_CACHE, http.MethodGet, tcp.PublishLocalhost(m, m.MergeLink(PP(SHARE, CACHE, m.Append(mdb.HASH))))) + } } return kit.Simple(m.Optionv(ice.MSG_UPLOAD)) } else { diff --git a/base/web/render.go b/base/web/render.go index 6f78e796..9a5c5dfa 100644 --- a/base/web/render.go +++ b/base/web/render.go @@ -166,7 +166,7 @@ func RenderPodCmd(m *ice.Message, pod, cmd string, arg ...ice.Any) { if msg.Append(ctx.INDEX) == "web.code.vimer" { m.Option(mdb.ICONS, msg.Option(ice.MSG_NODEICON)) } - m.OptionDefault(mdb.ICONS, m.Resource(kit.Select(ice.Info.NodeIcon, msg.Append(mdb.ICONS)))) + m.OptionDefault(mdb.ICONS, m.Resource(kit.Select(ice.Info.NodeIcon, msg.Option(ice.MSG_NODEICON), msg.Append(mdb.ICONS)))) if !kit.IsIn(cmd, PORTAL, DESKTOP, ADMIN) { pod = kit.Select(pod, msg.Option(ice.MSG_NODENAME)) m.OptionDefault(TITLE, kit.Select(cmd, msg.Append(mdb.HELP)+kit.Select("", " "+pod, pod != ""), !m.IsEnglish())) @@ -207,45 +207,40 @@ const ( UPGRADE = "upgrade" INSTALL = "install" - CODE_MYSQL_CLIENT = "web.code.mysql.client" - CODE_GIT_SERVICE = "web.code.git.service" - CODE_GIT_SEARCH = "web.code.git.search" - CODE_GIT_STATUS = "web.code.git.status" - CODE_GIT_REPOS = "web.code.git.repos" - CODE_AUTOGEN = "web.code.autogen" - CODE_COMPILE = "web.code.compile" - CODE_PUBLISH = "web.code.publish" - CODE_UPGRADE = "web.code.upgrade" - CODE_VIMER = "web.code.vimer" - CODE_INNER = "web.code.inner" - CODE_XTERM = "web.code.xterm" - CODE_MOD = "web.code.mod" - WIKI_FEEL = "web.wiki.feel" - WIKI_DRAW = "web.wiki.draw" - WIKI_WORD = "web.wiki.word" - WIKI_PORTAL = "web.wiki.portal" - CHAT_OAUTH_CLIENT = "web.chat.oauth.client" - CHAT_WX_ACCESS = "web.chat.wx.access" - CHAT_WX_AGENT = "web.chat.wx.agent" - CHAT_WX_TEMPLATE = "web.chat.wx.template" - CHAT_WX_OCR = "web.chat.wx.ocr" - CHAT_MESSAGE = "web.chat.message" - CHAT_HEADER = "web.chat.header" - CHAT_IFRAME = "web.chat.iframe" - CHAT_FAVOR = "web.chat.favor" - CHAT_FLOWS = "web.chat.flows" - CHAT_GRANT = "web.chat.grant" - CHAT_POD = "web.chat.pod" - CHAT_CMD = "web.chat.cmd" - TEAM_PLAN = "web.team.plan" - TEAM_GONGANXITONG_USER = "web.team.gonganxitong.user" - TEAM_GONGANXITONG_DOMAIN = "web.team.gonganxitong.domain" - TEAM_RENZHENGSHOUQUAN_PORTAL = "web.team.renzhengshouquan.portal" - TEAM_RENZHENGSHOUQUAN_AUTH = "web.team.renzhengshouquan.auth" - TEAM_DASHBOARD_PORTAL = "web.team.dashboard.portal" - TEAM_DASHBOARD_SUMMARY = "web.team.dashboard.summary" - TEAM_STORAGE_PORTAL = "web.team.storage.portal" - TEAM_STORAGE_FILE = "web.team.storage.file" + CODE_MYSQL_CLIENT = "web.code.mysql.client" + CODE_GIT_SERVICE = "web.code.git.service" + CODE_GIT_SEARCH = "web.code.git.search" + CODE_GIT_STATUS = "web.code.git.status" + CODE_GIT_REPOS = "web.code.git.repos" + CODE_AUTOGEN = "web.code.autogen" + CODE_COMPILE = "web.code.compile" + CODE_PUBLISH = "web.code.publish" + CODE_UPGRADE = "web.code.upgrade" + CODE_VIMER = "web.code.vimer" + CODE_INNER = "web.code.inner" + CODE_XTERM = "web.code.xterm" + CODE_MOD = "web.code.mod" + WIKI_FEEL = "web.wiki.feel" + WIKI_DRAW = "web.wiki.draw" + WIKI_WORD = "web.wiki.word" + WIKI_PORTAL = "web.wiki.portal" + CHAT_OAUTH_CLIENT = "web.chat.oauth.client" + CHAT_WX_ACCESS = "web.chat.wx.access" + CHAT_WX_AGENT = "web.chat.wx.agent" + CHAT_WX_TEMPLATE = "web.chat.wx.template" + CHAT_WX_OCR = "web.chat.wx.ocr" + CHAT_MESSAGE = "web.chat.message" + CHAT_HEADER = "web.chat.header" + CHAT_IFRAME = "web.chat.iframe" + CHAT_FAVOR = "web.chat.favor" + CHAT_FLOWS = "web.chat.flows" + CHAT_GRANT = "web.chat.grant" + CHAT_POD = "web.chat.pod" + CHAT_CMD = "web.chat.cmd" + TEAM_PLAN = "web.team.plan" + TEAM_GONGANXITONG_USER = "web.team.gonganxitong.user" + TEAM_GONGANXITONG_CITY = "web.team.gonganxitong.city" + TEAM_GONGANXITONG_DOMAIN = "web.team.gonganxitong.domain" ) func MessageInsertJSON(m *ice.Message, zone, name, text string, arg ...string) { diff --git a/base/web/space.go b/base/web/space.go index cb574a82..c213c60e 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -531,7 +531,7 @@ func init() { Upload(m) if pod := m.Option(ice.POD); pod != "" { if ls := kit.Simple(m.Optionv(ice.MSG_UPLOAD)); len(ls) > 1 { - m.Cmd(SPACE, pod, SPIDE, ice.DEV, CACHE, SHARE_CACHE+ls[0]) + // m.Cmd(SPACE, pod, SPIDE, ice.DEV, CACHE, SHARE_CACHE+ls[0]) } m.Options(ice.POD, []string{}, ice.MSG_USERPOD, strings.TrimPrefix(pod, "ops.")).Cmdy(append(kit.List(ice.SPACE, pod), arg...)...) return true