diff --git a/controllers/login.go b/controllers/login.go index a1e6cc2..eb4544d 100644 --- a/controllers/login.go +++ b/controllers/login.go @@ -86,7 +86,6 @@ func (c *LoginController) GetQrcode1() { if err1 == nil { fmt.Println(string(body)) } - s := &models.QQuery{} if len(body) > 0 { err := json.Unmarshal(body, &s) @@ -97,10 +96,11 @@ func (c *LoginController) GetQrcode1() { //jsonByte, _ := json.Marshal(s) //jsonStr := string(jsonByte) //fmt.Printf("%v", jsonStr) - ddd, _ := base64.StdEncoding.DecodeString(s.Data.QqLoginQrcode.Bytes) - c.Ctx.WriteString(`{"url":"` + "url" + `","img":"` + base64.StdEncoding.EncodeToString(ddd) + `"}`) //"data:image/png;base64," + - //c.Ctx.WriteString(s.Data.QqLoginQrcode.Bytes) //"data:image/png;base64," + - + //ddd, _ := base64.StdEncoding.DecodeString(s.Data.QqLoginQrcode.Bytes) + //c.Ctx.WriteString(`{"url":"` + "url" + `","img":"` + base64.StdEncoding.EncodeToString(ddd) + `"}`) //"data:image/png;base64," + + fmt.Println(`{"url":"` + "url" + `","img":"` + s.Data.QqLoginQrcode.Bytes + `"}`) + c.Ctx.WriteString(`{"url":"` + "url" + `","img":"` + s.Data.QqLoginQrcode.Bytes + `"}`) + return } func (c *LoginController) GetQrcode() { diff --git a/models/command.go b/models/command.go index d6d8f30..fdf0382 100644 --- a/models/command.go +++ b/models/command.go @@ -1,12 +1,10 @@ package models import ( - "encoding/json" "errors" "fmt" "github.com/beego/beego/v2/client/httplib" "github.com/beego/beego/v2/core/logs" - "io/ioutil" "regexp" "strings" "time" @@ -141,20 +139,24 @@ var codeSignals = []CodeSignal{ { Command: []string{"qrcode", "扫码", "二维码", "scan"}, Handle: func(sender *Sender) interface{} { - rsp, err := httplib.Post("https://api.kukuqaq.com/jd/qrcode").Response() + //rsp, err := httplib.Post("https://api.kukuqaq.com/jd/qrcode").Response() + //if err != nil { + // return nil + //} + //body, err1 := ioutil.ReadAll(rsp.Body) + //if err1 == nil { + // fmt.Println(string(body)) + //} + //s := &QQuery{} + //if len(body) > 0 { + // json.Unmarshal(body, &s) + //} + //logs.Info(s.Data.QqLoginQrcode.Bytes) + //ddd, _ := base64.StdEncoding.DecodeString(s.Data.QqLoginQrcode.Bytes) + rsp, err := httplib.Get("http://127.0.0.1:5703/api/login/qrcode1").Response() if err != nil { return nil } - body, err1 := ioutil.ReadAll(rsp.Body) - if err1 == nil { - fmt.Println(string(body)) - } - s := &QQuery{} - if len(body) > 0 { - json.Unmarshal(body, &s) - } - logs.Info(s.Data.QqLoginQrcode.Bytes) - //ddd, _ := base64.StdEncoding.DecodeString(s.Data.QqLoginQrcode.Bytes) return rsp }, },