Selaa lähdekoodia

feat: 新增session

zhangxinlei1996 2 vuotta sitten
vanhempi
commit
f6439b50a5
2 muutettua tiedostoa jossa 33 lisäystä ja 3 poistoa
  1. 16 0
      core/proxy/middleware/filterFuncs.go
  2. 17 3
      core/router/session.go

+ 16 - 0
core/proxy/middleware/filterFuncs.go

@@ -184,6 +184,22 @@ func infusionIdentity(r *ghttp.Request, sess *router.JySession, useCount, surplu
 	if sess.EntAccountId > 0 {
 		r.Header.Set("entAccountId", gconv.String(sess.EntAccountId))
 	}
+
+	if sess.PersonId > 0 {
+		r.Header.Set("personId", gconv.String(sess.PersonId))
+	}
+	if sess.AccountId > 0 {
+		r.Header.Set("accountId", gconv.String(sess.AccountId))
+	}
+	if sess.EntAccountId > 0 {
+		r.Header.Set("entAccountId", gconv.String(sess.EntAccountId))
+	}
+	if sess.PositionId > 0 {
+		r.Header.Set("positionId", gconv.String(sess.PositionId))
+	}
+	if sess.PositionType > 0 {
+		r.Header.Set("positionType", gconv.String(sess.PositionType))
+	}
 	if sess.UserName != "" {
 		reg := regexp.MustCompile("[^ -~\u2E80-\u2FDF\u3040-\u318F\u31A0-\u31BF\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FFF\uA960-\uA97F\uAC00-\uD7FF\u3002\u00a5\uff1f\uff01\uff0c\u3001\uff1b\uff1a\u201c\u201d\u2018\u2019\uff08\uff09\u300a\u300b\u3008\u3009\u3010\u3011\u300e\u300f\u300c\u300d\ufe43\ufe44\u3014\u3015\u2026\u2014\uff5e\ufe4f\uffe5\u00a5]+")
 		userName := strings.TrimSpace(reg.ReplaceAllString(sess.UserName, ""))

+ 17 - 3
core/router/session.go

@@ -28,8 +28,15 @@ type JySession struct {
 	UserPositionId    int64  //个人职位id
 	UserAccountId     int64  //个人账户id
 	EntUserPositionId int64  //企业职位id
-	EntAccountId      int64  //企业账户id
-	EntUserName       string //企业员工姓名
+	// EntAccountId      int64  //企业账户id
+	EntUserName string //企业员工姓名
+
+	PersonId     int64 //自然人id
+	AccountId    int64 //账户id
+	EntAccountId int64 //企业账户id
+	PositionId   int64 //职位id
+	PositionType int64 //职位类型
+
 }
 
 // InitJySessionContext 获取用户session
@@ -57,11 +64,18 @@ func InitJySessionContext(r *ghttp.Request) (jSession *JySession, err error) {
 	jSession.NewUid = gconv.Int64(data["base_user_id"])
 	jSession.EntUserId = gconv.Int64(data["entUserId"])
 	jSession.UserName, _ = data["userName"].(string)
+
+	jSession.EntUserName, _ = data["entUserName"].(string)
 	jSession.UserPositionId = gconv.Int64(data["userPositionId"])
 	jSession.UserAccountId = gconv.Int64(data["userAccountId"])
 	jSession.EntUserPositionId = gconv.Int64(data["entUserPositionId"])
+
+	jSession.PersonId = gconv.Int64(data["personId"])
+	jSession.AccountId = gconv.Int64(data["accountId"])
 	jSession.EntAccountId = gconv.Int64(data["entAccountId"])
-	jSession.EntUserName, _ = data["entUserName"].(string)
+	jSession.PositionId = gconv.Int64(data["positionId"])
+	jSession.PositionType = gconv.Int64(data["positionType"])
+
 	jSession.Data = data
 	return
 }