1

model/app_model/app_user_login.go

@@ -33,3 +33,16 @@ type WxLoginReq struct {
 	Phone    string `json:"phone" form:"phone"`       // 微信和电话登录使用
 	Password string `json:"password" form:"password"` // 密码登录
 }
+
+// 微信小程序解密后 用户手机号结构体
+type UserPhone struct {
+	PhoneNumber     string         `json:"phoneNumber,omitempty"`
+	PurePhoneNumber string         `json:"purePhoneNumber,omitempty"`
+	CountryCode     string         `json:"countryCode,omitempty"`
+	Watermark       *watermarkInfo `json:"watermark,omitempty"`
+}
+
+type watermarkInfo struct {
+	Appid     string `json:"appid,omitempty"`
+	Timestamp int    `json:"timestamp,omitempty"`
+}

services/print_server/app_server/wx_login.go

@@ -8,7 +8,6 @@ import (
 	"errors"
 	"fmt"
 	"git.rosy.net.cn/baseapi/utils"
-	"git.rosy.net.cn/gopay-main/wechat"
 	"git.rosy.net.cn/jx-print/dao"
 	"git.rosy.net.cn/jx-print/globals"
 	"git.rosy.net.cn/jx-print/model"
@@ -107,7 +106,7 @@ func (u *UserLogin) GetUserPhoneNum(param *wxLogin.WeChatPhoneNumberParam) (stri
 		return "", err
 	}
 
-	weChatLogin := new(wechat.UserPhone)
+	weChatLogin := new(wxLogin.UserPhone)
 	if err := DecryptOpenDataToStruct(param.EncryptedData, param.IV, sessionInfo.SessionKey, weChatLogin); err != nil {
 		return "", err
 	}