From 8062dff677a7f23fa367b3cb625f43080dd76448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Thu, 28 Jul 2022 16:48:56 +0800
Subject: [PATCH] 1

---
 services/print_server/app_server/wx_login.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/services/print_server/app_server/wx_login.go b/services/print_server/app_server/wx_login.go
index f86adf5..bd631d5 100644
--- a/services/print_server/app_server/wx_login.go
+++ b/services/print_server/app_server/wx_login.go
@@ -40,7 +40,7 @@ func (u *UserLogin) WxLogin(ctx *gin.Context, code, phone string) (*model.User,
 	}
 
 	// 获取用户信息，是否注册
-	userInfo, err := wechat.GetOauth2UserInfo(ctx, openObj.AccessToken, openObj.OpenID)
+	userInfo, err := api.WeixinMiniAPI.SNSGetUserInfo(openObj.AccessToken, openObj.OpenID)
 	if err != nil {
 		return nil, err
 	}
@@ -57,10 +57,10 @@ func (u *UserLogin) WxLogin(ctx *gin.Context, code, phone string) (*model.User,
 			DeletedAt:     &utils.DefaultTimeValue,
 			UserID:        utils.GetUUID(),
 			Password:      "",
-			Name:          userInfo.Nickname,
+			Name:          userInfo.NickName,
 			Mobile:        phone,
 			Email:         "",
-			Avatar:        userInfo.Headimgurl,
+			Avatar:        userInfo.HeadImgURL,
 			Status:        1,
 			Type:          1,
 			Company:       "",
@@ -72,8 +72,8 @@ func (u *UserLogin) WxLogin(ctx *gin.Context, code, phone string) (*model.User,
 			LastLoginAt:   &timeNow,
 			LastLoginIP:   ctx.ClientIP(),
 			LastLoginType: model.OrderOriginWxMini,
-			OpenId:        userInfo.Openid,
-			UnionId:       userInfo.Unionid,
+			OpenId:        userInfo.OpenID,
+			UnionId:       userInfo.UnionID,
 		}
 		if err := dao.CreateUserWx(userBase); err != nil {
 			return nil, err
@@ -82,10 +82,10 @@ func (u *UserLogin) WxLogin(ctx *gin.Context, code, phone string) (*model.User,
 	case 1:
 		// 用户使用电话号码登录，未使用微信登录
 		if users[0].OpenId == "" {
-			users[0].Name = userInfo.Nickname
-			users[0].Avatar = userInfo.Headimgurl
-			users[0].OpenId = userInfo.Openid
-			users[0].UnionId = userInfo.Unionid
+			users[0].Name = userInfo.NickName
+			users[0].Avatar = userInfo.HeadImgURL
+			users[0].OpenId = userInfo.OpenID
+			users[0].UnionId = userInfo.UnionID
 		}
 		// 用户存在,判断用户
 		users[0].UpdatedAt = &timeNow