diff --git a/core/function.go b/core/function.go index c802a71..d6cc696 100644 --- a/core/function.go +++ b/core/function.go @@ -17,7 +17,7 @@ type Function struct { Rules []string FindAll bool Admin bool - Handle func(s im.Sender) bool + Handle func(s im.Sender) interface{} } var pname = regexp.MustCompile(`/([^/\s]+)`).FindStringSubmatch(os.Args[0])[1] @@ -25,34 +25,31 @@ var pname = regexp.MustCompile(`/([^/\s]+)`).FindStringSubmatch(os.Args[0])[1] var functions = []Function{ { Rules: []string{"^傻妞 (.*)$", "^傻妞$"}, - Handle: func(s im.Sender) bool { + Handle: func(s im.Sender) interface{} { m := s.Get() if m != "" { s.Reply(fmt.Sprintf("哎呀，傻妞不懂%s是什么意思啦。", m)) } else { s.Reply("请说，我在。") } - return true + return nil }, }, { Rules: []string{"^升级$"}, Admin: true, - Handle: func(s im.Sender) bool { + Handle: func(s im.Sender) interface{} { s.Reply("傻妞开始拉取代码。") rtn, err := exec.Command("sh", "-c", "cd "+ExecPath+" && git stash && git pull").Output() if err != nil { - s.Reply("傻妞拉取代失败：" + err.Error() + "。") - return true + return "傻妞拉取代失败：" + err.Error() + "。" } t := string(rtn) if !strings.Contains(t, "changed") { if strings.Contains(t, "Already") || strings.Contains(t, "已经是最新") { - s.Reply("傻妞已是最新版啦。") - return true + return "傻妞已是最新版啦。" } else { - s.Reply("傻妞拉取代失败：" + t + "。") - return true + return "傻妞拉取代失败：" + t + "。" } } else { s.Reply("傻妞拉取代码成功。") @@ -60,23 +57,22 @@ var functions = []Function{ s.Reply("傻妞正在编译程序。") rtn, err = exec.Command("sh", "-c", "cd "+ExecPath+" && go build -o "+pname).Output() if err != nil { - s.Reply("傻妞编译失败：" + err.Error()) - return true + return "傻妞编译失败：" + err.Error() } else { s.Reply("傻妞编译成功。") } s.Reply("傻妞重启程序。") Daemon() - return true + return nil }, }, { Rules: []string{"^重启$"}, Admin: true, - Handle: func(s im.Sender) bool { + Handle: func(s im.Sender) interface{} { s.Reply("傻妞重启程序。") Daemon() - return true + return nil }, }, } @@ -108,8 +104,8 @@ func initToHandleMessage() { }() } -func AddCommand(cmd *Function) { - functions = append(functions, *cmd) +func AddCommand(cmd []Function) { + functions = append(functions, cmd...) } func handleMessage(sender im.Sender) { @@ -131,7 +127,15 @@ func handleMessage(sender im.Sender) { matched = true } } - if matched && function.Handle(sender) { + if matched { + if function.Admin && sender.IsAdmin() { + sender.Reply("没有权限操作") + return + } + rt := function.Handle(sender) + if rt != nil { + sender.Reply(rt) + } return } } diff --git a/core/reply.go b/core/reply.go index 7726979..7095692 100644 --- a/core/reply.go +++ b/core/reply.go @@ -27,14 +27,13 @@ type Reply struct { func InitReplies() { for _, v := range Config.Replies { reply := v - var handler func(s im.Sender) bool + var handler func(s im.Sender) interface{} if reply.Type != "url" { - handler = func(s im.Sender) bool { - s.Reply(reply.Content) - return true + handler = func(s im.Sender) interface{} { + return reply.Content } } - handler = func(s im.Sender) bool { + handler = func(s im.Sender) interface{} { url := reply.Request.Url body := reply.Request.Body for k, v := range s.GetMatch() { @@ -63,7 +62,7 @@ func InitReplies() { } else { s.Reply(err) } - return true + return nil } switch reply.Request.ResponseType { case "image": @@ -81,7 +80,7 @@ func InitReplies() { fmt.Println(string(d)) s.Reply(d) } - return true + return nil } functions = append(functions, Function{ Rules: reply.Rules, diff --git a/develop/qinglong/env.go b/develop/qinglong/env.go index ee94b63..f57d073 100644 --- a/develop/qinglong/env.go +++ b/develop/qinglong/env.go @@ -1,39 +1,41 @@ package qinglong -import ( - "encoding/json" - "errors" - "fmt" - "reflect" - "strings" - - "github.com/beego/beego/v2/adapter/httplib" - "github.com/buger/jsonparser" -) - type EnvResponse struct { Code int `json:"code"` Data []Env `json:"data"` } type Env struct { - Value string `json:"value"` - ID string `json:"_id"` - Status int `json:"status"` - Name string `json:"name"` - Remarks string `json:"remarks"` + Value string `json:"value,omitempty"` + ID string `json:"_id,omitempty"` + Status int `json:"status,omitempty"` + Name string `json:"name,omitempty"` + Timestamp string `json:"timestamp,omitempty"` + Remarks string `json:"remarks,omitempty"` } -func GetEnv(searchValue string) ([]Env, error) { +func GetEnv(searchValue string) (*Env, error) { + envs, err := GetEnvs(searchValue) + if err != nil { + return nil, err + } + + if len(envs) == 0 { + return nil, nil + } + return &envs[0], nil +} + +func GetEnvs(searchValue string) ([]Env, error) { er := EnvResponse{} - if err := req(PUT, ENVS, &er, "?searchValue="+searchValue); err != nil { + if err := req(ENVS, &er, "?searchValue="+searchValue); err != nil { return nil, err } return er.Data, nil } func SetEnv(e *Env) error { - es, err := GetEnv(e.Name) + es, err := GetEnvs(e.Name) if err != nil { return err } @@ -41,7 +43,7 @@ func SetEnv(e *Env) error { return AddEnv(e) } e.ID = es[0].ID - return req(PUT, ENVS, e) + return req(PUT, ENVS, *e) } func AddEnv(e *Env) error { @@ -49,7 +51,7 @@ func AddEnv(e *Env) error { } func RemEnv(e *Env) error { - es, err := GetEnv(e.Name) + es, err := GetEnvs(e.Name) if err != nil { return err } @@ -62,68 +64,3 @@ func RemEnv(e *Env) error { } return req(DELETE, ENVS, td) } - -func req(ps ...interface{}) error { - token, err := getToken() - if err != nil { - return err - } - method := GET - body := []byte{} - api := ENVS - apd := "" - var toParse interface{} - for _, p := range ps { - switch p.(type) { - case string: - switch p.(string) { - case GET, POST, DELETE, PUT: - method = p.(string) - case ENVS: - method = p.(string) - default: - apd = p.(string) - } - case []byte: - body = p.([]byte) - default: - if strings.Contains(reflect.TypeOf(&p).String(), "*") { - toParse = p - } else { - body, _ = json.Marshal(p) - } - } - } - var req *httplib.BeegoHTTPRequest - api += apd - switch method { - case GET: - req = httplib.Get(Config.Host + "/open/" + api) - case POST: - req = httplib.Delete(Config.Host + "/open/" + api) - case DELETE: - req = httplib.Delete(Config.Host + "/open/" + api) - case PUT: - req = httplib.Put(Config.Host + "/open/" + api) - } - if method != GET && len(body) > 0 { - req.Body(body) - } - req.Header("Authorization", fmt.Sprintf("Bearer %s", token)) - data, _ := json.Marshal(body) - req.Body(data) - data, err = req.Bytes() - if err != nil { - return err - } - code, _ := jsonparser.GetInt(data, "code") - if code != 200 { - return errors.New(string(data)) - } - if toParse != nil { - if err := json.Unmarshal(data, toParse); err != nil { - return errors.New(fmt.Sprintf("解析错误：%v,%v", err, string(data))) - } - } - return nil -} diff --git a/develop/qinglong/init.go b/develop/qinglong/init.go index c49cedb..8147a64 100644 --- a/develop/qinglong/init.go +++ b/develop/qinglong/init.go @@ -1,14 +1,18 @@ package qinglong import ( + "encoding/json" "errors" "fmt" + "reflect" + "strings" "time" "github.com/beego/beego/v2/adapter/httplib" "github.com/beego/beego/v2/core/logs" "github.com/buger/jsonparser" "github.com/cdle/sillyGirl/core" + "github.com/cdle/sillyGirl/im" ) type Yaml struct { @@ -29,11 +33,50 @@ var ENVS = "envs" func init() { core.ReadYaml(core.ExecPath+"/develop/qinglong/conf/", &Config, "https://raw.githubusercontent.com/cdle/sillyGirl/main/develop/qinglong/conf/config.yaml") - token, err := getToken() + _, err := getToken() if err == nil { - logs.Info("青龙可及%v", token) + logs.Info("青龙已连接") } - + core.AddCommand([]core.Function{ + { + Rules: []string{`^env\s+([\S]*)$`}, + Handle: func(s im.Sender) interface{} { + m := s.Get() + env, err := GetEnv(m) + if err != nil { + return err + } + if env == nil { + return "未设置该环境变量" + } + if env != nil { + status := "已启用" + if env.Status != 0 { + status = "已禁用" + } + if env.Remarks == "" { + env.Remarks = "无" + } + return fmt.Sprintf("名称：%v\n备注：%v\n状态：%v\n时间：%v\n值：%v", env.Name, env.Remarks, status, env.Timestamp, env.Value) + } + return nil + }, + }, + { + Rules: []string{`^export\s+([^'"=]+)=['"]?([^=]+?)['"]?$`, `^env\s+set\s+([^'"=]+)=['"]?([^=]+?)['"]?$`}, + Handle: func(s im.Sender) interface{} { + e := &Env{ + Name: s.Get(0), + Value: s.Get(1), + } + err := SetEnv(e) + if err != nil { + return err + } + return fmt.Sprintf("操作成功") + }, + }, + }) } func getToken() (string, error) { @@ -57,3 +100,75 @@ func getToken() (string, error) { expiration, _ = jsonparser.GetInt(data, "data", "expiration") return token, nil } + +func req(ps ...interface{}) error { + token, err := getToken() + if err != nil { + return err + } + method := GET + body := []byte{} + api := ENVS + apd := "" + var toParse interface{} + for _, p := range ps { + switch p.(type) { + case string: + switch p.(string) { + case GET, POST, DELETE, PUT: + method = p.(string) + case ENVS: + api = p.(string) + default: + apd = p.(string) + } + case []byte: + body = p.([]byte) + default: + if strings.Contains(reflect.TypeOf(p).String(), "*") { + toParse = p + } else { + fmt.Println(p, "--") + body, _ = json.Marshal(p) + fmt.Println(string(body), "++") + } + } + } + var req *httplib.BeegoHTTPRequest + api += apd + + switch method { + case GET: + req = httplib.Get(Config.Host + "/open/" + api) + case POST: + req = httplib.Delete(Config.Host + "/open/" + api) + case DELETE: + req = httplib.Delete(Config.Host + "/open/" + api) + case PUT: + req = httplib.Put(Config.Host + "/open/" + api) + } + req.Header("Authorization", fmt.Sprintf("Bearer %s", token)) + req.Header("Content-Type", "application/json;charset=UTF-8") + if method != GET { + + req.Body(body) + } + fmt.Println(Config.Host + "/open/" + api) + fmt.Println(method) + fmt.Println(string(body)) + req.Body(body) + data, err := req.Bytes() + if err != nil { + return err + } + code, _ := jsonparser.GetInt(data, "code") + if code != 200 { + return errors.New(string(data)) + } + if toParse != nil { + if err := json.Unmarshal(data, toParse); err != nil { + return errors.New(fmt.Sprintf("解析错误：%v,%v", err, string(data))) + } + } + return nil +} diff --git a/im/tg/tg.go b/im/tg/tg.go index 7b3485a..bf571e0 100644 --- a/im/tg/tg.go +++ b/im/tg/tg.go @@ -1,6 +1,7 @@ package tg import ( + "fmt" "net/http" "time" @@ -127,7 +128,7 @@ func (sender *Sender) Reply(rt interface{}) error { } switch rt.(type) { case error: - b.Send(r, rt.(error).Error, &tb.SendOptions{ReplyTo: sender.Message}) + b.Send(r, fmt.Sprintf("错误：%v", rt), &tb.SendOptions{ReplyTo: sender.Message}) case []byte: b.Send(r, string(rt.([]byte)), &tb.SendOptions{ReplyTo: sender.Message}) case string: