update init device

Author: lz1998

go.mod

@@ -3,7 +3,7 @@ module github.com/ProtobufBot/Go-Mirai-Client
 go 1.15
 
 require (
-	github.com/Mrs4s/MiraiGo v0.0.0-20210130140601-bebbc838c8bd
+	github.com/Mrs4s/MiraiGo v0.0.0-20210130224430-cad8dcb736b4
 	github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72
 	github.com/gin-gonic/gin v1.6.3
 	github.com/go-playground/validator/v10 v10.4.1 // indirect

go.sum

@@ -2,6 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Mrs4s/MiraiGo v0.0.0-20210130140601-bebbc838c8bd h1:iOv3KAtOOFPm6vx31yu1aPplBNmb00i5E0aKaOEkP+I=
 github.com/Mrs4s/MiraiGo v0.0.0-20210130140601-bebbc838c8bd/go.mod h1:yhqA0NyKxUf7I/0HR/1OMchveFggX8wde04gqdGrNfU=
+github.com/Mrs4s/MiraiGo v0.0.0-20210130224430-cad8dcb736b4 h1:3Y+C3EGDci0BcWx6xLqQ7L+KZdCGz066NVELl1KJNuY=
+github.com/Mrs4s/MiraiGo v0.0.0-20210130224430-cad8dcb736b4/go.mod h1:yhqA0NyKxUf7I/0HR/1OMchveFggX8wde04gqdGrNfU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

service/bot/bot.go

@@ -2,11 +2,11 @@ package bot
 
 import (
 	"fmt"
+	"github.com/Mrs4s/MiraiGo/utils"
 	"io/ioutil"
 	"time"
 
 	"github.com/Mrs4s/MiraiGo/client"
-	"github.com/Mrs4s/MiraiGo/utils"
 	"github.com/ProtobufBot/Go-Mirai-Client/pkg/util"
 	"github.com/fanliao/go-promise"
 	log "github.com/sirupsen/logrus"
@@ -15,26 +15,31 @@ import (
 var Cli *client.QQClient
 
 func InitDevice(path string) {
-	if !util.PathExists(path) {
-		log.Warn("虚拟设备信息不存在, 将自动生成随机设备.")
-		client.GenRandomDevice()
-		client.SystemDeviceInfo.Display = []byte("GMC." + utils.RandomStringRange(6, "0123456789") + ".001")
-		client.SystemDeviceInfo.FingerPrint = []byte("pbbot/gmc/gmc:10/PBBOT.200324.001/" + utils.RandomStringRange(7, "0123456789") + ":user/release-keys")
-		client.SystemDeviceInfo.ProcVersion = []byte("Linux 5.4.0-54-generic" + utils.RandomString(8) + " ([email protected])")
-		client.SystemDeviceInfo.AndroidId = client.SystemDeviceInfo.Display
-		client.SystemDeviceInfo.Device = []byte("gmc")
-		client.SystemDeviceInfo.Board = []byte("gmc")
-		client.SystemDeviceInfo.Model = []byte("gmc")
-		client.SystemDeviceInfo.Brand = []byte("pbbot")
-		client.SystemDeviceInfo.Product = []byte("gmc")
-		client.SystemDeviceInfo.Protocol = client.IPad
-		_ = ioutil.WriteFile(path, client.SystemDeviceInfo.ToJson(), 0644)
-		log.Infof("已生成设备信息并保存到 %s 文件.", path)
-	}
-	log.Infof("将使用 %s 内的设备信息运行", path)
+	log.Info("生成随机设备信息")
+	client.GenRandomDevice()
+	client.SystemDeviceInfo.Display = []byte("GMC." + utils.RandomStringRange(6, "0123456789") + ".001")
+	client.SystemDeviceInfo.FingerPrint = []byte("pbbot/gmc/gmc:10/PBBOT.200324.001/" + utils.RandomStringRange(7, "0123456789") + ":user/release-keys")
+	client.SystemDeviceInfo.ProcVersion = []byte("Linux 5.4.0-54-generic" + utils.RandomString(8) + " ([email protected])")
+	client.SystemDeviceInfo.AndroidId = client.SystemDeviceInfo.Display
+	client.SystemDeviceInfo.Device = []byte("gmc")
+	client.SystemDeviceInfo.Board = []byte("gmc")
+	client.SystemDeviceInfo.Model = []byte("gmc")
+	client.SystemDeviceInfo.Brand = []byte("pbbot")
+	client.SystemDeviceInfo.Product = []byte("gmc")
+	client.SystemDeviceInfo.Protocol = client.IPad
 	client.SystemDeviceInfo.IpAddress = []byte{192, 168, 31, 101}
-	if err := client.SystemDeviceInfo.ReadJson([]byte(util.ReadAllText(path))); err != nil {
-		util.FatalError(fmt.Errorf("failed to load device info, err: %+v", err))
+
+	if util.PathExists(path) {
+		log.Infof("使用 %s 内的设备信息覆盖随机设备信息", path)
+		if err := client.SystemDeviceInfo.ReadJson([]byte(util.ReadAllText(path))); err != nil {
+			util.FatalError(fmt.Errorf("failed to load device info, err: %+v", err))
+		}
+	}
+
+	log.Infof("保存设备信息到文件 %s", path)
+	err := ioutil.WriteFile(path, client.SystemDeviceInfo.ToJson(), 0644)
+	if err != nil {
+		log.Warnf("写设备信息文件 %s 失败", path)
 	}
 }