diff --git a/src/contexts/aaa/aaa.go b/src/contexts/aaa/aaa.go index daea4765..c987b5a4 100644 --- a/src/contexts/aaa/aaa.go +++ b/src/contexts/aaa/aaa.go @@ -526,7 +526,8 @@ var Index = &ctx.Context{Name: "aaa", Help: "认证中心", switch arg[1] { case "create": bid, arg = m.Cmdx("aaa.auth", arg[0], "ship", "bench", arg[2]), arg[3:] - m.Cmdx("aaa.auth", bid, "data", "name", "web") + m.Cmd("aaa.auth", bid, "data", "name", "web") + defer func() { m.Set("result").Echo(bid) }() case "select": m.Cmd("aaa.auth", arg[0], "ship", "bench").Table(func(maps map[string]string, list []string, line int) bool { if strings.Contains(maps["meta"], arg[2]) || strings.HasPrefix(maps["key"], arg[2]) || strings.HasSuffix(maps["key"], arg[2]) { @@ -540,6 +541,8 @@ var Index = &ctx.Context{Name: "aaa", Help: "认证中心", } case "bench": bid, arg = arg[0], arg[1:] + default: + return } if len(arg) == 0 { diff --git a/src/contexts/web/web.go b/src/contexts/web/web.go index 27d911b0..0b5d5c41 100644 --- a/src/contexts/web/web.go +++ b/src/contexts/web/web.go @@ -48,19 +48,21 @@ func merge(m *ctx.Message, uri string, arg ...string) string { add, e := url.Parse(uri) m.Assert(e) - if add.Scheme == "" { - add.Scheme = m.Conf("protocol") - } - if add.Host == "" { - add.Host = m.Conf("hostname") - } - if add.Path == "" { - add.Path = path.Join(m.Conf("path"), m.Conf("file")) - } else if !path.IsAbs(add.Path) { - add.Path = path.Join(m.Conf("path"), add.Path) - } - if add.RawQuery == "" { - add.RawQuery = m.Conf("query") + if false { + if add.Scheme == "" { + add.Scheme = m.Conf("protocol") + } + if add.Host == "" { + add.Host = m.Conf("hostname") + } + if add.Path == "" { + add.Path = path.Join(m.Conf("path"), m.Conf("file")) + } else if !path.IsAbs(add.Path) { + add.Path = path.Join(m.Conf("path"), add.Path) + } + if add.RawQuery == "" { + add.RawQuery = m.Conf("query") + } } query := add.Query()