diff --git a/models/asset.go b/models/asset.go index 6cbc299..dab9d02 100644 --- a/models/asset.go +++ b/models/asset.go @@ -39,12 +39,24 @@ var Int = func(s string) int { func DailyAssetsPush() { for _, ck := range GetJdCookies() { - msg := ck.Query() - if ck.QQ != 0 && Config.QQID != 0 && SendQQ != nil { - SendQQ(int64(ck.QQ), msg) - } - if ck.PushPlus != "" { - pushPlus(ck.PushPlus, msg) + if (ck.QQ != 0 && Config.QQID != 0 && SendQQ != nil) || ck.PushPlus != "" { + msg := "" + for _, task := range Config.Tasks { + if task.Word == "查询" { + task.Envs = []Env{{ + Name: "pins", + Value: ck.PtPin, + }} + msg = runTask(&task, true) + break + } + } + if ck.QQ != 0 && Config.QQID != 0 && SendQQ != nil { + SendQQ(int64(ck.QQ), msg) + } + if ck.PushPlus != "" { + pushPlus(ck.PushPlus, msg) + } } } } diff --git a/models/task.go b/models/task.go index b86ee6d..4cd95c1 100644 --- a/models/task.go +++ b/models/task.go @@ -34,7 +34,9 @@ type Env struct { func initTask() { for i := range Config.Tasks { - createTask(&Config.Tasks[i]) + if Config.Tasks[i].Cron != "" { + createTask(&Config.Tasks[i]) + } } } @@ -50,14 +52,14 @@ func createTask(task *Task) { } } -func runTask(task *Task, msgs ...interface{}) { +func runTask(task *Task, msgs ...interface{}) string { msg := "" if task.Name == "" { slice := strings.Split(task.Path, "/") len := len(slice) if len == 0 { logs.Warn("取法识别的文件名") - return + return "" } task.Name = slice[len-1] } @@ -95,14 +97,14 @@ func runTask(task *Task, msgs ...interface{}) { stdout, err := cmd.StdoutPipe() if err != nil { logs.Warn("cmd.StdoutPipe: ", err) - return + return "" } cmd.Dir = ExecPath + "/scripts/" cmd.Stderr = os.Stderr err = cmd.Start() if err != nil { logs.Warn("%v", err) - return + return "" } reader := bufio.NewReader(stdout) for { @@ -120,5 +122,5 @@ func runTask(task *Task, msgs ...interface{}) { sendAdminMessagee(msg, msgs...) } err = cmd.Wait() - return + return msg }