From f95ec9ef08a6f865db75222b4ec523f1e094c78b Mon Sep 17 00:00:00 2001 From: ZJY <764763903@qq.com> Date: Thu, 2 Sep 2021 10:50:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BAopenapi=20=E5=85=A8?= =?UTF-8?q?=E9=9D=A2=E6=94=AF=E6=8C=812.9=20=E8=A7=A3=E5=86=B3xdd=E5=92=8C?= =?UTF-8?q?=E9=9D=92=E9=BE=99=E6=8A=A2=E7=99=BB=E5=BD=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/container.go | 45 ++++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/models/container.go b/models/container.go index 8941c4c..b690500 100644 --- a/models/container.go +++ b/models/container.go @@ -508,20 +508,39 @@ func (c *Container) postConfig(handle func(config string) string) error { } func (c *Container) getSession() error { - req := httplib.Post(c.Address + "/auth") - req.Param("username", c.Username) - req.Param("password", c.Password) - rsp, err := req.Response() - if err != nil { - return err - } - c.Token = rsp.Header.Get("Set-Cookie") - if data, err := ioutil.ReadAll(rsp.Body); err != nil { - return err + if c.Version == "2.9" { + req := httplib.Post(c.Address + "/open/auth") + req.Param("username", c.Username) + req.Param("password", c.Password) + rsp, err := req.Response() + if err != nil { + return err + } + c.Token = rsp.Header.Get("Set-Cookie") + if data, err := ioutil.ReadAll(rsp.Body); err != nil { + return err + } else { + err, _ := jsonparser.GetInt(data, "err") + if err != 0 { + return errors.New(string(data)) + } + } } else { - err, _ := jsonparser.GetInt(data, "err") - if err != 0 { - return errors.New(string(data)) + req := httplib.Post(c.Address + "/auth") + req.Param("username", c.Username) + req.Param("password", c.Password) + rsp, err := req.Response() + if err != nil { + return err + } + c.Token = rsp.Header.Get("Set-Cookie") + if data, err := ioutil.ReadAll(rsp.Body); err != nil { + return err + } else { + err, _ := jsonparser.GetInt(data, "err") + if err != 0 { + return errors.New(string(data)) + } } } return nil