Merge branch 'dev/v1.3.9.1_rjj' of BaseService/gateway into hotfix/v1.3.9.1

core/proxy/middleware/filterFuncs.go

@@ -219,4 +219,7 @@ func infusionHeader(r *ghttp.Request, sess *router.JySession, useCount, surplusC
 	if sess.EntUserName != "" {
 		r.Header.Set("entUserName", sess.EntUserName)
 	}
+	if sess.RbUser > 0 {
+		r.Header.Set("isRbUser", gconv.String(sess.RbUser))
+	}
 }

core/router/session.go

@@ -36,7 +36,7 @@ type JySession struct {
 	PositionId   int64  //职位id
 	PositionType int64  //职位类型
 	MgoUserId    string //mongodb用户id
-
+	RbUser       int64  //消息bitmap
 }
 
 // InitJySessionContext 获取用户session
@@ -76,6 +76,7 @@ func InitJySessionContext(r *ghttp.Request) (jSession *JySession, err error) {
 	jSession.PositionId = gconv.Int64(data["positionId"])
 	jSession.PositionType = gconv.Int64(data["positionType"])
 	jSession.MgoUserId = gconv.String(data["mgoUserId"])
+	jSession.RbUser = gconv.Int64(data["rbUser"])
 
 	jSession.Data = data
 	return