diff --git a/develop/qinglong/env.go b/develop/qinglong/env.go index d4e1f4c..c0c8743 100644 --- a/develop/qinglong/env.go +++ b/develop/qinglong/env.go @@ -28,18 +28,21 @@ func init() { { Rules: []string{`^env\s+get\s+([\S]+)$`}, Handle: func(s im.Sender) interface{} { - m := s.Get() - env, err := GetEnv(m) + name := s.Get() + envs, err := GetEnvs(name) if err != nil { return err } - if env == nil { + if len(envs) == 0 { return "未设置该环境变量" } - if env != nil { - return formatEnv(env) + es := []string{} + for _, env := range envs { + if env.Name == name { + es = append(es, formatEnv(&env)) + } } - return nil + return strings.Join(es, "\n\n") }, }, { diff --git a/develop/qinglong/init.go b/develop/qinglong/init.go index c10f356..d5654bd 100644 --- a/develop/qinglong/init.go +++ b/develop/qinglong/init.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "reflect" + "regexp" "strings" "time" @@ -32,6 +33,9 @@ var ENVS = "envs" func init() { core.ReadYaml(core.ExecPath+"/develop/qinglong/conf/", &Config, "https://raw.githubusercontent.com/cdle/sillyGirl/main/develop/qinglong/conf/demo_config.yaml") + if v := regexp.MustCompile(`^(https?://[\.\w]+:?\d*)`).FindStringSubmatch(Config.Host); len(v) == 2 { + Config.Host = v[1] + } _, err := getToken() if err == nil { logs.Info("青龙已连接")