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

feat: protocol updater supports fallback to ghproxy

Browse Source
This commit is contained in:
Mrs4s 2023-03-17 22:30:13 +08:00
parent 1d0b513b96
commit 3a60e081f2
No known key found for this signature in database
GPG Key ID: 3186E98FA19CE3A7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/gocq/main.go
View File

@ -278,12 +278,15 @@ func LoginInteract() {
} }
if !isTokenLogin { if !isTokenLogin {
if !base.Account.DisableProtocolUpdate { if !base.Account.DisableProtocolUpdate {
log.Infof("正在检查协议更新...")
oldVersionName := device.Protocol.Version().String() oldVersionName := device.Protocol.Version().String()
remoteVersion, err := getRemoteLatestProtocolVersion(int(device.Protocol.Version().Protocol)) remoteVersion, err := getRemoteLatestProtocolVersion(int(device.Protocol.Version().Protocol))
if err == nil { if err == nil {
if err = device.Protocol.Version().UpdateFromJson(remoteVersion); err == nil { if err = device.Protocol.Version().UpdateFromJson(remoteVersion); err == nil {
if device.Protocol.Version().String() != oldVersionName { if device.Protocol.Version().String() != oldVersionName {
log.Infof("已自动更新协议版本: %s -> %s", oldVersionName, device.Protocol.Version().String()) log.Infof("已自动更新协议版本: %s -> %s", oldVersionName, device.Protocol.Version().String())
} else {
log.Infof("协议已经是最新版本")
} }
_ = os.WriteFile(versionFile, remoteVersion, 0o644) _ = os.WriteFile(versionFile, remoteVersion, 0o644)
} }
@ -437,7 +440,6 @@ func newClient() *client.QQClient {
return c return c
} }
// TODO: mirror support
var remoteVersions = map[int]string{ var remoteVersions = map[int]string{
1: "https://raw.githubusercontent.com/RomiChan/protocol-versions/master/android_phone.json", 1: "https://raw.githubusercontent.com/RomiChan/protocol-versions/master/android_phone.json",
6: "https://raw.githubusercontent.com/RomiChan/protocol-versions/master/android_pad.json", 6: "https://raw.githubusercontent.com/RomiChan/protocol-versions/master/android_pad.json",
@ -450,7 +452,7 @@ func getRemoteLatestProtocolVersion(protocolType int) ([]byte, error) {
} }
response, err := download.Request{URL: url}.Bytes() response, err := download.Request{URL: url}.Bytes()
if err != nil { if err != nil {
return nil, err return download.Request{URL: "https://ghproxy.com/" + url}.Bytes()
} }
return response, nil return response, nil
} }