Merge branch 'refs/heads/feat-sync-secret' into release

proto/conf.go

@@ -128,7 +128,13 @@ func ReadConfig(path string) error {
 		}
 		defer file.Close()
 		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 {
 			fmt.Println("Error encoding config")
 		}

service/shellService.go

@@ -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}) //执行成功
+			resp = append(resp, proto.UpdateShellReq{ID: v.ID, Server: v.Server, Status: 2, ShellResult: res, ShellRuntime: shellRuntime}) //执行成功
 		}
 	}
 	if len(resp) == 0 {

service/toolService.go

@@ -220,7 +220,6 @@ func SyncTokenSecretFromUserCenter() {
 
 	if secretSettings.Next == "" {
 		log.Println("SyncTokenSecretFromUserCenter secret is empty")
-		return
 	} else if proto.SyncSecretReqLog%100 == 0 {
 		go SetNextSecretToCurrent(*secretSettings) //异步设置下一个密钥为当前密钥
 	}