Merge branch 'refs/heads/feat-sync-secret' into release
This commit is contained in:
commit
0c6143086d
|
|
@ -128,7 +128,13 @@ func ReadConfig(path string) error {
|
||||||
}
|
}
|
||||||
defer file.Close()
|
defer file.Close()
|
||||||
encoder := json.NewEncoder(file)
|
encoder := json.NewEncoder(file)
|
||||||
err = encoder.Encode(&Config)
|
|
||||||
|
configData, err2 := json.MarshalIndent(Config, "", " ")
|
||||||
|
if err2 != nil {
|
||||||
|
log.Println("WriteConfigToFile json marshal error:", err)
|
||||||
|
return err2
|
||||||
|
}
|
||||||
|
err = encoder.Encode(string(configData))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println("Error encoding config")
|
fmt.Println("Error encoding config")
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -220,7 +220,6 @@ func SyncTokenSecretFromUserCenter() {
|
||||||
|
|
||||||
if secretSettings.Next == "" {
|
if secretSettings.Next == "" {
|
||||||
log.Println("SyncTokenSecretFromUserCenter secret is empty")
|
log.Println("SyncTokenSecretFromUserCenter secret is empty")
|
||||||
return
|
|
||||||
} else if proto.SyncSecretReqLog%100 == 0 {
|
} else if proto.SyncSecretReqLog%100 == 0 {
|
||||||
go SetNextSecretToCurrent(*secretSettings) //异步设置下一个密钥为当前密钥
|
go SetNextSecretToCurrent(*secretSettings) //异步设置下一个密钥为当前密钥
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue