|
@@ -16,8 +16,8 @@ import (
|
|
|
|
|
|
func redisCli() *redis.Client {
|
|
|
client := redis.NewClient(&redis.Options{
|
|
|
- //Addr: coo.RedisHost, // Redis地址
|
|
|
- Addr: "192.168.204.193:6379", // Redis地址
|
|
|
+ Addr: coo.RedisHost, // Redis地址
|
|
|
+ //Addr: "192.168.204.193:6379", // Redis地址
|
|
|
Password: "", // Redis密码,默认为空
|
|
|
DB: 1, // 使用哪个数据库,默认为0
|
|
|
})
|
|
@@ -194,9 +194,9 @@ func GetChannel(assessment ResourceAssessment) ChannelCategory {
|
|
|
func GetChatChannel(chat SemJsChatRecord) ChannelCategory {
|
|
|
log.Printf("%v", chat)
|
|
|
// 获取神策URL(不包含utm)
|
|
|
- //cc, _ := redisCli().Get("website:" + chat.GrUserID).Result()
|
|
|
- //var websiteUrl SensorsData
|
|
|
- //json.Unmarshal([]byte(cc), &websiteUrl)
|
|
|
+ cc, _ := redisCli().Get("website:" + chat.GrUserID).Result()
|
|
|
+ var websiteUrl SensorsData
|
|
|
+ json.Unmarshal([]byte(cc), &websiteUrl)
|
|
|
// 小程序解析
|
|
|
if strings.Contains(chat.ChatURL, "pages") && strings.Split(strings.Split(chat.ChatURL, "?")[1], "=")[0] == "miniapp" && (strings.Contains(chat.ChatURL, "baidu") || strings.Contains(chat.ChatURL, "wechat")) {
|
|
|
log.Printf("小程序解析")
|
|
@@ -263,7 +263,20 @@ func GetChatChannel(chat SemJsChatRecord) ChannelCategory {
|
|
|
return ChannelCategory{chat.ChannleID, chat.CategoryID}
|
|
|
}
|
|
|
// 获取神策url(包含utm)
|
|
|
-
|
|
|
+ cc1, _ := redisCli().Get("sensors:" + assessment.GrUserId).Result()
|
|
|
+ var utmUrl SensorsData
|
|
|
+ json.Unmarshal([]byte(cc1), &utmUrl)
|
|
|
+ // 神策解析
|
|
|
+ if utmUrl.Url != "" && !strings.Contains(assessment.URL, "link=") && !strings.Contains(assessment.ReferPageURL, "link=") && !strings.Contains(assessment.ChatURL, "link=") {
|
|
|
+ log.Printf("解析神策")
|
|
|
+ assessment.Channel = utmUrl.Channel
|
|
|
+ assessment.Category = utmUrl.Category
|
|
|
+ // 百度惠生活渠道合并
|
|
|
+ if assessment.Category == 239 {
|
|
|
+ assessment.Category = getCategory(292, assessment.JsonPath)
|
|
|
+ }
|
|
|
+ return ChannelCategory{assessment.Channel, assessment.Category}
|
|
|
+ }
|
|
|
// 搜索引擎SEO,外链解析
|
|
|
if chat.ReferPage != "" && !strings.Contains(chat.ReferPage, "https://www.jjl.cn/") && !strings.Contains(chat.ReferPage, "https://m.jjl.cn/") {
|
|
|
log.Printf("解析SEO")
|