diff --git a/binary/jce/writer.go b/binary/jce/writer.go index 21a1b4bf..be8f2764 100644 --- a/binary/jce/writer.go +++ b/binary/jce/writer.go @@ -3,11 +3,12 @@ package jce import ( "bytes" goBinary "encoding/binary" - "github.com/modern-go/reflect2" "reflect" "strconv" "sync" "unsafe" + + "github.com/modern-go/reflect2" ) type JceWriter struct { diff --git a/binary/tea_test.go b/binary/tea_test.go index 8bf4a07b..ca14946e 100644 --- a/binary/tea_test.go +++ b/binary/tea_test.go @@ -4,8 +4,9 @@ import ( "bytes" "crypto/rand" "encoding/hex" - "github.com/Mrs4s/MiraiGo/utils" "testing" + + "github.com/Mrs4s/MiraiGo/utils" ) var testTEA = NewTeaCipher([]byte("0123456789ABCDEF")) diff --git a/client/client.go b/client/client.go index 931a8715..1e419d7d 100644 --- a/client/client.go +++ b/client/client.go @@ -4,8 +4,6 @@ import ( "bytes" "crypto/md5" "fmt" - "github.com/Mrs4s/MiraiGo/binary/jce" - jsoniter "github.com/json-iterator/go" "io" "math" "math/rand" @@ -18,6 +16,9 @@ import ( "sync/atomic" "time" + "github.com/Mrs4s/MiraiGo/binary/jce" + jsoniter "github.com/json-iterator/go" + "github.com/pkg/errors" "github.com/Mrs4s/MiraiGo/binary" diff --git a/client/group_file.go b/client/group_file.go index 5e75803d..402cd4c6 100644 --- a/client/group_file.go +++ b/client/group_file.go @@ -4,16 +4,17 @@ import ( "crypto/sha1" "encoding/hex" "fmt" + "io" + "math/rand" + "os" + "runtime/debug" + "github.com/Mrs4s/MiraiGo/client/pb/exciting" "github.com/Mrs4s/MiraiGo/client/pb/oidb" "github.com/Mrs4s/MiraiGo/protocol/packets" "github.com/Mrs4s/MiraiGo/utils" "github.com/golang/protobuf/proto" "github.com/pkg/errors" - "io" - "math/rand" - "os" - "runtime/debug" ) type ( diff --git a/client/group_info.go b/client/group_info.go index e4269072..0655748c 100644 --- a/client/group_info.go +++ b/client/group_info.go @@ -2,6 +2,11 @@ package client import ( "fmt" + "math/rand" + "net/url" + "strings" + "sync" + "github.com/Mrs4s/MiraiGo/binary" "github.com/Mrs4s/MiraiGo/binary/jce" "github.com/Mrs4s/MiraiGo/client/pb/oidb" @@ -10,10 +15,6 @@ import ( "github.com/Mrs4s/MiraiGo/utils" "github.com/pkg/errors" "google.golang.org/protobuf/proto" - "math/rand" - "net/url" - "strings" - "sync" ) type ( diff --git a/client/highway.go b/client/highway.go index d323ec87..f54db0bb 100644 --- a/client/highway.go +++ b/client/highway.go @@ -6,11 +6,6 @@ import ( binary2 "encoding/binary" "encoding/hex" "fmt" - "github.com/Mrs4s/MiraiGo/binary" - "github.com/Mrs4s/MiraiGo/client/pb" - "github.com/Mrs4s/MiraiGo/utils" - "github.com/pkg/errors" - "google.golang.org/protobuf/proto" "io" "io/ioutil" "net" @@ -20,6 +15,12 @@ import ( "sync" "sync/atomic" "time" + + "github.com/Mrs4s/MiraiGo/binary" + "github.com/Mrs4s/MiraiGo/client/pb" + "github.com/Mrs4s/MiraiGo/utils" + "github.com/pkg/errors" + "google.golang.org/protobuf/proto" ) func (c *QQClient) highwayUpload(ip uint32, port int, updKey, data []byte, cmdId int32) error { diff --git a/client/image.go b/client/image.go index 28c16a5b..522392ce 100644 --- a/client/image.go +++ b/client/image.go @@ -4,6 +4,11 @@ import ( "bytes" "encoding/hex" "fmt" + "image" + "io" + "os" + "strings" + "github.com/Mrs4s/MiraiGo/binary" "github.com/Mrs4s/MiraiGo/client/pb" "github.com/Mrs4s/MiraiGo/message" @@ -11,10 +16,6 @@ import ( "github.com/Mrs4s/MiraiGo/utils" "github.com/golang/protobuf/proto" "github.com/pkg/errors" - "image" - "io" - "os" - "strings" ) func init() { diff --git a/client/pb/cmd0x346/cmd0x346.pb.go b/client/pb/cmd0x346/cmd0x346.pb.go index 96338f53..42c59001 100644 --- a/client/pb/cmd0x346/cmd0x346.pb.go +++ b/client/pb/cmd0x346/cmd0x346.pb.go @@ -7,11 +7,12 @@ package cmd0x346 import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/cmd0x352/cmd0x352.pb.go b/client/pb/cmd0x352/cmd0x352.pb.go index 584505a6..74a9e2bf 100644 --- a/client/pb/cmd0x352/cmd0x352.pb.go +++ b/client/pb/cmd0x352/cmd0x352.pb.go @@ -7,11 +7,12 @@ package cmd0x352 import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/cmd0x6ff/subcmd0x501.pb.go b/client/pb/cmd0x6ff/subcmd0x501.pb.go index ed46cfe6..e1c19a6f 100644 --- a/client/pb/cmd0x6ff/subcmd0x501.pb.go +++ b/client/pb/cmd0x6ff/subcmd0x501.pb.go @@ -7,11 +7,12 @@ package cmd0x6ff import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/data.pb.go b/client/pb/data.pb.go index b5d61da4..6a31f15e 100644 --- a/client/pb/data.pb.go +++ b/client/pb/data.pb.go @@ -7,11 +7,12 @@ package pb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/exciting/group.pb.go b/client/pb/exciting/group.pb.go index 45bb466e..7abe1846 100644 --- a/client/pb/exciting/group.pb.go +++ b/client/pb/exciting/group.pb.go @@ -7,11 +7,12 @@ package exciting import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/longmsg/longmsg.pb.go b/client/pb/longmsg/longmsg.pb.go index 05a90664..2ab2a8a0 100644 --- a/client/pb/longmsg/longmsg.pb.go +++ b/client/pb/longmsg/longmsg.pb.go @@ -7,11 +7,12 @@ package longmsg import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/msf/register_proxy.pb.go b/client/pb/msf/register_proxy.pb.go index daef5d70..65449ea8 100644 --- a/client/pb/msf/register_proxy.pb.go +++ b/client/pb/msf/register_proxy.pb.go @@ -7,11 +7,12 @@ package msf import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/msg/msg.pb.go b/client/pb/msg/msg.pb.go index d2e0aed4..56927931 100644 --- a/client/pb/msg/msg.pb.go +++ b/client/pb/msg/msg.pb.go @@ -7,11 +7,12 @@ package msg import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/msg/objmsg.pb.go b/client/pb/msg/objmsg.pb.go index 21701791..2d6c6fec 100644 --- a/client/pb/msg/objmsg.pb.go +++ b/client/pb/msg/objmsg.pb.go @@ -7,11 +7,12 @@ package msg import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/msg/report.pb.go b/client/pb/msg/report.pb.go index 619ba1b2..3fcd5456 100644 --- a/client/pb/msg/report.pb.go +++ b/client/pb/msg/report.pb.go @@ -7,11 +7,12 @@ package msg import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/multimsg/multimsg.pb.go b/client/pb/multimsg/multimsg.pb.go index 8f9a955a..edc64fb4 100644 --- a/client/pb/multimsg/multimsg.pb.go +++ b/client/pb/multimsg/multimsg.pb.go @@ -7,11 +7,12 @@ package multimsg import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/notify/group0x857.pb.go b/client/pb/notify/group0x857.pb.go index 31f5c040..fb23b0d8 100644 --- a/client/pb/notify/group0x857.pb.go +++ b/client/pb/notify/group0x857.pb.go @@ -7,11 +7,12 @@ package notify import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/oidb/oidb.pb.go b/client/pb/oidb/oidb.pb.go index b0e615cd..1a128152 100644 --- a/client/pb/oidb/oidb.pb.go +++ b/client/pb/oidb/oidb.pb.go @@ -7,11 +7,12 @@ package oidb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/oidb/oidb0x5eb.pb.go b/client/pb/oidb/oidb0x5eb.pb.go index fca9ee68..164e18de 100644 --- a/client/pb/oidb/oidb0x5eb.pb.go +++ b/client/pb/oidb/oidb0x5eb.pb.go @@ -7,11 +7,12 @@ package oidb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/oidb/oidb0x6d6.pb.go b/client/pb/oidb/oidb0x6d6.pb.go index 7584e4b1..4ec9594b 100644 --- a/client/pb/oidb/oidb0x6d6.pb.go +++ b/client/pb/oidb/oidb0x6d6.pb.go @@ -7,11 +7,12 @@ package oidb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/oidb/oidb0x6d8.pb.go b/client/pb/oidb/oidb0x6d8.pb.go index cdecb2ec..3cf3db7f 100644 --- a/client/pb/oidb/oidb0x6d8.pb.go +++ b/client/pb/oidb/oidb0x6d8.pb.go @@ -7,11 +7,12 @@ package oidb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/oidb/oidb0x6d9.pb.go b/client/pb/oidb/oidb0x6d9.pb.go index 335e2431..fd137db5 100644 --- a/client/pb/oidb/oidb0x6d9.pb.go +++ b/client/pb/oidb/oidb0x6d9.pb.go @@ -7,11 +7,12 @@ package oidb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/oidb/oidb0x769.pb.go b/client/pb/oidb/oidb0x769.pb.go index 1f3d00b7..a35daedd 100644 --- a/client/pb/oidb/oidb0x769.pb.go +++ b/client/pb/oidb/oidb0x769.pb.go @@ -7,11 +7,12 @@ package oidb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/oidb/oidb0x88d.pb.go b/client/pb/oidb/oidb0x88d.pb.go index dbddddb3..25dd5c3c 100644 --- a/client/pb/oidb/oidb0x88d.pb.go +++ b/client/pb/oidb/oidb0x88d.pb.go @@ -7,11 +7,12 @@ package oidb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/oidb/oidb0x8a7.pb.go b/client/pb/oidb/oidb0x8a7.pb.go index fd64ad78..8c5e0a69 100644 --- a/client/pb/oidb/oidb0x8a7.pb.go +++ b/client/pb/oidb/oidb0x8a7.pb.go @@ -7,11 +7,12 @@ package oidb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/oidb/oidb0x8fc.pb.go b/client/pb/oidb/oidb0x8fc.pb.go index 25f06963..fb4c6662 100644 --- a/client/pb/oidb/oidb0x8fc.pb.go +++ b/client/pb/oidb/oidb0x8fc.pb.go @@ -7,11 +7,12 @@ package oidb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/oidb/oidb0x990.pb.go b/client/pb/oidb/oidb0x990.pb.go index 2ab01935..b550336e 100644 --- a/client/pb/oidb/oidb0x990.pb.go +++ b/client/pb/oidb/oidb0x990.pb.go @@ -7,11 +7,12 @@ package oidb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/oidb/oidb0xb77.pb.go b/client/pb/oidb/oidb0xb77.pb.go index 3dcc9954..c283333a 100644 --- a/client/pb/oidb/oidb0xb77.pb.go +++ b/client/pb/oidb/oidb0xb77.pb.go @@ -7,11 +7,12 @@ package oidb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/oidb/oidb0xbcb.pb.go b/client/pb/oidb/oidb0xbcb.pb.go index 5d564274..27b73dbf 100644 --- a/client/pb/oidb/oidb0xbcb.pb.go +++ b/client/pb/oidb/oidb0xbcb.pb.go @@ -7,11 +7,12 @@ package oidb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/oidb/oidb0xd79.pb.go b/client/pb/oidb/oidb0xd79.pb.go index 4c6dab9c..950c5b00 100644 --- a/client/pb/oidb/oidb0xd79.pb.go +++ b/client/pb/oidb/oidb0xd79.pb.go @@ -7,11 +7,12 @@ package oidb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/oidb/oidb0xdad.pb.go b/client/pb/oidb/oidb0xdad.pb.go index 7f91cb3e..eea3242b 100644 --- a/client/pb/oidb/oidb0xdad.pb.go +++ b/client/pb/oidb/oidb0xdad.pb.go @@ -7,11 +7,12 @@ package oidb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/oidb/oidb0xe07.pb.go b/client/pb/oidb/oidb0xe07.pb.go index 6adca386..24c61c05 100644 --- a/client/pb/oidb/oidb0xe07.pb.go +++ b/client/pb/oidb/oidb0xe07.pb.go @@ -7,11 +7,12 @@ package oidb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/oidb/oidb0xe5b.pb.go b/client/pb/oidb/oidb0xe5b.pb.go index 95df9753..6872529c 100644 --- a/client/pb/oidb/oidb0xe5b.pb.go +++ b/client/pb/oidb/oidb0xe5b.pb.go @@ -7,11 +7,12 @@ package oidb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/oidb/oidb0xeac.pb.go b/client/pb/oidb/oidb0xeac.pb.go index 7e64f35a..0dc7b658 100644 --- a/client/pb/oidb/oidb0xeac.pb.go +++ b/client/pb/oidb/oidb0xeac.pb.go @@ -7,11 +7,12 @@ package oidb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/oidb/oidb0xec4.pb.go b/client/pb/oidb/oidb0xec4.pb.go index 662ead30..2ac57855 100644 --- a/client/pb/oidb/oidb0xec4.pb.go +++ b/client/pb/oidb/oidb0xec4.pb.go @@ -7,11 +7,12 @@ package oidb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/profilecard/accountsearch.pb.go b/client/pb/profilecard/accountsearch.pb.go index bd2bb025..eebb109f 100644 --- a/client/pb/profilecard/accountsearch.pb.go +++ b/client/pb/profilecard/accountsearch.pb.go @@ -7,11 +7,12 @@ package profilecard import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/profilecard/busi.pb.go b/client/pb/profilecard/busi.pb.go index d14ce1c3..dac3a9e2 100644 --- a/client/pb/profilecard/busi.pb.go +++ b/client/pb/profilecard/busi.pb.go @@ -7,11 +7,12 @@ package profilecard import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/profilecard/gate.pb.go b/client/pb/profilecard/gate.pb.go index 0b57da2e..b00f56d2 100644 --- a/client/pb/profilecard/gate.pb.go +++ b/client/pb/profilecard/gate.pb.go @@ -7,11 +7,12 @@ package profilecard import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/pttcenter/shortvideo.pb.go b/client/pb/pttcenter/shortvideo.pb.go index 912bca96..9ba6c313 100644 --- a/client/pb/pttcenter/shortvideo.pb.go +++ b/client/pb/pttcenter/shortvideo.pb.go @@ -7,11 +7,12 @@ package pttcenter import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/qweb/app.pb.go b/client/pb/qweb/app.pb.go index c08065cc..9cc00aff 100644 --- a/client/pb/qweb/app.pb.go +++ b/client/pb/qweb/app.pb.go @@ -7,11 +7,12 @@ package qweb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/qweb/protocol.pb.go b/client/pb/qweb/protocol.pb.go index c1e16b23..371656ab 100644 --- a/client/pb/qweb/protocol.pb.go +++ b/client/pb/qweb/protocol.pb.go @@ -7,11 +7,12 @@ package qweb import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/richmedia/tts.pb.go b/client/pb/richmedia/tts.pb.go index d4a10880..d4d62097 100644 --- a/client/pb/richmedia/tts.pb.go +++ b/client/pb/richmedia/tts.pb.go @@ -7,11 +7,12 @@ package richmedia import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/pb/structmsg/structmsg.pb.go b/client/pb/structmsg/structmsg.pb.go index 47700777..5d7bcc11 100644 --- a/client/pb/structmsg/structmsg.pb.go +++ b/client/pb/structmsg/structmsg.pb.go @@ -7,11 +7,12 @@ package structmsg import ( + reflect "reflect" + sync "sync" + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/client/private_msg.go b/client/private_msg.go index b14e6188..d39f6154 100644 --- a/client/private_msg.go +++ b/client/private_msg.go @@ -1,12 +1,13 @@ package client import ( + "math/rand" + "time" + "github.com/Mrs4s/MiraiGo/client/pb/msg" "github.com/Mrs4s/MiraiGo/message" "github.com/Mrs4s/MiraiGo/protocol/packets" "github.com/golang/protobuf/proto" - "math/rand" - "time" ) func (c *QQClient) SendPrivateMessage(target int64, m *message.SendingMessage) *message.PrivateMessage { diff --git a/client/ptt.go b/client/ptt.go index bfbd46f2..ca2fc950 100644 --- a/client/ptt.go +++ b/client/ptt.go @@ -3,6 +3,9 @@ package client import ( "crypto/md5" "encoding/hex" + "io" + "os" + "github.com/Mrs4s/MiraiGo/binary" "github.com/Mrs4s/MiraiGo/client/pb" "github.com/Mrs4s/MiraiGo/client/pb/cmd0x346" @@ -13,8 +16,6 @@ import ( "github.com/Mrs4s/MiraiGo/utils" "github.com/pkg/errors" "google.golang.org/protobuf/proto" - "io" - "os" ) func init() { diff --git a/client/sync.go b/client/sync.go index cca24d0a..ba2eb8be 100644 --- a/client/sync.go +++ b/client/sync.go @@ -2,6 +2,11 @@ package client import ( "fmt" + "math/rand" + "sync" + "sync/atomic" + "time" + "github.com/Mrs4s/MiraiGo/binary/jce" "github.com/Mrs4s/MiraiGo/client/pb" "github.com/Mrs4s/MiraiGo/client/pb/msf" @@ -11,10 +16,6 @@ import ( "github.com/Mrs4s/MiraiGo/protocol/packets" "github.com/golang/protobuf/proto" "github.com/pkg/errors" - "math/rand" - "sync" - "sync/atomic" - "time" ) func init() { diff --git a/message/pack.go b/message/pack.go index e6eff6fe..2450cddf 100644 --- a/message/pack.go +++ b/message/pack.go @@ -2,6 +2,7 @@ package message import ( "encoding/hex" + "github.com/Mrs4s/MiraiGo/binary" "github.com/Mrs4s/MiraiGo/client/pb/msg" "github.com/golang/protobuf/proto" diff --git a/protocol/crypto/crypto.go b/protocol/crypto/crypto.go index e2964ebd..27d58075 100644 --- a/protocol/crypto/crypto.go +++ b/protocol/crypto/crypto.go @@ -4,8 +4,9 @@ import ( "crypto/elliptic" "crypto/md5" "crypto/rand" - "github.com/Mrs4s/MiraiGo/binary" "math/big" + + "github.com/Mrs4s/MiraiGo/binary" ) type EncryptECDH struct { diff --git a/protocol/packets/builders.go b/protocol/packets/builders.go index 3e4c8e36..20f8d2cc 100644 --- a/protocol/packets/builders.go +++ b/protocol/packets/builders.go @@ -1,8 +1,9 @@ package packets import ( - "github.com/Mrs4s/MiraiGo/binary" "strconv" + + "github.com/Mrs4s/MiraiGo/binary" ) func BuildLoginPacket(uin int64, bodyType byte, key, body, extraData []byte) []byte { diff --git a/protocol/tlv/t1.go b/protocol/tlv/t1.go index 3e8875d2..ef50a85e 100644 --- a/protocol/tlv/t1.go +++ b/protocol/tlv/t1.go @@ -1,9 +1,10 @@ package tlv import ( - "github.com/Mrs4s/MiraiGo/binary" "math/rand" "time" + + "github.com/Mrs4s/MiraiGo/binary" ) func T1(uin uint32, ip []byte) []byte { diff --git a/protocol/tlv/t106.go b/protocol/tlv/t106.go index 699f166b..ee66bd7a 100644 --- a/protocol/tlv/t106.go +++ b/protocol/tlv/t106.go @@ -3,10 +3,11 @@ package tlv import ( "crypto/md5" binary2 "encoding/binary" - "github.com/Mrs4s/MiraiGo/binary" "math/rand" "strconv" "time" + + "github.com/Mrs4s/MiraiGo/binary" ) func T106(uin, salt, appId, ssoVer uint32, passwordMd5 [16]byte, guidAvailable bool, guid, tgtgtKey []byte, wtf uint32) []byte { diff --git a/protocol/tlv/t109.go b/protocol/tlv/t109.go index 1f6635f6..aa9f4900 100644 --- a/protocol/tlv/t109.go +++ b/protocol/tlv/t109.go @@ -2,6 +2,7 @@ package tlv import ( "crypto/md5" + "github.com/Mrs4s/MiraiGo/binary" ) diff --git a/protocol/tlv/t187.go b/protocol/tlv/t187.go index f6cce89c..654b0378 100644 --- a/protocol/tlv/t187.go +++ b/protocol/tlv/t187.go @@ -2,6 +2,7 @@ package tlv import ( "crypto/md5" + "github.com/Mrs4s/MiraiGo/binary" ) diff --git a/protocol/tlv/t188.go b/protocol/tlv/t188.go index e089b0a2..e7f8570c 100644 --- a/protocol/tlv/t188.go +++ b/protocol/tlv/t188.go @@ -2,6 +2,7 @@ package tlv import ( "crypto/md5" + "github.com/Mrs4s/MiraiGo/binary" ) diff --git a/protocol/tlv/t400.go b/protocol/tlv/t400.go index c008e730..84784959 100644 --- a/protocol/tlv/t400.go +++ b/protocol/tlv/t400.go @@ -1,8 +1,9 @@ package tlv import ( - "github.com/Mrs4s/MiraiGo/binary" "time" + + "github.com/Mrs4s/MiraiGo/binary" ) func T400(g []byte, uin int64, guid, dpwd []byte, j2, j3 int64, randSeed []byte) []byte { diff --git a/protocol/tlv/t511.go b/protocol/tlv/t511.go index df0ccdff..0cc07a9d 100644 --- a/protocol/tlv/t511.go +++ b/protocol/tlv/t511.go @@ -1,9 +1,10 @@ package tlv import ( - "github.com/Mrs4s/MiraiGo/binary" "strconv" "strings" + + "github.com/Mrs4s/MiraiGo/binary" ) func T511(domains []string) []byte {