ljydlv
/
videoplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/feat-cmd' into release

This commit is contained in:
junleea 2025-03-05 19:33:15 +08:00
parent 32bf491219 e9fd3b346d
commit ac3f88c8ce
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
service/shellService.go
View File

@ -57,10 +57,13 @@ func ShellWillRunFromServer() {
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})
} }
} }
if len(resp) == 0 {
return
}
//返回执行结果 //返回执行结果
url := "https://" + proto.Config.MASTER_SERVER_DOMAIN + "/shell/update" url := "https://" + proto.Config.MASTER_SERVER_DOMAIN + "/shell/update"
var req proto.SyncUserShellResp var req proto.SyncUserShellResp
req.Token = worker.GetRedisSetMembers("super_permission_tokens")[0] req.Token = worker.GetRedisSetMembers("super_permission_tokens?super_id=1")[0]
req.Shells = resp req.Shells = resp
resp_data, err := worker.SyncDataFromMasterShellReq3(url, req) resp_data, err := worker.SyncDataFromMasterShellReq3(url, req)
if err != nil { if err != nil {
@ -78,7 +81,7 @@ func ShellWillRunFromServer() {
func GetShellWillRunFromMaster(server string) ([]dao.Shell, error) { func GetShellWillRunFromMaster(server string) ([]dao.Shell, error) {
master := proto.Config.MASTER_SERVER_DOMAIN master := proto.Config.MASTER_SERVER_DOMAIN
//发起请求获取待执行的shell //发起请求获取待执行的shell
url := "https://" + master + "/shell/server_will_run_list" url := "https://" + master + "/shell/server_will_run_list?super_id=1"
var req proto.SyncUserShellReq var req proto.SyncUserShellReq
req.Server = server req.Server = server
req.Token = worker.GetRedisSetMembers("super_permission_tokens")[0] req.Token = worker.GetRedisSetMembers("super_permission_tokens")[0]