This commit is contained in:
cdle 2021-08-17 13:52:21 +08:00
parent 59edf4a728
commit 32cd88f9af
2 changed files with 26 additions and 12 deletions

View File

@ -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)
}
}
}
}

View File

@ -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
}