@@ -75,8 +75,13 @@ var IsRequestTokenAgain bool = false
7575var TTI_i = 30
7676
7777func GmcTokenLogin () (g GMCLogin , err error ) {
78- _ , err = toml .DecodeFile ("deviceInfo.toml" , & GTL )
79- return * GTL , err
78+ if PathExists ("deviceInfo.toml" ){
79+ _ , err = toml .DecodeFile ("deviceInfo.toml" , & GTL )
80+ return * GTL , err
81+ } else {
82+ g = GMCLogin {}
83+ return g , nil
84+ }
8085}
8186
8287func SRI () (sr SignRegister , err error ) {
@@ -116,21 +121,21 @@ func InitLog(cli *client.QQClient) {
116121func Login (cli * client.QQClient ) (bool , error ) {
117122 cli .AllowSlider = true
118123 if GTL .ClientProtocol == 1 && GTL .SignServer != "" {
119- wrapper . RegisterSign = RegisterSign
124+ RegisterSign ( uint64 ( cli . Uin ), cli . Device (). AndroidId , cli . Device (). Guid , cli . Device (). QImei36 , GTL . SignServerKey )
120125 wrapper .DandelionEnergy = Energy
121126 wrapper .FekitGetSign = Sign
122127 } else if GTL .SignServer != "" {
123- fmt . Println ("SignServer 不支持该协议" )
128+ log . Warn ("SignServer 不支持该协议" )
124129 }
125130 rsp , err := cli .Login ()
126131 if rsp .Code == byte (45 ) && GTL .SignServer == "" {
127- fmt . Println ("您的账号被限制登录，请配置 SignServer 后重试" )
132+ log . Warn ("您的账号被限制登录，请配置 SignServer 后重试" )
128133 }
129134 if rsp .Code == byte (235 ) {
130- fmt . Println ("设备信息被封禁，请删除设备（device）文件夹里对应设备文件后重试" )
135+ log . Warn ("设备信息被封禁，请删除设备（device）文件夹里对应设备文件后重试" )
131136 }
132137 if rsp .Code == byte (237 ) {
133- fmt . Println ("登录过于频繁，请在手机QQ登录并根据提示完成认证" )
138+ log . Warn ("登录过于频繁，请在手机QQ登录并根据提示完成认证" )
134139 }
135140 if err != nil {
136141 return false , err
@@ -260,7 +265,7 @@ func Sign(seq uint64, uin string, cmd string, qua string, buff []byte) (sign []b
260265 token , _ = hex .DecodeString (gjson .GetBytes (response , "data.token" ).String ())
261266
262267 json .Unmarshal (response , & RSR )
263- fmt . Println (RSR .Data .RequestCallback [0 ], RSR .Data .RequestCallback [1 ])
268+ log . Debug (RSR .Data .RequestCallback [0 ], RSR .Data .RequestCallback [1 ])
264269 return sign , extra , token , nil
265270}
266271
@@ -277,8 +282,8 @@ func RegisterSign(uin uint64, androidId []byte, guid []byte, Qimei36 string, sig
277282 // http://your.host:port/register?uin=[QQ]&android_id=[ANDROID_ID]&guid=[GUID]&qimei36=[QIMEI36]&key=[KEY]
278283 _ = os .WriteFile ("signRegisterInfo.toml" , []byte (fmt .Sprintf ("uin= %v \n androidId= \" %s\" \n guid= \" %s\" \n qimei36= \" %s\" \n key= \" %s\" " , uin , hex .EncodeToString (androidId ), hex .EncodeToString (guid ), Qimei36 , signServerAuth )), 0o644 )
279284
280- fmt . Println (uin , hex .EncodeToString (androidId ), hex .EncodeToString (guid ), Qimei36 , signServerAuth )
281- fmt . Println (fmt .Sprintf ("?uin=%v&android_id=%s&guid=%s&qimei36=%s&key=%s" , uin , hex .EncodeToString (androidId ), hex .EncodeToString (guid ), Qimei36 , signServerAuth ))
285+ log . Debug (uin , hex .EncodeToString (androidId ), hex .EncodeToString (guid ), Qimei36 , signServerAuth )
286+ log . Debug (fmt .Sprintf ("?uin=%v&android_id=%s&guid=%s&qimei36=%s&key=%s" , uin , hex .EncodeToString (androidId ), hex .EncodeToString (guid ), Qimei36 , signServerAuth ))
282287 response , err := download.Request {
283288 Method : http .MethodGet ,
284289 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 ),
@@ -287,7 +292,7 @@ func RegisterSign(uin uint64, androidId []byte, guid []byte, Qimei36 string, sig
287292 log .Warnf ("初始化 Sign 失败\n " , err )
288293 } else {
289294 log .Info ("初始化 Sign 成功" )
290- fmt . Println (gjson .GetBytes (response , "msg" ).String ())
295+ log . Debug (gjson .GetBytes (response , "msg" ).String ())
291296 }
292297}
293298
@@ -305,8 +310,8 @@ func SubmitRequestCallback(uin uint64, cmd string, callbackId int, buffer []byte
305310 log .Warnf (cmd , " " , callbackId , "提交失败\n " , err )
306311 } else {
307312 log .Info (cmd , " " , callbackId , "提交成功" )
308- fmt . Println (string (response ))
309- fmt . Println (gjson .GetBytes (response , "msg" ).String ())
313+ log . Debug (string (response ))
314+ log . Debug (gjson .GetBytes (response , "msg" ).String ())
310315 }
311316}
312317
@@ -328,8 +333,8 @@ func RequestToken(uin uint64) {
328333 log .Warn ("QSign not initialized, unable to request_ Token, please submit the initialization package first." )
329334 } else {
330335 log .Info ("请求 Token 成功" )
331- fmt . Println (string (response ))
332- fmt . Println (gjson .GetBytes (response , "msg" ).String ())
336+ log . Debug (string (response ))
337+ log . Debug (gjson .GetBytes (response , "msg" ).String ())
333338 }
334339}
335340
0 commit comments