mirror of
https://github.com/silenceper/wechat.git
synced 2026-02-11 00:02:27 +08:00
Merge pull request #83 from Chyroc/skip-valid-when-debug-mode
skip-valid-when-debug-mode(fix #82)
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -25,3 +25,4 @@ _testmain.go
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
.vscode/
|
.vscode/
|
||||||
vendor/*/
|
vendor/*/
|
||||||
|
.idea/
|
||||||
|
|||||||
@@ -31,10 +31,10 @@ const (
|
|||||||
type Media struct {
|
type Media struct {
|
||||||
util.CommonError
|
util.CommonError
|
||||||
|
|
||||||
Type MediaType `json:"type"`
|
Type MediaType `json:"type"`
|
||||||
MediaID string `json:"media_id"`
|
MediaID string `json:"media_id"`
|
||||||
ThumbMediaID string `json:"thumb_media_id"`
|
ThumbMediaID string `json:"thumb_media_id"`
|
||||||
CreatedAt int64 `json:"created_at"`
|
CreatedAt int64 `json:"created_at"`
|
||||||
}
|
}
|
||||||
|
|
||||||
//MediaUpload 临时素材上传
|
//MediaUpload 临时素材上传
|
||||||
|
|||||||
@@ -83,15 +83,15 @@ type MixMessage struct {
|
|||||||
URL string `xml:"Url"`
|
URL string `xml:"Url"`
|
||||||
|
|
||||||
//事件相关
|
//事件相关
|
||||||
Event EventType `xml:"Event"`
|
Event EventType `xml:"Event"`
|
||||||
EventKey string `xml:"EventKey"`
|
EventKey string `xml:"EventKey"`
|
||||||
Ticket string `xml:"Ticket"`
|
Ticket string `xml:"Ticket"`
|
||||||
Latitude string `xml:"Latitude"`
|
Latitude string `xml:"Latitude"`
|
||||||
Longitude string `xml:"Longitude"`
|
Longitude string `xml:"Longitude"`
|
||||||
Precision string `xml:"Precision"`
|
Precision string `xml:"Precision"`
|
||||||
MenuID string `xml:"MenuId"`
|
MenuID string `xml:"MenuId"`
|
||||||
Status string `xml:"Status"`
|
Status string `xml:"Status"`
|
||||||
SessionFrom string `xml:"SessionFrom"`
|
SessionFrom string `xml:"SessionFrom"`
|
||||||
|
|
||||||
ScanCodeInfo struct {
|
ScanCodeInfo struct {
|
||||||
ScanType string `xml:"ScanType"`
|
ScanType string `xml:"ScanType"`
|
||||||
|
|||||||
@@ -18,6 +18,8 @@ import (
|
|||||||
type Server struct {
|
type Server struct {
|
||||||
*context.Context
|
*context.Context
|
||||||
|
|
||||||
|
debug bool
|
||||||
|
|
||||||
openID string
|
openID string
|
||||||
|
|
||||||
messageHandler func(message.MixMessage) *message.Reply
|
messageHandler func(message.MixMessage) *message.Reply
|
||||||
@@ -40,6 +42,11 @@ func NewServer(context *context.Context) *Server {
|
|||||||
return srv
|
return srv
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetDebug set debug field
|
||||||
|
func (srv *Server) SetDebug(debug bool) {
|
||||||
|
srv.debug = debug
|
||||||
|
}
|
||||||
|
|
||||||
//Serve 处理微信的请求消息
|
//Serve 处理微信的请求消息
|
||||||
func (srv *Server) Serve() error {
|
func (srv *Server) Serve() error {
|
||||||
if !srv.Validate() {
|
if !srv.Validate() {
|
||||||
@@ -65,6 +72,9 @@ func (srv *Server) Serve() error {
|
|||||||
|
|
||||||
//Validate 校验请求是否合法
|
//Validate 校验请求是否合法
|
||||||
func (srv *Server) Validate() bool {
|
func (srv *Server) Validate() bool {
|
||||||
|
if srv.debug {
|
||||||
|
return true
|
||||||
|
}
|
||||||
timestamp := srv.Query("timestamp")
|
timestamp := srv.Query("timestamp")
|
||||||
nonce := srv.Query("nonce")
|
nonce := srv.Query("nonce")
|
||||||
signature := srv.Query("signature")
|
signature := srv.Query("signature")
|
||||||
|
|||||||
10
wechat.go
10
wechat.go
@@ -10,10 +10,10 @@ import (
|
|||||||
"github.com/silenceper/wechat/material"
|
"github.com/silenceper/wechat/material"
|
||||||
"github.com/silenceper/wechat/menu"
|
"github.com/silenceper/wechat/menu"
|
||||||
"github.com/silenceper/wechat/oauth"
|
"github.com/silenceper/wechat/oauth"
|
||||||
|
"github.com/silenceper/wechat/pay"
|
||||||
"github.com/silenceper/wechat/server"
|
"github.com/silenceper/wechat/server"
|
||||||
"github.com/silenceper/wechat/template"
|
"github.com/silenceper/wechat/template"
|
||||||
"github.com/silenceper/wechat/user"
|
"github.com/silenceper/wechat/user"
|
||||||
"github.com/silenceper/wechat/pay"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Wechat struct
|
// Wechat struct
|
||||||
@@ -27,9 +27,9 @@ type Config struct {
|
|||||||
AppSecret string
|
AppSecret string
|
||||||
Token string
|
Token string
|
||||||
EncodingAESKey string
|
EncodingAESKey string
|
||||||
PayMchID string //支付 - 商户 ID
|
PayMchID string //支付 - 商户 ID
|
||||||
PayNotifyURL string //支付 - 接受微信支付结果通知的接口地址
|
PayNotifyURL string //支付 - 接受微信支付结果通知的接口地址
|
||||||
PayKey string //支付 - 商户后台设置的支付 key
|
PayKey string //支付 - 商户后台设置的支付 key
|
||||||
Cache cache.Cache
|
Cache cache.Cache
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -98,4 +98,4 @@ func (wc *Wechat) GetTemplate() *template.Template {
|
|||||||
// GetPay 返回支付消息的实例
|
// GetPay 返回支付消息的实例
|
||||||
func (wc *Wechat) GetPay() *pay.Pay {
|
func (wc *Wechat) GetPay() *pay.Pay {
|
||||||
return pay.NewPay(wc.Context)
|
return pay.NewPay(wc.Context)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user