git/wechat
1
0
Fork 0
mirror of https://github.com/silenceper/wechat.git synced 2026-02-07 14:12:27 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release-2.0-hb' into release-2.0-hb

Browse Source 
# Conflicts:
#	credential/work_js_ticket.go
#	work/js/js.go
#	work/message/reply.go
#	work/server/error.go
#	work/server/server.go
#	work/server/util.go
This commit is contained in:
wind
2024-11-15 11:44:40 +08:00
parent a7347f9506 8a044dcd58
commit 06e92dd5ce
22 changed files with 673 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
miniprogram/encryptor/encryptor.go
View File

@@ -7,8 +7,8 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/silenceper/wechat/v2/miniprogram/context"
"strings"
)
// Encryptor struct
@@ -108,13 +108,23 @@ func GetCipherText(sessionKey, encryptedData, iv string) ([]byte, error) {
}
// Decrypt 解密数据
func (encryptor *Encryptor) Decrypt(sessionKey, encryptedData, iv string) (*PlainData, error) {
func (encryptor *Encryptor) Decrypt(sessionKey, encryptedData, appid string) (*PlainData, error) {
ivB := make([]byte, 16)
iv := base64.StdEncoding.EncodeToString(ivB)
cipherText, err := GetCipherText(sessionKey, encryptedData, iv)
if err != nil {
return nil, err
}
length := string(cipherText[:20])
cipherTextData := strings.TrimPrefix(string(cipherText), string(cipherText[:20]))
cipherTextData = strings.TrimSuffix(cipherTextData, appid)
if len(length) != len(cipherTextData) {
return nil, fmt.Errorf("length not match, %d != %d", length, len(cipherTextData))
}
var plainData PlainData
err = json.Unmarshal(cipherText, &plainData)
err = json.Unmarshal([]byte(cipherTextData), &plainData)
if err != nil {
return nil, err
}