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

optimize(login): log打印

Browse Source
This commit is contained in:
源文雨 2023-08-03 11:56:19 +08:00
parent 94a3ff5dae
commit 3b99a825eb
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/gocq/login.go
View File

@ -290,7 +290,7 @@ func energy(uin uint64, id string, _ string, salt []byte) ([]byte, error) {
} }
response, err := req.Bytes() response, err := req.Bytes()
if err != nil { if err != nil {
log.Warnf("获取T544 sign时出现错误: %v server: %v", err, signServer) log.Warnf("获取T544 sign时出现错误: %v. server: %v", err, signServer)
return nil, err return nil, err
} }
data, err := hex.DecodeString(gjson.GetBytes(response, "data").String()) data, err := hex.DecodeString(gjson.GetBytes(response, "data").String())
@ -299,7 +299,7 @@ func energy(uin uint64, id string, _ string, salt []byte) ([]byte, error) {
return nil, err return nil, err
} }
if len(data) == 0 { if len(data) == 0 {
log.Warnf("获取T544 sign时出现错误: %v", "data is empty") log.Warnf("获取T544 sign时出现错误: %v.", "data is empty")
return nil, errors.New("data is empty") return nil, errors.New("data is empty")
} }
return data, nil return data, nil
@ -320,7 +320,7 @@ func signSubmit(uin string, cmd string, callbackID int64, buffer []byte, t strin
uin, cmd, callbackID, buffStr), uin, cmd, callbackID, buffStr),
}.WithTimeout(time.Duration(base.SignServerTimeout) * time.Second).Bytes() }.WithTimeout(time.Duration(base.SignServerTimeout) * time.Second).Bytes()
if err != nil { if err != nil {
log.Warnf("提交 callback 时出现错误: %v server: %v", err, signServer) log.Warnf("提交 callback 时出现错误: %v. server: %v", err, signServer)
} }
} }
@ -386,12 +386,12 @@ func signRegister(uin int64, androidID, guid []byte, qimei36, key string) {
uin, utils.B2S(androidID), hex.EncodeToString(guid), qimei36, key), uin, utils.B2S(androidID), hex.EncodeToString(guid), qimei36, key),
}.WithTimeout(time.Duration(base.SignServerTimeout) * time.Second).Bytes() }.WithTimeout(time.Duration(base.SignServerTimeout) * time.Second).Bytes()
if err != nil { if err != nil {
log.Warnf("注册QQ实例时出现错误: %v server: %v", err, signServer) log.Warnf("注册QQ实例时出现错误: %v. server: %v", err, signServer)
return return
} }
msg := gjson.GetBytes(resp, "msg") msg := gjson.GetBytes(resp, "msg")
if gjson.GetBytes(resp, "code").Int() != 0 { if gjson.GetBytes(resp, "code").Int() != 0 {
log.Warnf("注册QQ实例时出现错误: %v server: %v", msg, signServer) log.Warnf("注册QQ实例时出现错误: %v. server: %v", msg, signServer)
return return
} }
log.Infof("注册QQ实例 %v 成功: %v", uin, msg) log.Infof("注册QQ实例 %v 成功: %v", uin, msg)
@ -405,14 +405,15 @@ func signRefreshToken(uin string) error {
log.Info("正在刷新 token") log.Info("正在刷新 token")
resp, err := download.Request{ resp, err := download.Request{
Method: http.MethodGet, Method: http.MethodGet,
URL: signServer + "request_token" + fmt.Sprintf("?uin=%v", uin), URL: signServer + "request_token?uin=" + uin,
}.WithTimeout(time.Duration(base.SignServerTimeout) * time.Second).Bytes() }.WithTimeout(time.Duration(base.SignServerTimeout) * time.Second).Bytes()
if err != nil { if err != nil {
return err return err
} }
msg := gjson.GetBytes(resp, "msg") msg := gjson.GetBytes(resp, "msg")
if gjson.GetBytes(resp, "code").Int() != 0 { code := gjson.GetBytes(resp, "code")
return errors.New(msg.String()) if code.Int() != 0 {
return errors.New("code=" + code.String() + ", msg: " + msg.String())
} }
go signCallback(uin, gjson.GetBytes(resp, "data").Array(), "request token") go signCallback(uin, gjson.GetBytes(resp, "data").Array(), "request token")
return nil return nil
@ -425,7 +426,7 @@ func sign(seq uint64, uin string, cmd string, qua string, buff []byte) (sign []b
for { for {
sign, extra, token, err = signRequset(seq, uin, cmd, qua, buff) sign, extra, token, err = signRequset(seq, uin, cmd, qua, buff)
if err != nil { if err != nil {
log.Warnf("获取sso sign时出现错误: %v server: %v", err, base.SignServer) log.Warnf("获取sso sign时出现错误: %v. server: %v", err, base.SignServer)
} }
if i > 0 { if i > 0 {
break break
@ -449,7 +450,7 @@ func sign(seq uint64, uin string, cmd string, qua string, buff []byte) (sign []b
if registerLock.TryLock() { if registerLock.TryLock() {
defer registerLock.Unlock() defer registerLock.Unlock()
if err := signRefreshToken(uin); err != nil { if err := signRefreshToken(uin); err != nil {
log.Warnf("刷新 token 出现错误: %v server: %v", err, base.SignServer) log.Warnf("刷新 token 出现错误: %v. server: %v", err, base.SignServer)
} else { } else {
log.Info("刷新 token 成功") log.Info("刷新 token 成功")
} }
@ -513,11 +514,12 @@ func signStartRefreshToken(interval int64) {
interval = 60 interval = 60
} }
t := time.NewTicker(time.Duration(interval) * time.Minute) t := time.NewTicker(time.Duration(interval) * time.Minute)
qqstr := strconv.FormatInt(base.Account.Uin, 10)
defer t.Stop() defer t.Stop()
for range t.C { for range t.C {
err := signRefreshToken(strconv.FormatInt(base.Account.Uin, 10)) err := signRefreshToken(qqstr)
if err != nil { if err != nil {
log.Warnf("刷新 token 出现错误: %v server: %v", err, base.SignServer) log.Warnf("刷新 token 出现错误: %v. server: %v", err, base.SignServer)
} }
} }
} }