git/wechat
1
0
Fork 0
mirror of https://github.com/silenceper/wechat.git synced 2026-02-11 16:22:26 +08:00
Code Issues Projects Releases Wiki Activity

[feature] Format the code and improve Mini Program authorization to o… (#473)

Browse Source 
* [feature] Format the code and improve Mini Program authorization to obtain openid（miniprogram/auth/auth.go Code2Session）

* [feature] CheckEncryptedData (https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/user-info/auth.checkEncryptedData.html)

* upgrade json error

* upgrade json error

Co-authored-by: houseme <houseme@outlook.com>
This commit is contained in:
houseme
2021-09-08 11:03:23 +08:00
committed by GitHub
parent 47adf42208
commit 96c1f98944
90 changed files with 787 additions and 760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
officialaccount/server/server.go
View File

@@ -17,7 +17,7 @@ import (
"github.com/silenceper/wechat/v2/util"
)
//Server struct
// Server struct
type Server struct {
*context.Context
Writer http.ResponseWriter
@@ -40,7 +40,7 @@ type Server struct {
timestamp int64
}
//NewServer init
// NewServer init
func NewServer(context *context.Context) *Server {
srv := new(Server)
srv.Context = context
@@ -52,7 +52,7 @@ func (srv *Server) SkipValidate(skip bool) {
srv.skipValidate = skip
}
//Serve 处理微信的请求消息
// Serve 处理微信的请求消息
func (srv *Server) Serve() error {
if !srv.Validate() {
log.Error("Validate Signature Failed.")
@@ -70,13 +70,13 @@ func (srv *Server) Serve() error {
return err
}
//debug print request msg
// debug print request msg
log.Debugf("request msg =%s", string(srv.RequestRawXMLMsg))
return srv.buildResponse(response)
}
//Validate 校验请求是否合法
// Validate 校验请求是否合法
func (srv *Server) Validate() bool {
if srv.skipValidate {
return true
@@ -88,16 +88,16 @@ func (srv *Server) Validate() bool {
return signature == util.Signature(srv.Token, timestamp, nonce)
}
//HandleRequest 处理微信的请求
// HandleRequest 处理微信的请求
func (srv *Server) handleRequest() (reply *message.Reply, err error) {
//set isSafeMode
// set isSafeMode
srv.isSafeMode = false
encryptType := srv.Query("encrypt_type")
if encryptType == "aes" {
srv.isSafeMode = true
}
//set openID
// set openID
srv.openID = srv.Query("openid")
var msg interface{}
@@ -114,12 +114,12 @@ func (srv *Server) handleRequest() (reply *message.Reply, err error) {
return
}
//GetOpenID return openID
// GetOpenID return openID
func (srv *Server) GetOpenID() string {
return srv.openID
}
//getMessage 解析微信返回的消息
// getMessage 解析微信返回的消息
func (srv *Server) getMessage() (interface{}, error) {
var rawXMLMsgBytes []byte
var err error
@@ -129,7 +129,7 @@ func (srv *Server) getMessage() (interface{}, error) {
return nil, fmt.Errorf("从body中解析xml失败,err=%v", err)
}
//验证消息签名
// 验证消息签名
timestamp := srv.Query("timestamp")
srv.timestamp, err = strconv.ParseInt(timestamp, 10, 32)
if err != nil {
@@ -143,7 +143,7 @@ func (srv *Server) getMessage() (interface{}, error) {
return nil, fmt.Errorf("消息不合法，验证签名失败")
}
//解密
// 解密
srv.random, rawXMLMsgBytes, err = util.DecryptMsg(srv.AppID, encryptedXMLMsg.EncryptedMsg, srv.EncodingAESKey)
if err != nil {
return nil, fmt.Errorf("消息解密失败, err=%v", err)
@@ -166,7 +166,7 @@ func (srv *Server) parseRequestMessage(rawXMLMsgBytes []byte) (msg *message.MixM
return
}
//SetMessageHandler 设置用户自定义的回调方法
// SetMessageHandler 设置用户自定义的回调方法
func (srv *Server) SetMessageHandler(handler func(*message.MixMessage) *message.Reply) {
srv.messageHandler = handler
}
@@ -178,7 +178,7 @@ func (srv *Server) buildResponse(reply *message.Reply) (err error) {
}
}()
if reply == nil {
//do nothing
// do nothing
return nil
}
msgType := reply.MsgType
@@ -197,7 +197,7 @@ func (srv *Server) buildResponse(reply *message.Reply) (err error) {
msgData := reply.MsgData
value := reflect.ValueOf(msgData)
//msgData must be a ptr
// msgData must be a ptr
kind := value.Kind().String()
if kind != "ptr" {
return message.ErrUnsupportReply
@@ -221,18 +221,18 @@ func (srv *Server) buildResponse(reply *message.Reply) (err error) {
return
}
//Send 将自定义的消息发送
// Send 将自定义的消息发送
func (srv *Server) Send() (err error) {
replyMsg := srv.ResponseMsg
log.Debugf("response msg =%+v", replyMsg)
if srv.isSafeMode {
//安全模式下对消息进行加密
// 安全模式下对消息进行加密
var encryptedMsg []byte
encryptedMsg, err = util.EncryptMsg(srv.random, srv.ResponseRawXMLMsg, srv.AppID, srv.EncodingAESKey)
if err != nil {
return
}
//TODO 如果获取不到timestamp nonce 则自己生成
// TODO 如果获取不到timestamp nonce 则自己生成
timestamp := srv.timestamp
timestampStr := strconv.FormatInt(timestamp, 10)
msgSignature := util.Signature(srv.Token, timestampStr, srv.nonce, string(encryptedMsg))

10
officialaccount/server/util.go
View File

@@ -15,10 +15,10 @@ func writeContextType(w http.ResponseWriter, value []string) {
}
}
//Render render from bytes
// Render render from bytes
func (srv *Server) Render(bytes []byte) {
//debug
//fmt.Println("response msg = ", string(bytes))
// debug
// fmt.Println("response msg = ", string(bytes))
srv.Writer.WriteHeader(200)
_, err := srv.Writer.Write(bytes)
if err != nil {
@@ -26,13 +26,13 @@ func (srv *Server) Render(bytes []byte) {
}
}
//String render from string
// String render from string
func (srv *Server) String(str string) {
writeContextType(srv.Writer, plainContentType)
srv.Render([]byte(str))
}
//XML render to xml
// XML render to xml
func (srv *Server) XML(obj interface{}) {
writeContextType(srv.Writer, xmlContentType)
bytes, err := xml.Marshal(obj)