Merge branch 'dev_v4.9.18_wh' of qmx/jy into feature/v4.9.18

src/jfw/front/login.go

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

src/jfw/front/org_structure.go

@@ -195,7 +195,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(mongodb, id, openId, "wx", "pc", source, openId, "", "", util.GetIp(this.Request), this.UserAgent(), this.Site(), "")
+					jy.SaveUserLog(public.Mgo_Log, id, openId, "wx", "pc", source, openId, "", "", util.GetIp(this.Request), this.UserAgent(), this.Site(), "")
 					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

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

src/jfw/front/pchelper.go

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

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

@@ -379,7 +379,7 @@ func (o *OneClickInfo) phoneLogin(phone string) (map[string]interface{}, error)
 					}()
 				}
 				userInfo["isNewUser"] = true
-				jy.SaveUserLog(db.Mgo, _id, phone, "phone", "pc", platform, "", "", "", o.R.Proto, o.R.UserAgent(), "", "")
+				jy.SaveUserLog(db.Mgo_Log, _id, phone, "phone", "pc", platform, "", "", "", o.R.Proto, o.R.UserAgent(), "", "")
 				//用户中台同步
 				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.MQFW, saveId, phone, "phone", "wx", "wx", "", "", "", this.Request.Proto, this.Request.UserAgent(), this.Site(), "")
+			jy.SaveUserLog(util.Mgo_log, saveId, phone, "phone", "wx", "wx", "", "", "", this.Request.Proto, this.Request.UserAgent(), this.Site(), "")
 
 			flushWxsession = true
 		}

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

@@ -353,7 +353,7 @@ func saveUser(u *UserInfo, source, pre, RSource, CSource string) (bool, string,
 			// 	"unionid":  u.UnionId,
 			// }
 			// usercenter.AddBaseUser(tools.MQFW, util.ObjToString(config.Sysconfig["userCenterApi"]), _id, formdata, &http.Cookie{})
-			jy.SaveUserLog(tools.MQFW, _id, "", "wx", "wx", "wx", u.OpenId, "", "", "", "", "", "")
+			jy.SaveUserLog(tools.MGLOG, _id, "", "wx", "wx", "wx", u.OpenId, "", "", "", "", "", "")
 			nickname := util.ObjToString(util.If(u.Nickname != "", u.Nickname, newUser["s_jyname"]))
 			if ok := jy.AddUser(tools.MQFW, _id, pb.UserAddReq{
 				Appid:    "10000",