Merge branch 'master' into feature/v1.0.30

common/src/qfw/util/jy/subScribe.go

@@ -62,7 +62,7 @@ func GetSubScribeInfo(session *httpsession.Session, mg mongodb.MongodbSim, types
 				if (*ojy)["a_key"] != nil {
 					akey := common.ObjArrToMapArr((*ojy)["a_key"].([]interface{}))
 					(*object)["a_items"] = []map[string]interface{}{ //转换至和其它结构一致
-						map[string]interface{}{
+						{
 							"a_key": akey,
 						},
 					}
@@ -160,7 +160,7 @@ func format(data *map[string]interface{}) *map[string]interface{} {
 }
 
 // 用户注册日志保存
-func SaveUserLog(mg mongodb.MongodbSim, userid, phone, way, system, source, openid, search_engine, promotion, ip, user_agent, site, event string, others ...map[string]interface{}) {
+func SaveUserLog(mg mongodb.MongodbSim, userid, phone, way, system, source, openid, search_engine, promotion, ip, user_agent, site, event string, referer string, others ...map[string]interface{}) {
 	data := map[string]interface{}{
 		"userid":        userid,
 		"phone":         phone,
@@ -175,6 +175,7 @@ func SaveUserLog(mg mongodb.MongodbSim, userid, phone, way, system, source, open
 		"user_agent":    user_agent,
 		"site":          site,
 		"event":         event,
+		"referer":       referer,
 	}
 	if len(others) > 0 {
 		for k, v := range others[0] {