diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 53346c402..2c050bcc8 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -300,9 +300,6 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string authInfo.IsExistOpenID = true } } - if WeCartAppID == appID { - authInfo.AuthBindInfo.AppServer = WeCartAppID - } } } } diff --git a/business/auth2/auth_info.go b/business/auth2/auth_info.go index 5ffe2a09d..2cf07072d 100644 --- a/business/auth2/auth_info.go +++ b/business/auth2/auth_info.go @@ -84,10 +84,6 @@ func (a *AuthInfo) GetAuthType() string { return a.AuthBindInfo.Type } -func (a *AuthInfo) GetIsWeCartApp() string { - return a.AuthBindInfo.AppServer -} - func (a *AuthInfo) GetAuthTypeID() string { return a.AuthBindInfo.TypeID } diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 5586930a9..bb16f2e20 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -736,18 +736,9 @@ func getGetStoresSkusBaseSQL(db *dao.DaoDB, storeIDs, skuIDs []int, upcs []strin func GetStoresSkus(ctx *jxcontext.Context, storeIDs, skuIDs []int, upcs []string, isFocus, isHighPrice bool, priceType int, keyword string, isBySku, isAct bool, params map[string]interface{}, offset, pageSize int) (skuNamesInfo *dao.StoreSkuNamesInfo, err error) { //权限 管理员/未登录人员不进入,商城不进入 - fmt.Println("===========================0", permission.IsRoled(ctx)) - fmt.Println("===========================1", ctx.GetToken()) - fmt.Println("===========================1", ctx.GetLoginInfo()) - fmt.Println("===========================1", ctx.GetFullUser()) - fmt.Println("===========================1", ctx.GetLoginInfo().GetAuthType()) - fmt.Println("===========================1", ctx.GetLoginInfo().GetAuthID()) - fmt.Println("===========================1", ctx.GetLoginInfo().GetIsWeCartApp()) - fmt.Println("===========================1", ctx.GetLoginInfo().GetUserTag()) - fmt.Println("===========================1") if permission.IsRoled(ctx) { // 登录人员,来自小程序不做处理 - if ctx.GetLoginInfo().GetIsWeCartApp() != "" && auth2.WeCartAppID != ctx.GetLoginInfo().GetIsWeCartApp() { + if auth2.WeCartAppID == strings.Split(ctx.GetToken(), ".")[4] { return GetStoresSkusNew(ctx, storeIDs, skuIDs, upcs, isFocus, isHighPrice, priceType, keyword, isBySku, isAct, params, offset, pageSize) } if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil { diff --git a/business/jxutils/jxcontext/jxcontext.go b/business/jxutils/jxcontext/jxcontext.go index 77e1543d6..69ad6985a 100644 --- a/business/jxutils/jxcontext/jxcontext.go +++ b/business/jxutils/jxcontext/jxcontext.go @@ -15,7 +15,6 @@ type IAuther interface { GetAuthID() string GetAuthType() string GetUserTag() string - GetIsWeCartApp() string } type Context struct { diff --git a/business/model/auth2.go b/business/model/auth2.go index cf0aba58a..56e485665 100644 --- a/business/model/auth2.go +++ b/business/model/auth2.go @@ -28,7 +28,6 @@ type AuthBind struct { AuthSecret2 string `orm:"size(48)" json:"-"` Remark string `orm:"size(255)" json:"remark"` DetailData string `orm:"type(text)" json:"detailData"` - AppServer string `json:"appServer"` } func (*AuthBind) TableUnique() [][]string {