liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wx注册错误

Browse Source
This commit is contained in:
richboo111
2022-08-22 17:09:06 +08:00
parent 69bfa4e2f2
commit c38a2dbc86
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/auth2/auth2.go
View File

@@ -282,6 +282,7 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string
} }
} }
authInfo = createAuthInfo(user, authBindEx) authInfo = createAuthInfo(user, authBindEx)
globals.SugarLogger.Debug("authInfo==================", authInfo)
if user != nil && user.GetID() != "" { if user != nil && user.GetID() != "" {
userProvider.UpdateLastLogin(user.GetID(), authType, ctx.GetRealRemoteIP()) userProvider.UpdateLastLogin(user.GetID(), authType, ctx.GetRealRemoteIP())
} }

1
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -1038,6 +1038,7 @@ func (s *DefScheduler) swtich2SelfDeliverWithRetry(savedOrderInfo *WatchOrderInf
if retryCount > 0 { if retryCount > 0 {
utils.AfterFuncWithRecover(duration, func() { utils.AfterFuncWithRecover(duration, func() {
jxutils.CallMsgHandlerAsync(func() { jxutils.CallMsgHandlerAsync(func() {
s.SelfDeliverDelivering(order, "非专送、快送、混合送订单，转自送失败，调用deriving转自送")
s.swtich2SelfDeliverWithRetry(savedOrderInfo, bill, retryCount-1, duration) s.swtich2SelfDeliverWithRetry(savedOrderInfo, bill, retryCount-1, duration)
}, jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID)) }, jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID))
}) })

5
controllers/auth2.go
View File

@@ -116,6 +116,7 @@ func (c *Auth2Controller) TiktokDecrypt() {
// @router /Login [post] // @router /Login [post]
func (c *Auth2Controller) Login() { func (c *Auth2Controller) Login() {
c.callLogin(func(params *tAuth2LoginParams) (retVal interface{}, errCode string, err error) { c.callLogin(func(params *tAuth2LoginParams) (retVal interface{}, errCode string, err error) {
globals.SugarLogger.Debug("params.AuthType==============", params.AuthType)
if params.AuthType == auth2.AuthTypeMobile { if params.AuthType == auth2.AuthTypeMobile {
params.AuthIDType = auth2.UserIDMobile params.AuthIDType = auth2.UserIDMobile
} else if params.AuthType == auth2.AuthTypeEmail { } else if params.AuthType == auth2.AuthTypeEmail {
@@ -133,14 +134,18 @@ func (c *Auth2Controller) Login() {
params.AuthSecret = GetComposedCode2(&c.Controller, params.AuthSecret) params.AuthSecret = GetComposedCode2(&c.Controller, params.AuthSecret)
} }
ctx := auth2.NewContext(c.Ctx.ResponseWriter, c.Ctx.Request) ctx := auth2.NewContext(c.Ctx.ResponseWriter, c.Ctx.Request)
globals.SugarLogger.Debug("params.AuthType, params.AuthID, params.AuthIDType, params.AuthSecret==============", params.AuthType, params.AuthID, params.AuthIDType, params.AuthSecret)
authInfo, err := auth2.Login(ctx, params.AuthType, params.AuthID, params.AuthIDType, params.AuthSecret) authInfo, err := auth2.Login(ctx, params.AuthType, params.AuthID, params.AuthIDType, params.AuthSecret)
globals.SugarLogger.Debug("authInfo==============", authInfo)
// TODO 兼容没有取到authid2的错误 // TODO 兼容没有取到authid2的错误
if err == nil && authInfo.AuthBindInfo != nil { if err == nil && authInfo.AuthBindInfo != nil {
if authInfo.AuthBindInfo.AuthID2 == "" { if authInfo.AuthBindInfo.AuthID2 == "" {
globals.SugarLogger.Debug("fgfggggggg")
authInfo.AuthBindInfo.AuthID2 = authInfo.AuthBindInfo.AuthID authInfo.AuthBindInfo.AuthID2 = authInfo.AuthBindInfo.AuthID
} }
retVal = authInfo retVal = authInfo
} }
globals.SugarLogger.Debug("retVal==============", retVal)
return retVal, "", err return retVal, "", err
}) })
} }