fenzhihebing

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

@@ -5,12 +5,15 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"log"
 	"net/http"
 	"net/http/cookiejar"
 	"net/url"
 	"regexp"
 	"strings"
+	"time"
 
+	"app.yhyue.com/moapp/jybase/common"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/router"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/util/gconv"
@@ -144,19 +147,33 @@ func (s *sussBi) AutoLogin() error {
 
 // RequestLogin 装配登录状态
 func (s *sussBi) RequestLogin(r *ghttp.Request) error {
-	if strings.HasPrefix(r.URL.Path, "/succbi") {
-		u, e := url.Parse(s.Url.String() + "/succbi")
-		if e != nil {
-			return e
-		}
-		//cookies2 := s.succbiJar.Cookies(s.Url)
-		//fmt.Println(cookies2)
-		if cookies := s.succbiJar.Cookies(u); len(cookies) > 0 {
-			r.Request.AddCookie(cookies[0])
+	if strings.HasPrefix(r.RequestURI, "/succbi/crm_system") {
+		ctx := router.GetGContext(r.GetCtx())
+		md5Val := common.GetMd5String(fmt.Sprintf("%s_%s_%d_%d_%d_%d_%d_%d_%s_%d_%s_%d", ctx.Sess.NickName, ctx.Sess.YyName, ctx.Sess.EntRole, ctx.Sess.EntNicheDis, ctx.Sess.PositionId, ctx.Sess.AccountId, ctx.Sess.EntAccountId, ctx.Sess.EntId, ctx.Sess.EntName, ctx.Sess.EntDeptId, ctx.Sess.EntUserName, ctx.Sess.EntUserId))
+		c := &http.Cookie{
+			Name:     "BITOKEN",
+			Value:    md5Val,
+			Path:     "/",
+			HttpOnly: false,
+			MaxAge:   604800,
+			Expires:  time.Now().AddDate(0, 0, 7),
 		}
+		r.Request.AddCookie(c)
+		log.Println(ctx.Sess.PositionId, "BITOKEN====", md5Val)
+		//http.SetCookie(r.Response.ResponseWriter, c)
 	} else {
-		if cookies := s.jar.Cookies(s.Url); len(cookies) > 0 {
-			r.Request.AddCookie(cookies[0])
+		if strings.HasPrefix(r.URL.Path, "/succbi") {
+			u, e := url.Parse(s.Url.String() + "/succbi")
+			if e != nil {
+				return e
+			}
+			if cookies := s.succbiJar.Cookies(u); len(cookies) > 0 {
+				r.Request.AddCookie(cookies[0])
+			}
+		} else {
+			if cookies := s.jar.Cookies(s.Url); len(cookies) > 0 {
+				r.Request.AddCookie(cookies[0])
+			}
 		}
 	}
 	return nil
@@ -174,11 +191,7 @@ 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.PositionId,
-			// "jyUserPositionId": ctx.Sess.UserPositionId,
-			// "jyUserAccountId":  ctx.Sess.UserAccountId,
-			// "jyEntPositionId":  ctx.Sess.EntUserPositionId,
-			// "jyEntAccountId":   ctx.Sess.EntAccountId,
+			"jyUserId":         ctx.Sess.PositionId,
 			"jyUserPositionId": ctx.Sess.PositionId,
 			"jyUserAccountId":  ctx.Sess.AccountId,
 			"jyEntPositionId":  ctx.Sess.PositionId,
@@ -187,6 +200,7 @@ func (s *sussBi) Filter(r *ghttp.Request) error {
 			"jyEntName":        ctx.Sess.EntName,
 			"jyEntId":          ctx.Sess.EntId,
 			"jyEntUserName":    ctx.Sess.EntUserName,
+			"jyEntUserId":      ctx.Sess.EntUserId,
 		}
 		if r.Request.Method == http.MethodPost {
 			bodyBytes, err := io.ReadAll(r.Request.Body)

core/proxy/middleware/filterFuncs.go

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

core/proxy/proxyServer.go

@@ -1,6 +1,10 @@
 package proxy
 
 import (
+	"fmt"
+	"net/http"
+	"net/url"
+
 	log "app.yhyue.com/moapp/jylog"
 	. "bp.jydev.jianyu360.cn/BaseService/gateway/common/gatecode"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/node"
@@ -10,14 +14,11 @@ import (
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/proxy/proxyClient"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/proxy/vars"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/router"
-	"fmt"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/net/gtrace"
 	"github.com/gogf/gf/v2/os/gcfg"
 	"github.com/gogf/gf/v2/os/gctx"
-	"net/http"
-	"net/url"
 )
 
 var routerManager *router.Manager

core/router/session.go

@@ -25,6 +25,8 @@ type JySession struct {
 	Data              g.Map  // 当前Session管理对象
 	EntUserId         int64  //当前企业用户id
 	UserName          string //用户名称
+	NickName          string //微信昵称
+	YyName            string //剑鱼生成的昵称
 	UserPositionId    int64  //个人职位id
 	UserAccountId     int64  //个人账户id
 	EntUserPositionId int64  //企业职位id
@@ -36,7 +38,13 @@ type JySession struct {
 	PositionId   int64  //职位id
 	PositionType int64  //职位类型
 	MgoUserId    string //mongodb用户id
+<<<<<<< HEAD
 	RbUser       int64  //消息bitmap
+=======
+	EntRole      int64  //管理员角色
+	EntNicheDis  int64  //商机分配角色
+	EntDeptId    int64  //部门id
+>>>>>>> master
 }
 
 // InitJySessionContext 获取用户session
@@ -64,6 +72,8 @@ 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.NickName, _ = data["s_nickname"].(string)
+	jSession.YyName, _ = data["s_jyname"].(string)
 
 	jSession.EntUserName, _ = data["entUserName"].(string)
 	jSession.UserPositionId = gconv.Int64(data["userPositionId"])
@@ -76,7 +86,13 @@ 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"])
+<<<<<<< HEAD
 	jSession.RbUser = gconv.Int64(data["rbUser"])
+=======
+	jSession.EntRole = gconv.Int64(data["entRole"])
+	jSession.EntNicheDis = gconv.Int64(data["entNicheDis"])
+	jSession.EntDeptId = gconv.Int64(data["entDeptId"])
+>>>>>>> master
 
 	jSession.Data = data
 	return

go.mod

@@ -3,75 +3,86 @@ module bp.jydev.jianyu360.cn/BaseService/gateway
 go 1.18
 
 require (
-	app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a
+	app.yhyue.com/moapp/jybase v0.0.0-20230718012114-37013054344b
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
+	app.yhyue.com/moapp/jypkg v0.0.0-20230825092743-3bfc415bb5bb
 	bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220424062752-50170a93c431
-	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230210052334-7b32c3b8c773
+	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230222052351-9d6fad062447
 	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7
-	bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220905055615-8540037e1b06
+	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13
 	github.com/go-redis/redis v6.15.9+incompatible
 	github.com/gogf/gf/contrib/trace/jaeger/v2 v2.3.3
 	github.com/gogf/gf/v2 v2.3.1
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
-	github.com/zeromicro/go-zero v1.4.4
-	go.etcd.io/etcd/client/v3 v3.5.7
-	golang.org/x/net v0.8.0
+	github.com/zeromicro/go-zero v1.5.3
+	go.etcd.io/etcd/client/v3 v3.5.9
+	golang.org/x/net v0.10.0
 )
 
 require (
+	app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d // indirect
+	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230304035551-21bb1eedf547 // indirect
+	app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae // indirect
+	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e // indirect
 	github.com/BurntSushi/toml v1.1.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/clbanning/mxj/v2 v2.5.5 // indirect
-	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
+	github.com/coreos/go-semver v0.3.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/fatih/color v1.13.0 // indirect
-	github.com/felixge/fgprof v0.9.3 // indirect
+	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/fatih/color v1.15.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/garyburd/redigo v1.6.2 // indirect
 	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.1 // indirect
+	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/go-redis/redis/v8 v8.11.5 // indirect
-	github.com/go-sql-driver/mysql v1.7.0 // indirect
+	github.com/go-sql-driver/mysql v1.7.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/mock v1.6.0 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/gomodule/redigo v1.8.9 // indirect
+	github.com/gomodule/redigo v2.0.0+incompatible // indirect
+	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/pprof v0.0.0-20211214055906-6f57359322fd // indirect
-	github.com/googleapis/gnostic v0.5.5 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grokify/html-strip-tags-go v0.0.1 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.1 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.15.11 // indirect
+	github.com/klauspost/compress v1.15.15 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/nsqio/go-nsq v1.1.0 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/olivere/elastic v6.2.37+incompatible // indirect
+	github.com/olivere/elastic/v7 v7.0.22 // indirect
 	github.com/openzipkin/zipkin-go v0.4.1 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.13.0 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/prometheus/client_golang v1.15.1 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/sirupsen/logrus v1.8.3 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
@@ -85,35 +96,37 @@ require (
 	github.com/xdg-go/scram v1.1.1 // indirect
 	github.com/xdg-go/stringprep v1.0.3 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	go.etcd.io/etcd/api/v3 v3.5.7 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
-	go.mongodb.org/mongo-driver v1.11.1 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.9 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
+	go.mongodb.org/mongo-driver v1.11.6 // indirect
 	go.opentelemetry.io/otel v1.15.1 // indirect
 	go.opentelemetry.io/otel/exporters/jaeger v1.15.1 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.15.1 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.15.1 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.15.1 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.15.1 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.14.0 // indirect
 	go.opentelemetry.io/otel/exporters/zipkin v1.15.1 // indirect
 	go.opentelemetry.io/otel/sdk v1.15.1 // indirect
 	go.opentelemetry.io/otel/trace v1.15.1 // indirect
 	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/automaxprocs v1.5.1 // indirect
-	go.uber.org/multierr v1.8.0 // indirect
-	go.uber.org/zap v1.21.0 // indirect
-	golang.org/x/crypto v0.0.0-20221010152910-d6f0a8c073c2 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/automaxprocs v1.5.2 // indirect
+	go.uber.org/multierr v1.9.0 // indirect
+	go.uber.org/zap v1.24.0 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
 	golang.org/x/image v0.0.0-20190802002840-cff245a6509b // indirect
-	golang.org/x/oauth2 v0.4.0 // indirect
+	golang.org/x/oauth2 v0.7.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.7.0 // indirect
-	golang.org/x/term v0.6.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
+	golang.org/x/sys v0.8.0 // indirect
+	golang.org/x/term v0.8.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
-	google.golang.org/grpc v1.54.0 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
+	google.golang.org/grpc v1.56.1 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
@@ -121,11 +134,14 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gorm.io/driver/mysql v1.0.5 // indirect
 	gorm.io/gorm v1.21.3 // indirect
-	k8s.io/api v0.22.9 // indirect
-	k8s.io/apimachinery v0.22.9 // indirect
-	k8s.io/client-go v0.22.9 // indirect
-	k8s.io/klog/v2 v2.80.1 // indirect
-	k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
-	sigs.k8s.io/yaml v1.2.0 // indirect
+	jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230710093759-d9d6c68de8b1 // indirect
+	k8s.io/api v0.26.3 // indirect
+	k8s.io/apimachinery v0.27.0-alpha.3 // indirect
+	k8s.io/client-go v0.26.3 // indirect
+	k8s.io/klog/v2 v2.90.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20230307230338-69ee2d25a840 // indirect
+	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
 )