update

2mf8 · 2mf8 · commit a5b2df756ac1 · 2023-07-07T14:15:59.000+08:00
diff --git a/README.md b/README.md
@@ -1,5 +1,36 @@
 # Go-Mirai-Client
 
+## session.token 登录说明
+
+只支持单账号登录，如需多账号登录，请放不同文件夹内，例如
+
+```shell
+File
+|- File one
+| |- gmc.exe
+| |- session.token
+| |- deviceInfo.toml
+| |- logs
+| |  |- 2023-06-30.log
+| |  |- latest.log
+| |- plugins
+| |  |- default.json
+| |- device
+| |  |- device-1688014725597.json
+|- File two
+| |- gmc.exe
+| |- session.token
+| |- deviceInfo.toml
+| |- logs
+| |  |- 2023-06-30.log
+| |  |- latest.log
+| |- plugins
+| |  |- default.json
+| |- device
+| |  |- device-1688014725597.json
+```
+
+
 [![QQ群](https://img.shields.io/static/v1?label=QQ%E7%BE%A4&message=335783090&color=blue)](https://jq.qq.com/?_wv=1027&k=B7Of3GMZ)
 
 用于收发QQ消息，并通过 websocket + protobuf 上报给 server 进行处理。
diff --git a/dto_proto/http_dto.proto b/dto_proto/http_dto.proto
@@ -29,6 +29,7 @@ message CreateBotReq{
     int64 device_seed = 3; // 设备信息随机种子
     int32 client_protocol = 4; // 协议类型
     string sign_server = 5;
+    string sign_server_auth = 6;
 }
 message CreateBotResp{
 }
diff --git a/pkg/bot/api_handler.s b/pkg/bot/api_handler.s
diff --git a/pkg/bot/bot.go b/pkg/bot/bot.go
@@ -3,6 +3,7 @@ package bot
 import (
 	"bytes"
 	"encoding/hex"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"net/http"
@@ -32,15 +33,57 @@ type GMCLogin struct {
 	DeviceSeed     int64
 	ClientProtocol int32
 	SignServer     string
+	SignServerKey  string
 }
 
+type SignRegister struct {
+	Uin       uint64
+	AndroidId string
+	Guid      string
+	Qimei36   string
+	Key       string
+}
+
+type RequestCallback struct {
+	Cmd        string `json:"cmd,omitempty"` // trpc.o3.ecdh_access.EcdhAccess.SsoSecureA2Establish
+	Body       string `json:"body,omitempty"`
+	CallBackId int    `json:"callbackId,omitempty"`
+}
+
+type RequestSignData struct {
+	Token           string `json:"token,omitempty"`
+	Extra           string `json:"extra,omitempty"`
+	Sign            string `json:"sign,omitempty"`
+	O3dId           string `json:"o3did,omitempty"`
+	RequestCallback []*RequestCallback
+}
+
+type RequestSignResult struct {
+	Code int    `json:"code,omitempty"`
+	Msg  string `json:"msg,omitempty"`
+	Data *RequestSignData
+}
+
+var RSR RequestSignResult
+
 var GTL *GMCLogin
 
+var SR SignRegister
+
+var IsRequestTokenAgain bool = false
+
+var TTI_i = 30
+
 func GmcTokenLogin() (g GMCLogin, err error) {
 	_, err = toml.DecodeFile("deviceInfo.toml", &GTL)
 	return *GTL, err
 }
 
+func SRI() (sr SignRegister, err error) {
+	_, err = toml.DecodeFile("signRegisterInfo.toml", &SR)
+	return SR, err
+}
+
 func PathExists(path string) bool {
 	_, err := os.Stat(path)
 	return err == nil || errors.Is(err, os.ErrExist)
@@ -73,6 +116,7 @@ func InitLog(cli *client.QQClient) {
 func Login(cli *client.QQClient) (bool, error) {
 	cli.AllowSlider = true
 	if GTL.ClientProtocol == 1 && GTL.SignServer != "" {
+		wrapper.RegisterSign = RegisterSign
 		wrapper.DandelionEnergy = Energy
 		wrapper.FekitGetSign = Sign
 	} else if GTL.SignServer != "" {
@@ -178,7 +222,7 @@ func Energy(uin uint64, id string, appVersion string, salt []byte) ([]byte, erro
 	}
 	response, err := download.Request{
 		Method: http.MethodGet,
-		URL:    signServer + "custom_energy" + fmt.Sprintf("?data=%v&salt=%v", id, hex.EncodeToString(salt)),
+		URL:    signServer + "custom_energy" + fmt.Sprintf("?uin=%v&data=%v&salt=%v", uin, id, hex.EncodeToString(salt)),
 	}.Bytes()
 	if err != nil {
 		log.Warnf("获取T544 sign时出现错误: %v server: %v", err, signServer)
@@ -214,5 +258,87 @@ func Sign(seq uint64, uin string, cmd string, qua string, buff []byte) (sign []b
 	sign, _ = hex.DecodeString(gjson.GetBytes(response, "data.sign").String())
 	extra, _ = hex.DecodeString(gjson.GetBytes(response, "data.extra").String())
 	token, _ = hex.DecodeString(gjson.GetBytes(response, "data.token").String())
+
+	json.Unmarshal(response, &RSR)
+	fmt.Println(RSR.Data.RequestCallback[0], RSR.Data.RequestCallback[1])
 	return sign, extra, token, nil
 }
+
+func RegisterSign(uin uint64, androidId []byte, guid []byte, Qimei36 string, signServerAuth string) {
+	signServer := GTL.SignServer
+	if !strings.HasSuffix(signServer, "/") {
+		signServer += "/"
+	}
+	SR.Uin = uin
+	SR.AndroidId = string(androidId)
+	SR.Guid = string(guid)
+	SR.Guid = string(guid)
+	SR.Key = signServerAuth
+	// http://your.host:port/register?uin=[QQ]&android_id=[ANDROID_ID]&guid=[GUID]&qimei36=[QIMEI36]&key=[KEY]
+	_ = os.WriteFile("signRegisterInfo.toml", []byte(fmt.Sprintf("uin= %v \nandroidId= \"%s\" \nguid= \"%s\" \nqimei36= \"%s\" \nkey= \"%s\"", uin, hex.EncodeToString(androidId), hex.EncodeToString(guid), Qimei36, signServerAuth)), 0o644)
+
+	fmt.Println(uin, hex.EncodeToString(androidId), hex.EncodeToString(guid), Qimei36, signServerAuth)
+	fmt.Println(fmt.Sprintf("?uin=%v&android_id=%s&guid=%s&qimei36=%s&key=%s", uin, hex.EncodeToString(androidId), hex.EncodeToString(guid), Qimei36, signServerAuth))
+	response, err := download.Request{
+		Method: http.MethodGet,
+		URL:    signServer + "register" + fmt.Sprintf("?uin=%v&android_id=%s&guid=%s&qimei36=%s&key=%s", uin, hex.EncodeToString(androidId), hex.EncodeToString(guid), Qimei36, signServerAuth),
+	}.Bytes()
+	if err != nil {
+		log.Warnf("初始化 Sign 失败\n", err)
+	} else {
+		log.Info("初始化 Sign 成功")
+		fmt.Println(gjson.GetBytes(response, "msg").String())
+	}
+}
+
+// http://your.host:port/submit?uin=[QQ]&cmd=[CMD]&callback_id=[CALLBACK_ID]&buffer=[BUFFER]
+func SubmitRequestCallback(uin uint64, cmd string, callbackId int, buffer []byte) {
+	signServer := GTL.SignServer
+	if !strings.HasSuffix(signServer, "/") {
+		signServer += "/"
+	}
+	response, err := download.Request{
+		Method: http.MethodGet,
+		URL:    signServer + "submit" + fmt.Sprintf("?uin=%v&cmd=%s&callback_id=%v&buffer=%s", uin, cmd, callbackId, buffer),
+	}.Bytes()
+	if err != nil {
+		log.Warnf(cmd, " ", callbackId, "提交失败\n", err)
+	} else {
+		log.Info(cmd, " ", callbackId, "提交成功")
+		fmt.Println(string(response))
+		fmt.Println(gjson.GetBytes(response, "msg").String())
+	}
+}
+
+func RequestToken(uin uint64) {
+	signServer := GTL.SignServer
+	if !strings.HasSuffix(signServer, "/") {
+		signServer += "/"
+	}
+	response, err := download.Request{
+		Method: http.MethodGet,
+		URL:    signServer + "request_token" + fmt.Sprintf("?uin=%v", uin),
+	}.Bytes()
+	if err != nil || strings.HasPrefix(gjson.GetBytes(response, "msg").String(), "Uin") { // QSign
+		log.Warnf("请求 Token 失败\n", gjson.GetBytes(response, "msg").String(), err)
+		log.Info("正在重新注册 ", uin)
+		RegisterSign(SR.Uin, []byte(SR.AndroidId), []byte(SR.Guid), SR.Qimei36, SR.Key)
+		IsRequestTokenAgain = true
+	} else if strings.HasPrefix(gjson.GetBytes(response, "msg").String(), "QSign") {
+		log.Warn("QSign not initialized, unable to request_ Token, please submit the initialization package first.")
+	} else {
+		log.Info("请求 Token 成功")
+		fmt.Println(string(response))
+		fmt.Println(gjson.GetBytes(response, "msg").String())
+	}
+}
+
+func TTIR(uin uint64) {
+	for TTI_i >= 0 {
+		time.Sleep(time.Minute)
+		if TTI_i == 0 {
+			TTI_i = 30
+			RequestToken(uin)
+		}
+	}
+}
diff --git a/pkg/bot/captcha.go b/pkg/bot/captcha.go
@@ -55,18 +55,11 @@ func ProcessLoginRsp(cli *client.QQClient, rsp *client.LoginResponse) (bool, err
 		})
 		defer WaitingCaptchas.Delete(cli.Uin)
 
-		for count := 120; count > 0; count-- {
-			str := fetchCaptcha(id)
-			if str != "" {
-				rsp, err := cli.SubmitTicket(str)
-				if err != nil {
-					return false, err
-				}
-				return ProcessLoginRsp(cli, rsp)
-			}
-			time.Sleep(time.Second)
+		ticket := getTicket(id)
+		rsp, err := cli.SubmitTicket(ticket)
+		if err != nil {
+			return false, err
 		}
-		log.Warnf("验证超时")
 		return ProcessLoginRsp(cli, rsp)
 	case client.NeedCaptcha:
 		log.Infof("遇到图形验证码，根据README提示操作 https://github.com/protobufbot/Go-Mirai-Client (顺便star)")
@@ -160,3 +153,15 @@ func fetchCaptcha(id string) string {
 	}
 	return ""
 }
+
+func getTicket(id string) string {
+	for count := 120; count > 0; count-- {
+		str := fetchCaptcha(id)
+		if str != "" {
+			return str
+		}
+		time.Sleep(time.Second)
+	}
+	log.Warnf("验证超时")
+	return ""
+}
diff --git a/pkg/gmc/gmc.go b/pkg/gmc/gmc.go
@@ -11,6 +11,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/ProtobufBot/Go-Mirai-Client/pkg/bot"
 	"github.com/ProtobufBot/Go-Mirai-Client/pkg/config"
 	"github.com/ProtobufBot/Go-Mirai-Client/pkg/gmc/handler"
 	"github.com/ProtobufBot/Go-Mirai-Client/pkg/static"
@@ -98,6 +99,11 @@ func Start() {
 
 	CreateBotIfParamExist() // 如果环境变量存在，使用环境变量创建机器人 UIN PASSWORD
 	InitGin()               // 初始化GIN HTTP管理
+	sr, err := bot.SRI()
+	if err != nil {
+		log.Warn("signRegisterInfo.toml 不存在，应该是首次登录")
+	}
+	fmt.Println(sr)
 	handler.TokenLogin()
 }
 
@@ -138,7 +144,7 @@ func CreateBotIfParamExist() {
 	if uin != 0 && pass != "" {
 		log.Infof("使用参数创建机器人 %d", uin)
 		go func() {
-			handler.CreateBotImpl(uin, pass, 0, 0)
+			handler.CreateBotImpl(uin, pass, 0, 0, "")
 		}()
 	}
 }
diff --git a/pkg/gmc/handler/bot.go b/pkg/gmc/handler/bot.go
@@ -106,20 +106,22 @@ func CreateBot(c *gin.Context) {
 			DeviceSeed:     req.DeviceSeed,
 			ClientProtocol: 6,
 			SignServer:     req.SignServer,
+			SignServerKey:  req.SignServerAuth,
 		}
-		_ = os.WriteFile("deviceInfo.toml", []byte(fmt.Sprintf("DeviceSeed = %d \nClientProtocol= %d \nSignServer= \"%s\"", req.DeviceSeed, 6, req.SignServer)), 0o644)
+		_ = os.WriteFile("deviceInfo.toml", []byte(fmt.Sprintf("DeviceSeed = %d \nClientProtocol= %d \nSignServer= \"%s\" \nSignServerkey= \"%s\"", req.DeviceSeed, 6, req.SignServer, req.SignServerAuth)), 0o644)
 		go func() {
-			CreateBotImpl(req.BotId, req.Password, req.DeviceSeed, 6)
+			CreateBotImpl(req.BotId, req.Password, req.DeviceSeed, 6, req.SignServerAuth)
 		}()
 	} else {
 		bot.GTL = &bot.GMCLogin{
 			DeviceSeed:     req.DeviceSeed,
 			ClientProtocol: req.ClientProtocol,
 			SignServer:     req.SignServer,
+			SignServerKey:  req.SignServerAuth,
 		}
-		_ = os.WriteFile("deviceInfo.toml", []byte(fmt.Sprintf("DeviceSeed = %d \nClientProtocol= %d \nSignServer= \"%s\"", req.DeviceSeed, req.ClientProtocol, req.SignServer)), 0o644)
+		_ = os.WriteFile("deviceInfo.toml", []byte(fmt.Sprintf("DeviceSeed = %d \nClientProtocol= %d \nSignServer= \"%s\" \nSignServerkey= \"%s\"", req.DeviceSeed, req.ClientProtocol, req.SignServer, req.SignServerAuth)), 0o644)
 		go func() {
-			CreateBotImpl(req.BotId, req.Password, req.DeviceSeed, req.ClientProtocol)
+			CreateBotImpl(req.BotId, req.Password, req.DeviceSeed, req.ClientProtocol, req.SignServerAuth)
 		}()
 	}
 	resp := &dto.CreateBotResp{}
@@ -396,23 +398,27 @@ func Return(c *gin.Context, resp proto.Message) {
 	c.Data(http.StatusOK, c.ContentType(), data)
 }
 
-func CreateBotImpl(uin int64, password string, deviceRandSeed int64, clientProtocol int32) {
-	CreateBotImplMd5(uin, md5.Sum([]byte(password)), deviceRandSeed, clientProtocol)
+func CreateBotImpl(uin int64, password string, deviceRandSeed int64, clientProtocol int32, signServerKey string) {
+	CreateBotImplMd5(uin, md5.Sum([]byte(password)), deviceRandSeed, clientProtocol, signServerKey)
 }
 
-func CreateBotImplMd5(uin int64, passwordMd5 [16]byte, deviceRandSeed int64, clientProtocol int32) {
+func CreateBotImplMd5(uin int64, passwordMd5 [16]byte, deviceRandSeed int64, clientProtocol int32, signServerKey string) {
 	var deviceInfo *client.DeviceInfo
 	log.Infof("开始初始化设备信息")
 	if deviceRandSeed != 0 {
 		deviceInfo = device.GetDevice(deviceRandSeed, clientProtocol)
 	} else {
 		deviceInfo = device.GetDevice(uin, clientProtocol)
 	}
+
+	fmt.Println(signServerKey)
+
 	log.Infof("设备信息 %+v", string(deviceInfo.ToJson()))
 
 	log.Infof("创建机器人 %+v", uin)
 
 	cli := client.NewClientMd5(uin, passwordMd5)
+	cli.SetSSK(signServerKey)
 	cli.UseDevice(deviceInfo)
 	bot.Clients.Store(uin, cli)
 
@@ -428,25 +434,24 @@ func CreateBotImplMd5(uin int64, passwordMd5 [16]byte, deviceRandSeed int64, cli
 	}
 	if ok {
 		log.Infof("登录成功")
-		bot.GTL = &bot.GMCLogin{
-			DeviceSeed:     bot.GTL.DeviceSeed,
-			ClientProtocol: bot.GTL.ClientProtocol,
-			SignServer:     "",
+		for _, data := range bot.RSR.Data.RequestCallback {
+			go bot.SubmitRequestCallback(uint64(uin), data.Cmd, data.CallBackId, []byte(data.Body))
 		}
+		time.Sleep(time.Second * 3)
 		AfterLogin(cli)
 		accountToken := cli.GenToken()
 		_ = os.WriteFile("session.token", accountToken, 0o644)
 	} else {
 		log.Infof("登录失败")
-		bot.GTL = &bot.GMCLogin{
-			DeviceSeed:     bot.GTL.DeviceSeed,
-			ClientProtocol: bot.GTL.ClientProtocol,
-			SignServer:     "",
-		}
 	}
 }
 
 func AfterLogin(cli *client.QQClient) {
+	bot.RequestToken(uint64(cli.Uin))
+	if bot.IsRequestTokenAgain {
+		bot.RequestToken(uint64(cli.Uin))
+	}
+	go bot.TTIR(uint64(cli.Uin))
 	for {
 		time.Sleep(5 * time.Second)
 		if cli.Online.Load() {
diff --git a/proto_gen/dto/http_dto.pb.go b/proto_gen/dto/http_dto.pb.go
diff --git a/service/gmc/gmc b/service/gmc/gmc

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ message CreateBotReq{`
`29`	`29`	`int64 device_seed = 3; // 设备信息随机种子`
`30`	`30`	`int32 client_protocol = 4; // 协议类型`
`31`	`31`	`string sign_server = 5;`
	`32`	`+ string sign_server_auth = 6;`
`32`	`33`	`}`
`33`	`34`	`message CreateBotResp{`
`34`	`35`	`}`