wangchuanjin 2 rokov pred
rodič
commit
2a5b26c570
4 zmenil súbory, kde vykonal 11 pridanie a 7 odobranie
  1. 3 2
      common/src/qfw/util/jy/userMerge.go
  2. 1 0
      go.mod
  3. 1 0
      go.sum
  4. 6 5
      jyutil/jyutil.go

+ 3 - 2
common/src/qfw/util/jy/userMerge.go

@@ -2,14 +2,15 @@ package jy
 
 import (
 	"fmt"
+	"net/http"
 	"strings"
 
 	qutil "app.yhyue.com/moapp/jybase/common"
 	. "app.yhyue.com/moapp/jybase/encrypt"
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 	. "app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/mysql"
-
-	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
+	usercenter "app.yhyue.com/moapp/jybase/usercenter"
 	"go.mongodb.org/mongo-driver/bson"
 )
 

+ 1 - 0
go.mod

@@ -18,6 +18,7 @@ require (
 	github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f // indirect
 	github.com/garyburd/redigo v1.6.2 // indirect
 	github.com/go-sql-driver/mysql v1.6.0 // indirect
+	github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/howeyc/fsnotify v0.9.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect

+ 1 - 0
go.sum

@@ -225,6 +225,7 @@ github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang-jwt/jwt/v4 v4.4.2 h1:rcc4lwaZgFMCZ5jxF9ABolDcIHdBytAFgqFPbSJQAYs=
 github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=

+ 6 - 5
jyutil/jyutil.go

@@ -12,18 +12,19 @@ import (
 
 	"app.yhyue.com/moapp/jypkg/public"
 
+	"strings"
+	"time"
+
 	util "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
 	. "app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/redis"
-
-	"strings"
-	"time"
+	usercenter "app.yhyue.com/moapp/jybase/usercenter"
 )
 
 var mongodb = public.MQFW
 var se = &encrypt.SimpleEncrypt{Key: "topnet2015topnet2015"}
-
+var Sysconfig map[string]interface{}
 var AC = &encrypt.AES_CBC{
 	Key: "mGlAgnIBB8bx2nch",
 	Iv:  "1389461544135476",
@@ -143,7 +144,7 @@ func GetSessionVal(q map[string]interface{}) (*map[string]interface{}, map[strin
 		//
 		entId := util.Int64All(sessionVal["entId"])
 		uid := util.ObjToString(sessionVal["userId"])
-		identity := usercenter.GetUserIdentity(util.ObjToString(config.Sysconfig["userCenterApi"]), uid, int64(base_uid), entId, &http.Cookie{})
+		identity := usercenter.GetUserIdentity(util.ObjToString(Sysconfig["userCenterApi"]), uid, int64(base_uid), entId, &http.Cookie{})
 		if identity != nil {
 			if identity.PersonId > 0 {
 				sessionVal["personId"] = identity.PersonId