merg

README.md

@@ -5,7 +5,7 @@
 
 
 ## 
-
+##
 
 ## 服务注册与服务发现
 

core/proxy/broker/outServer/SussBi.go

@@ -29,7 +29,7 @@ type sussBi struct {
 	prm        *ParamReplaceManager
 }
 
-//参数替换
+// 参数替换
 type ParamReplace struct {
 	Replace []ParamReplaceSetting
 	Match   []ParamReplaceSetting
@@ -174,10 +174,14 @@ func (s *sussBi) Filter(r *ghttp.Request) error {
 	ctx := router.GetGContext(r.GetCtx())
 	if ctx.Sess.NewUid != 0 {
 		replaceMap := map[string]interface{}{
-			"jyUserId":         ctx.Sess.NewUid,
-			"jyUserPositionId": ctx.Sess.UserPositionId,
-			"jyUserAccountId":  ctx.Sess.UserAccountId,
-			"jyEntPositionId":  ctx.Sess.EntUserPositionId,
+			"jyUserId": ctx.Sess.NewUid,
+			// "jyUserPositionId": ctx.Sess.UserPositionId,
+			// "jyUserAccountId":  ctx.Sess.UserAccountId,
+			// "jyEntPositionId":  ctx.Sess.EntUserPositionId,
+			// "jyEntAccountId":   ctx.Sess.EntAccountId,
+			"jyUserPositionId": ctx.Sess.PositionId,
+			"jyUserAccountId":  ctx.Sess.AccountId,
+			"jyEntPositionId":  ctx.Sess.PositionId,
 			"jyEntAccountId":   ctx.Sess.EntAccountId,
 			"jyUserName":       ctx.Sess.UserName,
 			"jyEntName":        ctx.Sess.EntName,

core/proxy/middleware/filterFuncs.go

@@ -191,9 +191,6 @@ func infusionIdentity(r *ghttp.Request, sess *router.JySession, useCount, surplu
 	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))
 	}

core/router/session.go

@@ -28,9 +28,8 @@ type JySession struct {
 	UserPositionId    int64  //个人职位id
 	UserAccountId     int64  //个人账户id
 	EntUserPositionId int64  //企业职位id
-	// EntAccountId      int64  //企业账户id
-	EntUserName string //企业员工姓名
 
+	EntUserName  string //企业员工姓名
 	PersonId     int64  //自然人id
 	AccountId    int64  //账户id
 	EntAccountId int64  //企业账户id

go.sum

@@ -8,7 +8,7 @@ app.yhyue.com/moapp/jybase v0.0.0-20220719064915-2fef79005dfa/go.mod h1:FjBF25AY
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698 h1:2xGDnrmbGt4VzAmDSsKH+C9Bq40z9eQ4NJfH/779o8g=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=
 bp.jydev.jianyu360.cn/BaseService/gateway v0.0.0-20220419090715-88ddb32961be/go.mod h1:Yj4oabIGItuMoF0BXYLz2XAnF581kxgXBrvlUtIJrkI=
-bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4/go.mod h1:BMLd/5wb3BIEGhnEgF9y1sJN9P5/Dw9kYsoiE9V8I9g=
+bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4/go.mod h1:huj4op63LVbzDQA0i8oaVpQlPIEbTfd50bivVfk0gKU=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220418005748-8ba5d936dd53/go.mod h1:E5lcDI3k4FESLxiAetCfWQTq8qfpy9cv0yN1oKoEO34=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220419023723-0b32d4a41751/go.mod h1:6KL5LMEku83uRbre0W/bj5kXG2I6pJGBFtktmtp51yM=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220420075831-0b59892e9982/go.mod h1:wsHNO91h37H+xE4ZNny0yd7mtpODeDJxbVYhIRMR+qw=