|
@@ -1697,25 +1697,25 @@ func vipFastSubscribe(user *map[string]interface{}, keyWord, openId, m string) (
|
|
}
|
|
}
|
|
if len(keysFilter) == 0 {
|
|
if len(keysFilter) == 0 {
|
|
// log.Println("已经订阅过此关键词-----")
|
|
// log.Println("已经订阅过此关键词-----")
|
|
- return -2, strings.Replace(keyWord, "+", " ", -1), hasOldKey
|
|
|
|
|
|
+ return -2, strings.Replace(keyWord, "++", " ", -1), hasOldKey
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if keysCount+len(keysFilter) > 300 {
|
|
if keysCount+len(keysFilter) > 300 {
|
|
//vip订阅超过300组关键词
|
|
//vip订阅超过300组关键词
|
|
// log.Println("vip订阅超过300组关键词-----")
|
|
// log.Println("vip订阅超过300组关键词-----")
|
|
- return -3, strings.Replace(keyWord, "+", " ", -1), hasOldKey
|
|
|
|
|
|
+ return -3, strings.Replace(keyWord, "++", " ", -1), hasOldKey
|
|
}
|
|
}
|
|
}
|
|
}
|
|
var a_key []map[string]interface{}
|
|
var a_key []map[string]interface{}
|
|
classify_name := "未分类"
|
|
classify_name := "未分类"
|
|
if m == "1" {
|
|
if m == "1" {
|
|
for _, v := range keysFilter {
|
|
for _, v := range keysFilter {
|
|
- tmp := map[string]interface{}{"key": strings.Split(v, "+")}
|
|
|
|
|
|
+ tmp := map[string]interface{}{"key": strings.Split(v, "++")}
|
|
a_key = append(a_key, tmp)
|
|
a_key = append(a_key, tmp)
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
a_key = append(a_key, map[string]interface{}{
|
|
a_key = append(a_key, map[string]interface{}{
|
|
- "key": strings.Split(keyWord, "+"),
|
|
|
|
|
|
+ "key": strings.Split(keyWord, "++"),
|
|
})
|
|
})
|
|
}
|
|
}
|
|
if len(a_key) > 0 {
|
|
if len(a_key) > 0 {
|
|
@@ -1732,7 +1732,7 @@ func vipFastSubscribe(user *map[string]interface{}, keyWord, openId, m string) (
|
|
}, false, false)
|
|
}, false, false)
|
|
}
|
|
}
|
|
if flag {
|
|
if flag {
|
|
- return 1, strings.Replace(keyWord, "+", " ", -1), hasOldKey
|
|
|
|
|
|
+ return 1, strings.Replace(keyWord, "++", " ", -1), hasOldKey
|
|
}
|
|
}
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -1745,7 +1745,8 @@ func fastSubscribe(content, openId string) (int, string, bool) {
|
|
//content = strings.TrimPrefix(content, "订阅")
|
|
//content = strings.TrimPrefix(content, "订阅")
|
|
//content = strings.TrimSpace(content)
|
|
//content = strings.TrimSpace(content)
|
|
content = regexp.MustCompile("\\s+").ReplaceAllString(content, " ")
|
|
content = regexp.MustCompile("\\s+").ReplaceAllString(content, " ")
|
|
- keyWord := strings.Replace(content, " ", "+", -1)
|
|
|
|
|
|
+ keyWord := strings.Replace(content, " ", "++", -1)
|
|
|
|
+ // keyWord := strings.Replace(content, " ", "+", -1)//dev3.5 互联网+等原因 逻辑调整 +号去掉
|
|
// log.Println(keyWord, ":kwssssssss")
|
|
// log.Println(keyWord, ":kwssssssss")
|
|
o_jy, _ := (*user)["o_jy"].(map[string]interface{})
|
|
o_jy, _ := (*user)["o_jy"].(map[string]interface{})
|
|
i_vip_status := util.IntAll((*user)["i_vip_status"])
|
|
i_vip_status := util.IntAll((*user)["i_vip_status"])
|
|
@@ -1781,7 +1782,7 @@ func fastSubscribe(content, openId string) (int, string, bool) {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
key := map[string][]string{}
|
|
key := map[string][]string{}
|
|
- key["key"] = strings.Split(keyWord, "+")
|
|
|
|
|
|
+ key["key"] = strings.Split(keyWord, "++")
|
|
key["notkey"] = []string{}
|
|
key["notkey"] = []string{}
|
|
key["infotype"] = []string{}
|
|
key["infotype"] = []string{}
|
|
key["area"] = []string{}
|
|
key["area"] = []string{}
|