Merge branch 'dev/v4.8.52_dx' of qmx/jy into feature/v4.8.52

src/jfw/filter/anonymousUser.go

@@ -81,22 +81,22 @@ func AnonymousAuthentication(W http.ResponseWriter, R *http.Request, Session *ht
 	}
 	fid, err := R.Cookie("fid")
 	if err != nil {
-		log.Println("匿名用户获取fid失败", err.Error())
+		//log.Println("匿名用户获取fid失败", err.Error())
 		return
 	}
 	eid, err := R.Cookie("eid")
 	if err != nil {
-		log.Println("匿名用户获取eid失败", err.Error())
+		//log.Println("匿名用户获取eid失败", err.Error())
 		return
 	}
 	if fid.Value != "" && eid.Value != "" {
 		eData, err1 := Decryption(eid.Value)
 		if err1 != nil {
-			log.Printf("匿名用户eid:%s,fid:%s 解密失败err:%s", eid.Value, fid.Value, err1.Error())
+			//log.Printf("匿名用户eid:%s,fid:%s 解密失败err:%s", eid.Value, fid.Value, err1.Error())
 			return
 		}
 		if fid.Value != eData {
-			log.Printf("匿名用户身份验证不通过,eid:%s,fid:%s,eData:%s", eid.Value, fid.Value, eData)
+			//log.Printf("匿名用户身份验证不通过,eid:%s,fid:%s,eData:%s", eid.Value, fid.Value, eData)
 			return
 		}
 		Session.Set("anonymousEid", eid.Value)

src/jfw/filter/logfilter.go

@@ -98,11 +98,7 @@ func (l *logFilter) addLog() {
 	s_url := l.R.RequestURI
 	md, _ := json.Marshal(l.R.Form)
 	str := string(md)
-	var eid, fid string
-	eidCookie, _ := l.R.Cookie("eid")
-	if eidCookie != nil {
-		eid = eidCookie.Value
-	}
+	var fid string
 	fidCookie, _ := l.R.Cookie("fid")
 	if fidCookie != nil {
 		fid = fidCookie.Value
@@ -122,7 +118,6 @@ func (l *logFilter) addLog() {
 		"browse":    util.GetBrowse(agent),
 		"method":    l.R.Method,
 		"url":       s_url,
-		"eid":       eid,
 		"fid":       fid,
 	}
 	if l.GetSession["userId"] != nil {

src/jfw/front/login.go

@@ -109,7 +109,7 @@ func (l *Login) Login() error {
 					ok, _, userInfo := afterLogin(phone, l.Session())
 					if ok {
 						result["userInfo"] = userInfo
-						go anonymousLogin(l.Session(), l.Cookie("eid"), l.Cookie("fid"))
+						go anonymousLogin(l.Session(), l.Cookie("fid"))
 						return 1, true
 					}
 				} else {
@@ -204,7 +204,7 @@ func (l *Login) Login() error {
 						}
 						if ok {
 							result["userInfo"] = userInfo
-							go anonymousLogin(l.Session(), l.Cookie("eid"), l.Cookie("fid"))
+							go anonymousLogin(l.Session(), l.Cookie("fid"))
 							return 1, true
 						}
 					}
@@ -233,7 +233,7 @@ func (l *Login) Login() error {
 					ok, _, userInfo := afterLogin(phone, l.Session())
 					if ok {
 						result["userInfo"] = userInfo
-						go anonymousLogin(l.Session(), l.Cookie("eid"), l.Cookie("fid"))
+						go anonymousLogin(l.Session(), l.Cookie("fid"))
 						return 1, true
 					}
 				}
@@ -384,11 +384,16 @@ func userIsExists(phoneNum string) bool {
 	return mongodb.Count("user", query) > 0
 }
 
-func anonymousLogin(session *httpsession.Session, eid, fid string) {
+func anonymousLogin(session *httpsession.Session, fid string) {
+	sessionMap := session.GetMultiple()
+	positionId := sessionMap["positionId"]
+	mgoUserId := sessionMap["mgoUserId"]
+	queryData := map[string]interface{}{"positionId": positionId, "mgoUserId": mgoUserId, "fid": fid, "creation_time": time.Now().Unix()}
+
 	//匿名用户登录后创建关联信息
-	public.BaseMysql.Insert("anonymous_association", map[string]interface{}{"creation_time": time.Now().Unix(),
-		"positionId": session.Get("positionId"), "mgoUserId": session.Get("mgoUserId"), "eid": eid, "fid": fid})
+	public.BaseMysql.Insert("anonymous_association", queryData)
 }
+
 func afterLogin(phone string, session *httpsession.Session) (bool, *map[string]interface{}, map[string]interface{}) {
 	ok, user := getPhoneUser(phone)
 	if !ok {

src/jfw/front/pchelper.go

@@ -246,7 +246,6 @@ func (l *PcHelper) Logout() {
 	l.DelSession("s_m_openid")
 	l.DelSession("user")
 	l.DelSession("rpcBackUserInfo")
-	l.DelSession("anonymousEid") //删除匿名认证信息
 	//pcHelper-login
 	l.DelSession("userId")
 	jy.ClearPhoneIdentSession(l.Session())