Compare commits
No commits in common. "0c6143086dc716528dfc8e46d511131863d9849d" and "7991fd29607f0da5cd2ddf0b060f70b7ff68454e" have entirely different histories.
0c6143086d
...
7991fd2960
|
|
@ -128,13 +128,7 @@ func ReadConfig(path string) error {
|
|||
}
|
||||
defer file.Close()
|
||||
encoder := json.NewEncoder(file)
|
||||
|
||||
configData, err2 := json.MarshalIndent(Config, "", " ")
|
||||
if err2 != nil {
|
||||
log.Println("WriteConfigToFile json marshal error:", err)
|
||||
return err2
|
||||
}
|
||||
err = encoder.Encode(string(configData))
|
||||
err = encoder.Encode(&Config)
|
||||
if err != nil {
|
||||
fmt.Println("Error encoding config")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ func ShellWillRunFromServer() {
|
|||
if err2 != "" {
|
||||
resp = append(resp, proto.UpdateShellReq{ID: v.ID, Server: v.Server, Status: 3, ShellResult: err2, ShellRuntime: shellRuntime}) //执行出错
|
||||
} else {
|
||||
resp = append(resp, proto.UpdateShellReq{ID: v.ID, Server: v.Server, Status: 2, ShellResult: res, ShellRuntime: shellRuntime}) //执行成功
|
||||
resp = append(resp, proto.UpdateShellReq{ID: v.ID, Server: v.Server, Status: 2, ShellResult: res}) //执行成功
|
||||
}
|
||||
}
|
||||
if len(resp) == 0 {
|
||||
|
|
|
|||
|
|
@ -220,6 +220,7 @@ func SyncTokenSecretFromUserCenter() {
|
|||
|
||||
if secretSettings.Next == "" {
|
||||
log.Println("SyncTokenSecretFromUserCenter secret is empty")
|
||||
return
|
||||
} else if proto.SyncSecretReqLog%100 == 0 {
|
||||
go SetNextSecretToCurrent(*secretSettings) //异步设置下一个密钥为当前密钥
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue