m hai 1 mes
pai
achega
8283590e99
Modificáronse 3 ficheiros con 7 adicións e 10 borrados
  1. 3 4
      common/lxhttp/http_tax.go
  2. 2 3
      common/lxhttp/rsvmp.go
  3. 2 3
      login/method.go

+ 3 - 4
common/lxhttp/http_tax.go

@@ -7,7 +7,6 @@ import (
 	"encoding/json"
 	"fmt"
 	login_js "git.listensoft.net/tool/jspkit/common/login-js"
-	Rsvmp "git.listensoft.net/tool/jspkit/common/rsvmp"
 	"git.listensoft.net/tool/jspkit/logger"
 	"git.listensoft.net/tool/jspkit/taxerr"
 	"github.com/tidwall/gjson"
@@ -55,8 +54,8 @@ beggin:
 	}
 	defer resp.Body.Close()
 	if !strings.Contains(uri, "api/login") {
-		if resp.StatusCode == 412 && f < 3 && Rsvmp.NeedRsvmpAPi(uri) {
-			ck, uri = Rsvmp.Rsvmp(uri)
+		if resp.StatusCode == 412 && f < 3 && NeedRsvmpAPi(uri) {
+			ck, uri = Rsvmp(uri)
 			f++
 			goto beggin
 		}
@@ -134,7 +133,7 @@ func AutoHttp(client *http.Client, uri string, Method string, bytesData []byte,
 		}
 		if resp.StatusCode == 412 {
 			logger.Info("需要瑞数加密了:", zap.Int("code", resp.StatusCode))
-			Cookies, _ = Rsvmp.Rsvmp(uri)
+			Cookies, _ = Rsvmp(uri)
 			logger.Info("加密完成")
 			logger.Info("ck", zap.Any("ck", Cookies))
 			continue

+ 2 - 3
common/rsvmp/rsvmp.go → common/lxhttp/rsvmp.go

@@ -1,7 +1,6 @@
-package Rsvmp
+package lxhttp
 
 import (
-	"git.listensoft.net/tool/jspkit/common/lxhttp"
 	"git.listensoft.net/tool/jspkit/logger"
 	"github.com/tidwall/gjson"
 	"net/http"
@@ -66,7 +65,7 @@ func Rsvmp(uri string) (cookies []*http.Cookie, Posturl string) {
 	var body []byte
 	var err error
 	for range "...." {
-		body, err = lxhttp.POSTJson(http.DefaultClient, RsServer, p, h)
+		body, err = POSTJson(http.DefaultClient, RsServer, p, h)
 		if err != nil {
 			continue
 		}

+ 2 - 3
login/method.go

@@ -7,7 +7,6 @@ import (
 	"git.listensoft.net/tool/jspkit/common"
 	"git.listensoft.net/tool/jspkit/common/lxhttp"
 	"git.listensoft.net/tool/jspkit/common/models"
-	Rsvmp "git.listensoft.net/tool/jspkit/common/rsvmp"
 	"git.listensoft.net/tool/jspkit/logger"
 	"git.listensoft.net/tool/jspkit/taxerr"
 	"github.com/go-rod/rod"
@@ -148,8 +147,8 @@ func PostLoin(jsonR []byte, headder map[string]string, info models.CompanyInfo)
 
 func RsCookie(url string) (ck []*http.Cookie, uri string) {
 	return nil, url
-	if Rsvmp.NeedRsvmp(url) {
-		ck, _ = Rsvmp.Rsvmp(url)
+	if lxhttp.NeedRsvmp(url) {
+		ck, _ = lxhttp.Rsvmp(url)
 		return ck, url
 	}
 	return nil, url