feat:xiugai

src/jfw/modules/weixin/src/wx/wx.go

@@ -531,7 +531,6 @@ func Subscribe(w ResponseWriter, r *Request) {
 	defer func() {
 		MsgTxtHandler(w, r)
 	}()
-	saveEvenLog(r)
 	openid := r.FromUserName
 	if isRepeatCall(openid, r.CreateTime) {
 		return
@@ -545,6 +544,7 @@ func Subscribe(w ResponseWriter, r *Request) {
 		log.Println(err)
 		return
 	}
+	saveEvenLog(r, user)
 	var (
 		source string
 	)
@@ -705,7 +705,7 @@ var numCodeReg = regexp.MustCompile("^\\d+$")
 
 func ScanHandler(w ResponseWriter, r *Request) {
 	defer util.Catch()
-	saveEvenLog(r)
+	saveEvenLog(r, nil)
 	openid := r.FromUserName
 	if isRepeatCall(openid, r.CreateTime) {
 		return
@@ -750,8 +750,8 @@ func ScanHandler(w ResponseWriter, r *Request) {
 				ip = util.ObjToString(infoData["Rip"])
 			}
 		}
-		user, err := Mux.GetUserInfo(openid)
 		if *m == nil {
+			user, err := Mux.GetUserInfo(openid)
 			if err != nil {
 				log.Println(err)
 			} else {
@@ -962,7 +962,7 @@ func FindUserId(openid string) (userId, phone string, positionId int64) {
 
 // 取消关注事件
 func UnSubscribe(w ResponseWriter, r *Request) {
-	saveEvenLog(r)
+	saveEvenLog(r, nil)
 	openid := r.FromUserName
 	log.Println("取关", openid)
 	//updateUser(openid)
@@ -1397,11 +1397,17 @@ func GetModule(source string) string {
 	sourceModuleMap, _ := config.Sysconfig["cookieSource"].(map[string]interface{})
 	return util.ObjToString(sourceModuleMap[source])
 }
-func saveEvenLog(r *Request) {
-	go tools.MGLOG.Save("weixin_even_log", map[string]interface{}{
+func saveEvenLog(r *Request, u *UserInfo) {
+	data := map[string]interface{}{
 		"s_m_openid": r.FromUserName,
 		"event_key":  r.EventKey,
 		"event":      r.Event,
 		"createtime": time.Now().Unix(),
-	})
+	}
+	if u != nil {
+		data["subscribe_scene"] = u.Subscribe_scene
+		data["qr_scene"] = u.Qr_scene
+		data["qr_scene_str"] = u.Qr_scene_str
+	}
+	go tools.MGLOG.Save("weixin_even_log", data)
 }