Merge branch 'dev_1.3.10_wh' of BaseService/gateway into feature/v1.3.10

common/db/db.go

@@ -7,6 +7,7 @@ import (
 	"app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/mysql"
 	"app.yhyue.com/moapp/jybase/redis"
+	"app.yhyue.com/moapp/jypkg/ent/util"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcfg"
 	"github.com/gogf/gf/v2/os/gctx"
@@ -77,6 +78,7 @@ func InitDatabases() {
 		MaxIdleConns: jyMysqlConf.MaxIdleConns,
 	}
 	JyMysql.Init()
+	util.Mysql = JyMysql
 	log.Printf("初始化jy Mysql完成 %+v\n", mysqlConf)
 	// 初始化mongodb
 	var mgoConf MgoConf

core/proxy/broker/outServer/SussBi.go

@@ -1,7 +1,6 @@
 package outServer
 
 import (
-	"app.yhyue.com/moapp/jybase/common"
 	"bytes"
 	"fmt"
 	"io"
@@ -12,7 +11,6 @@ import (
 	"regexp"
 	"strings"
 
-	. "app.yhyue.com/moapp/jypkg/ent/entity"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/router"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/util/gconv"
@@ -189,7 +187,7 @@ func (s *sussBi) Filter(r *ghttp.Request) error {
 		}
 		//role//角色，0：个人版1：企业版-企业管理员2：企业版-部门管理员3：企业版-员工
 		//entDeptId//部门id
-		currentUser := VarCurrentUser.EntInfo(common.IntAll(ctx.Sess.EntId), common.IntAll(ctx.Sess.EntUserId))
+		/*currentUser := VarCurrentUser.EntInfo(common.IntAll(ctx.Sess.EntId), common.IntAll(ctx.Sess.EntUserId))
 		role := 0
 		deptId := 0
 		if ctx.Sess.PositionType == 1 {
@@ -203,7 +201,7 @@ func (s *sussBi) Filter(r *ghttp.Request) error {
 			deptId = currentUser.Dept.Id
 		}
 		replaceMap["jyRole"] = role
-		replaceMap["jyEntDeptId"] = deptId
+		replaceMap["jyEntDeptId"] = deptId*/
 		if r.Request.Method == http.MethodPost {
 			bodyBytes, err := io.ReadAll(r.Request.Body)
 			if err != nil {