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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-04-09 11:47:39 +08:00
parent dc1f8df8f6
commit 101b0e5c24
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
business/auth2/authprovider/weixin/weixin_mini.go
View File

@@ -2,7 +2,6 @@ package weixin
import ( import (
"errors" "errors"
"fmt"
"strings" "strings"
"git.rosy.net.cn/baseapi/platformapi/weixinapi" "git.rosy.net.cn/baseapi/platformapi/weixinapi"
@@ -57,13 +56,13 @@ func (a *MiniAuther) DecryptData(authInfo *auth2.AuthInfo, jsCode, encryptedData
if jsCode != "" { if jsCode != "" {
sessionInfo, err := getWxApp(appID).SNSCode2Session(jsCode) sessionInfo, err := getWxApp(appID).SNSCode2Session(jsCode)
if err == nil { if err == nil {
if authBindEx, err := a.UnionFindAuthBind(AuthTypeMini, getWxApp(appID).GetAppID(), []string{AuthTypeMini}, sessionInfo.OpenID, "", nil); err == nil { // if authBindEx, err := a.UnionFindAuthBind(AuthTypeMini, getWxApp(appID).GetAppID(), []string{AuthTypeMini}, sessionInfo.OpenID, "", nil); err == nil {
if authBindEx.UserID != authInfo.GetID() { // if authBindEx.UserID != authInfo.GetID() {
return "", fmt.Errorf("jsCode与token不匹配") // return "", fmt.Errorf("jsCode与token不匹配")
} // }
} else { // } else {
return "", err // return "", err
} // }
sessionKey = sessionInfo.SessionKey sessionKey = sessionInfo.SessionKey
} else { } else {
return "", err return "", err

6
controllers/auth2.go
View File

@@ -6,8 +6,6 @@ import (
"net/http" "net/http"
"strings" "strings"
"git.rosy.net.cn/jx-callback/globals/api"
"git.rosy.net.cn/baseapi/platformapi/weixinapi" "git.rosy.net.cn/baseapi/platformapi/weixinapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/auth2" "git.rosy.net.cn/jx-callback/business/auth2"
@@ -362,8 +360,8 @@ type UserInfoWithWeixin struct {
func (c *Auth2Controller) GetUserByMiniInfo() { func (c *Auth2Controller) GetUserByMiniInfo() {
c.callGetUserByMiniInfo(func(params *tAuth2GetUserByMiniInfoParams) (retVal interface{}, errCode string, err error) { c.callGetUserByMiniInfo(func(params *tAuth2GetUserByMiniInfoParams) (retVal interface{}, errCode string, err error) {
authInfo := &auth2.AuthInfo{} authInfo := &auth2.AuthInfo{}
result := api.Cacher.Get(params.Token) // result := api.Cacher.Get(params.Token)
utils.Map2StructByJson(result.(map[string]interface{}), &authInfo, false) // utils.Map2StructByJson(result.(map[string]interface{}), &authInfo, false)
jsCode := "" jsCode := ""
if params.AuthType == weixin.AuthTypeMini { if params.AuthType == weixin.AuthTypeMini {
jsCode = GetComposedCode(&c.Controller, params.JsCode) jsCode = GetComposedCode(&c.Controller, params.JsCode)