mirror of
https://github.com/Mrs4s/go-cqhttp.git
synced 2025-05-04 19:17:37 +08:00
Merge branch 'master' into dev
This commit is contained in:
commit
01dca0305c
10
main.go
10
main.go
@ -40,6 +40,7 @@ import (
|
||||
|
||||
var json = jsoniter.ConfigCompatibleWithStandardLibrary
|
||||
var conf *global.JSONConfig
|
||||
var isFastStart = false
|
||||
|
||||
func init() {
|
||||
if global.PathExists("cqhttp.json") {
|
||||
@ -119,7 +120,6 @@ func init() {
|
||||
func main() {
|
||||
|
||||
var byteKey []byte
|
||||
var isFastStart = false
|
||||
arg := os.Args
|
||||
if len(arg) > 1 {
|
||||
for i := range arg {
|
||||
@ -143,7 +143,9 @@ func main() {
|
||||
|
||||
if conf.Uin == 0 || (conf.Password == "" && conf.PasswordEncrypted == "") {
|
||||
log.Warnf("请修改 config.hjson 以添加账号密码.")
|
||||
time.Sleep(time.Second * 5)
|
||||
if (!isFastStart) {
|
||||
time.Sleep(time.Second * 5)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
@ -507,7 +509,9 @@ func getConfig() *global.JSONConfig {
|
||||
return nil
|
||||
}
|
||||
log.Infof("默认配置文件已生成, 请编辑 config.hjson 后重启程序.")
|
||||
time.Sleep(time.Second * 5)
|
||||
if (!isFastStart) {
|
||||
time.Sleep(time.Second * 5)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
return conf
|
||||
|
Loading…
x
Reference in New Issue
Block a user