shkong/go-cqhttp
1
0
Fork 0
mirror of https://github.com/Mrs4s/go-cqhttp.git synced 2025-05-04 19:17:37 +08:00
Code Issues Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
源文雨 2023-08-01 11:16:58 +08:00
parent 88f5db89a8
commit 5cb8548487
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/gocq/login.go
View File

@ -24,8 +24,6 @@ import (
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
"gopkg.ilharper.com/x/isatty" "gopkg.ilharper.com/x/isatty"
"github.com/Mrs4s/go-cqhttp/internal/base"
"github.com/Mrs4s/go-cqhttp/global" "github.com/Mrs4s/go-cqhttp/global"
"github.com/Mrs4s/go-cqhttp/internal/base" "github.com/Mrs4s/go-cqhttp/internal/base"
"github.com/Mrs4s/go-cqhttp/internal/download" "github.com/Mrs4s/go-cqhttp/internal/download"
@ -271,7 +269,7 @@ func fetchCaptcha(id string) string {
return "" return ""
} }
func energy(_ uint64, id string, _ string, salt []byte) ([]byte, error) { func energy(uin uint64, id string, _ string, salt []byte) ([]byte, error) {
signServer := base.SignServer signServer := base.SignServer
if !strings.HasSuffix(signServer, "/") { if !strings.HasSuffix(signServer, "/") {
signServer += "/" signServer += "/"
@ -283,7 +281,7 @@ func energy(_ uint64, id string, _ string, salt []byte) ([]byte, error) {
} }
req := download.Request{ req := download.Request{
Method: http.MethodGet, Method: http.MethodGet,
Header: headers, Header: headers,
URL: signServer + "custom_energy" + fmt.Sprintf("?data=%v&salt=%v&uin=%v&android_id=%v&guid=%v", URL: signServer + "custom_energy" + fmt.Sprintf("?data=%v&salt=%v&uin=%v&android_id=%v&guid=%v",
id, hex.EncodeToString(salt), uin, utils.B2S(device.AndroidId), hex.EncodeToString(device.Guid)), id, hex.EncodeToString(salt), uin, utils.B2S(device.AndroidId), hex.EncodeToString(device.Guid)),
}.WithTimeout(time.Duration(base.SignServerTimeout) * time.Second) }.WithTimeout(time.Duration(base.SignServerTimeout) * time.Second)