mirror of
https://github.com/silenceper/wechat.git
synced 2026-02-11 16:22:26 +08:00
Compare commits
8 Commits
1be476c633
...
feature/re
| Author | SHA1 | Date | |
|---|---|---|---|
|
f62fd8de8e | ||
|
dad35b9f6d | ||
|
|
b797312d34 | ||
|
|
7bf2053e0f | ||
|
|
dab9d682cf | ||
|
|
b08cf8738e | ||
|
|
e7ff8d90ed | ||
|
|
5467bc6245 |
5
.github/workflows/go.yml
vendored
5
.github/workflows/go.yml
vendored
@@ -29,11 +29,6 @@ jobs:
|
|||||||
name: Test
|
name: Test
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
services:
|
services:
|
||||||
redis:
|
|
||||||
image: redis
|
|
||||||
ports:
|
|
||||||
- 6379:6379
|
|
||||||
options: --entrypoint redis-server
|
|
||||||
memcached:
|
memcached:
|
||||||
image: memcached
|
image: memcached
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
94
cache/redis.go
vendored
94
cache/redis.go
vendored
@@ -1,94 +0,0 @@
|
|||||||
package cache
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/go-redis/redis/v8"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Redis .redis cache
|
|
||||||
type Redis struct {
|
|
||||||
ctx context.Context
|
|
||||||
conn redis.UniversalClient
|
|
||||||
}
|
|
||||||
|
|
||||||
// RedisOpts redis 连接属性
|
|
||||||
type RedisOpts struct {
|
|
||||||
Host string `yml:"host" json:"host"`
|
|
||||||
Username string `yaml:"username" json:"username"`
|
|
||||||
Password string `yml:"password" json:"password"`
|
|
||||||
Database int `yml:"database" json:"database"`
|
|
||||||
MaxIdle int `yml:"max_idle" json:"max_idle"`
|
|
||||||
MaxActive int `yml:"max_active" json:"max_active"`
|
|
||||||
IdleTimeout int `yml:"idle_timeout" json:"idle_timeout"` // second
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewRedis 实例化
|
|
||||||
func NewRedis(ctx context.Context, opts *RedisOpts) *Redis {
|
|
||||||
conn := redis.NewUniversalClient(&redis.UniversalOptions{
|
|
||||||
Addrs: []string{opts.Host},
|
|
||||||
DB: opts.Database,
|
|
||||||
Username: opts.Username,
|
|
||||||
Password: opts.Password,
|
|
||||||
IdleTimeout: time.Second * time.Duration(opts.IdleTimeout),
|
|
||||||
MinIdleConns: opts.MaxIdle,
|
|
||||||
})
|
|
||||||
return &Redis{ctx: ctx, conn: conn}
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetConn 设置conn
|
|
||||||
func (r *Redis) SetConn(conn redis.UniversalClient) {
|
|
||||||
r.conn = conn
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetRedisCtx 设置redis ctx 参数
|
|
||||||
func (r *Redis) SetRedisCtx(ctx context.Context) {
|
|
||||||
r.ctx = ctx
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get 获取一个值
|
|
||||||
func (r *Redis) Get(key string) interface{} {
|
|
||||||
return r.GetContext(r.ctx, key)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetContext 获取一个值
|
|
||||||
func (r *Redis) GetContext(ctx context.Context, key string) interface{} {
|
|
||||||
result, err := r.conn.Do(ctx, "GET", key).Result()
|
|
||||||
if err != nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set 设置一个值
|
|
||||||
func (r *Redis) Set(key string, val interface{}, timeout time.Duration) error {
|
|
||||||
return r.SetContext(r.ctx, key, val, timeout)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetContext 设置一个值
|
|
||||||
func (r *Redis) SetContext(ctx context.Context, key string, val interface{}, timeout time.Duration) error {
|
|
||||||
return r.conn.SetEX(ctx, key, val, timeout).Err()
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsExist 判断key是否存在
|
|
||||||
func (r *Redis) IsExist(key string) bool {
|
|
||||||
return r.IsExistContext(r.ctx, key)
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsExistContext 判断key是否存在
|
|
||||||
func (r *Redis) IsExistContext(ctx context.Context, key string) bool {
|
|
||||||
result, _ := r.conn.Exists(ctx, key).Result()
|
|
||||||
|
|
||||||
return result > 0
|
|
||||||
}
|
|
||||||
|
|
||||||
// Delete 删除
|
|
||||||
func (r *Redis) Delete(key string) error {
|
|
||||||
return r.DeleteContext(r.ctx, key)
|
|
||||||
}
|
|
||||||
|
|
||||||
// DeleteContext 删除
|
|
||||||
func (r *Redis) DeleteContext(ctx context.Context, key string) error {
|
|
||||||
return r.conn.Del(ctx, key).Err()
|
|
||||||
}
|
|
||||||
46
cache/redis_test.go
vendored
46
cache/redis_test.go
vendored
@@ -1,46 +0,0 @@
|
|||||||
package cache
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/alicebob/miniredis/v2"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestRedis(t *testing.T) {
|
|
||||||
server, err := miniredis.Run()
|
|
||||||
if err != nil {
|
|
||||||
t.Error("miniredis.Run Error", err)
|
|
||||||
}
|
|
||||||
t.Cleanup(server.Close)
|
|
||||||
var (
|
|
||||||
timeoutDuration = time.Second
|
|
||||||
ctx = context.Background()
|
|
||||||
opts = &RedisOpts{
|
|
||||||
Host: server.Addr(),
|
|
||||||
}
|
|
||||||
redis = NewRedis(ctx, opts)
|
|
||||||
val = "silenceper"
|
|
||||||
key = "username"
|
|
||||||
)
|
|
||||||
redis.SetConn(redis.conn)
|
|
||||||
redis.SetRedisCtx(ctx)
|
|
||||||
|
|
||||||
if err = redis.Set(key, val, timeoutDuration); err != nil {
|
|
||||||
t.Error("set Error", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if !redis.IsExist(key) {
|
|
||||||
t.Error("IsExist Error")
|
|
||||||
}
|
|
||||||
|
|
||||||
name := redis.Get(key).(string)
|
|
||||||
if name != val {
|
|
||||||
t.Error("get Error")
|
|
||||||
}
|
|
||||||
|
|
||||||
if err = redis.Delete(key); err != nil {
|
|
||||||
t.Errorf("delete Error , err=%v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,85 +0,0 @@
|
|||||||
package credential
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/silenceper/wechat/v2/cache"
|
|
||||||
"github.com/silenceper/wechat/v2/util"
|
|
||||||
)
|
|
||||||
|
|
||||||
// 获取ticket的url https://developer.work.weixin.qq.com/document/path/90506
|
|
||||||
const getQyWxTicketURL = "https://qyapi.weixin.qq.com/cgi-bin/get_jsapi_ticket?access_token=%s"
|
|
||||||
const getQyAppTicketURL = "https://qyapi.weixin.qq.com/cgi-bin/ticket/get?access_token=%s&type=agent_config"
|
|
||||||
|
|
||||||
// WorkJsTicket 默认获取js ticket方法
|
|
||||||
type WorkJsTicket struct {
|
|
||||||
appID string
|
|
||||||
agentID string
|
|
||||||
cacheKeyPrefix string
|
|
||||||
cache cache.Cache
|
|
||||||
//jsAPITicket 读写锁 同一个AppID一个
|
|
||||||
jsAPITicketLock *sync.Mutex
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewWorkJsTicket new
|
|
||||||
func NewWorkJsTicket(appID string, agentID string, cacheKeyPrefix string, cache cache.Cache) JsTicketHandle {
|
|
||||||
return &WorkJsTicket{
|
|
||||||
appID: appID,
|
|
||||||
agentID: agentID,
|
|
||||||
cache: cache,
|
|
||||||
cacheKeyPrefix: cacheKeyPrefix,
|
|
||||||
jsAPITicketLock: new(sync.Mutex),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetTicket 获取企业微信jsapi_ticket
|
|
||||||
func (js *WorkJsTicket) GetTicket(accessToken string) (ticketStr string, err error) {
|
|
||||||
//先从cache中取
|
|
||||||
jsAPITicketCacheKey := fmt.Sprintf("%s_jsapi_ticket_%s", js.cacheKeyPrefix, js.appID)
|
|
||||||
if val := js.cache.Get(jsAPITicketCacheKey); val != nil {
|
|
||||||
return val.(string), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
js.jsAPITicketLock.Lock()
|
|
||||||
defer js.jsAPITicketLock.Unlock()
|
|
||||||
|
|
||||||
// 双检，防止重复从微信服务器获取
|
|
||||||
if val := js.cache.Get(jsAPITicketCacheKey); val != nil {
|
|
||||||
return val.(string), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
var ticket ResTicket
|
|
||||||
ticket, err = GetQyWxTicketFromServer(accessToken, js.agentID != "")
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
expires := ticket.ExpiresIn - 1500
|
|
||||||
err = js.cache.Set(jsAPITicketCacheKey, ticket.Ticket, time.Duration(expires)*time.Second)
|
|
||||||
ticketStr = ticket.Ticket
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetQyWxTicketFromServer 从企业微信服务器中获取ticket
|
|
||||||
func GetQyWxTicketFromServer(accessToken string, isApp bool) (ticket ResTicket, err error) {
|
|
||||||
var response []byte
|
|
||||||
url := fmt.Sprintf(getQyWxTicketURL, accessToken)
|
|
||||||
if isApp {
|
|
||||||
url = fmt.Sprintf(getQyAppTicketURL, accessToken)
|
|
||||||
}
|
|
||||||
response, err = util.HTTPGet(url)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
err = json.Unmarshal(response, &ticket)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if ticket.ErrCode != 0 {
|
|
||||||
err = fmt.Errorf("getTicket Error : errcode=%d , errmsg=%s", ticket.ErrCode, ticket.ErrMsg)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
2
go.mod
2
go.mod
@@ -3,10 +3,8 @@ module github.com/silenceper/wechat/v2
|
|||||||
go 1.16
|
go 1.16
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/alicebob/miniredis/v2 v2.30.0
|
|
||||||
github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d
|
github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d
|
||||||
github.com/fatih/structs v1.1.0
|
github.com/fatih/structs v1.1.0
|
||||||
github.com/go-redis/redis/v8 v8.11.5
|
|
||||||
github.com/sirupsen/logrus v1.9.0
|
github.com/sirupsen/logrus v1.9.0
|
||||||
github.com/spf13/cast v1.4.1
|
github.com/spf13/cast v1.4.1
|
||||||
github.com/stretchr/testify v1.7.1
|
github.com/stretchr/testify v1.7.1
|
||||||
|
|||||||
102
go.sum
102
go.sum
@@ -1,61 +1,14 @@
|
|||||||
github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk=
|
|
||||||
github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
|
|
||||||
github.com/alicebob/miniredis/v2 v2.30.0 h1:uA3uhDbCxfO9+DI/DuGeAMr9qI+noVWwGPNTFuKID5M=
|
|
||||||
github.com/alicebob/miniredis/v2 v2.30.0/go.mod h1:84TWKZlxYkfgMucPBf5SOQBYJceZeQRFIaQgNMiCX6Q=
|
|
||||||
github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d h1:pVrfxiGfwelyab6n21ZBkbkmbevaf+WvMIiR7sr97hw=
|
github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d h1:pVrfxiGfwelyab6n21ZBkbkmbevaf+WvMIiR7sr97hw=
|
||||||
github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
|
github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
|
||||||
github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
|
|
||||||
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
|
||||||
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
|
|
||||||
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
|
|
||||||
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
|
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
|
|
||||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
|
|
||||||
github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
|
github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
|
||||||
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
|
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
|
||||||
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
|
||||||
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
|
|
||||||
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
|
|
||||||
github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
|
|
||||||
github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
|
|
||||||
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
|
|
||||||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
|
||||||
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
|
|
||||||
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
|
|
||||||
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
|
|
||||||
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
|
|
||||||
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
|
|
||||||
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
|
||||||
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
|
||||||
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
|
||||||
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
|
||||||
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
|
||||||
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
|
||||||
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
|
||||||
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
|
|
||||||
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=
|
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=
|
||||||
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
|
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
|
||||||
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
|
||||||
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
|
|
||||||
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4=
|
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4=
|
||||||
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
|
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
|
||||||
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
|
|
||||||
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
|
|
||||||
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
|
|
||||||
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
|
||||||
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
|
|
||||||
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
|
|
||||||
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
|
|
||||||
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
|
|
||||||
github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
|
|
||||||
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
|
|
||||||
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
|
|
||||||
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
|
|
||||||
github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
|
|
||||||
github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
|
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
|
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
|
||||||
@@ -64,7 +17,6 @@ github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA=
|
|||||||
github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
|
github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
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.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||||
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
|
||||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
|
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
|
||||||
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
@@ -74,74 +26,20 @@ github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
|
|||||||
github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
|
github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
|
||||||
github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
|
github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
|
||||||
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
|
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
|
||||||
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
|
||||||
github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 h1:5mLPGnFdSsevFRFc9q3yYbBkB6tsm4aCwwQV/j1JQAQ=
|
|
||||||
github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
|
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
|
||||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
|
||||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
|
||||||
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY=
|
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY=
|
||||||
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
|
||||||
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
||||||
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/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
|
||||||
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
|
||||||
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
|
|
||||||
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
|
|
||||||
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
||||||
golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
||||||
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-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
|
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
|
||||||
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
|
||||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
|
||||||
golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
|
|
||||||
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
|
||||||
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
|
||||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
|
||||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
|
||||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
|
||||||
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
|
|
||||||
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
|
|
||||||
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
|
|
||||||
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
|
|
||||||
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
|
|
||||||
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
|
||||||
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
|
||||||
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
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/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
|
|
||||||
gopkg.in/h2non/gock.v1 v1.1.2 h1:jBbHXgGBK/AoPVfJh5x4r/WxIrElvbLel8TCZkkZJoY=
|
gopkg.in/h2non/gock.v1 v1.1.2 h1:jBbHXgGBK/AoPVfJh5x4r/WxIrElvbLel8TCZkkZJoY=
|
||||||
gopkg.in/h2non/gock.v1 v1.1.2/go.mod h1:n7UGz/ckNChHiK05rDoiC4MYSunEC/lyaUm2WWaDva0=
|
gopkg.in/h2non/gock.v1 v1.1.2/go.mod h1:n7UGz/ckNChHiK05rDoiC4MYSunEC/lyaUm2WWaDva0=
|
||||||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
|
|
||||||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
|
|
||||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
|
||||||
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
|
||||||
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
|
||||||
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
|
|
||||||
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
|
|
||||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
|
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
|
||||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
|||||||
@@ -30,9 +30,7 @@ miniprogram := wc.GetMiniProgram(&miniConfig.Config{
|
|||||||
AppSecret: "xxx",
|
AppSecret: "xxx",
|
||||||
AppKey: "xxx",
|
AppKey: "xxx",
|
||||||
OfferID: "xxx",
|
OfferID: "xxx",
|
||||||
Cache: cache.NewRedis(&redis.Options{
|
Cache: cache.NewMemory(),
|
||||||
Addr: "",
|
|
||||||
}),
|
|
||||||
})
|
})
|
||||||
virtualPayment := miniprogram.GetVirtualPayment()
|
virtualPayment := miniprogram.GetVirtualPayment()
|
||||||
virtualPayment.SetSessionKey("xxx")
|
virtualPayment.SetSessionKey("xxx")
|
||||||
|
|||||||
@@ -1,93 +0,0 @@
|
|||||||
package js
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/silenceper/wechat/v2/credential"
|
|
||||||
"github.com/silenceper/wechat/v2/util"
|
|
||||||
"github.com/silenceper/wechat/v2/work/context"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Js struct
|
|
||||||
type Js struct {
|
|
||||||
*context.Context
|
|
||||||
credential.JsTicketHandle
|
|
||||||
}
|
|
||||||
|
|
||||||
// Config 返回给用户jssdk配置信息
|
|
||||||
type Config struct {
|
|
||||||
CorpID string `json:"corp_id"`
|
|
||||||
Agentid string `json:"agentid"`
|
|
||||||
Timestamp int64 `json:"timestamp"`
|
|
||||||
NonceStr string `json:"nonce_str"`
|
|
||||||
Signature string `json:"signature"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewJs init
|
|
||||||
func NewJs(context *context.Context) *Js {
|
|
||||||
js := new(Js)
|
|
||||||
js.Context = context
|
|
||||||
jsTicketHandle := credential.NewWorkJsTicket(context.CorpID, context.AgentID, credential.CacheKeyWorkPrefix, context.Cache)
|
|
||||||
js.SetJsTicketHandle(jsTicketHandle)
|
|
||||||
return js
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetJsTicketHandle 自定义js ticket取值方式
|
|
||||||
func (js *Js) SetJsTicketHandle(ticketHandle credential.JsTicketHandle) {
|
|
||||||
js.JsTicketHandle = ticketHandle
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetConfig 获取jssdk需要的配置参数
|
|
||||||
// uri 为当前网页地址
|
|
||||||
func (js *Js) GetConfig(uri string) (config *Config, err error) {
|
|
||||||
config = new(Config)
|
|
||||||
var accessToken string
|
|
||||||
accessToken, err = js.GetAccessToken()
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
var ticketStr string
|
|
||||||
ticketStr, err = js.GetTicket(accessToken)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
nonceStr := util.RandomStr(16)
|
|
||||||
timestamp := util.GetCurrTS()
|
|
||||||
str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s×tamp=%d&url=%s", ticketStr, nonceStr, timestamp, uri)
|
|
||||||
sigStr := util.Signature(str)
|
|
||||||
|
|
||||||
config.CorpID = js.CorpID
|
|
||||||
config.Agentid = js.AgentID
|
|
||||||
config.NonceStr = nonceStr
|
|
||||||
config.Timestamp = timestamp
|
|
||||||
config.Signature = sigStr
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetAgentConfig 获取jssdk需要的配置参数
|
|
||||||
// uri 为当前网页地址
|
|
||||||
func (js *Js) GetAgentConfig(uri string) (config *Config, err error) {
|
|
||||||
config = new(Config)
|
|
||||||
var accessToken string
|
|
||||||
accessToken, err = js.GetAccessToken()
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
var ticketStr string
|
|
||||||
ticketStr, err = js.GetTicket(accessToken)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
nonceStr := util.RandomStr(16)
|
|
||||||
timestamp := util.GetCurrTS()
|
|
||||||
str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s×tamp=%d&url=%s", ticketStr, nonceStr, timestamp, uri)
|
|
||||||
sigStr := util.Signature(str)
|
|
||||||
|
|
||||||
config.CorpID = js.CorpID
|
|
||||||
config.NonceStr = nonceStr
|
|
||||||
config.Timestamp = timestamp
|
|
||||||
config.Signature = sigStr
|
|
||||||
return
|
|
||||||
}
|
|
||||||
@@ -18,23 +18,20 @@ const (
|
|||||||
|
|
||||||
// ReceptionistOptions 添加接待人员请求参数
|
// ReceptionistOptions 添加接待人员请求参数
|
||||||
type ReceptionistOptions struct {
|
type ReceptionistOptions struct {
|
||||||
OpenKFID string `json:"open_kfid"` // 客服帐号ID
|
OpenKFID string `json:"open_kfid"` // 客服帐号ID
|
||||||
UserIDList []string `json:"userid_list"` // 接待人员userid列表。第三方应用填密文userid，即open_userid 可填充个数：1 ~ 100。超过100个需分批调用。
|
UserIDList []string `json:"userid_list"` // 接待人员userid列表。第三方应用填密文userid，即open_userid 可填充个数：1 ~ 100。超过100个需分批调用。
|
||||||
DepartmentIDList []int `json:"department_id_list"` // 接待人员部门id列表 可填充个数：0 ~ 100。超过100个需分批调用。
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ReceptionistSchema 添加接待人员响应内容
|
// ReceptionistSchema 添加接待人员响应内容
|
||||||
type ReceptionistSchema struct {
|
type ReceptionistSchema struct {
|
||||||
util.CommonError
|
util.CommonError
|
||||||
ResultList []struct {
|
ResultList []struct {
|
||||||
UserID string `json:"userid"`
|
UserID string `json:"userid"`
|
||||||
DepartmentID int `json:"department_id"`
|
|
||||||
util.CommonError
|
util.CommonError
|
||||||
} `json:"result_list"`
|
} `json:"result_list"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// ReceptionistAdd 添加接待人员
|
// ReceptionistAdd 添加接待人员
|
||||||
// @see https://developer.work.weixin.qq.com/document/path/94646
|
|
||||||
func (r *Client) ReceptionistAdd(options ReceptionistOptions) (info ReceptionistSchema, err error) {
|
func (r *Client) ReceptionistAdd(options ReceptionistOptions) (info ReceptionistSchema, err error) {
|
||||||
var (
|
var (
|
||||||
accessToken string
|
accessToken string
|
||||||
@@ -52,11 +49,10 @@ func (r *Client) ReceptionistAdd(options ReceptionistOptions) (info Receptionist
|
|||||||
if info.ErrCode != 0 {
|
if info.ErrCode != 0 {
|
||||||
return info, NewSDKErr(info.ErrCode, info.ErrMsg)
|
return info, NewSDKErr(info.ErrCode, info.ErrMsg)
|
||||||
}
|
}
|
||||||
return
|
return info, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// ReceptionistDel 删除接待人员
|
// ReceptionistDel 删除接待人员
|
||||||
// @see https://developer.work.weixin.qq.com/document/path/94647
|
|
||||||
func (r *Client) ReceptionistDel(options ReceptionistOptions) (info ReceptionistSchema, err error) {
|
func (r *Client) ReceptionistDel(options ReceptionistOptions) (info ReceptionistSchema, err error) {
|
||||||
var (
|
var (
|
||||||
accessToken string
|
accessToken string
|
||||||
@@ -76,22 +72,19 @@ func (r *Client) ReceptionistDel(options ReceptionistOptions) (info Receptionist
|
|||||||
if info.ErrCode != 0 {
|
if info.ErrCode != 0 {
|
||||||
return info, NewSDKErr(info.ErrCode, info.ErrMsg)
|
return info, NewSDKErr(info.ErrCode, info.ErrMsg)
|
||||||
}
|
}
|
||||||
return
|
return info, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// ReceptionistListSchema 获取接待人员列表响应内容
|
// ReceptionistListSchema 获取接待人员列表响应内容
|
||||||
type ReceptionistListSchema struct {
|
type ReceptionistListSchema struct {
|
||||||
util.CommonError
|
util.CommonError
|
||||||
ReceptionistList []struct {
|
ReceptionistList []struct {
|
||||||
UserID string `json:"userid"` // 接待人员的userid。第三方应用获取到的为密文userid，即open_userid
|
UserID string `json:"userid"` // 接待人员的userid。第三方应用获取到的为密文userid，即open_userid
|
||||||
Status int `json:"status"` // 接待人员的接待状态。0:接待中,1:停止接待。第三方应用需具有“管理帐号、分配会话和收发消息”权限才可获取
|
Status int `json:"status"` // 接待人员的接待状态。0:接待中,1:停止接待。第三方应用需具有“管理帐号、分配会话和收发消息”权限才可获取
|
||||||
DepartmentID int `json:"department_id"` // 接待人员部门的id
|
|
||||||
StopType int `json:"stop_type"` // 接待人员的接待状态为「停止接待」的子类型。0:停止接待,1:暂时挂起
|
|
||||||
} `json:"servicer_list"`
|
} `json:"servicer_list"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// ReceptionistList 获取接待人员列表
|
// ReceptionistList 获取接待人员列表
|
||||||
// @see https://developer.work.weixin.qq.com/document/path/94645
|
|
||||||
func (r *Client) ReceptionistList(kfID string) (info ReceptionistListSchema, err error) {
|
func (r *Client) ReceptionistList(kfID string) (info ReceptionistListSchema, err error) {
|
||||||
var (
|
var (
|
||||||
accessToken string
|
accessToken string
|
||||||
@@ -111,5 +104,5 @@ func (r *Client) ReceptionistList(kfID string) (info ReceptionistListSchema, err
|
|||||||
if info.ErrCode != 0 {
|
if info.ErrCode != 0 {
|
||||||
return info, NewSDKErr(info.ErrCode, info.ErrMsg)
|
return info, NewSDKErr(info.ErrCode, info.ErrMsg)
|
||||||
}
|
}
|
||||||
return
|
return info, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,8 +14,6 @@ const (
|
|||||||
uploadTempFile = "https://qyapi.weixin.qq.com/cgi-bin/media/upload?access_token=%s&type=%s"
|
uploadTempFile = "https://qyapi.weixin.qq.com/cgi-bin/media/upload?access_token=%s&type=%s"
|
||||||
// uploadAttachment 上传附件资源
|
// uploadAttachment 上传附件资源
|
||||||
uploadAttachment = "https://qyapi.weixin.qq.com/cgi-bin/media/upload_attachment?access_token=%s&media_type=%s&attachment_type=%d"
|
uploadAttachment = "https://qyapi.weixin.qq.com/cgi-bin/media/upload_attachment?access_token=%s&media_type=%s&attachment_type=%d"
|
||||||
// getTempFile 获取临时素材
|
|
||||||
getTempFile = "https://qyapi.weixin.qq.com/cgi-bin/media/get?access_token=%s&media_id=%s"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// UploadImgResponse 上传图片响应
|
// UploadImgResponse 上传图片响应
|
||||||
@@ -150,21 +148,3 @@ func (r *Client) UploadAttachmentFromReader(filename, mediaType string, reader i
|
|||||||
err = util.DecodeWithError(response, result, "UploadAttachment")
|
err = util.DecodeWithError(response, result, "UploadAttachment")
|
||||||
return result, err
|
return result, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetTempFile 获取临时素材
|
|
||||||
// @see https://developer.work.weixin.qq.com/document/path/90254
|
|
||||||
func (r *Client) GetTempFile(mediaID string) ([]byte, error) {
|
|
||||||
var (
|
|
||||||
accessToken string
|
|
||||||
err error
|
|
||||||
)
|
|
||||||
if accessToken, err = r.GetAccessToken(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
url := fmt.Sprintf(getTempFile, accessToken, mediaID)
|
|
||||||
response, err := util.HTTPGet(url)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return response, nil
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,285 +0,0 @@
|
|||||||
package message
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/xml"
|
|
||||||
|
|
||||||
"github.com/silenceper/wechat/v2/officialaccount/device"
|
|
||||||
)
|
|
||||||
|
|
||||||
// MsgType 企业微信普通消息类型
|
|
||||||
type MsgType string
|
|
||||||
|
|
||||||
// EventType 企业微信事件消息类型
|
|
||||||
type EventType string
|
|
||||||
|
|
||||||
// InfoType 第三方平台授权事件类型
|
|
||||||
type InfoType string
|
|
||||||
|
|
||||||
const (
|
|
||||||
//MsgTypeEvent 表示事件推送消息 [限接收]
|
|
||||||
MsgTypeEvent = "event"
|
|
||||||
|
|
||||||
//MsgTypeText 表示文本消息
|
|
||||||
MsgTypeText MsgType = "text"
|
|
||||||
//MsgTypeImage 表示图片消息
|
|
||||||
MsgTypeImage MsgType = "image"
|
|
||||||
//MsgTypeVoice 表示语音消息
|
|
||||||
MsgTypeVoice MsgType = "voice"
|
|
||||||
//MsgTypeVideo 表示视频消息
|
|
||||||
MsgTypeVideo MsgType = "video"
|
|
||||||
//MsgTypeNews 表示图文消息[限回复与发送应用消息]
|
|
||||||
MsgTypeNews MsgType = "news"
|
|
||||||
|
|
||||||
//MsgTypeLink 表示链接消息[限接收]
|
|
||||||
MsgTypeLink MsgType = "link"
|
|
||||||
//MsgTypeLocation 表示坐标消息[限接收]
|
|
||||||
MsgTypeLocation MsgType = "location"
|
|
||||||
|
|
||||||
//MsgTypeUpdateButton 更新点击用户的按钮文案[限回复应用消息]
|
|
||||||
MsgTypeUpdateButton MsgType = "update_button"
|
|
||||||
//MsgTypeUpdateTemplateCard 更新点击用户的整张卡片[限回复应用消息]
|
|
||||||
MsgTypeUpdateTemplateCard MsgType = "update_template_card"
|
|
||||||
|
|
||||||
//MsgTypeFile 文件消息[限发送应用消息]
|
|
||||||
MsgTypeFile MsgType = "file"
|
|
||||||
//MsgTypeTextCard 文本卡片消息[限发送应用消息]
|
|
||||||
MsgTypeTextCard MsgType = "textcard"
|
|
||||||
//MsgTypeMpNews 图文消息[限发送应用消息] 跟普通的图文消息一致，唯一的差异是图文内容存储在企业微信
|
|
||||||
MsgTypeMpNews MsgType = "mpnews"
|
|
||||||
//MsgTypeMarkdown markdown消息[限发送应用消息]
|
|
||||||
MsgTypeMarkdown MsgType = "markdown"
|
|
||||||
//MsgTypeMiniprogramNotice 小程序通知消息[限发送应用消息]
|
|
||||||
MsgTypeMiniprogramNotice MsgType = "miniprogram_notice"
|
|
||||||
//MsgTypeTemplateCard 模板卡片消息[限发送应用消息]
|
|
||||||
MsgTypeTemplateCard MsgType = "template_card"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
//EventSubscribe 成员关注，成员已经加入企业，管理员添加成员到应用可见范围(或移除可见范围)时
|
|
||||||
EventSubscribe EventType = "subscribe"
|
|
||||||
//EventUnsubscribe 成员取消关注，成员已经在应用可见范围，成员加入(或退出)企业时
|
|
||||||
EventUnsubscribe EventType = "unsubscribe"
|
|
||||||
//EventEnterAgent 本事件在成员进入企业微信的应用时触发
|
|
||||||
EventEnterAgent EventType = "enter_agent"
|
|
||||||
//EventLocation 上报地理位置事件
|
|
||||||
EventLocation EventType = "LOCATION"
|
|
||||||
//EventBatchJobResult 异步任务完成事件推送
|
|
||||||
EventBatchJobResult EventType = "batch_job_result"
|
|
||||||
//EventClick 点击菜单拉取消息时的事件推送
|
|
||||||
EventClick EventType = "click"
|
|
||||||
//EventView 点击菜单跳转链接时的事件推送
|
|
||||||
EventView EventType = "view"
|
|
||||||
//EventScancodePush 扫码推事件的事件推送
|
|
||||||
EventScancodePush EventType = "scancode_push"
|
|
||||||
//EventScancodeWaitmsg 扫码推事件且弹出“消息接收中”提示框的事件推送
|
|
||||||
EventScancodeWaitmsg EventType = "scancode_waitmsg"
|
|
||||||
//EventPicSysphoto 弹出系统拍照发图的事件推送
|
|
||||||
EventPicSysphoto EventType = "pic_sysphoto"
|
|
||||||
//EventPicPhotoOrAlbum 弹出拍照或者相册发图的事件推送
|
|
||||||
EventPicPhotoOrAlbum EventType = "pic_photo_or_album"
|
|
||||||
//EventPicWeixin 弹出微信相册发图器的事件推送
|
|
||||||
EventPicWeixin EventType = "pic_weixin"
|
|
||||||
//EventLocationSelect 弹出地理位置选择器的事件推送
|
|
||||||
EventLocationSelect EventType = "location_select"
|
|
||||||
|
|
||||||
//EventOpenApprovalChange 审批状态通知事件推送
|
|
||||||
EventOpenApprovalChange EventType = "open_approval_change"
|
|
||||||
|
|
||||||
//EventShareAgentChange 共享应用事件回调
|
|
||||||
EventShareAgentChange EventType = "share_agent_change"
|
|
||||||
|
|
||||||
//EventTemplateCard 模板卡片事件推送
|
|
||||||
EventTemplateCard EventType = "template_card_event"
|
|
||||||
|
|
||||||
//EventTemplateCardMenu 通用模板卡片右上角菜单事件推送
|
|
||||||
EventTemplateCardMenu EventType = "template_card_menu_event"
|
|
||||||
|
|
||||||
//EventChangeExternalContact 企业客户事件推送
|
|
||||||
//add_external_contact 添加
|
|
||||||
//edit_external_contact 编辑
|
|
||||||
//add_half_external_contact 免验证添加
|
|
||||||
//del_external_contact 员工删除客户
|
|
||||||
//del_follow_user 客户删除跟进员工
|
|
||||||
//transfer_fail 企业将客户分配给新的成员接替后，客户添加失败
|
|
||||||
//change_external_chat 客户群创建事件
|
|
||||||
EventChangeExternalContact EventType = "change_external_contact"
|
|
||||||
|
|
||||||
//EventChangeExternalChat 企业客户群变更事件推送
|
|
||||||
//create 客户群创建
|
|
||||||
//update 客户群变更
|
|
||||||
//dismiss 客户群解散
|
|
||||||
EventChangeExternalChat EventType = "change_external_chat"
|
|
||||||
|
|
||||||
//EventChangeExternalTag 企业客户标签创建事件推送
|
|
||||||
//create 创建标签
|
|
||||||
//update 变更标签
|
|
||||||
//delete 删除标签
|
|
||||||
//shuffle 重新排序
|
|
||||||
EventChangeExternalTag EventType = "change_external_tag"
|
|
||||||
|
|
||||||
//EventKfMsg 企业微信客服回调事件
|
|
||||||
EventKfMsg EventType = "kf_msg_or_event"
|
|
||||||
//EventLivingStatusChange 直播回调事件
|
|
||||||
EventLivingStatusChange EventType = "living_status_change"
|
|
||||||
|
|
||||||
//EventMsgauditNotify 会话内容存档开启后，产生会话回调事件
|
|
||||||
EventMsgauditNotify EventType = "msgaudit_notify"
|
|
||||||
)
|
|
||||||
|
|
||||||
//todo 第三方应用开发
|
|
||||||
/*const (
|
|
||||||
//微信开放平台需要用到
|
|
||||||
|
|
||||||
// InfoTypeVerifyTicket 返回ticket
|
|
||||||
InfoTypeVerifyTicket InfoType = "component_verify_ticket"
|
|
||||||
// InfoTypeAuthorized 授权
|
|
||||||
InfoTypeAuthorized = "authorized"
|
|
||||||
// InfoTypeUnauthorized 取消授权
|
|
||||||
InfoTypeUnauthorized = "unauthorized"
|
|
||||||
// InfoTypeUpdateAuthorized 更新授权
|
|
||||||
InfoTypeUpdateAuthorized = "updateauthorized"
|
|
||||||
)*/
|
|
||||||
|
|
||||||
// MixMessage 存放所有企业微信官方发送过来的消息和事件
|
|
||||||
type MixMessage struct {
|
|
||||||
CommonToken
|
|
||||||
|
|
||||||
//接收普通消息
|
|
||||||
MsgID int64 `xml:"MsgId"` //其他消息推送过来是MsgId
|
|
||||||
AgentID int `xml:"AgentID"` //企业应用的id，整型。可在应用的设置页面查看
|
|
||||||
|
|
||||||
Content string `xml:"Content,omitempty"` //文本消息内容
|
|
||||||
Format string `xml:"Format,omitempty"` //语音消息格式，如amr，speex等
|
|
||||||
ThumbMediaID string `xml:"ThumbMediaId,omitempty"` //视频消息缩略图的媒体id，可以调用获取媒体文件接口拉取数据，仅三天内有效
|
|
||||||
|
|
||||||
Title string `xml:"Title,omitempty"` //链接消息，标题
|
|
||||||
Description string `xml:"Description,omitempty"` //链接消息，描述
|
|
||||||
URL string `xml:"Url,omitempty"` //链接消息，链接跳转的url
|
|
||||||
|
|
||||||
PicURL string `xml:"PicUrl,omitempty"` ////图片消息或者链接消息，封面缩略图的url
|
|
||||||
MediaID string `xml:"MediaId,omitempty"` //图片媒体文件id//语音媒体文件id//视频消息缩略图的媒体id，可以调用获取媒体文件接口拉取，仅三天内有效
|
|
||||||
|
|
||||||
LocationX float64 `xml:"Location_X,omitempty"` //位置消息，地理位置纬度
|
|
||||||
LocationY float64 `xml:"Location_Y,omitempty"` //位置消息，地理位置经度
|
|
||||||
Scale float64 `xml:"Scale,omitempty"` //位置消息，地图缩放大小
|
|
||||||
Label string `xml:"Label,omitempty"` //位置消息，地理位置信息
|
|
||||||
|
|
||||||
AppType string `xml:"AppType,omitempty"` //接收地理位置时存在，app类型，在企业微信固定返回wxwork，在微信不返回该字段
|
|
||||||
|
|
||||||
//TemplateMsgID int64 `xml:"MsgID"` //模板消息推送成功的消息是MsgID
|
|
||||||
///Recognition string `xml:"Recognition"`
|
|
||||||
|
|
||||||
//事件相关
|
|
||||||
Event EventType `xml:"Event,omitempty"`
|
|
||||||
EventKey string `xml:"EventKey,omitempty"`
|
|
||||||
ChangeType string `xml:"ChangeType,omitempty"`
|
|
||||||
|
|
||||||
//模板卡片事件推送 https://developer.work.weixin.qq.com/document/path/90240#%E6%A8%A1%E6%9D%BF%E5%8D%A1%E7%89%87%E4%BA%8B%E4%BB%B6%E6%8E%A8%E9%80%81
|
|
||||||
TaskId string `xml:"TaskId,omitempty"` //与发送模板卡片消息时指定的task_id相同
|
|
||||||
CardType string `xml:"CardType,omitempty"` //通用模板卡片的类型，类型有"text_notice", "news_notice", "button_interaction", "vote_interaction", "multiple_interaction"五种
|
|
||||||
ResponseCode string `xml:"ResponseCode,omitempty"` //用于调用更新卡片接口的ResponseCode，24小时内有效，且只能使用一次
|
|
||||||
SelectedItems struct {
|
|
||||||
SelectedItem struct {
|
|
||||||
QuestionKey string `xml:"QuestionKey"` //问题的key值
|
|
||||||
OptionIds struct { //对应问题的选项列表
|
|
||||||
OptionId string `xml:"OptionId"`
|
|
||||||
} `xml:"OptionIds"`
|
|
||||||
} `xml:"SelectedItem"`
|
|
||||||
} `xml:"SelectedItems,omitempty"`
|
|
||||||
|
|
||||||
//仅上报地理位置事件
|
|
||||||
Latitude string `xml:"Latitude,omitempty"` //地理位置纬度
|
|
||||||
Longitude string `xml:"Longitude,omitempty"` //地理位置经度
|
|
||||||
Precision string `xml:"Precision,omitempty"` //地理位置精度
|
|
||||||
|
|
||||||
//仅异步任务完成事件
|
|
||||||
JobId string `xml:"JobId,omitempty"` //异步任务id，最大长度为64字符
|
|
||||||
JobType string `xml:"JobType,omitempty"` //异步任务，操作类型，字符串，目前分别有：sync_user(增量更新成员)、 replace_user(全量覆盖成员）、invite_user(邀请成员关注）、replace_party(全量覆盖部门)
|
|
||||||
ErrCode int `xml:"ErrCode,omitempty"` //异步任务，返回码
|
|
||||||
ErrMsg string `xml:"ErrMsg,omitempty"` //异步任务，对返回码的文本描述内容
|
|
||||||
|
|
||||||
//开启通讯录回调通知 https://open.work.weixin.qq.com/api/doc/90000/90135/90967
|
|
||||||
UserID string `xml:"UserID,omitempty"` //用户userid
|
|
||||||
ExternalUserID string `xml:"ExternalUserID,omitempty"` //外部联系人userid
|
|
||||||
State string `xml:"State,omitempty"` //添加此用户的「联系我」方式配置的state参数，可用于识别添加此用户的渠道
|
|
||||||
WelcomeCode string `xml:"WelcomeCode,omitempty"` //欢迎码，当state为1时，该值有效
|
|
||||||
Source string `xml:"Source,omitempty"` //删除客户的操作来源，DELETE_BY_TRANSFER表示此客户是因在职继承自动被转接成员删除
|
|
||||||
|
|
||||||
// todo 第三方平台相关 字段名可能不准确
|
|
||||||
/*InfoType InfoType `xml:"InfoType"`
|
|
||||||
AppID string `xml:"AppId"`
|
|
||||||
ComponentVerifyTicket string `xml:"ComponentVerifyTicket"`
|
|
||||||
AuthorizerAppid string `xml:"AuthorizerAppid"`
|
|
||||||
AuthorizationCode string `xml:"AuthorizationCode"```````````````````````````````````````
|
|
||||||
AuthorizationCodeExpiredTime int64 `xml:"AuthorizationCodeExpiredTime"`
|
|
||||||
PreAuthCode string `xml:"PreAuthCode"`*/
|
|
||||||
|
|
||||||
//设备相关
|
|
||||||
device.MsgDevice
|
|
||||||
}
|
|
||||||
|
|
||||||
// EventPic 发图事件推送
|
|
||||||
type EventPic struct {
|
|
||||||
PicMd5Sum string `xml:"PicMd5Sum"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// EncryptedXMLMsg 安全模式下的消息体
|
|
||||||
type EncryptedXMLMsg struct {
|
|
||||||
XMLName struct{} `xml:"xml" json:"-"`
|
|
||||||
ToUserName string `xml:"ToUserName" json:"ToUserName"`
|
|
||||||
AgentID string `xml:"AgentID" json:"AgentID"`
|
|
||||||
EncryptedMsg string `xml:"Encrypt" json:"Encrypt"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// ResponseEncryptedXMLMsg 需要返回的消息体
|
|
||||||
type ResponseEncryptedXMLMsg struct {
|
|
||||||
XMLName struct{} `xml:"xml" json:"-"`
|
|
||||||
EncryptedMsg string `xml:"Encrypt" json:"Encrypt"`
|
|
||||||
MsgSignature string `xml:"MsgSignature" json:"MsgSignature"`
|
|
||||||
Timestamp int64 `xml:"TimeStamp" json:"TimeStamp"`
|
|
||||||
Nonce string `xml:"Nonce" json:"Nonce"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// CDATA 使用该类型,在序列化为 xml 文本时文本会被解析器忽略
|
|
||||||
type CDATA string
|
|
||||||
|
|
||||||
// MarshalXML 实现自己的序列化方法
|
|
||||||
func (c CDATA) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
|
|
||||||
return e.EncodeElement(struct {
|
|
||||||
string `xml:",cdata"`
|
|
||||||
}{string(c)}, start)
|
|
||||||
}
|
|
||||||
|
|
||||||
// CommonToken 消息中通用的结构
|
|
||||||
type CommonToken struct {
|
|
||||||
XMLName xml.Name `xml:"xml"`
|
|
||||||
ToUserName CDATA `xml:"ToUserName"`
|
|
||||||
FromUserName CDATA `xml:"FromUserName"`
|
|
||||||
CreateTime int64 `xml:"CreateTime"`
|
|
||||||
MsgType MsgType `xml:"MsgType"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetToUserName set ToUserName
|
|
||||||
func (msg *CommonToken) SetToUserName(toUserName CDATA) {
|
|
||||||
msg.ToUserName = toUserName
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetFromUserName set FromUserName
|
|
||||||
func (msg *CommonToken) SetFromUserName(fromUserName CDATA) {
|
|
||||||
msg.FromUserName = fromUserName
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetCreateTime set createTime
|
|
||||||
func (msg *CommonToken) SetCreateTime(createTime int64) {
|
|
||||||
msg.CreateTime = createTime
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetMsgType set MsgType
|
|
||||||
func (msg *CommonToken) SetMsgType(msgType MsgType) {
|
|
||||||
msg.MsgType = msgType
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetOpenID get the FromUserName value
|
|
||||||
func (msg *CommonToken) GetOpenID() string {
|
|
||||||
return string(msg.FromUserName)
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
package message
|
|
||||||
|
|
||||||
import "errors"
|
|
||||||
|
|
||||||
// ErrInvalidReply 无效的回复
|
|
||||||
var ErrInvalidReply = errors.New("无效的回复消息")
|
|
||||||
|
|
||||||
// ErrUnsupportReply 不支持的回复类型
|
|
||||||
var ErrUnsupportReply = errors.New("无需回复消息")
|
|
||||||
|
|
||||||
// Reply 消息回复
|
|
||||||
type Reply struct {
|
|
||||||
MsgType MsgType
|
|
||||||
MsgData interface{}
|
|
||||||
}
|
|
||||||
@@ -1,129 +0,0 @@
|
|||||||
package message
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"github.com/silenceper/wechat/v2/util"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
messageUpdateTemplateCardURL = "https://api.weixin.qq.com/cgi-bin/message/update_template_card"
|
|
||||||
messageDelURL = "https://api.weixin.qq.com/cgi-bin/message/recall"
|
|
||||||
)
|
|
||||||
|
|
||||||
// UpdateButton 模板卡片按钮
|
|
||||||
type UpdateButton struct {
|
|
||||||
//CommonToken `json:"-"`
|
|
||||||
Button struct {
|
|
||||||
ReplaceName string `xml:"ReplaceName" json:"replace_name"`
|
|
||||||
} `xml:"Button" json:"button"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewUpdateButton 更新点击用户的按钮文案
|
|
||||||
func NewUpdateButton(replaceName string) *UpdateButton {
|
|
||||||
btn := new(UpdateButton)
|
|
||||||
btn.Button.ReplaceName = replaceName
|
|
||||||
return btn
|
|
||||||
}
|
|
||||||
|
|
||||||
// TemplateCard 被动回复模板卡片
|
|
||||||
// https://open.work.weixin.qq.com/api/doc/90000/90135/90241
|
|
||||||
type TemplateCard struct {
|
|
||||||
//CommonToken `json:"-"`
|
|
||||||
TemplateCard interface{} `xml:"TemplateCard" json:"template_card"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewTemplateCard 更新点击用户的整张卡片
|
|
||||||
func NewTemplateCard(cardXml interface{}) *TemplateCard {
|
|
||||||
card := new(TemplateCard)
|
|
||||||
card.TemplateCard = cardXml
|
|
||||||
return card
|
|
||||||
}
|
|
||||||
|
|
||||||
type PushFile struct {
|
|
||||||
MediaID string `json:"media_id"`
|
|
||||||
}
|
|
||||||
type PushTextCard struct {
|
|
||||||
Title string `json:"title"`
|
|
||||||
Description string `json:"description"`
|
|
||||||
Url string `json:"url"`
|
|
||||||
Btntxt string `json:"btntxt"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type resTemplateSend struct {
|
|
||||||
util.CommonError
|
|
||||||
Invaliduser string `json:"invaliduser"` //不合法的userid，不区分大小写，统一转为小写
|
|
||||||
Invalidparty string `json:"invalidparty"` //不合法的partyid
|
|
||||||
Invalidtag string `json:"invalidtag"` //不合法的标签id
|
|
||||||
MsgID string `json:"msgid"` //消息id，用于撤回应用消息
|
|
||||||
ResponseCode string `json:"response_code"` //仅消息类型为“按钮交互型”，“投票选择型”和“多项选择型”的模板卡片消息返回，应用可使用response_code调用更新模版卡片消息接口，24小时内有效，且只能使用一次
|
|
||||||
}
|
|
||||||
|
|
||||||
// TemplateUpdate 更新模版卡片消息内容
|
|
||||||
type TemplateUpdate struct {
|
|
||||||
Userids []string `json:"userids"`
|
|
||||||
Partyids []int `json:"partyids"`
|
|
||||||
Tagids []int `json:"tagids"`
|
|
||||||
Atall int `json:"atall"`
|
|
||||||
Agentid int `json:"agentid"`
|
|
||||||
ResponseCode string `json:"response_code"`
|
|
||||||
*UpdateButton
|
|
||||||
*TemplateCard
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateTemplate 更新模版卡片消息
|
|
||||||
func (r *Client) UpdateTemplate(msg *TemplateUpdate) (msgID string, err error) {
|
|
||||||
var accessToken string
|
|
||||||
accessToken, err = r.GetAccessToken()
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
uri := fmt.Sprintf("%s?access_token=%s", messageUpdateTemplateCardURL, accessToken)
|
|
||||||
var response []byte
|
|
||||||
response, err = util.PostJSON(uri, msg)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
var result resTemplateSend
|
|
||||||
err = json.Unmarshal(response, &result)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if result.ErrCode != 0 {
|
|
||||||
err = fmt.Errorf("template msg send error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
msgID = result.MsgID
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
type ReqRecall struct {
|
|
||||||
MsgID int64 `json:"msgid"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Recall 撤回应用消息
|
|
||||||
func (r *Client) Recall(msgID int64) (err error) {
|
|
||||||
var accessToken string
|
|
||||||
accessToken, err = r.GetAccessToken()
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
uri := fmt.Sprintf("%s?access_token=%s", messageDelURL, accessToken)
|
|
||||||
var response []byte
|
|
||||||
response, err = util.PostJSON(uri, &ReqRecall{
|
|
||||||
MsgID: msgID,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
var result util.CommonError
|
|
||||||
err = json.Unmarshal(response, &result)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if result.ErrCode != 0 {
|
|
||||||
err = fmt.Errorf("template msg send error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
@@ -1,66 +0,0 @@
|
|||||||
package server
|
|
||||||
|
|
||||||
import (
|
|
||||||
"reflect"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Error 错误
|
|
||||||
type Error string
|
|
||||||
|
|
||||||
const (
|
|
||||||
SDKValidateSignatureError Error = "签名验证错误" //-40001
|
|
||||||
SDKParseJsonError Error = "xml/json解析失败" //-40002
|
|
||||||
SDKComputeSignatureError Error = "sha加密生成签名失败" //-40003
|
|
||||||
SDKIllegalAesKey Error = "AESKey 非法" //-40004
|
|
||||||
SDKValidateCorpidError Error = "ReceiveId 校验错误" //-40005
|
|
||||||
SDKEncryptAESError Error = "AES 加密失败" //-40006
|
|
||||||
SDKDecryptAESError Error = "AES 解密失败" //-40007
|
|
||||||
SDKIllegalBuffer Error = "解密后得到的buffer非法" //-40008
|
|
||||||
SDKEncodeBase64Error Error = "base64加密失败" //-40009
|
|
||||||
SDKDecodeBase64Error Error = "base64解密失败" //-40010
|
|
||||||
SDKGenJsonError Error = "生成xml/json失败" //-40011
|
|
||||||
SDKIllegalProtocolType Error = "协议类型非法" //-40012
|
|
||||||
SDKUnknownError Error = "未知错误"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Error 输出错误信息
|
|
||||||
func (r Error) Error() string {
|
|
||||||
return reflect.ValueOf(r).String()
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewSDKErr 初始化SDK实例错误信息
|
|
||||||
func NewSDKErr(code int64, msgList ...string) Error {
|
|
||||||
switch code {
|
|
||||||
case 40001:
|
|
||||||
return SDKValidateSignatureError
|
|
||||||
case 40002:
|
|
||||||
return SDKParseJsonError
|
|
||||||
case 40003:
|
|
||||||
return SDKComputeSignatureError
|
|
||||||
case 40004:
|
|
||||||
return SDKIllegalAesKey
|
|
||||||
case 40005:
|
|
||||||
return SDKValidateCorpidError
|
|
||||||
case 40006:
|
|
||||||
return SDKEncryptAESError
|
|
||||||
case 40007:
|
|
||||||
return SDKDecryptAESError
|
|
||||||
case 40008:
|
|
||||||
return SDKIllegalBuffer
|
|
||||||
case 40009:
|
|
||||||
return SDKEncodeBase64Error
|
|
||||||
case 40010:
|
|
||||||
return SDKDecodeBase64Error
|
|
||||||
case 40011:
|
|
||||||
return SDKGenJsonError
|
|
||||||
case 40012:
|
|
||||||
return SDKIllegalProtocolType
|
|
||||||
default:
|
|
||||||
//返回未知的自定义错误
|
|
||||||
if len(msgList) > 0 {
|
|
||||||
return Error(strings.Join(msgList, ","))
|
|
||||||
}
|
|
||||||
return SDKUnknownError
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,228 +0,0 @@
|
|||||||
package server
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/xml"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"net/http"
|
|
||||||
"reflect"
|
|
||||||
"runtime/debug"
|
|
||||||
"strconv"
|
|
||||||
|
|
||||||
"github.com/silenceper/wechat/v2/work/context"
|
|
||||||
"github.com/silenceper/wechat/v2/work/message"
|
|
||||||
log "github.com/sirupsen/logrus"
|
|
||||||
|
|
||||||
"github.com/silenceper/wechat/v2/util"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Server struct
|
|
||||||
type Server struct {
|
|
||||||
*context.Context
|
|
||||||
Writer http.ResponseWriter
|
|
||||||
Request *http.Request
|
|
||||||
|
|
||||||
skipValidate bool
|
|
||||||
|
|
||||||
messageHandler func(*message.MixMessage) *message.Reply
|
|
||||||
|
|
||||||
RequestRawXMLMsg []byte
|
|
||||||
RequestMsg *message.MixMessage
|
|
||||||
ResponseRawXMLMsg []byte
|
|
||||||
ResponseMsg interface{}
|
|
||||||
|
|
||||||
random []byte
|
|
||||||
nonce string
|
|
||||||
timestamp int64
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewServer 实例化
|
|
||||||
func NewServer(context *context.Context) *Server {
|
|
||||||
srv := new(Server)
|
|
||||||
srv.Context = context
|
|
||||||
return srv
|
|
||||||
}
|
|
||||||
|
|
||||||
func (srv *Server) VerifyURL() (string, error) {
|
|
||||||
timestamp := srv.Query("timestamp")
|
|
||||||
nonce := srv.Query("nonce")
|
|
||||||
signature := srv.Query("msg_signature")
|
|
||||||
echoStr := srv.Query("echostr")
|
|
||||||
if signature != util.Signature(srv.Token, timestamp, nonce, echoStr) {
|
|
||||||
return "", NewSDKErr(40001)
|
|
||||||
}
|
|
||||||
_, bData, err := util.DecryptMsg(srv.CorpID, echoStr, srv.EncodingAESKey)
|
|
||||||
if err != nil {
|
|
||||||
return "", NewSDKErr(40002)
|
|
||||||
}
|
|
||||||
|
|
||||||
return string(bData), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// SkipValidate set skip validate
|
|
||||||
func (srv *Server) SkipValidate(skip bool) {
|
|
||||||
srv.skipValidate = skip
|
|
||||||
}
|
|
||||||
|
|
||||||
// Serve 处理企业微信的请求消息
|
|
||||||
func (srv *Server) Serve() error {
|
|
||||||
response, err := srv.handleRequest()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
//debug print request msg
|
|
||||||
log.Debugf("request msg =%s", string(srv.RequestRawXMLMsg))
|
|
||||||
return srv.buildResponse(response)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Validate 校验请求是否合法
|
|
||||||
func (srv *Server) Validate() bool {
|
|
||||||
if srv.skipValidate {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
timestamp := srv.Query("timestamp")
|
|
||||||
nonce := srv.Query("nonce")
|
|
||||||
signature := srv.Query("msg_signature")
|
|
||||||
log.Debugf("validate signature, timestamp=%s, nonce=%s", timestamp, nonce)
|
|
||||||
return signature == util.Signature(srv.Token, timestamp, nonce)
|
|
||||||
}
|
|
||||||
|
|
||||||
// HandleRequest 处理企业微信的请求
|
|
||||||
func (srv *Server) handleRequest() (reply *message.Reply, err error) {
|
|
||||||
|
|
||||||
var msg interface{}
|
|
||||||
msg, err = srv.getMessage()
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
mixMessage, success := msg.(*message.MixMessage)
|
|
||||||
if !success {
|
|
||||||
err = errors.New("消息类型转换失败")
|
|
||||||
}
|
|
||||||
srv.RequestMsg = mixMessage
|
|
||||||
reply = srv.messageHandler(mixMessage)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// getMessage 解析企业微信返回的消息
|
|
||||||
func (srv *Server) getMessage() (interface{}, error) {
|
|
||||||
var rawXMLMsgBytes []byte
|
|
||||||
var err error
|
|
||||||
|
|
||||||
var encryptedXMLMsg message.EncryptedXMLMsg
|
|
||||||
if err := xml.NewDecoder(srv.Request.Body).Decode(&encryptedXMLMsg); err != nil {
|
|
||||||
return nil, fmt.Errorf("从body中解析xml失败,err=%v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
//验证消息签名
|
|
||||||
timestamp := srv.Query("timestamp")
|
|
||||||
srv.timestamp, err = strconv.ParseInt(timestamp, 10, 32)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
nonce := srv.Query("nonce")
|
|
||||||
srv.nonce = nonce
|
|
||||||
msgSignature := srv.Query("msg_signature")
|
|
||||||
msgSignatureGen := util.Signature(srv.Token, timestamp, nonce, encryptedXMLMsg.EncryptedMsg)
|
|
||||||
if msgSignature != msgSignatureGen {
|
|
||||||
return nil, fmt.Errorf("消息不合法，验证签名失败")
|
|
||||||
}
|
|
||||||
|
|
||||||
//解密
|
|
||||||
srv.random, rawXMLMsgBytes, err = util.DecryptMsg(srv.CorpID, encryptedXMLMsg.EncryptedMsg, srv.EncodingAESKey)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("消息解密失败, err=%v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
srv.RequestRawXMLMsg = rawXMLMsgBytes
|
|
||||||
return srv.parseRequestMessage(rawXMLMsgBytes)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (srv *Server) parseRequestMessage(rawXMLMsgBytes []byte) (msg *message.MixMessage, err error) {
|
|
||||||
msg = &message.MixMessage{}
|
|
||||||
err = xml.Unmarshal(rawXMLMsgBytes, msg)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetMessageHandler 设置用户自定义的回调方法
|
|
||||||
func (srv *Server) SetMessageHandler(handler func(*message.MixMessage) *message.Reply) {
|
|
||||||
srv.messageHandler = handler
|
|
||||||
}
|
|
||||||
|
|
||||||
func (srv *Server) buildResponse(reply *message.Reply) (err error) {
|
|
||||||
defer func() {
|
|
||||||
if e := recover(); e != nil {
|
|
||||||
err = fmt.Errorf("panic error: %v\n%s", e, debug.Stack())
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
if reply == nil {
|
|
||||||
//do nothing
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
msgType := reply.MsgType
|
|
||||||
switch msgType {
|
|
||||||
case message.MsgTypeText:
|
|
||||||
case message.MsgTypeImage:
|
|
||||||
case message.MsgTypeVoice:
|
|
||||||
case message.MsgTypeVideo:
|
|
||||||
case message.MsgTypeNews:
|
|
||||||
case message.MsgTypeUpdateButton:
|
|
||||||
case message.MsgTypeUpdateTemplateCard:
|
|
||||||
default:
|
|
||||||
err = message.ErrUnsupportReply
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
msgData := reply.MsgData
|
|
||||||
value := reflect.ValueOf(msgData)
|
|
||||||
//msgData must be a ptr
|
|
||||||
kind := value.Kind().String()
|
|
||||||
if kind != "ptr" {
|
|
||||||
return message.ErrUnsupportReply
|
|
||||||
}
|
|
||||||
|
|
||||||
params := make([]reflect.Value, 1)
|
|
||||||
params[0] = reflect.ValueOf(srv.RequestMsg.FromUserName)
|
|
||||||
value.MethodByName("SetToUserName").Call(params)
|
|
||||||
|
|
||||||
params[0] = reflect.ValueOf(srv.RequestMsg.ToUserName)
|
|
||||||
value.MethodByName("SetFromUserName").Call(params)
|
|
||||||
|
|
||||||
params[0] = reflect.ValueOf(msgType)
|
|
||||||
value.MethodByName("SetMsgType").Call(params)
|
|
||||||
|
|
||||||
params[0] = reflect.ValueOf(util.GetCurrTS())
|
|
||||||
value.MethodByName("SetCreateTime").Call(params)
|
|
||||||
srv.ResponseMsg = msgData
|
|
||||||
srv.ResponseRawXMLMsg, err = xml.Marshal(msgData)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send 将自定义的消息发送
|
|
||||||
func (srv *Server) Send() (err error) {
|
|
||||||
replyMsg := srv.ResponseMsg
|
|
||||||
log.Debugf("response msg =%+v", replyMsg)
|
|
||||||
|
|
||||||
//安全模式下对消息进行加密
|
|
||||||
var encryptedMsg []byte
|
|
||||||
encryptedMsg, err = util.EncryptMsg(srv.random, srv.ResponseRawXMLMsg, srv.CorpID, srv.EncodingAESKey)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
//TODO 如果获取不到timestamp nonce 则自己生成
|
|
||||||
timestamp := srv.timestamp
|
|
||||||
timestampStr := strconv.FormatInt(timestamp, 10)
|
|
||||||
msgSignature := util.Signature(srv.Token, timestampStr, srv.nonce, string(encryptedMsg))
|
|
||||||
replyMsg = message.ResponseEncryptedXMLMsg{
|
|
||||||
EncryptedMsg: string(encryptedMsg),
|
|
||||||
MsgSignature: msgSignature,
|
|
||||||
Timestamp: timestamp,
|
|
||||||
Nonce: srv.nonce,
|
|
||||||
}
|
|
||||||
|
|
||||||
if replyMsg != nil {
|
|
||||||
srv.XML(replyMsg)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
package server
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/xml"
|
|
||||||
"net/http"
|
|
||||||
)
|
|
||||||
|
|
||||||
var xmlContentType = []string{"application/xml; charset=utf-8"}
|
|
||||||
var plainContentType = []string{"text/plain; charset=utf-8"}
|
|
||||||
|
|
||||||
func writeContextType(w http.ResponseWriter, value []string) {
|
|
||||||
header := w.Header()
|
|
||||||
if val := header["Content-Type"]; len(val) == 0 {
|
|
||||||
header["Content-Type"] = value
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Render render from bytes
|
|
||||||
func (srv *Server) Render(bytes []byte) {
|
|
||||||
//debug
|
|
||||||
//fmt.Println("response msg = ", string(bytes))
|
|
||||||
srv.Writer.WriteHeader(200)
|
|
||||||
_, err := srv.Writer.Write(bytes)
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// String render from string
|
|
||||||
func (srv *Server) String(str string) {
|
|
||||||
writeContextType(srv.Writer, plainContentType)
|
|
||||||
srv.Render([]byte(str))
|
|
||||||
}
|
|
||||||
|
|
||||||
// XML render to xml
|
|
||||||
func (srv *Server) XML(obj interface{}) {
|
|
||||||
writeContextType(srv.Writer, xmlContentType)
|
|
||||||
bytes, err := xml.Marshal(obj)
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
srv.Render(bytes)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Query returns the keyed url query value if it exists
|
|
||||||
func (srv *Server) Query(key string) string {
|
|
||||||
value, _ := srv.GetQuery(key)
|
|
||||||
return value
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetQuery is like Query(), it returns the keyed url query value
|
|
||||||
func (srv *Server) GetQuery(key string) (string, bool) {
|
|
||||||
req := srv.Request
|
|
||||||
if values, ok := req.URL.Query()[key]; ok && len(values) > 0 {
|
|
||||||
return values[0], true
|
|
||||||
}
|
|
||||||
return "", false
|
|
||||||
}
|
|
||||||
16
work/work.go
16
work/work.go
@@ -9,15 +9,12 @@ import (
|
|||||||
"github.com/silenceper/wechat/v2/work/context"
|
"github.com/silenceper/wechat/v2/work/context"
|
||||||
"github.com/silenceper/wechat/v2/work/externalcontact"
|
"github.com/silenceper/wechat/v2/work/externalcontact"
|
||||||
"github.com/silenceper/wechat/v2/work/invoice"
|
"github.com/silenceper/wechat/v2/work/invoice"
|
||||||
"github.com/silenceper/wechat/v2/work/js"
|
|
||||||
"github.com/silenceper/wechat/v2/work/kf"
|
"github.com/silenceper/wechat/v2/work/kf"
|
||||||
"github.com/silenceper/wechat/v2/work/material"
|
"github.com/silenceper/wechat/v2/work/material"
|
||||||
"github.com/silenceper/wechat/v2/work/message"
|
"github.com/silenceper/wechat/v2/work/message"
|
||||||
"github.com/silenceper/wechat/v2/work/msgaudit"
|
"github.com/silenceper/wechat/v2/work/msgaudit"
|
||||||
"github.com/silenceper/wechat/v2/work/oauth"
|
"github.com/silenceper/wechat/v2/work/oauth"
|
||||||
"github.com/silenceper/wechat/v2/work/robot"
|
"github.com/silenceper/wechat/v2/work/robot"
|
||||||
"github.com/silenceper/wechat/v2/work/server"
|
|
||||||
"net/http"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Work 企业微信
|
// Work 企业微信
|
||||||
@@ -94,16 +91,3 @@ func (wk *Work) GetInvoice() *invoice.Client {
|
|||||||
func (wk *Work) GetCheckin() *checkin.Client {
|
func (wk *Work) GetCheckin() *checkin.Client {
|
||||||
return checkin.NewClient(wk.ctx)
|
return checkin.NewClient(wk.ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetJs js-sdk配置
|
|
||||||
func (wk *Work) GetJs() *js.Js {
|
|
||||||
return js.NewJs(wk.ctx)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetServer 消息管理：接收事件，被动回复消息管理
|
|
||||||
func (wk *Work) GetServer(req *http.Request, writer http.ResponseWriter) *server.Server {
|
|
||||||
srv := server.NewServer(wk.ctx)
|
|
||||||
srv.Request = req
|
|
||||||
srv.Writer = writer
|
|
||||||
return srv
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user