diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml new file mode 100644 index 0000000..93497a1 --- /dev/null +++ b/.github/workflows/go.yml @@ -0,0 +1,50 @@ +name: Go + +on: + push: + branches: [ master,release-* ] + pull_request: + branches: [ master,release-* ] + +jobs: + build: + name: Build + runs-on: ubuntu-latest + services: + redis: + image: redis + ports: + - 6379:6379 + options: --entrypoint redis-server + memcached: + image: memcached + ports: + - 11211:11211 + steps: + + - name: Set up Go 1.x + uses: actions/setup-go@v2 + with: + go-version: ^1.13 + id: go + + - name: Check out code into the Go module directory + uses: actions/checkout@v2 + + - name: Get dependencies + run: | + go get -v -t -d ./... + if [ -f Gopkg.toml ]; then + curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh + dep ensure + fi + + - name: Lint Go Code + run: | + export PATH=$PATH:$(go env GOPATH)/bin # temporary fix. See https://github.com/actions/setup-go/issues/14 + go get -u golang.org/x/lint/golint + go vet ./... + golint -set_exit_status $(go list ./...) + + - name: Test + run: go test -v -race ./... diff --git a/README.md b/README.md index 3c333d8..ef55760 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # WeChat SDK for Go -[![Build Status](https://travis-ci.org/silenceper/wechat.svg?branch=release-1.3)](https://travis-ci.org/silenceper/wechat) +[![Build Status](https://travis-ci.org/silenceper/wechat.svg?branch=release-2.0)](https://travis-ci.org/silenceper/wechat) [![Go Report Card](https://goreportcard.com/badge/github.com/silenceper/wechat)](https://goreportcard.com/report/github.com/silenceper/wechat) [![GoDoc](http://godoc.org/github.com/silenceper/wechat?status.svg)](http://godoc.org/github.com/silenceper/wechat) @@ -44,10 +44,11 @@ server.Send() ``` +## 文档 +[Wechat SDK 2.0 文档](http://silenceper.com/wechat) -## 参与贡献 -### 目录说明 +## 目录说明 - officialaccount: 微信公众号API - miniprogram: 小程序API - minigame:小游戏API @@ -56,6 +57,10 @@ server.Send() - work:企业微信 - aispeech:智能对话 +## 如何贡献 +- 提交issue，描述需要贡献的内容 +- 完成更改后，提交PR + ## License diff --git a/go.mod b/go.mod index 56fd263..bf49a13 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,11 @@ -module github.com/silenceper/wechat +module github.com/silenceper/wechat/v2 -go 1.13 +go 1.14 require ( github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b - github.com/gomodule/redigo v2.0.0+incompatible - golang.org/x/crypto v0.0.0-20200117160349-530e935923ad + github.com/gomodule/redigo v1.8.1 + github.com/sirupsen/logrus v1.6.0 + golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 + golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect ) diff --git a/go.sum b/go.sum index 9351b0b..351f9a8 100644 --- a/go.sum +++ b/go.sum @@ -1,13 +1,39 @@ github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b h1:L/QXpzIa3pOvUGt1D1lA5KjYhPBAN/3iWdP7xeFS9F0= github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= -github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0= -github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= +github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/gomodule/redigo v1.8.1 h1:Abmo0bI7Xf0IhdIPc7HZQzZcShdnmxeoVuDDtIQp8N8= +github.com/gomodule/redigo v1.8.1/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= +github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200117160349-530e935923ad h1:Jh8cai0fqIK+f6nG0UgPW5wFk8wmiMhM3AyciDBdtQg= -golang.org/x/crypto v0.0.0-20200117160349-530e935923ad/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 h1:cg5LA/zNPRzIXIWSCxQW10Rvpy94aQh3LT/ShoCpkHw= +golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7 h1:EBZoQjiKKPaLbPrbpssUfuHtwM6KV/vb4U85g/cigFY= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/miniprogram/analysis/analysis.go b/miniprogram/analysis/analysis.go index c9c3e80..11e1de1 100644 --- a/miniprogram/analysis/analysis.go +++ b/miniprogram/analysis/analysis.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - "github.com/silenceper/wechat/miniprogram/context" + "github.com/silenceper/wechat/v2/miniprogram/context" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/util" ) const ( diff --git a/miniprogram/auth/auth.go b/miniprogram/auth/auth.go index 0c6653b..377e2b7 100644 --- a/miniprogram/auth/auth.go +++ b/miniprogram/auth/auth.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" - "github.com/silenceper/wechat/miniprogram/context" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/miniprogram/context" + "github.com/silenceper/wechat/v2/util" ) const ( diff --git a/miniprogram/basic/basic.go b/miniprogram/basic/basic.go index 0382ff9..3d1df74 100644 --- a/miniprogram/basic/basic.go +++ b/miniprogram/basic/basic.go @@ -1,6 +1,6 @@ package basic -import "github.com/silenceper/wechat/miniprogram/context" +import "github.com/silenceper/wechat/v2/miniprogram/context" //Basic struct type Basic struct { diff --git a/miniprogram/config/config.go b/miniprogram/config/config.go index 2e7c66a..7edf435 100644 --- a/miniprogram/config/config.go +++ b/miniprogram/config/config.go @@ -1,7 +1,7 @@ package config import ( - "github.com/silenceper/wechat/cache" + "github.com/silenceper/wechat/v2/cache" ) //Config config for 小程序 diff --git a/miniprogram/context/access_token.go b/miniprogram/context/access_token.go index 01305de..f382d71 100644 --- a/miniprogram/context/access_token.go +++ b/miniprogram/context/access_token.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/util" ) const ( diff --git a/miniprogram/context/context.go b/miniprogram/context/context.go index ba99960..6a6017d 100644 --- a/miniprogram/context/context.go +++ b/miniprogram/context/context.go @@ -3,7 +3,7 @@ package context import ( "sync" - "github.com/silenceper/wechat/miniprogram/config" + "github.com/silenceper/wechat/v2/miniprogram/config" ) // Context struct diff --git a/miniprogram/miniprogram.go b/miniprogram/miniprogram.go index b92a89d..2eb551b 100644 --- a/miniprogram/miniprogram.go +++ b/miniprogram/miniprogram.go @@ -3,13 +3,13 @@ package miniprogram import ( "sync" - "github.com/silenceper/wechat/miniprogram/analysis" - "github.com/silenceper/wechat/miniprogram/auth" - "github.com/silenceper/wechat/miniprogram/basic" - "github.com/silenceper/wechat/miniprogram/config" - "github.com/silenceper/wechat/miniprogram/context" - "github.com/silenceper/wechat/miniprogram/qrcode" - "github.com/silenceper/wechat/miniprogram/tcb" + "github.com/silenceper/wechat/v2/miniprogram/analysis" + "github.com/silenceper/wechat/v2/miniprogram/auth" + "github.com/silenceper/wechat/v2/miniprogram/basic" + "github.com/silenceper/wechat/v2/miniprogram/config" + "github.com/silenceper/wechat/v2/miniprogram/context" + "github.com/silenceper/wechat/v2/miniprogram/qrcode" + "github.com/silenceper/wechat/v2/miniprogram/tcb" ) //MiniProgram 微信小程序相关API diff --git a/miniprogram/qrcode/qrcode.go b/miniprogram/qrcode/qrcode.go index 066cce7..995ffc0 100644 --- a/miniprogram/qrcode/qrcode.go +++ b/miniprogram/qrcode/qrcode.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/silenceper/wechat/miniprogram/context" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/miniprogram/context" + "github.com/silenceper/wechat/v2/util" ) const ( diff --git a/miniprogram/tcb/README.md b/miniprogram/tcb/README.md index 3fd3078..473e510 100644 --- a/miniprogram/tcb/README.md +++ b/miniprogram/tcb/README.md @@ -29,4 +29,4 @@ if err != nil { } ``` -更多使用方法参考[GODOC](https://godoc.org/github.com/silenceper/wechat/tcb) \ No newline at end of file +更多使用方法参考[GODOC](https://godoc.org/github.com/silenceper/wechat/v2/tcb) \ No newline at end of file diff --git a/miniprogram/tcb/cloudfunction.go b/miniprogram/tcb/cloudfunction.go index 6cbfbe1..87b11ab 100644 --- a/miniprogram/tcb/cloudfunction.go +++ b/miniprogram/tcb/cloudfunction.go @@ -3,7 +3,7 @@ package tcb import ( "fmt" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/util" ) const ( diff --git a/miniprogram/tcb/database.go b/miniprogram/tcb/database.go index 5ec8e00..9d473dd 100644 --- a/miniprogram/tcb/database.go +++ b/miniprogram/tcb/database.go @@ -3,7 +3,7 @@ package tcb import ( "fmt" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/util" ) const ( diff --git a/miniprogram/tcb/file.go b/miniprogram/tcb/file.go index 3eaabe1..bfee9ea 100644 --- a/miniprogram/tcb/file.go +++ b/miniprogram/tcb/file.go @@ -3,7 +3,7 @@ package tcb import ( "fmt" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/util" ) const ( diff --git a/miniprogram/tcb/tcb.go b/miniprogram/tcb/tcb.go index cbab947..35522ee 100644 --- a/miniprogram/tcb/tcb.go +++ b/miniprogram/tcb/tcb.go @@ -1,6 +1,6 @@ package tcb -import "github.com/silenceper/wechat/miniprogram/context" +import "github.com/silenceper/wechat/v2/miniprogram/context" //Tcb Tencent Cloud Base type Tcb struct { diff --git a/officialaccount/basic/basic.go b/officialaccount/basic/basic.go index 40c7769..dae392b 100644 --- a/officialaccount/basic/basic.go +++ b/officialaccount/basic/basic.go @@ -1,6 +1,6 @@ package basic -import "github.com/silenceper/wechat/officialaccount/context" +import "github.com/silenceper/wechat/v2/officialaccount/context" //Basic struct type Basic struct { diff --git a/officialaccount/basic/qr.go b/officialaccount/basic/qr.go index 09ac154..161c8d4 100644 --- a/officialaccount/basic/qr.go +++ b/officialaccount/basic/qr.go @@ -6,7 +6,7 @@ import ( "reflect" "time" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/util" ) const ( diff --git a/officialaccount/config/config.go b/officialaccount/config/config.go index ce85e7c..3db65fe 100644 --- a/officialaccount/config/config.go +++ b/officialaccount/config/config.go @@ -1,7 +1,7 @@ package config import ( - "github.com/silenceper/wechat/cache" + "github.com/silenceper/wechat/v2/cache" ) //Config config for 微信公众号 diff --git a/officialaccount/context/access_token.go b/officialaccount/context/access_token.go index d37138b..56069e7 100644 --- a/officialaccount/context/access_token.go +++ b/officialaccount/context/access_token.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/util" ) const ( diff --git a/officialaccount/context/context.go b/officialaccount/context/context.go index 348c881..a7d12a9 100644 --- a/officialaccount/context/context.go +++ b/officialaccount/context/context.go @@ -3,7 +3,7 @@ package context import ( "sync" - "github.com/silenceper/wechat/officialaccount/config" + "github.com/silenceper/wechat/v2/officialaccount/config" ) // Context struct diff --git a/officialaccount/device/authorize.go b/officialaccount/device/authorize.go index 80b0152..de02647 100644 --- a/officialaccount/device/authorize.go +++ b/officialaccount/device/authorize.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/util" ) const ( diff --git a/officialaccount/device/bind.go b/officialaccount/device/bind.go index 6d2b3d0..f885667 100644 --- a/officialaccount/device/bind.go +++ b/officialaccount/device/bind.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/util" ) // ReqBind 设备绑定解绑共通实体 diff --git a/officialaccount/device/device.go b/officialaccount/device/device.go index cbb2af2..327add4 100644 --- a/officialaccount/device/device.go +++ b/officialaccount/device/device.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" - "github.com/silenceper/wechat/officialaccount/context" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/officialaccount/context" + "github.com/silenceper/wechat/v2/util" ) const ( diff --git a/officialaccount/device/qrcode.go b/officialaccount/device/qrcode.go index fb2e9f8..51cf91a 100644 --- a/officialaccount/device/qrcode.go +++ b/officialaccount/device/qrcode.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/util" ) //ResCreateQRCode 获取二维码的返回实体 diff --git a/officialaccount/js/js.go b/officialaccount/js/js.go index a2a5f05..16b20f3 100644 --- a/officialaccount/js/js.go +++ b/officialaccount/js/js.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/silenceper/wechat/officialaccount/context" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/officialaccount/context" + "github.com/silenceper/wechat/v2/util" ) const getTicketURL = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=%s&type=jsapi" diff --git a/officialaccount/material/material.go b/officialaccount/material/material.go index d682d8c..2158a6d 100644 --- a/officialaccount/material/material.go +++ b/officialaccount/material/material.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/silenceper/wechat/officialaccount/context" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/officialaccount/context" + "github.com/silenceper/wechat/v2/util" ) const ( diff --git a/officialaccount/material/media.go b/officialaccount/material/media.go index 70ff09e..093f206 100644 --- a/officialaccount/material/media.go +++ b/officialaccount/material/media.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/util" ) //MediaType 媒体文件类型 diff --git a/officialaccount/menu/menu.go b/officialaccount/menu/menu.go index fc5ebe8..1434057 100644 --- a/officialaccount/menu/menu.go +++ b/officialaccount/menu/menu.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" - "github.com/silenceper/wechat/officialaccount/context" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/officialaccount/context" + "github.com/silenceper/wechat/v2/util" ) const ( diff --git a/officialaccount/message/customer_message.go b/officialaccount/message/customer_message.go index 6864b34..ddbbdb9 100644 --- a/officialaccount/message/customer_message.go +++ b/officialaccount/message/customer_message.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" - "github.com/silenceper/wechat/officialaccount/context" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/officialaccount/context" + "github.com/silenceper/wechat/v2/util" ) const ( diff --git a/officialaccount/message/message.go b/officialaccount/message/message.go index 87ee8c9..85aa732 100644 --- a/officialaccount/message/message.go +++ b/officialaccount/message/message.go @@ -3,7 +3,7 @@ package message import ( "encoding/xml" - "github.com/silenceper/wechat/officialaccount/device" + "github.com/silenceper/wechat/v2/officialaccount/device" ) // MsgType 基本消息类型 diff --git a/officialaccount/message/template.go b/officialaccount/message/template.go index e158152..6486471 100644 --- a/officialaccount/message/template.go +++ b/officialaccount/message/template.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" - "github.com/silenceper/wechat/officialaccount/context" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/officialaccount/context" + "github.com/silenceper/wechat/v2/util" ) const ( diff --git a/officialaccount/oauth/oauth.go b/officialaccount/oauth/oauth.go index a11e07e..c9290e9 100644 --- a/officialaccount/oauth/oauth.go +++ b/officialaccount/oauth/oauth.go @@ -6,8 +6,8 @@ import ( "net/http" "net/url" - "github.com/silenceper/wechat/officialaccount/context" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/officialaccount/context" + "github.com/silenceper/wechat/v2/util" ) const ( diff --git a/officialaccount/officialaccount.go b/officialaccount/officialaccount.go index db88761..d471a8f 100644 --- a/officialaccount/officialaccount.go +++ b/officialaccount/officialaccount.go @@ -4,17 +4,17 @@ import ( "net/http" "sync" - "github.com/silenceper/wechat/officialaccount/basic" - "github.com/silenceper/wechat/officialaccount/config" - "github.com/silenceper/wechat/officialaccount/context" - "github.com/silenceper/wechat/officialaccount/device" - "github.com/silenceper/wechat/officialaccount/js" - "github.com/silenceper/wechat/officialaccount/material" - "github.com/silenceper/wechat/officialaccount/menu" - "github.com/silenceper/wechat/officialaccount/message" - "github.com/silenceper/wechat/officialaccount/oauth" - "github.com/silenceper/wechat/officialaccount/server" - "github.com/silenceper/wechat/officialaccount/user" + "github.com/silenceper/wechat/v2/officialaccount/basic" + "github.com/silenceper/wechat/v2/officialaccount/config" + "github.com/silenceper/wechat/v2/officialaccount/context" + "github.com/silenceper/wechat/v2/officialaccount/device" + "github.com/silenceper/wechat/v2/officialaccount/js" + "github.com/silenceper/wechat/v2/officialaccount/material" + "github.com/silenceper/wechat/v2/officialaccount/menu" + "github.com/silenceper/wechat/v2/officialaccount/message" + "github.com/silenceper/wechat/v2/officialaccount/oauth" + "github.com/silenceper/wechat/v2/officialaccount/server" + "github.com/silenceper/wechat/v2/officialaccount/user" ) //OfficialAccount 微信公众号相关API @@ -25,7 +25,7 @@ type OfficialAccount struct { //NewOfficialAccount 实例化公众号API func NewOfficialAccount(cfg *config.Config) *OfficialAccount { if cfg.Cache == nil { - panic("cache未设置") + panic("cache 未设置") } ctx := &context.Context{ Config: cfg, diff --git a/officialaccount/server/server.go b/officialaccount/server/server.go index d796a98..b8addfa 100644 --- a/officialaccount/server/server.go +++ b/officialaccount/server/server.go @@ -10,10 +10,11 @@ import ( "runtime/debug" "strconv" - "github.com/silenceper/wechat/officialaccount/context" - "github.com/silenceper/wechat/officialaccount/message" + "github.com/silenceper/wechat/v2/officialaccount/context" + "github.com/silenceper/wechat/v2/officialaccount/message" + log "github.com/sirupsen/logrus" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/util" ) //Server struct @@ -22,7 +23,7 @@ type Server struct { Writer http.ResponseWriter Request *http.Request - debug bool + skipValidate bool openID string @@ -46,14 +47,15 @@ func NewServer(context *context.Context) *Server { return srv } -// SetDebug set debug field -func (srv *Server) SetDebug(debug bool) { - srv.debug = debug +// SkipValidate set skip validate +func (srv *Server) SkipValidate(skip bool) { + srv.skipValidate = skip } //Serve 处理微信的请求消息 func (srv *Server) Serve() error { if !srv.Validate() { + log.Error("Validate Signature Failed.") return fmt.Errorf("请求校验失败") } @@ -68,22 +70,21 @@ func (srv *Server) Serve() error { return err } - //debug - if srv.debug { - fmt.Println("request msg = ", string(srv.requestRawXMLMsg)) - } + //debug print request msg + log.Debugf("request msg =%s", string(srv.requestRawXMLMsg)) return srv.buildResponse(response) } //Validate 校验请求是否合法 func (srv *Server) Validate() bool { - if srv.debug { + if srv.skipValidate { return true } timestamp := srv.Query("timestamp") nonce := srv.Query("nonce") signature := srv.Query("signature") + log.Debugf("validate signature, timestamp=%s, nonce=%s", timestamp, nonce) return signature == util.Signature(srv.Token, timestamp, nonce) } @@ -223,6 +224,7 @@ func (srv *Server) buildResponse(reply *message.Reply) (err error) { //Send 将自定义的消息发送 func (srv *Server) Send() (err error) { replyMsg := srv.responseMsg + log.Debugf("response msg =%+v", replyMsg) if srv.isSafeMode { //安全模式下对消息进行加密 var encryptedMsg []byte diff --git a/officialaccount/user/user.go b/officialaccount/user/user.go index 74eceeb..c8ab31c 100644 --- a/officialaccount/user/user.go +++ b/officialaccount/user/user.go @@ -5,8 +5,8 @@ import ( "fmt" "net/url" - "github.com/silenceper/wechat/officialaccount/context" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/officialaccount/context" + "github.com/silenceper/wechat/v2/util" ) const ( diff --git a/pay/notify/notify.go b/pay/notify/notify.go index 32fbd0c..4630996 100644 --- a/pay/notify/notify.go +++ b/pay/notify/notify.go @@ -1,7 +1,7 @@ package notify import ( - "github.com/silenceper/wechat/pay/config" + "github.com/silenceper/wechat/v2/pay/config" ) //Notify 回调 diff --git a/pay/notify/paid.go b/pay/notify/paid.go index 0e222d7..6217b72 100644 --- a/pay/notify/paid.go +++ b/pay/notify/paid.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/util" ) // Base 公用参数 diff --git a/pay/order/pay.go b/pay/order/pay.go index 02f48a2..b1336c2 100644 --- a/pay/order/pay.go +++ b/pay/order/pay.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/silenceper/wechat/pay/config" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/pay/config" + "github.com/silenceper/wechat/v2/util" ) //https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1 diff --git a/pay/pay.go b/pay/pay.go index f93f544..37d3797 100644 --- a/pay/pay.go +++ b/pay/pay.go @@ -1,9 +1,9 @@ package pay import ( - "github.com/silenceper/wechat/pay/config" - "github.com/silenceper/wechat/pay/notify" - "github.com/silenceper/wechat/pay/order" + "github.com/silenceper/wechat/v2/pay/config" + "github.com/silenceper/wechat/v2/pay/notify" + "github.com/silenceper/wechat/v2/pay/order" ) //Pay 微信支付相关API diff --git a/pay/refund/refund.go b/pay/refund/refund.go index 9458ace..1220d5c 100644 --- a/pay/refund/refund.go +++ b/pay/refund/refund.go @@ -4,8 +4,8 @@ import ( "encoding/xml" "fmt" - "github.com/silenceper/wechat/pay/config" - "github.com/silenceper/wechat/util" + "github.com/silenceper/wechat/v2/pay/config" + "github.com/silenceper/wechat/v2/util" ) var refundGateway = "https://api.mch.weixin.qq.com/secapi/pay/refund" diff --git a/wechat.go b/wechat.go index fd3ae57..bb29def 100644 --- a/wechat.go +++ b/wechat.go @@ -1,15 +1,31 @@ package wechat import ( - "github.com/silenceper/wechat/miniprogram" - miniConfig "github.com/silenceper/wechat/miniprogram/config" - payConfig "github.com/silenceper/wechat/pay/config" + "os" - "github.com/silenceper/wechat/officialaccount" - offConfig "github.com/silenceper/wechat/officialaccount/config" - "github.com/silenceper/wechat/pay" + "github.com/silenceper/wechat/v2/miniprogram" + miniConfig "github.com/silenceper/wechat/v2/miniprogram/config" + "github.com/silenceper/wechat/v2/officialaccount" + offConfig "github.com/silenceper/wechat/v2/officialaccount/config" + "github.com/silenceper/wechat/v2/pay" + payConfig "github.com/silenceper/wechat/v2/pay/config" + log "github.com/sirupsen/logrus" ) +func init() { + + // Log as JSON instead of the default ASCII formatter. + log.SetFormatter(&log.TextFormatter{}) + + // Output to stdout instead of the default stderr + // Can be any io.Writer, see below for File example + log.SetOutput(os.Stdout) + + // Only log the warning severity or above. + log.SetLevel(log.DebugLevel) + +} + // Wechat struct type Wechat struct { }