liubin/icebergs
1
0
Fork 0
forked from x/icebergs
Code Pull Requests Activity

add some

Browse Source
This commit is contained in:
IT 老营长 @云轩领航-创始人 2024-04-08 23:00:33 +08:00
parent 21df7f027d
commit 0d6db1c35e
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
base/web/space.go
View File

@ -316,6 +316,7 @@ func init() {
m.Push(nfs.VERSION, ice.Info.Make.Versions()) m.Push(nfs.VERSION, ice.Info.Make.Versions())
m.Push(nfs.PATHNAME, ice.Info.Pathname) m.Push(nfs.PATHNAME, ice.Info.Pathname)
m.Push(ORIGIN, m.Option(ice.MSG_USERHOST)) m.Push(ORIGIN, m.Option(ice.MSG_USERHOST))
m.Push(tcp.HOSTPORT, HostPort(m, m.Cmd(tcp.HOST).Append(aaa.IP), m.Cmd(SERVER).Append(tcp.PORT)))
}}, }},
mdb.SEARCH: {Hand: func(m *ice.Message, arg ...string) { mdb.SEARCH: {Hand: func(m *ice.Message, arg ...string) {
if mdb.IsSearchPreview(m, arg) { if mdb.IsSearchPreview(m, arg) {

6
core/code/publish.go
View File

@ -54,9 +54,7 @@ func _publish_contexts(m *ice.Message, arg ...string) {
env := []string{} env := []string{}
switch k { switch k {
case nfs.SOURCE, ice.DEV: case nfs.SOURCE, ice.DEV:
if ice.Info.NodeType == web.SERVER { if m.Option(ice.MSG_USERPOD) == "" {
m.OptionDefault(nfs.SOURCE, ice.Info.Make.Remote)
} else if m.Option(ice.MSG_USERPOD) == "" {
m.OptionDefault(nfs.SOURCE, web.AdminCmd(m, cli.RUNTIME, "make.remote").Result()) m.OptionDefault(nfs.SOURCE, web.AdminCmd(m, cli.RUNTIME, "make.remote").Result())
} else { } else {
m.OptionDefault(nfs.SOURCE, web.AdminCmd(m, web.SPACE, kit.KeyBase(m.Option(ice.MSG_USERPOD)), cli.RUNTIME, "make.remote").Result()) m.OptionDefault(nfs.SOURCE, web.AdminCmd(m, web.SPACE, kit.KeyBase(m.Option(ice.MSG_USERPOD)), cli.RUNTIME, "make.remote").Result())
@ -64,7 +62,7 @@ func _publish_contexts(m *ice.Message, arg ...string) {
env = append(env, cli.CTX_REPOS, m.Option(nfs.SOURCE)) env = append(env, cli.CTX_REPOS, m.Option(nfs.SOURCE))
fallthrough fallthrough
case nfs.BINARY, ice.APP: case nfs.BINARY, ice.APP:
if host := msg.Append(web.ORIGIN); m.Option(web.DOMAIN) != host { if host := msg.Append(tcp.HOSTPORT); m.Option(web.DOMAIN) != host {
env = append(env, cli.CTX_DEV_IP, strings.Split(host, "?")[0]) env = append(env, cli.CTX_DEV_IP, strings.Split(host, "?")[0])
} }
if m.Option(ice.MSG_USERPOD) != "" { if m.Option(ice.MSG_USERPOD) != "" {