shkong/go-cqhttp
1
0
Fork 0
mirror of https://github.com/Mrs4s/go-cqhttp.git synced 2025-05-05 03:23:49 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Mrs4s 2021-02-02 07:12:59 +08:00
commit 01dca0305c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main.go
View File

@ -40,6 +40,7 @@ import (
var json = jsoniter.ConfigCompatibleWithStandardLibrary var json = jsoniter.ConfigCompatibleWithStandardLibrary
var conf *global.JSONConfig var conf *global.JSONConfig
var isFastStart = false
func init() { func init() {
if global.PathExists("cqhttp.json") { if global.PathExists("cqhttp.json") {
@ -119,7 +120,6 @@ func init() {
func main() { func main() {
var byteKey []byte var byteKey []byte
var isFastStart = false
arg := os.Args arg := os.Args
if len(arg) > 1 { if len(arg) > 1 {
for i := range arg { for i := range arg {
@ -143,7 +143,9 @@ func main() {
if conf.Uin == 0 || (conf.Password == "" && conf.PasswordEncrypted == "") { if conf.Uin == 0 || (conf.Password == "" && conf.PasswordEncrypted == "") {
log.Warnf("请修改 config.hjson 以添加账号密码.") log.Warnf("请修改 config.hjson 以添加账号密码.")
time.Sleep(time.Second * 5) if (!isFastStart) {
time.Sleep(time.Second * 5)
}
return return
} }
@ -507,7 +509,9 @@ func getConfig() *global.JSONConfig {
return nil return nil
} }
log.Infof("默认配置文件已生成, 请编辑 config.hjson 后重启程序.") log.Infof("默认配置文件已生成, 请编辑 config.hjson 后重启程序.")
time.Sleep(time.Second * 5) if (!isFastStart) {
time.Sleep(time.Second * 5)
}
return nil return nil
} }
return conf return conf