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

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

@@ -1,35 +1,34 @@
 package entity
 
 import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"jy/src/jfw/modules/publicapply/src/config"
-	"jy/src/jfw/modules/publicapply/src/db"
-	"jy/src/jfw/modules/publicapply/src/jyutil"
-	"jy/src/jfw/modules/publicapply/src/oneclick/initjson"
-	"log"
-	"net/http"
-	"strings"
-	"sync"
-	"time"
+    "encoding/json"
+    "errors"
+    "fmt"
+    "jy/src/jfw/modules/publicapply/src/config"
+    "jy/src/jfw/modules/publicapply/src/db"
+    "jy/src/jfw/modules/publicapply/src/jyutil"
+    "jy/src/jfw/modules/publicapply/src/oneclick/initjson"
+    "log"
+    "net/http"
+    "strings"
+    "sync"
+    "time"
 
-	"app.yhyue.com/moapp/jybase/common"
-	qutil "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/date"
-	"app.yhyue.com/moapp/jybase/encrypt"
-	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
-	"app.yhyue.com/moapp/jybase/mongodb"
-	"app.yhyue.com/moapp/jybase/redis"
-	qrpc "app.yhyue.com/moapp/jybase/rpc"
-	"app.yhyue.com/moapp/jybase/usercenter"
-	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
-	"app.yhyue.com/moapp/jypkg/public"
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
-	openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client"
-	dypnsapi20170525 "github.com/alibabacloud-go/dypnsapi-20170525/v2/client"
-	util "github.com/alibabacloud-go/tea-utils/v2/service"
-	"github.com/alibabacloud-go/tea/tea"
+    "app.yhyue.com/moapp/jybase/common"
+    "app.yhyue.com/moapp/jybase/date"
+    "app.yhyue.com/moapp/jybase/encrypt"
+    "app.yhyue.com/moapp/jybase/go-xweb/httpsession"
+    "app.yhyue.com/moapp/jybase/mongodb"
+    "app.yhyue.com/moapp/jybase/redis"
+    qrpc "app.yhyue.com/moapp/jybase/rpc"
+    "app.yhyue.com/moapp/jybase/usercenter"
+    "app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
+    "app.yhyue.com/moapp/jypkg/public"
+    "bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
+    openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client"
+    dypnsapi20170525 "github.com/alibabacloud-go/dypnsapi-20170525/v2/client"
+    util "github.com/alibabacloud-go/tea-utils/v2/service"
+    "github.com/alibabacloud-go/tea/tea"
 )
 
 type OneClickInfo struct {
@@ -423,8 +422,9 @@ func (o *OneClickInfo) phoneLogin(phone string) (map[string]interface{}, error)
 		}
 		return 0
 	}()
-	if status == 1 {
-		mgoUserId := qutil.ObjToString(o.Session.Get("mgoUserId"))
+	if status > 0 {
+		//mgoUserId := qutil.ObjToString(o.Session.Get("mgoUserId"))
+		mgoUserId, _ := o.Session.Get("mgoUserId").(string)
 		err := jy.Publish(db.Mgo_Log, config.Config.Nsq, config.Config.NsqTopic, "task", mgoUserId, "", map[string]interface{}{
 			"code":       1014, //下载app任务
 			"types":      "downloadApp",
@@ -435,10 +435,8 @@ func (o *OneClickInfo) phoneLogin(phone string) (map[string]interface{}, error)
 		if err != nil {
 			log.Println(mgoUserId, "下载app任务，发送nsq消息错误-->", err)
 		}
-	}
-	if status > 0 {
+		log.Println("一键登录  session信息：", o.Session.GetMultiple())
 		//登录source 更新 p414
-		mgoUserId, _ := o.Session.Get("mgoUserId").(string)
 		phone, _ := o.Session.Get("phone").(string)
 		positionId, _ := o.Session.Get("positionId").(int64)
 		us := jy.UserSource{

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

@@ -20,8 +20,8 @@ func SaveUserSource(channelCode, userId, phone, ip string, state int, positionId
 		ChannelCode:      qutil.If(channelCode == "", fmt.Sprintf("%s%s", "jy_wx", qutil.If(state == 1, "_scan", "_sub")), channelCode).(string),
 		EncryptionUserId: encrypt.SE.Encode2Hex(userId),
 		CreateTime:       time.Now().Format(date.Date_Full_Layout),
-		LoginWay:         3, //登录方式;1:手机号密码；2：手机号验证码；3：微信；4：手机号一键登录
-		Platform:         2, //登录端；1：PC；2：WX；3：APP；4：H5
+		LoginWay:         3,                                       //登录方式;1:手机号密码；2：手机号验证码；3：微信；4：手机号一键登录
+		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))