|
@@ -127,23 +127,24 @@ func InitSussBi(config map[string]interface{}) (*sussBi, error) {
|
|
// AutoLogin 自动登录
|
|
// AutoLogin 自动登录
|
|
func (s *sussBi) AutoLogin() error {
|
|
func (s *sussBi) AutoLogin() error {
|
|
client := &http.Client{
|
|
client := &http.Client{
|
|
- Jar: s.jar,
|
|
|
|
|
|
+ Jar: s.succbiJar,
|
|
}
|
|
}
|
|
- resp, err := client.Get(fmt.Sprintf("%s/?:user=%s&:password=%s", s.addr, s.user, s.pwd))
|
|
|
|
- if err != nil {
|
|
|
|
- return err
|
|
|
|
- }
|
|
|
|
- if !(resp.StatusCode == 302 || resp.StatusCode == 200) {
|
|
|
|
- return fmt.Errorf("自动登录异常")
|
|
|
|
- }
|
|
|
|
- client.Jar = s.succbiJar
|
|
|
|
- resp, err = client.Get(fmt.Sprintf("%s/succbi/?:user=%s&:password=%s", s.addr, s.user, s.pwd))
|
|
|
|
|
|
+ resp, err := client.Get(fmt.Sprintf("%s/succbi/?:user=%s&:password=%s", s.addr, s.user, s.pwd))
|
|
if err != nil {
|
|
if err != nil {
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
if !(resp.StatusCode == 302 || resp.StatusCode == 200) {
|
|
if !(resp.StatusCode == 302 || resp.StatusCode == 200) {
|
|
return fmt.Errorf("自动登录异常")
|
|
return fmt.Errorf("自动登录异常")
|
|
}
|
|
}
|
|
|
|
+ s.succbiJar = s.jar
|
|
|
|
+ // client.Jar = s.succbiJar
|
|
|
|
+ // resp, err = client.Get(fmt.Sprintf("%s/succbi/?:user=%s&:password=%s", s.addr, s.user, s.pwd))
|
|
|
|
+ // if err != nil {
|
|
|
|
+ // return err
|
|
|
|
+ // }
|
|
|
|
+ // if !(resp.StatusCode == 302 || resp.StatusCode == 200) {
|
|
|
|
+ // return fmt.Errorf("自动登录异常")
|
|
|
|
+ // }
|
|
return nil
|
|
return nil
|
|
}
|
|
}
|
|
|
|
|
|
@@ -167,9 +168,12 @@ func (s *sussBi) RequestLogin(r *ghttp.Request) error {
|
|
if strings.HasPrefix(r.URL.Path, "/succbi") {
|
|
if strings.HasPrefix(r.URL.Path, "/succbi") {
|
|
u, e := url.Parse(s.Url.String() + "/succbi")
|
|
u, e := url.Parse(s.Url.String() + "/succbi")
|
|
if e != nil {
|
|
if e != nil {
|
|
|
|
+ log.Println("RequestLogin url.Parse error", e)
|
|
return e
|
|
return e
|
|
}
|
|
}
|
|
|
|
+ log.Println("succbiJar----", u.Path, u.RequestURI(), s.succbiJar.Cookies(u))
|
|
if cookies := s.succbiJar.Cookies(u); len(cookies) > 0 {
|
|
if cookies := s.succbiJar.Cookies(u); len(cookies) > 0 {
|
|
|
|
+ log.Println("RequestLogin AddCookie", cookies[0])
|
|
r.Request.AddCookie(cookies[0])
|
|
r.Request.AddCookie(cookies[0])
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|