Merge branch 'dev_v4.9.28_wh' of qmx/jy into release/v4.9.28

src/jfw/front/login.go

@@ -204,7 +204,7 @@ func (l *Login) Login() error {
 					_id := mongodb.Save("user", data)
 					if _id != "" {
 						//用户日志保存
-						jy.SaveUserLog(public.Mgo_Log, _id, phone, "phone", "pc", source, "", gconv.String(l.GetSession("RSource")), "pc", qutil.GetIp(l.Request), l.UserAgent(), "jybx", "")
+						jy.SaveUserLog(public.Mgo_Log, _id, phone, "phone", "pc", source, "", gconv.String(l.GetSession("RSource")), gconv.String(sessVal["RSource"]), qutil.GetIp(l.Request), l.UserAgent(), "jybx", "")
 						jy.ClearPhoneIdentSession(l.Session())
 						ok, _, userInfo := afterLogin(phone, l.Session(), false)
 						userInfo["isNewUser"] = true

src/jfw/front/org_structure.go

@@ -196,7 +196,7 @@ func (this *OrgStructure) AutoLogon() error {
 			}); resp != nil && resp.Data.Id > 0 {
 				data["base_user_id"] = resp.Data.Id
 				if id := mongodb.Save("user", data); id != "" {
-					jy.SaveUserLog(public.Mgo_Log, id, openId, "wx", "pc", source, openId, gconv.String(this.GetSession("RSource")), "wx_org_structure_share", util.GetIp(this.Request), this.UserAgent(), "jybx", "")
+					jy.SaveUserLog(public.Mgo_Log, id, openId, "wx", "pc", source, openId, gconv.String(this.GetSession("RSource")), gconv.String(this.GetSession("RSource")), util.GetIp(this.Request), this.UserAgent(), "jybx", "")
 					nsqPath, _ := config.Sysconfig["nsq"].(string)
 					nsq_topic, _ := config.Sysconfig["nsq_topic"].(string)
 					jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, "task", id, jy.Jyweb_node2, map[string]interface{}{

src/jfw/front/otherAct.go

@@ -151,7 +151,7 @@ func (f *Front) Lpsubmit() error {
 			_id := mongodb.Save("user", data)
 			if _id != "" {
 				//用户日志保存
-				jy.SaveUserLog(public.Mgo_Log, _id, phone, "phone", "pc", "landPage", "", gconv.String(f.GetSession("RSource")), "landPage", util.GetIp(f.Request), f.UserAgent(), "jybx", "")
+				jy.SaveUserLog(public.Mgo_Log, _id, phone, "phone", "pc", "landPage", "", gconv.String(f.GetSession("RSource")), util.ObjToString(f.GetSession("RSource")), util.GetIp(f.Request), f.UserAgent(), "jybx", "")
 				deleteIdentSession(f.Session())
 				return "y"
 			}

src/jfw/front/pchelper.go

@@ -153,7 +153,7 @@ func (l *PcHelper) Login() error {
 						}
 						_id := mongodb.Save("user", data)
 						if _id != "" {
-							jy.SaveUserLog(public.Mgo_Log, _id, phone, "phone", "pc", "pc", "", gconv.String(l.GetSession("RSource")), "pchelper", util.GetIp(l.Request), l.UserAgent(), "jybx", "")
+							jy.SaveUserLog(public.Mgo_Log, _id, phone, "phone", "pc", "pc", "", gconv.String(l.GetSession("RSource")), gconv.String(l.GetSession("RSource")), util.GetIp(l.Request), l.UserAgent(), "jybx", "")
 							jy.ClearPhoneIdentSession(l.Session())
 							reToken = getUToken(mac, phone)
 							reOpenId = phone

src/jfw/modules/app/src/app/front/login.go

@@ -257,7 +257,8 @@ func (l *Login) Login() error {
 					}
 					_id := mongodb.Save("user", data)
 					if _id != "" {
-						jy.SaveUserLog(public.Mgo_Log, _id, phone, "phone", "app", isAndroidOrIOS(l.Header("User-Agent")), "", gconv.String(l.GetSession("RSource")), gconv.String(data["s_regsource"]), "", l.Header("User-Agent"), gconv.String(qutil.If(gconv.String(data["s_regsource"]) == "jyzbw", "jyzbw", "jybx")), "")
+						log.Println(111, _id, phone, "phone", "app", isAndroidOrIOS(l.Header("User-Agent")), "", gconv.String(l.GetSession("RSource")), gconv.String(data["s_rsource"]), "", l.Header("User-Agent"), gconv.String(qutil.If(gconv.String(data["s_regsource"]) == "jyzbw", "jyzbw", "jybx")), "")
+						jy.SaveUserLog(public.Mgo_Log, _id, phone, "phone", "app", isAndroidOrIOS(l.Header("User-Agent")), "", gconv.String(l.GetSession("RSource")), gconv.String(data["s_rsource"]), "", l.Header("User-Agent"), gconv.String(qutil.If(gconv.String(data["s_regsource"]) == "jyzbw", "jyzbw", "jybx")), "")
 						if sourceLabel != "" {
 							go func() {
 								redis.Del("limitation", fmt.Sprintf("firstVisitTagByWX_%s", l.Session().Id()))
@@ -814,7 +815,8 @@ func (l *Login) WxLogin() {
 			}
 
 			if _id := mongodb.Save("user", newUser); _id != "" {
-				jy.SaveUserLog(public.Mgo_Log, _id, "", "wx", "app", isAndroidOrIOS(l.Header("User-Agent")), "", gconv.String(l.GetSession("RSource")), isAndroidOrIOS(l.Header("User-Agent")), "", l.Header("User-Agent"), gconv.String(qutil.If(isAndroidOrIOS(l.Header("User-Agent")) == "jyzbw", "jyzbw", "jybx")), "")
+				log.Println(222, _id, "", "wx", "app", isAndroidOrIOS(l.Header("User-Agent")), "", isAndroidOrIOS(l.Header("User-Agent")), sourceLabel, "", l.Header("User-Agent"), gconv.String(qutil.If(isAndroidOrIOS(l.Header("User-Agent")) == "jyzbw", "jyzbw", "jybx")), "")
+				jy.SaveUserLog(public.Mgo_Log, _id, "", "wx", "app", isAndroidOrIOS(l.Header("User-Agent")), "", isAndroidOrIOS(l.Header("User-Agent")), sourceLabel, "", l.Header("User-Agent"), gconv.String(qutil.If(isAndroidOrIOS(l.Header("User-Agent")) == "jyzbw", "jyzbw", "jybx")), "")
 				if sourceLabel != "" {
 					go func() {
 						redis.Del("limitation", fmt.Sprintf("firstVisitTagByWX_%s", l.Session().Id()))

src/jfw/modules/publicapply/src/oneclick/entity/entity.go

@@ -380,7 +380,7 @@ func (o *OneClickInfo) phoneLogin(phone string) (map[string]interface{}, error)
 					}()
 				}
 				userInfo["isNewUser"] = true
-				jy.SaveUserLog(db.Mgo_Log, _id, phone, "phone", "pc", platform, "", "", "", o.R.Proto, isAndroidOrIOS(client), gconv.String(common.If(isAndroidOrIOS(client) == "jyzbw", "jyzbw", "jybx")), "")
+				jy.SaveUserLog(db.Mgo_Log, _id, phone, "phone", "pc", platform, "", "", gconv.String(data["s_rsource"]), o.R.Proto, isAndroidOrIOS(client), gconv.String(common.If(isAndroidOrIOS(client) == "jyzbw", "jyzbw", "jybx")), "")
 				//用户中台同步
 				func(userid string) {
 					if ok := jy.AddUser(db.Mgo, userid, pb.UserAddReq{

src/jfw/modules/subscribepay/src/service/userAccountInfo.go

@@ -906,7 +906,7 @@ func (this *UserAccount) WxUnBind() {
 			if saveId == "" {
 				return nil, DBUPDATE_ERROR
 			}
-            jy.SaveUserLog(util.Mgo_log, saveId, phone, "phone", "wx", "wx", "", "", "", this.Request.Proto, gconv.String((*unsetMap)["s_rsource"]), gconv.String(qutil.If(gconv.String((*unsetMap)["s_rsource"]) == "jyzbw", "jyzbw", "jybx")), "")
+			jy.SaveUserLog(util.Mgo_log, saveId, phone, "phone", "wx", "wx", "", "", gconv.String(this.GetSession("RSource")), this.Request.Proto, gconv.String((*unsetMap)["s_rsource"]), gconv.String(qutil.If(gconv.String((*unsetMap)["s_rsource"]) == "jyzbw", "jyzbw", "jybx")), "")
 
 			flushWxsession = true
 		}