From bb97bddc08c0cfd9ca7d28c86e11949bc98225d2 Mon Sep 17 00:00:00 2001
From: ciel yu <ciel7yu@gmail.com>
Date: Sat, 12 Oct 2019 16:27:55 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=A7=A3=E5=AF=86=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E8=A7=A3=E5=AF=86=EF=BC=8C=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=9A=84=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=A7=A3=E5=AF=86"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 54e2c82f
---
 miniprogram/decrypt.go | 43 ++----------------------------------------
 1 file changed, 2 insertions(+), 41 deletions(-)

diff --git a/miniprogram/decrypt.go b/miniprogram/decrypt.go
index fce7775..6897368 100644
--- a/miniprogram/decrypt.go
+++ b/miniprogram/decrypt.go
@@ -36,17 +36,6 @@ type UserInfo struct {
 	} `json:"watermark"`
 }
 
-// 用户手机号
-type PhoneInfo struct {
-	PhoneNumber     string `json:"phoneNumber"`
-	PurePhoneNumber string `json:"purePhoneNumber"`
-	CountryCode     string `json:"countryCode"`
-	Watermark       struct {
-		Timestamp int64  `json:"timestamp"`
-		AppID     string `json:"appid"`
-	} `json:"watermark"`
-}
-
 // pkcs7Unpad returns slice of the original data without padding
 func pkcs7Unpad(data []byte, blockSize int) ([]byte, error) {
 	if blockSize <= 0 {
@@ -68,8 +57,8 @@ func pkcs7Unpad(data []byte, blockSize int) ([]byte, error) {
 	return data[:len(data)-n], nil
 }
 
-// get cipherText
-func getCipherText(sessionKey, encryptedData, iv string) ([]byte, error) {
+// Decrypt 解密数据
+func (wxa *MiniProgram) Decrypt(sessionKey, encryptedData, iv string) (*UserInfo, error) {
 	aesKey, err := base64.StdEncoding.DecodeString(sessionKey)
 	if err != nil {
 		return nil, err
@@ -92,16 +81,6 @@ func getCipherText(sessionKey, encryptedData, iv string) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	return cipherText, err
-}
-
-// Decrypt 解密(用户)数据
-func (wxa *MiniProgram) Decrypt(sessionKey, encryptedData, iv string) (*UserInfo, error) {
-	// 拿到 cipherText
-	cipherText,err := getCipherText(sessionKey, encryptedData, iv)
-	if err != nil {
-		return nil, err
-	}
 	var userInfo UserInfo
 	err = json.Unmarshal(cipherText, &userInfo)
 	if err != nil {
@@ -112,21 +91,3 @@ func (wxa *MiniProgram) Decrypt(sessionKey, encryptedData, iv string) (*UserInfo
 	}
 	return &userInfo, nil
 }
-
-// Decrypt 解密(手机)数据
-func (wxa *MiniProgram) DecryptPhone(sessionKey, encryptedData, iv string) (*PhoneInfo, error) {
-	// 拿到 cipherText
-	cipherText,err := getCipherText(sessionKey, encryptedData, iv)
-	if err != nil {
-		return nil, err
-	}
-	var phoneInfo PhoneInfo
-	err = json.Unmarshal(cipherText, &phoneInfo)
-	if err != nil {
-		return nil, err
-	}
-	if phoneInfo.Watermark.AppID != wxa.AppID {
-		return nil, ErrAppIDNotMatch
-	}
-	return &phoneInfo, nil
-}