Merge branch 'release/v4.8.74_ws' of qmx/jy into release/v4.8.74

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

@@ -439,7 +439,6 @@ func (o *OneClickInfo) phoneLogin(phone string) (map[string]interface{}, error)
 		phone, _ := o.Session.Get("phone").(string)
 		//positionId, _ := o.Session.Get("positionId").(int64)
 		positionId := common.Int64All(o.Session.Get("positionId"))
-		log.Println(positionId, "  一键登录  session信息：", o.Session.GetMultiple())
 		us := jy.UserSource{
 			UserId:           mgoUserId,
 			PositionId:       positionId,

src/jfw/modules/weixin/src/service/usersource.go

@@ -25,6 +25,7 @@ func SaveUserSource(channelCode, userId, phone, ip string, state int, positionId
 		Platform:         qutil.If(channelCode != "", 1, 2).(int), //登录端；1：PC；2：WX；3：APP；4：H5
 		Ip:               ip,
 	}
-	b := jy.SaveUserSource(tools.Mysql, jy.ChannelTableName, qutil.StructToMapMore(us))
-	log.Println("user source  保存 状态：", b)
+	if b := jy.SaveUserSource(tools.Mysql, jy.ChannelTableName, qutil.StructToMapMore(us)); !b {
+		log.Println("user source  保存 状态：", b, userId)
+	}
 }

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

@@ -930,7 +930,6 @@ func ScanHandler(w ResponseWriter, r *Request) {
 // SaveUserSource state 1:扫码 2：关注
 func SaveUserSource(erCode, openid string, state int) {
 	if openid != "" {
-		log.Println("-------userSource---信息 收集 开始----------")
 		channelCode := ""
 		ip := ""
 		if erCode != "" {
@@ -953,7 +952,6 @@ func SaveUserSource(erCode, openid string, state int) {
 		time.Sleep(userCTS)
 		userId, phone, positionId := FindUserId(openid)
 		service.SaveUserSource(channelCode, userId, phone, ip, state, positionId)
-		log.Println("-------userSource---信息 收集 结束----------")
 	}
 }
 func WxBind(code, openId string, w ResponseWriter, newUnionId string) bool {