Merge branch 'dev/4.8.50_fuwencai' of https://jygit.jydev.jianyu360.cn/qmx/jy into dev/4.8.50_fuwencai

src/jfw/modules/app/src/app/front/login.go

@@ -122,7 +122,7 @@ func (l *Login) Login() error {
 				"s_password": qutil.GetMd5String(password),
 			}
 			// user, ok := mongodb.FindOne("user", query)
-			user, ok := mongodb.Find("user", query, `{"s_phone":-1}`, `{"_id":1,"s_password":1}`, false, 0, 1)
+			user, ok := mongodb.Find("user", query, `{"s_phone":-1}`, `{"_id":1,"s_password":1,"s_jpushid":1,"s_opushid":1,"s_appponetype":1,"o_jy":1}`, false, 0, 1) //
 			//登录成功
 			if ok && user != nil && len(*user) > 0 {
 				rid := l.GetString("rid")
@@ -1036,6 +1036,7 @@ func afterLogin(user map[string]interface{}, session *httpsession.Session, rid,
 					off = false
 				}
 			}
+			log.Println("app:", old_rid, "---", old_oid, "---", rid, "---", off)
 			//同一账号在不同设备登录，极光id不一样，给之前的设备推送自定义的下线消息，离线消息保持10天
 			if old_rid != "" && old_rid != rid && off && rid != "" {
 				mongodb.UpdateById("user", userid, map[string]interface{}{

src/jfw/modules/publicapply/src/ad/entity/struct.go

@@ -2,7 +2,6 @@ package entity
 
 import (
 	"encoding/json"
-	"log"
 	"strings"
 	"time"
 )
@@ -42,7 +41,7 @@ func Handle(data []interface{}, host string) []AdInfo {
 		if len(AdInfo_Arr) > 0 {
 			now := time.Now()
 			for _, v := range AdInfo_Arr {
-				log.Println(v.S_id, "---", host, "----", strings.Contains(host, v.S_id))
+				//log.Println(v.S_id, "---", host, "----", strings.Contains(host, v.S_id))
 				if v.S_id != "" && host != "" {
 					//根据不同环境区分广告位信息 v.S_id 填充内容， 例：app-i2;app-a1
 					if !strings.Contains(host, v.S_id) {

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

@@ -582,6 +582,7 @@ func afterLogin(user map[string]interface{}, session *httpsession.Session, rid,
 	old_oid, _ := user["s_opushid"].(string)
 	old_ponetype, _ := user["s_appponetype"].(string)
 	off := true
+	log.Println("多账号登录：", user)
 	go func() {
 		if !isNewUser {
 			if rd := config.Compatible.Select(userid, `{"i_unlimited":1}`); rd != nil && len(*rd) > 0 {
@@ -590,6 +591,7 @@ func afterLogin(user map[string]interface{}, session *httpsession.Session, rid,
 					off = false
 				}
 			}
+			log.Println("publicapply:", old_rid, "---", old_oid, "---", rid, "---", off)
 			//同一账号在不同设备登录，极光id不一样，给之前的设备推送自定义的下线消息，离线消息保持10天
 			if old_rid != "" && old_rid != rid && off && rid != "" {
 				db.Mgo.UpdateById("user", userid, map[string]interface{}{

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

@@ -4,7 +4,6 @@ import (
 	. "app.yhyue.com/moapp/jybase/api"
 	qu "app.yhyue.com/moapp/jybase/common"
 	"errors"
-	"fmt"
 	"jy/src/jfw/modules/publicapply/src/oneclick/entity"
 	"log"
 )
@@ -49,8 +48,8 @@ func (o *OneClick) GetPhoneByToken() {
 }
 
 func (o *OneClick) GetAuthToken() {
-	userId, _ := o.GetSession("mgoUserId").(string)
-	fmt.Println("-----------------", userId)
+	//userId, _ := o.GetSession("mgoUserId").(string)
+	//fmt.Println("-----------------", userId)
 	defer qu.Catch()
 	r := func() Result {
 		if o.Method() != "POST" {