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

修改MiniDecryptData中的bug

Browse Source
This commit is contained in:
gazebo
2019-11-08 18:25:46 +08:00
parent a7164bb511
commit 128d719a9c
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,6 @@
package weixin package weixin
import ( import (
"encoding/base64"
"errors" "errors"
"strings" "strings"
@@ -55,7 +54,7 @@ func (a *MiniAuther) DecryptData(authInfo *auth2.AuthInfo, encryptedData, iv str
if err != nil { if err != nil {
return "", err return "", err
} }
return base64.StdEncoding.EncodeToString(decryptedData), nil return string(decryptedData), nil
} }
func (a *MiniAuther) GetUserType() (userType int8) { func (a *MiniAuther) GetUserType() (userType int8) {

15
controllers/auth2.go
View File

@@ -6,6 +6,7 @@ import (
"net/http" "net/http"
"strings" "strings"
"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"
"git.rosy.net.cn/jx-callback/business/auth2/authprovider/dingding" "git.rosy.net.cn/jx-callback/business/auth2/authprovider/dingding"
@@ -13,9 +14,9 @@ import (
"git.rosy.net.cn/jx-callback/business/auth2/authprovider/password" "git.rosy.net.cn/jx-callback/business/auth2/authprovider/password"
"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin" "git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals"
"github.com/astaxie/beego" "github.com/astaxie/beego"
"git.rosy.net.cn/jx-callback/business/model/dao"
) )
func GetComposedCode(c *beego.Controller, code string) (composedCode string) { func GetComposedCode(c *beego.Controller, code string) (composedCode string) {
@@ -309,10 +310,14 @@ func (c *Auth2Controller) MiniDecryptData() {
c.callMiniDecryptData(func(params *tAuth2MiniDecryptDataParams) (retVal interface{}, errCode string, err error) { c.callMiniDecryptData(func(params *tAuth2MiniDecryptDataParams) (retVal interface{}, errCode string, err error) {
authInfo, err := params.Ctx.GetV2AuthInfo() authInfo, err := params.Ctx.GetV2AuthInfo()
if err == nil { if err == nil {
if retVal, err = weixin.AutherObjMini.DecryptData(authInfo, params.Data, params.Iv); err == nil { decryptedDataBase64, err2 := weixin.AutherObjMini.DecryptData(authInfo, params.Data, params.Iv)
if user:= params.Ctx.GetFullUser(); user != nil { if err = err2; err == nil {
user.Avatar = "avatar" var userInfo *weixinapi.MiniUserInfo
dao.UpdateEntity(dao.GetDB(), user, "Avatar") if err = utils.UnmarshalUseNumber([]byte(decryptedDataBase64), &userInfo); err == nil {
if user := params.Ctx.GetFullUser(); user != nil {
user.Avatar = userInfo.AvatarURL
dao.UpdateEntity(dao.GetDB(), user, "Avatar")
}
} }
} }
} }