From 9f03736f7cab8e2865e7fdb6d2b9647a762ad811 Mon Sep 17 00:00:00 2001
From: cdle <798731886@qq.com>
Date: Tue, 17 Aug 2021 15:35:21 +0800
Subject: [PATCH] x

---
 models/bot.go    | 31 +++++++++++++++++++++++++++----
 models/handle.go |  2 +-
 models/task.go   |  2 +-
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/models/bot.go b/models/bot.go
index a7a9930..3b62778 100644
--- a/models/bot.go
+++ b/models/bot.go
@@ -167,11 +167,11 @@ var handleMessage = func(msgs ...interface{}) interface{} {
 		for _, ck := range cks {
 			if tp == "qq" {
 				if ck.QQ == id {
-					pins += ck.PtPin
+					pins += "&" + ck.PtPin
 				}
 			} else if tp == "qqg" {
 				if ck.QQ == msgs[3].(int) {
-					pins += ck.PtPin
+					pins += "&" + ck.PtPin
 				}
 			}
 		}
@@ -249,17 +249,40 @@ var handleMessage = func(msgs ...interface{}) interface{} {
 					}
 					cks := GetJdCookies()
 					a := s[2]
+					pins := ""
+					{
+						if s := strings.Split(a, "-"); len(s) == 2 {
+							for i, ck := range cks {
+								if i+1 >= Int(s[0]) && i+1 <= Int(s[1]) {
+									pins += "&" + ck.PtPin
+								}
+							}
+						}
+					}
+					{
+						if x := regexp.MustCompile(`^[\s\d,]+$`).FindString(a); x != "" {
+							xx := regexp.MustCompile(`(\d+)`).FindAllStringSubmatch(a, -1)
+							for i, ck := range cks {
+								for _, x := range xx {
+									if fmt.Sprint(i+1) == x[1] {
+										pins += "&" + ck.PtPin
+									}
+								}
+
+							}
+						}
+					}
 					{
 						a = strings.Replace(a, " ", "", -1)
-						pins := ""
 						for _, ck := range cks {
 							if strings.Contains(ck.Note, a) || strings.Contains(ck.Nickname, a) || strings.Contains(ck.PtPin, a) {
-								pins += ck.PtPin
+								pins += "&" + ck.PtPin
 							}
 						}
 						if pins == "" {
 							return "找不到匹配的账号"
 						}
+						fmt.Println(pins)
 						for _, task := range Config.Tasks {
 							if task.Word == "查询" {
 								task.Envs = []Env{{
diff --git a/models/handle.go b/models/handle.go
index 99f83ac..024cbf7 100644
--- a/models/handle.go
+++ b/models/handle.go
@@ -50,7 +50,7 @@ if(pins){
 	for (var key in cookies) {
 	    c = false
 	    for (var pin of pins) {
-		   if (cookies[key].indexOf(pin) != -1) {
+		   if (pin && cookies[key].indexOf(pin) != -1) {
 			  c = true
 			  break
 		   }
diff --git a/models/task.go b/models/task.go
index 5113852..815d4f5 100644
--- a/models/task.go
+++ b/models/task.go
@@ -111,7 +111,7 @@ func runTask(task *Task, msgs ...interface{}) string {
 	}
 	envs := ""
 	for _, env := range task.Envs {
-		envs += fmt.Sprintf("export %s=%s", env.Name, env.Value)
+		envs += fmt.Sprintf("export %s=\"%s\"", env.Name, env.Value)
 	}
 	sh := fmt.Sprintf(`
 %s