|
|
@@ -1,6 +1,12 @@
|
|
|
package jy
|
|
|
|
|
|
import (
|
|
|
+ "fmt"
|
|
|
+ "log"
|
|
|
+ "net/http"
|
|
|
+ "strings"
|
|
|
+ "time"
|
|
|
+
|
|
|
qutil "app.yhyue.com/moapp/jybase/common"
|
|
|
"app.yhyue.com/moapp/jybase/encrypt"
|
|
|
"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
|
|
|
@@ -8,17 +14,14 @@ import (
|
|
|
"app.yhyue.com/moapp/jybase/redis"
|
|
|
"app.yhyue.com/moapp/jypkg/identity"
|
|
|
"app.yhyue.com/moapp/jypkg/middleground"
|
|
|
- "fmt"
|
|
|
"go.mongodb.org/mongo-driver/bson/primitive"
|
|
|
- "net/http"
|
|
|
- "strings"
|
|
|
- "time"
|
|
|
)
|
|
|
|
|
|
// JyAppCreateSession app登陆创建session公共方法
|
|
|
// copy from app program
|
|
|
func JyAppCreateSession(mdb mongodb.MongodbSim, s *httpsession.Session, loginId string, loginType int, rw http.ResponseWriter, isSwitchToBestIdentity bool, mgd *middleground.Middleground, appPushServiceRpc string, criticality int) bool {
|
|
|
if loginId == "" {
|
|
|
+ log.Println("JyAppCreateSession空的loginId")
|
|
|
return false
|
|
|
}
|
|
|
query := map[string]interface{}{
|
|
|
@@ -38,10 +41,12 @@ func JyAppCreateSession(mdb mongodb.MongodbSim, s *httpsession.Session, loginId
|
|
|
query["base_user_id"] = qutil.Int64All(loginId)
|
|
|
break
|
|
|
default:
|
|
|
+ log.Println("JyAppCreateSession未知的loginType", loginId)
|
|
|
return false
|
|
|
}
|
|
|
data, ok := mdb.FindOneByField("user", query, `{"s_m_openid":1,"s_phone":1,"s_jpushid":1,"s_opushid":1,"s_appponetype":1,"s_headimageurl":1,"s_phone":1,"s_nickname":1,"s_appversion":1,"i_unlimited":1,"s_jyname":1,"base_user_id":1}`)
|
|
|
if !ok || data == nil || len(*data) == 0 {
|
|
|
+ log.Println("JyAppCreateSession没有找到该用户", ok, data, query)
|
|
|
return false
|
|
|
}
|
|
|
person := *data
|
|
|
@@ -73,7 +78,10 @@ func JyAppCreateSession(mdb mongodb.MongodbSim, s *httpsession.Session, loginId
|
|
|
if qutil.ObjToString(person["s_jyname"]) != "" {
|
|
|
sessVal["s_jyname"] = person["s_jyname"]
|
|
|
}
|
|
|
- s.SetMultiple(sessVal)
|
|
|
+ if err := s.SetMultiple(sessVal); err != nil {
|
|
|
+ log.Println("JyAppCreateSession保存redis出错", loginId, err)
|
|
|
+ return false
|
|
|
+ }
|
|
|
if isSwitchToBestIdentity && mgd != nil {
|
|
|
identity.SwitchToBest(qutil.Int64All(sessVal["base_user_id"]), s, mgd, &mdb, true)
|
|
|
}
|
