mirror of
https://github.com/silenceper/wechat.git
synced 2026-02-23 13:42:25 +08:00
Compare commits
2 Commits
feature/au
...
76dd5cc683
| Author | SHA1 | Date | |
|---|---|---|---|
|
76dd5cc683 | ||
|
|
6b764e9126 |
10
.github/workflows/go.yml
vendored
10
.github/workflows/go.yml
vendored
@@ -2,15 +2,15 @@ name: Go
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ master,release-*,v2 ]
|
||||
branches: [ master,release-*,v2,feature/* ]
|
||||
pull_request:
|
||||
branches: [ master,release-*,v2 ]
|
||||
branches: [ master,release-*,v2,feature/* ]
|
||||
|
||||
jobs:
|
||||
golangci:
|
||||
strategy:
|
||||
matrix:
|
||||
go-version: [ '1.16','1.17','1.18','1.19','1.20' ]
|
||||
go-version: [ '1.18','1.19','1.20','1.21' ]
|
||||
name: golangci-lint
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
@@ -42,11 +42,11 @@ jobs:
|
||||
# strategy set
|
||||
strategy:
|
||||
matrix:
|
||||
go: [ '1.16','1.17','1.18','1.19','1.20' ]
|
||||
go: [ '1.18','1.19','1.20','1.21' ]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Set up Go 1.x
|
||||
- name: Set up Go ${{ matrix.go-version }}
|
||||
uses: actions/setup-go@v4
|
||||
with:
|
||||
go-version: ${{ matrix.go }}
|
||||
|
||||
@@ -55,7 +55,7 @@ issues:
|
||||
linters-settings:
|
||||
funlen:
|
||||
lines: 66
|
||||
statements: 50
|
||||
statements: 40
|
||||
|
||||
#issues:
|
||||
# include:
|
||||
|
||||
22
cache/redis.go
vendored
22
cache/redis.go
vendored
@@ -4,7 +4,7 @@ import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
"github.com/go-redis/redis/v8"
|
||||
"github.com/redis/go-redis/v9"
|
||||
)
|
||||
|
||||
// Redis .redis cache
|
||||
@@ -26,21 +26,21 @@ type RedisOpts struct {
|
||||
// NewRedis 实例化
|
||||
func NewRedis(ctx context.Context, opts *RedisOpts) *Redis {
|
||||
conn := redis.NewUniversalClient(&redis.UniversalOptions{
|
||||
Addrs: []string{opts.Host},
|
||||
DB: opts.Database,
|
||||
Password: opts.Password,
|
||||
IdleTimeout: time.Second * time.Duration(opts.IdleTimeout),
|
||||
MinIdleConns: opts.MaxIdle,
|
||||
Addrs: []string{opts.Host},
|
||||
DB: opts.Database,
|
||||
Password: opts.Password,
|
||||
ConnMaxIdleTime: time.Second * time.Duration(opts.IdleTimeout),
|
||||
MinIdleConns: opts.MaxIdle,
|
||||
})
|
||||
return &Redis{ctx: ctx, conn: conn}
|
||||
}
|
||||
|
||||
// SetConn 设置conn
|
||||
// SetConn 设置 conn
|
||||
func (r *Redis) SetConn(conn redis.UniversalClient) {
|
||||
r.conn = conn
|
||||
}
|
||||
|
||||
// SetRedisCtx 设置redis ctx 参数
|
||||
// SetRedisCtx 设置 redis ctx 参数
|
||||
func (r *Redis) SetRedisCtx(ctx context.Context) {
|
||||
r.ctx = ctx
|
||||
}
|
||||
@@ -66,15 +66,15 @@ func (r *Redis) Set(key string, val interface{}, timeout time.Duration) error {
|
||||
|
||||
// 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()
|
||||
return r.conn.SetEx(ctx, key, val, timeout).Err()
|
||||
}
|
||||
|
||||
// IsExist 判断key是否存在
|
||||
// IsExist 判断 key 是否存在
|
||||
func (r *Redis) IsExist(key string) bool {
|
||||
return r.IsExistContext(r.ctx, key)
|
||||
}
|
||||
|
||||
// IsExistContext 判断key是否存在
|
||||
// IsExistContext 判断 key 是否存在
|
||||
func (r *Redis) IsExistContext(ctx context.Context, key string) bool {
|
||||
result, _ := r.conn.Exists(ctx, key).Result()
|
||||
|
||||
|
||||
32
go.mod
32
go.mod
@@ -1,16 +1,30 @@
|
||||
module github.com/silenceper/wechat/v2
|
||||
|
||||
go 1.16
|
||||
go 1.18
|
||||
|
||||
require (
|
||||
github.com/alicebob/miniredis/v2 v2.30.0
|
||||
github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d
|
||||
github.com/alicebob/miniredis/v2 v2.30.5
|
||||
github.com/bradfitz/gomemcache v0.0.0-20230611145640-acc696258285
|
||||
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/spf13/cast v1.4.1
|
||||
github.com/stretchr/testify v1.7.1
|
||||
github.com/tidwall/gjson v1.14.1
|
||||
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
|
||||
github.com/redis/go-redis/v9 v9.1.0
|
||||
github.com/sirupsen/logrus v1.9.3
|
||||
github.com/spf13/cast v1.5.1
|
||||
github.com/stretchr/testify v1.8.4
|
||||
github.com/tidwall/gjson v1.16.0
|
||||
golang.org/x/crypto v0.12.0
|
||||
gopkg.in/h2non/gock.v1 v1.1.2
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302 // indirect
|
||||
github.com/cespare/xxhash/v2 v2.2.0 // indirect
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
|
||||
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
github.com/tidwall/match v1.1.1 // indirect
|
||||
github.com/tidwall/pretty v1.2.1 // indirect
|
||||
github.com/yuin/gopher-lua v1.1.0 // indirect
|
||||
golang.org/x/sys v0.11.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
|
||||
153
go.sum
153
go.sum
@@ -1,11 +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/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/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302 h1:uvdUDbHQHO85qeSydJtItA4T55Pw6BtAejd0APRJOCE=
|
||||
github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
|
||||
github.com/alicebob/miniredis/v2 v2.30.5 h1:3r6kTHdKnuP4fkS8k2IrvSfxpxUTcW1SOL0wN7b7Dt0=
|
||||
github.com/alicebob/miniredis/v2 v2.30.5/go.mod h1:b25qWj4fCEsBeAAR2mlb0ufImGC6uH3VlUfb/HS5zKg=
|
||||
github.com/bradfitz/gomemcache v0.0.0-20230611145640-acc696258285 h1:Dr+ezPI5ivhMn/3WOoB86XzMhie146DNaBbhaQWZHMY=
|
||||
github.com/bradfitz/gomemcache v0.0.0-20230611145640-acc696258285/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
|
||||
github.com/bsm/ginkgo/v2 v2.9.5 h1:rtVBYPs3+TC5iLUVOis1B9tjLTup7Cj5IfzosKtvTJ0=
|
||||
github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y=
|
||||
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
|
||||
github.com/cespare/xxhash/v2 v2.2.0/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=
|
||||
@@ -16,132 +19,46 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r
|
||||
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/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/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
|
||||
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
|
||||
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/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/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||
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/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/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
|
||||
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
||||
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/redis/go-redis/v9 v9.1.0 h1:137FnGdk+EQdCbye1FW+qOEcY5S+SpY9T0NiuqvtfMY=
|
||||
github.com/redis/go-redis/v9 v9.1.0/go.mod h1:urWj3He21Dj5k4TK1y59xH8Uj6ATueP8AH1cY3lZl4c=
|
||||
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
|
||||
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
|
||||
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
||||
github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
|
||||
github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48=
|
||||
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=
|
||||
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/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/tidwall/gjson v1.14.1 h1:iymTbGkQBhveq21bEvAQ81I0LEBork8BFe1CUZXdyuo=
|
||||
github.com/tidwall/gjson v1.14.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
|
||||
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
|
||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||
github.com/tidwall/gjson v1.16.0 h1:SyXa+dsSPpUlcwEDuKuEBJEz5vzTvOea+9rjyYodQFg=
|
||||
github.com/tidwall/gjson v1.16.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
|
||||
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
|
||||
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/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/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/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=
|
||||
github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
|
||||
github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
|
||||
github.com/yuin/gopher-lua v1.1.0 h1:BojcDhfyDWgU2f2TOzYK/g5p2gxMrku8oupLDqlnSqE=
|
||||
github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
|
||||
golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk=
|
||||
golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
|
||||
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-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-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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
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/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=
|
||||
golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
|
||||
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
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/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/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/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
|
||||
@@ -15,8 +15,6 @@ const (
|
||||
checkEncryptedDataURL = "https://api.weixin.qq.com/wxa/business/checkencryptedmsg?access_token=%s"
|
||||
|
||||
getPhoneNumber = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=%s"
|
||||
|
||||
checkSessionURL = "https://api.weixin.qq.com/wxa/checksession?access_token=%s&openid=%s&signature=%s&sig_method=hmac_sha256"
|
||||
)
|
||||
|
||||
// Auth 登录/用户信息
|
||||
@@ -35,7 +33,7 @@ type ResCode2Session struct {
|
||||
|
||||
OpenID string `json:"openid"` // 用户唯一标识
|
||||
SessionKey string `json:"session_key"` // 会话密钥
|
||||
UnionID string `json:"unionid"` // 用户在开放平台的唯一标识符，在满足 UnionID 下发条件的情况下会返回
|
||||
UnionID string `json:"unionid"` // 用户在开放平台的唯一标识符，在满足UnionID下发条件的情况下会返回
|
||||
}
|
||||
|
||||
// RspCheckEncryptedData .
|
||||
@@ -72,12 +70,12 @@ func (auth *Auth) GetPaidUnionID() {
|
||||
// TODO
|
||||
}
|
||||
|
||||
// CheckEncryptedData .检查加密信息是否由微信生成（当前只支持手机号加密数据），只能检测最近 3 天生成的加密数据
|
||||
// CheckEncryptedData .检查加密信息是否由微信生成（当前只支持手机号加密数据），只能检测最近3天生成的加密数据
|
||||
func (auth *Auth) CheckEncryptedData(encryptedMsgHash string) (result RspCheckEncryptedData, err error) {
|
||||
return auth.CheckEncryptedDataContext(context2.Background(), encryptedMsgHash)
|
||||
}
|
||||
|
||||
// CheckEncryptedDataContext .检查加密信息是否由微信生成（当前只支持手机号加密数据），只能检测最近 3 天生成的加密数据
|
||||
// CheckEncryptedDataContext .检查加密信息是否由微信生成（当前只支持手机号加密数据），只能检测最近3天生成的加密数据
|
||||
func (auth *Auth) CheckEncryptedDataContext(ctx context2.Context, encryptedMsgHash string) (result RspCheckEncryptedData, err error) {
|
||||
var response []byte
|
||||
var (
|
||||
@@ -87,7 +85,7 @@ func (auth *Auth) CheckEncryptedDataContext(ctx context2.Context, encryptedMsgHa
|
||||
return
|
||||
}
|
||||
|
||||
// 由于 GetPhoneNumberContext 需要传入 JSON，所以 HTTPPostContext 入参改为 []byte
|
||||
// 由于GetPhoneNumberContext需要传入JSON，所以HTTPPostContext入参改为[]byte
|
||||
if response, err = util.HTTPPostContext(ctx, fmt.Sprintf(checkEncryptedDataURL, at), []byte("encrypted_msg_hash="+encryptedMsgHash), nil); err != nil {
|
||||
return
|
||||
}
|
||||
@@ -115,62 +113,38 @@ type PhoneInfo struct {
|
||||
} `json:"watermark"` // 数据水印
|
||||
}
|
||||
|
||||
// GetPhoneNumberContext 小程序通过 code 获取用户手机号
|
||||
func (auth *Auth) GetPhoneNumberContext(ctx context2.Context, code string) (result *GetPhoneNumberResponse, err error) {
|
||||
var accessToken string
|
||||
if accessToken, err = auth.GetAccessToken(); err != nil {
|
||||
// GetPhoneNumberContext 小程序通过code获取用户手机号
|
||||
func (auth *Auth) GetPhoneNumberContext(ctx context2.Context, code string) (*GetPhoneNumberResponse, error) {
|
||||
var response []byte
|
||||
var (
|
||||
at string
|
||||
err error
|
||||
)
|
||||
if at, err = auth.GetAccessToken(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
bodyBytes, err := json.Marshal(map[string]interface{}{
|
||||
body := map[string]interface{}{
|
||||
"code": code,
|
||||
})
|
||||
}
|
||||
|
||||
bodyBytes, err := json.Marshal(body)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var (
|
||||
header = map[string]string{"Content-Type": "application/json;charset=utf-8"}
|
||||
response []byte
|
||||
)
|
||||
|
||||
if response, err = util.HTTPPostContext(ctx, fmt.Sprintf(getPhoneNumber, accessToken), bodyBytes, header); err != nil {
|
||||
header := map[string]string{"Content-Type": "application/json;charset=utf-8"}
|
||||
if response, err = util.HTTPPostContext(ctx, fmt.Sprintf(getPhoneNumber, at), bodyBytes, header); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
err = util.DecodeWithError(response, &result, "phonenumber.getPhoneNumber")
|
||||
return
|
||||
var result GetPhoneNumberResponse
|
||||
if err = util.DecodeWithError(response, &result, "phonenumber.getPhoneNumber"); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &result, nil
|
||||
}
|
||||
|
||||
// GetPhoneNumber 小程序通过 code 获取用户手机号
|
||||
// GetPhoneNumber 小程序通过code获取用户手机号
|
||||
func (auth *Auth) GetPhoneNumber(code string) (*GetPhoneNumberResponse, error) {
|
||||
return auth.GetPhoneNumberContext(context2.Background(), code)
|
||||
}
|
||||
|
||||
// // CheckSession 检验登录态是否过期。
|
||||
// func (auth *Auth) CheckSession(sessionKey, openID string) (result *CheckSessionResponse, err error) {
|
||||
// return auth.CheckSessionContext(context2.Background(), sessionKey, openID)
|
||||
// }
|
||||
//
|
||||
// // CheckSessionContext 检验登录态是否过期。
|
||||
// func (auth *Auth) CheckSessionContext(ctx context2.Context, sessionKey, openID string) (result *CheckSessionResponse, err error) {
|
||||
// var accessToken string
|
||||
// if accessToken, err = auth.GetAccessToken(); err != nil {
|
||||
// return nil, err
|
||||
// }
|
||||
// var (
|
||||
// response []byte
|
||||
// signature string = sessionKey
|
||||
// )
|
||||
// if response, err = util.HTTPGetContext(ctx, fmt.Sprintf(checkSessionURL, accessToken, openID, signature)); err != nil {
|
||||
// return nil, err
|
||||
// }
|
||||
//
|
||||
// err = util.DecodeWithError(response, &result, "CheckSessionContext")
|
||||
// return
|
||||
// }
|
||||
//
|
||||
// // CheckSessionResponse 检验登录态是否过期。
|
||||
// type CheckSessionResponse struct {
|
||||
// util.CommonError
|
||||
// }
|
||||
|
||||
@@ -7,11 +7,9 @@ import (
|
||||
|
||||
// Config .config for 小程序
|
||||
type Config struct {
|
||||
AppID string `json:"app_id"` // appid
|
||||
AppSecret string `json:"app_secret"` // appSecret
|
||||
AppKey string `json:"app_key"` // appKey
|
||||
OfferID string `json:"offer_id"` // offerId
|
||||
Token string `json:"token"` // token
|
||||
EncodingAESKey string `json:"encoding_aes_key"` // EncodingAESKey
|
||||
Cache cache.Cache
|
||||
AppID string `json:"app_id"` // appid
|
||||
AppSecret string `json:"app_secret"` // appSecret
|
||||
AppKey string `json:"app_key"` // appKey
|
||||
OfferID string `json:"offer_id"` // offerId
|
||||
Cache cache.Cache
|
||||
}
|
||||
|
||||
@@ -20,12 +20,6 @@ const (
|
||||
MsgTypeLink = "link"
|
||||
// MsgTypeMiniProgramPage 小程序卡片
|
||||
MsgTypeMiniProgramPage = "miniprogrampage"
|
||||
// MsgTypeEvent 事件
|
||||
MsgTypeEvent MsgType = "event"
|
||||
// DataTypeXML XML格式数据
|
||||
DataTypeXML = "xml"
|
||||
// DataTypeJSON JSON格式数据
|
||||
DataTypeJSON = "json"
|
||||
)
|
||||
|
||||
// CommonToken 消息中通用的结构
|
||||
|
||||
@@ -1,375 +0,0 @@
|
||||
package message
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"encoding/xml"
|
||||
"errors"
|
||||
"io"
|
||||
"net/http"
|
||||
"sort"
|
||||
"strings"
|
||||
|
||||
"github.com/silenceper/wechat/v2/miniprogram/context"
|
||||
"github.com/silenceper/wechat/v2/miniprogram/security"
|
||||
"github.com/silenceper/wechat/v2/util"
|
||||
)
|
||||
|
||||
// ConfirmReceiveMethod 确认收货方式
|
||||
type ConfirmReceiveMethod int8
|
||||
|
||||
const (
|
||||
// EventTypeTradeManageRemindAccessAPI 提醒接入发货信息管理服务API
|
||||
// 小程序完成账期授权时/小程序产生第一笔交易时/已产生交易但从未发货的小程序，每天一次
|
||||
EventTypeTradeManageRemindAccessAPI EventType = "trade_manage_remind_access_api"
|
||||
// EventTypeTradeManageRemindShipping 提醒需要上传发货信息
|
||||
// 曾经发过货的小程序，订单超过48小时未发货时
|
||||
EventTypeTradeManageRemindShipping EventType = "trade_manage_remind_shipping"
|
||||
// EventTypeTradeManageOrderSettlement 订单将要结算或已经结算
|
||||
// 订单完成发货时/订单结算时
|
||||
EventTypeTradeManageOrderSettlement EventType = "trade_manage_order_settlement"
|
||||
// EventTypeAddExpressPath 运单轨迹更新事件
|
||||
EventTypeAddExpressPath EventType = "add_express_path"
|
||||
// EventTypeSecvodUpload 短剧媒资上传完成事件
|
||||
EventTypeSecvodUpload EventType = "secvod_upload_event"
|
||||
// EventTypeSecvodAudit 短剧媒资审核状态事件
|
||||
EventTypeSecvodAudit EventType = "secvod_audit_event"
|
||||
// EventTypeWxaMediaCheck 媒体内容安全异步审查结果通知
|
||||
EventTypeWxaMediaCheck EventType = "wxa_media_check"
|
||||
// EventTypeXpayGoodsDeliverNotify 道具发货推送事件
|
||||
EventTypeXpayGoodsDeliverNotify EventType = "xpay_goods_deliver_notify"
|
||||
// EventTypeXpayCoinPayNotify 代币支付推送事件
|
||||
EventTypeXpayCoinPayNotify EventType = "xpay_coin_pay_notify"
|
||||
// ConfirmReceiveMethodAuto 自动确认收货
|
||||
ConfirmReceiveMethodAuto ConfirmReceiveMethod = 1
|
||||
// ConfirmReceiveMethodManual 手动确认收货
|
||||
ConfirmReceiveMethodManual ConfirmReceiveMethod = 2
|
||||
)
|
||||
|
||||
// PushReceiver 接收消息推送
|
||||
// 暂仅支付Aes加密方式
|
||||
type PushReceiver struct {
|
||||
*context.Context
|
||||
}
|
||||
|
||||
// NewPushReceiver 实例化
|
||||
func NewPushReceiver(ctx *context.Context) *PushReceiver {
|
||||
return &PushReceiver{
|
||||
Context: ctx,
|
||||
}
|
||||
}
|
||||
|
||||
// GetMsg 获取接收到的消息(如果是加密的返回解密数据)
|
||||
func (receiver *PushReceiver) GetMsg(r *http.Request) (string, []byte, error) {
|
||||
// 判断请求格式
|
||||
var dataType string
|
||||
contentType := r.Header.Get("Content-Type")
|
||||
if strings.HasPrefix(contentType, "text/xml") {
|
||||
// xml格式
|
||||
dataType = DataTypeXML
|
||||
} else {
|
||||
// json格式
|
||||
dataType = DataTypeJSON
|
||||
}
|
||||
|
||||
// 读取参数，验证签名
|
||||
signature := r.FormValue("signature")
|
||||
timestamp := r.FormValue("timestamp")
|
||||
nonce := r.FormValue("nonce")
|
||||
encryptType := r.FormValue("encrypt_type")
|
||||
// 验证签名
|
||||
tmpArr := []string{
|
||||
receiver.Token,
|
||||
timestamp,
|
||||
nonce,
|
||||
}
|
||||
sort.Strings(tmpArr)
|
||||
tmpSignature := util.Signature(tmpArr...)
|
||||
if tmpSignature != signature {
|
||||
return dataType, nil, errors.New("signature error")
|
||||
}
|
||||
|
||||
if encryptType == "aes" {
|
||||
// 解密
|
||||
var reqData DataReceived
|
||||
if dataType == DataTypeXML {
|
||||
if err := xml.NewDecoder(r.Body).Decode(&reqData); err != nil {
|
||||
return dataType, nil, err
|
||||
}
|
||||
} else {
|
||||
if err := json.NewDecoder(r.Body).Decode(&reqData); err != nil {
|
||||
return dataType, nil, err
|
||||
}
|
||||
}
|
||||
_, rawMsgBytes, err := util.DecryptMsg(receiver.AppID, reqData.Encrypt, receiver.EncodingAESKey)
|
||||
return dataType, rawMsgBytes, err
|
||||
}
|
||||
// 不加密
|
||||
byteData, err := io.ReadAll(r.Body)
|
||||
return dataType, byteData, err
|
||||
}
|
||||
|
||||
// GetMsgData 获取接收到的消息(解密数据)
|
||||
func (receiver *PushReceiver) GetMsgData(r *http.Request) (MsgType, EventType, PushData, error) {
|
||||
dataType, decryptMsg, err := receiver.GetMsg(r)
|
||||
if err != nil {
|
||||
return "", "", nil, err
|
||||
}
|
||||
var (
|
||||
msgType MsgType
|
||||
eventType EventType
|
||||
)
|
||||
if dataType == DataTypeXML {
|
||||
var commonToken CommonPushData
|
||||
if err := xml.Unmarshal(decryptMsg, &commonToken); err != nil {
|
||||
return "", "", nil, err
|
||||
}
|
||||
msgType, eventType = commonToken.MsgType, commonToken.Event
|
||||
} else {
|
||||
var commonToken CommonPushData
|
||||
if err := json.Unmarshal(decryptMsg, &commonToken); err != nil {
|
||||
return "", "", nil, err
|
||||
}
|
||||
msgType, eventType = commonToken.MsgType, commonToken.Event
|
||||
}
|
||||
if msgType == MsgTypeEvent {
|
||||
pushData, err := receiver.getEvent(dataType, eventType, decryptMsg)
|
||||
// 暂不支持其他事件类型
|
||||
return msgType, eventType, pushData, err
|
||||
}
|
||||
// 暂不支持其他消息类型
|
||||
return msgType, eventType, decryptMsg, nil
|
||||
}
|
||||
|
||||
// getEvent 获取事件推送的数据
|
||||
func (receiver *PushReceiver) getEvent(dataType string, eventType EventType, decryptMsg []byte) (PushData, error) {
|
||||
switch eventType {
|
||||
case EventTypeTradeManageRemindAccessAPI:
|
||||
// 提醒接入发货信息管理服务API
|
||||
var pushData PushDataRemindAccessAPI
|
||||
err := receiver.unmarshal(dataType, decryptMsg, &pushData)
|
||||
return &pushData, err
|
||||
case EventTypeTradeManageRemindShipping:
|
||||
// 提醒需要上传发货信息
|
||||
var pushData PushDataRemindShipping
|
||||
err := receiver.unmarshal(dataType, decryptMsg, &pushData)
|
||||
return &pushData, err
|
||||
case EventTypeTradeManageOrderSettlement:
|
||||
// 订单将要结算或已经结算
|
||||
var pushData PushDataOrderSettlement
|
||||
err := receiver.unmarshal(dataType, decryptMsg, &pushData)
|
||||
return &pushData, err
|
||||
case EventTypeWxaMediaCheck:
|
||||
// 媒体内容安全异步审查结果通知
|
||||
var pushData MediaCheckAsyncData
|
||||
err := receiver.unmarshal(dataType, decryptMsg, &pushData)
|
||||
return &pushData, err
|
||||
case EventTypeAddExpressPath:
|
||||
// 运单轨迹更新
|
||||
var pushData PushDataAddExpressPath
|
||||
err := receiver.unmarshal(dataType, decryptMsg, &pushData)
|
||||
return &pushData, err
|
||||
case EventTypeSecvodUpload:
|
||||
// 短剧媒资上传完成
|
||||
var pushData PushDataSecVodUpload
|
||||
err := receiver.unmarshal(dataType, decryptMsg, &pushData)
|
||||
return &pushData, err
|
||||
case EventTypeSecvodAudit:
|
||||
// 短剧媒资审核状态
|
||||
var pushData PushDataSecVodAudit
|
||||
err := receiver.unmarshal(dataType, decryptMsg, &pushData)
|
||||
return &pushData, err
|
||||
case EventTypeXpayGoodsDeliverNotify:
|
||||
// 道具发货推送事件
|
||||
var pushData PushDataXpayGoodsDeliverNotify
|
||||
err := receiver.unmarshal(dataType, decryptMsg, &pushData)
|
||||
return &pushData, err
|
||||
case EventTypeXpayCoinPayNotify:
|
||||
// 代币支付推送事件
|
||||
var pushData PushDataXpayCoinPayNotify
|
||||
err := receiver.unmarshal(dataType, decryptMsg, &pushData)
|
||||
return &pushData, err
|
||||
}
|
||||
// 暂不支持其他事件类型，直接返回解密后的数据，由调用方处理
|
||||
return decryptMsg, nil
|
||||
}
|
||||
|
||||
// unmarshal 解析推送的数据
|
||||
func (receiver *PushReceiver) unmarshal(dateType string, decryptMsg []byte, pushData interface{}) error {
|
||||
if dateType == DataTypeXML {
|
||||
return xml.Unmarshal(decryptMsg, pushData)
|
||||
}
|
||||
return json.Unmarshal(decryptMsg, pushData)
|
||||
}
|
||||
|
||||
// DataReceived 接收到的数据
|
||||
type DataReceived struct {
|
||||
Encrypt string `json:"Encrypt" xml:"Encrypt"` // 加密的消息体
|
||||
}
|
||||
|
||||
// PushData 推送的数据(已转对应的结构体)
|
||||
type PushData interface{}
|
||||
|
||||
// CommonPushData 推送数据通用部分
|
||||
type CommonPushData struct {
|
||||
XMLName xml.Name `json:"-" xml:"xml"`
|
||||
MsgType MsgType `json:"MsgType" xml:"MsgType"` // 消息类型，为固定值 "event"
|
||||
Event EventType `json:"Event" xml:"Event"` // 事件类型
|
||||
ToUserName string `json:"ToUserName" xml:"ToUserName"` // 小程序的原始 ID
|
||||
FromUserName string `json:"FromUserName" xml:"FromUserName"` // 发送方账号（一个 OpenID，此时发送方是系统账号）
|
||||
CreateTime int64 `json:"CreateTime" xml:"CreateTime"` // 消息创建时间 （整型），时间戳
|
||||
}
|
||||
|
||||
// MediaCheckAsyncData 媒体内容安全异步审查结果通知
|
||||
type MediaCheckAsyncData struct {
|
||||
CommonPushData
|
||||
Appid string `json:"appid" xml:"appid"`
|
||||
TraceID string `json:"trace_id" xml:"trace_id"`
|
||||
Version int `json:"version" xml:"version"`
|
||||
Detail []*MediaCheckDetail `json:"detail" xml:"detail"`
|
||||
Errcode int `json:"errcode" xml:"errcode"`
|
||||
Errmsg string `json:"errmsg" xml:"errmsg"`
|
||||
Result MediaCheckAsyncResult `json:"result" xml:"result"`
|
||||
}
|
||||
|
||||
// MediaCheckDetail 检测结果详情
|
||||
type MediaCheckDetail struct {
|
||||
Strategy string `json:"strategy" xml:"strategy"`
|
||||
Errcode int `json:"errcode" xml:"errcode"`
|
||||
Suggest security.CheckSuggest `json:"suggest" xml:"suggest"`
|
||||
Label int `json:"label" xml:"label"`
|
||||
Prob int `json:"prob" xml:"prob"`
|
||||
}
|
||||
|
||||
// MediaCheckAsyncResult 检测结果
|
||||
type MediaCheckAsyncResult struct {
|
||||
Suggest security.CheckSuggest `json:"suggest" xml:"suggest"`
|
||||
Label security.CheckLabel `json:"label" xml:"label"`
|
||||
}
|
||||
|
||||
// PushDataOrderSettlement 订单将要结算或已经结算通知
|
||||
type PushDataOrderSettlement struct {
|
||||
CommonPushData
|
||||
TransactionID string `json:"transaction_id" xml:"transaction_id"` // 支付订单号
|
||||
MerchantID string `json:"merchant_id" xml:"merchant_id"` // 商户号
|
||||
SubMerchantID string `json:"sub_merchant_id" xml:"sub_merchant_id"` // 子商户号
|
||||
MerchantTradeNo string `json:"merchant_trade_no" xml:"merchant_trade_no"` // 商户订单号
|
||||
PayTime int64 `json:"pay_time" xml:"pay_time"` // 支付成功时间，秒级时间戳
|
||||
ShippedTime int64 `json:"shipped_time" xml:"shipped_time"` // 发货时间，秒级时间戳
|
||||
EstimatedSettlementTime int64 `json:"estimated_settlement_time" xml:"estimated_settlement_time"` // 预计结算时间，秒级时间戳。发货时推送才有该字段
|
||||
ConfirmReceiveMethod ConfirmReceiveMethod `json:"confirm_receive_method" xml:"confirm_receive_method"` // 确认收货方式：1. 自动确认收货；2. 手动确认收货。结算时推送才有该字段
|
||||
ConfirmReceiveTime int64 `json:"confirm_receive_time" xml:"confirm_receive_time"` // 确认收货时间，秒级时间戳。结算时推送才有该字段
|
||||
SettlementTime int64 `json:"settlement_time" xml:"settlement_time"` // 订单结算时间，秒级时间戳。结算时推送才有该字段
|
||||
}
|
||||
|
||||
// PushDataRemindShipping 提醒需要上传发货信息
|
||||
type PushDataRemindShipping struct {
|
||||
CommonPushData
|
||||
TransactionID string `json:"transaction_id" xml:"transaction_id"` // 微信支付订单号
|
||||
MerchantID string `json:"merchant_id" xml:"merchant_id"` // 商户号
|
||||
SubMerchantID string `json:"sub_merchant_id" xml:"sub_merchant_id"` // 子商户号
|
||||
MerchantTradeNo string `json:"merchant_trade_no" xml:"merchant_trade_no"` // 商户订单号
|
||||
PayTime int64 `json:"pay_time" xml:"pay_time"` // 支付成功时间，秒级时间戳
|
||||
Msg string `json:"msg" xml:"msg"` // 消息文本内容
|
||||
}
|
||||
|
||||
// PushDataRemindAccessAPI 提醒接入发货信息管理服务API信息
|
||||
type PushDataRemindAccessAPI struct {
|
||||
CommonPushData
|
||||
Msg string `json:"msg" xml:"msg"` // 消息文本内容
|
||||
}
|
||||
|
||||
// PushDataAddExpressPath 运单轨迹更新信息
|
||||
type PushDataAddExpressPath struct {
|
||||
CommonPushData
|
||||
DeliveryID string `json:"DeliveryID" xml:"DeliveryID"` // 快递公司ID
|
||||
WayBillID string `json:"WaybillId" xml:"WaybillId"` // 运单ID
|
||||
OrderID string `json:"OrderId" xml:"OrderId"` // 订单ID
|
||||
Version int `json:"Version" xml:"Version"` // 轨迹版本号（整型）
|
||||
Count int `json:"Count" xml:"Count"` // 轨迹节点数（整型）
|
||||
Actions []*PushDataAddExpressPathAction `json:"Actions" xml:"Actions"` // 轨迹节点列表
|
||||
}
|
||||
|
||||
// PushDataAddExpressPathAction 轨迹节点
|
||||
type PushDataAddExpressPathAction struct {
|
||||
ActionTime int64 `json:"ActionTime" xml:"ActionTime"` // 轨迹节点 Unix 时间戳
|
||||
ActionType int `json:"ActionType" xml:"ActionType"` // 轨迹节点类型
|
||||
ActionMsg string `json:"ActionMsg" xml:"ActionMsg"` // 轨迹节点详情
|
||||
}
|
||||
|
||||
// PushDataSecVodUpload 短剧媒资上传完成
|
||||
type PushDataSecVodUpload struct {
|
||||
CommonPushData
|
||||
UploadEvent SecVodUploadEvent `json:"upload_event" xml:"upload_event"` // 上传完成事件
|
||||
}
|
||||
|
||||
// SecVodUploadEvent 短剧媒资上传完成事件
|
||||
type SecVodUploadEvent struct {
|
||||
MediaID string `json:"media_id" xml:"media_id"` // 媒资id
|
||||
SourceContext string `json:"source_context" xml:"source_context"` // 透传上传接口中开发者设置的值。
|
||||
Errcode int `json:"errcode" xml:"errcode"` // 错误码，上传失败时该值非
|
||||
Errmsg string `json:"errmsg" xml:"errmsg"` // 错误提示
|
||||
}
|
||||
|
||||
// PushDataSecVodAudit 短剧媒资审核状态
|
||||
type PushDataSecVodAudit struct {
|
||||
CommonPushData
|
||||
AuditEvent SecVodAuditEvent `json:"audit_event" xml:"audit_event"` // 审核状态事件
|
||||
}
|
||||
|
||||
// SecVodAuditEvent 短剧媒资审核状态事件
|
||||
type SecVodAuditEvent struct {
|
||||
DramaID string `json:"drama_id" xml:"drama_id"` // 剧目id
|
||||
SourceContext string `json:"source_context" xml:"source_context"` // 透传上传接口中开发者设置的值
|
||||
AuditDetail DramaAuditDetail `json:"audit_detail" xml:"audit_detail"` // 剧目审核结果，单独每一集的审核结果可以根据drama_id查询剧集详情得到
|
||||
}
|
||||
|
||||
// DramaAuditDetail 剧目审核结果
|
||||
type DramaAuditDetail struct {
|
||||
Status int `json:"status" xml:"status"` // 审核状态，0为无效值；1为审核中；2为最终失败；3为审核通过；4为驳回重填
|
||||
CreateTime int64 `json:"create_time" xml:"create_time"` // 提审时间戳
|
||||
AuditTime int64 `json:"audit_time" xml:"audit_time"` // 审核时间戳
|
||||
}
|
||||
|
||||
// PushDataXpayGoodsDeliverNotify 道具发货推送
|
||||
type PushDataXpayGoodsDeliverNotify struct {
|
||||
CommonPushData
|
||||
OpenID string `json:"OpenId" xml:"OpenId"` // 用户openid
|
||||
OutTradeNo string `json:"OutTradeNo" xml:"OutTradeNo"` // 业务订单号
|
||||
Env int `json:"Env" xml:"Env"` //，环境配置 0：现网环境（也叫正式环境）1：沙箱环境
|
||||
WeChatPayInfo WeChatPayInfo `json:"WeChatPayInfo" xml:"WeChatPayInfo"` // 微信支付信息 非微信支付渠道可能没有
|
||||
GoodsInfo GoodsInfo `json:"GoodsInfo" xml:"GoodsInfo"` // 道具参数信息
|
||||
}
|
||||
|
||||
// WeChatPayInfo 微信支付信息
|
||||
type WeChatPayInfo struct {
|
||||
MchOrderNo string `json:"MchOrderNo" xml:"MchOrderNo"` // 微信支付商户单号
|
||||
TransactionID string `json:"TransactionId" xml:"TransactionId"` // 交易单号（微信支付订单号）
|
||||
PaidTime int64 `json:"PaidTime" xml:"PaidTime"` // 用户支付时间，Linux秒级时间戳
|
||||
}
|
||||
|
||||
// GoodsInfo 道具参数信息
|
||||
type GoodsInfo struct {
|
||||
ProductID string `json:"ProductId" xml:"ProductId"` // 道具ID
|
||||
Quantity int `json:"Quantity" xml:"Quantity"` // 数量
|
||||
OrigPrice int64 `json:"OrigPrice" xml:"OrigPrice"` // 物品原始价格 （单位：分）
|
||||
ActualPrice int64 `json:"ActualPrice" xml:"ActualPrice"` // 物品实际支付价格（单位：分）
|
||||
Attach string `json:"Attach" xml:"Attach"` // 透传信息
|
||||
}
|
||||
|
||||
// PushDataXpayCoinPayNotify 代币支付推送
|
||||
type PushDataXpayCoinPayNotify struct {
|
||||
CommonPushData
|
||||
OpenID string `json:"OpenId" xml:"OpenId"` // 用户openid
|
||||
OutTradeNo string `json:"OutTradeNo" xml:"OutTradeNo"` // 业务订单号
|
||||
Env int `json:"Env" xml:"Env"` //，环境配置 0：现网环境（也叫正式环境）1：沙箱环境
|
||||
WeChatPayInfo WeChatPayInfo `json:"WeChatPayInfo" xml:"WeChatPayInfo"` // 微信支付信息 非微信支付渠道可能没有
|
||||
CoinInfo CoinInfo `json:"CoinInfo" xml:"CoinInfo"` // 代币参数信息
|
||||
}
|
||||
|
||||
// CoinInfo 代币参数信息
|
||||
type CoinInfo struct {
|
||||
Quantity int `json:"Quantity" xml:"Quantity"` // 数量
|
||||
OrigPrice int64 `json:"OrigPrice" xml:"OrigPrice"` // 物品原始价格 （单位：分）
|
||||
ActualPrice int64 `json:"ActualPrice" xml:"ActualPrice"` // 物品实际支付价格（单位：分）
|
||||
Attach string `json:"Attach" xml:"Attach"` // 透传信息
|
||||
}
|
||||
@@ -12,7 +12,6 @@ import (
|
||||
"github.com/silenceper/wechat/v2/miniprogram/encryptor"
|
||||
"github.com/silenceper/wechat/v2/miniprogram/message"
|
||||
"github.com/silenceper/wechat/v2/miniprogram/minidrama"
|
||||
"github.com/silenceper/wechat/v2/miniprogram/order"
|
||||
"github.com/silenceper/wechat/v2/miniprogram/privacy"
|
||||
"github.com/silenceper/wechat/v2/miniprogram/qrcode"
|
||||
"github.com/silenceper/wechat/v2/miniprogram/riskcontrol"
|
||||
@@ -141,16 +140,6 @@ func (miniProgram *MiniProgram) GetVirtualPayment() *virtualpayment.VirtualPayme
|
||||
return virtualpayment.NewVirtualPayment(miniProgram.ctx)
|
||||
}
|
||||
|
||||
// GetMessageReceiver 获取消息推送接收器
|
||||
func (miniProgram *MiniProgram) GetMessageReceiver() *message.PushReceiver {
|
||||
return message.NewPushReceiver(miniProgram.ctx)
|
||||
}
|
||||
|
||||
// GetShipping 小程序发货信息管理服务
|
||||
func (miniProgram *MiniProgram) GetShipping() *order.Shipping {
|
||||
return order.NewShipping(miniProgram.ctx)
|
||||
}
|
||||
|
||||
// GetMiniDrama 小程序娱乐微短剧
|
||||
func (miniProgram *MiniProgram) GetMiniDrama() *minidrama.MiniDrama {
|
||||
return minidrama.NewMiniDrama(miniProgram.ctx)
|
||||
|
||||
@@ -1,269 +0,0 @@
|
||||
package order
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/silenceper/wechat/v2/miniprogram/context"
|
||||
"github.com/silenceper/wechat/v2/util"
|
||||
)
|
||||
|
||||
const (
|
||||
// 发货信息录入
|
||||
uploadShippingInfoURL = "https://api.weixin.qq.com/wxa/sec/order/upload_shipping_info?access_token=%s"
|
||||
|
||||
// 查询订单发货状态
|
||||
getShippingOrderURL = "https://api.weixin.qq.com/wxa/sec/order/get_order?access_token=%s"
|
||||
|
||||
// 查询订单列表
|
||||
getShippingOrderListURL = "https://api.weixin.qq.com/wxa/sec/order/get_order_list?access_token=%s"
|
||||
|
||||
// 确认收货提醒接口
|
||||
notifyConfirmReceiveURL = "https://api.weixin.qq.com/wxa/sec/order/notify_confirm_receive?access_token=%s"
|
||||
)
|
||||
|
||||
// Shipping 发货信息管理
|
||||
type Shipping struct {
|
||||
*context.Context
|
||||
}
|
||||
|
||||
// NewShipping init
|
||||
func NewShipping(ctx *context.Context) *Shipping {
|
||||
return &Shipping{ctx}
|
||||
}
|
||||
|
||||
// UploadShippingInfo 发货信息录入
|
||||
// see https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order-shipping/order-shipping.html
|
||||
func (shipping *Shipping) UploadShippingInfo(in *UploadShippingInfoRequest) (err error) {
|
||||
accessToken, err := shipping.GetAccessToken()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
uri := fmt.Sprintf(uploadShippingInfoURL, accessToken)
|
||||
response, err := util.PostJSON(uri, in)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
// 使用通用方法返回错误
|
||||
return util.DecodeWithCommonError(response, "UploadShippingInfo")
|
||||
}
|
||||
|
||||
// GetShippingOrder 查询订单发货状态
|
||||
func (shipping *Shipping) GetShippingOrder(in *GetShippingOrderRequest) (res ShippingOrderResponse, err error) {
|
||||
accessToken, err := shipping.GetAccessToken()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
uri := fmt.Sprintf(getShippingOrderURL, accessToken)
|
||||
response, err := util.PostJSON(uri, in)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
err = util.DecodeWithError(response, &res, "GetShippingOrder")
|
||||
return
|
||||
}
|
||||
|
||||
// GetShippingOrderList 查询订单列表
|
||||
func (shipping *Shipping) GetShippingOrderList(in *GetShippingOrderListRequest) (res GetShippingOrderListResponse, err error) {
|
||||
accessToken, err := shipping.GetAccessToken()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
uri := fmt.Sprintf(getShippingOrderListURL, accessToken)
|
||||
response, err := util.PostJSON(uri, in)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
err = util.DecodeWithError(response, &res, "GetShippingOrderList")
|
||||
return
|
||||
}
|
||||
|
||||
// NotifyConfirmReceive 确认收货提醒接口
|
||||
func (shipping *Shipping) NotifyConfirmReceive(in *NotifyConfirmReceiveRequest) (err error) {
|
||||
accessToken, err := shipping.GetAccessToken()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
uri := fmt.Sprintf(notifyConfirmReceiveURL, accessToken)
|
||||
response, err := util.PostJSON(uri, in)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
// 使用通用方法返回错误
|
||||
return util.DecodeWithCommonError(response, "NotifyConfirmReceive")
|
||||
}
|
||||
|
||||
// UploadShippingInfoRequest 发货信息录入请求参数
|
||||
type UploadShippingInfoRequest struct {
|
||||
OrderKey *ShippingOrderKey `json:"order_key"` // 订单，需要上传物流信息的订单
|
||||
LogisticsType LogisticsType `json:"logistics_type"` // 物流模式
|
||||
DeliveryMode DeliveryMode `json:"delivery_mode"` // 发货模式
|
||||
IsAllDelivered bool `json:"is_all_delivered"` // 分拆发货模式时必填，用于标识分拆发货模式下是否已全部发货完成
|
||||
ShippingList []*ShippingInfo `json:"shipping_list"` // 物流信息列表，发货物流单列表，支持统一发货（单个物流单）和分拆发货（多个物流单）两种模式
|
||||
UploadTime *time.Time `json:"upload_time"` // 上传时间，用于标识请求的先后顺序
|
||||
Payer *ShippingPayer `json:"payer"` // 支付人信息
|
||||
}
|
||||
|
||||
// ShippingOrderKey 订单
|
||||
type ShippingOrderKey struct {
|
||||
OrderNumberType NumberType `json:"order_number_type"` // 订单单号类型，用于确认需要上传详情的订单。枚举值1，使用下单商户号和商户侧单号；枚举值2，使用微信支付单号。
|
||||
TransactionID string `json:"transaction_id"` // 原支付交易对应的微信订单号
|
||||
Mchid string `json:"mchid"` // 支付下单商户的商户号，由微信支付生成并下发
|
||||
OutTradeNo string `json:"out_trade_no"` // 商户系统内部订单号，只能是数字、大小写字母`_-*`且在同一个商户号下唯一
|
||||
}
|
||||
|
||||
// ShippingPayer 支付者信息
|
||||
type ShippingPayer struct {
|
||||
Openid string `json:"openid"` // 用户标识，用户在小程序appid下的唯一标识
|
||||
}
|
||||
|
||||
// ShippingInfo 物流信息
|
||||
type ShippingInfo struct {
|
||||
TrackingNo string `json:"tracking_no"` // 物流单号，物流快递发货时必填
|
||||
ExpressCompany string `json:"express_company"` // 物流公司编码，快递公司ID，物流快递发货时必填；参见「查询物流公司编码列表」
|
||||
ItemDesc string `json:"item_desc"` // 商品信息，例如：微信红包抱枕*1个，限120个字以内
|
||||
Contact ShippingContact `json:"contact"` // 联系方式，当发货的物流公司为顺丰时，联系方式为必填，收件人或寄件人联系方式二选一
|
||||
}
|
||||
|
||||
// ShippingContact 联系方式
|
||||
type ShippingContact struct {
|
||||
ConsignorContact string `json:"consignor_contact"` // 寄件人联系方式，寄件人联系方式，采用掩码传输，最后4位数字不能打掩码
|
||||
ReceiverContact string `json:"receiver_contact"` // 收件人联系方式，收件人联系方式，采用掩码传输，最后4位数字不能打掩码
|
||||
}
|
||||
|
||||
// DeliveryMode 发货模式
|
||||
type DeliveryMode uint8
|
||||
|
||||
const (
|
||||
// DeliveryModeUnifiedDelivery 统一发货
|
||||
DeliveryModeUnifiedDelivery DeliveryMode = 1
|
||||
// DeliveryModeSplitDelivery 分拆发货
|
||||
DeliveryModeSplitDelivery DeliveryMode = 2
|
||||
)
|
||||
|
||||
// LogisticsType 物流模式
|
||||
type LogisticsType uint8
|
||||
|
||||
const (
|
||||
// LogisticsTypeExpress 实体物流配送采用快递公司进行实体物流配送形式
|
||||
LogisticsTypeExpress LogisticsType = 1
|
||||
// LogisticsTypeSameCity 同城配送
|
||||
LogisticsTypeSameCity LogisticsType = 2
|
||||
// LogisticsTypeVirtual 虚拟商品，虚拟商品，例如话费充值，点卡等，无实体配送形式
|
||||
LogisticsTypeVirtual LogisticsType = 3
|
||||
// LogisticsTypeSelfPickup 用户自提
|
||||
LogisticsTypeSelfPickup LogisticsType = 4
|
||||
)
|
||||
|
||||
// NumberType 订单单号类型
|
||||
type NumberType uint8
|
||||
|
||||
const (
|
||||
// NumberTypeOutTradeNo 使用下单商户号和商户侧单号
|
||||
NumberTypeOutTradeNo NumberType = 1
|
||||
// NumberTypeTransactionID 使用微信支付单号
|
||||
NumberTypeTransactionID NumberType = 2
|
||||
)
|
||||
|
||||
// GetShippingOrderRequest 查询订单发货状态参数
|
||||
type GetShippingOrderRequest struct {
|
||||
TransactionID string `json:"transaction_id"` // 原支付交易对应的微信订单号
|
||||
MerchantID string `json:"merchant_id"` // 支付下单商户的商户号，由微信支付生成并下发
|
||||
SubMerchantID string `json:"sub_merchant_id"` //二级商户号
|
||||
MerchantTradeNo string `json:"merchant_trade_no"` //商户系统内部订单号，只能是数字、大小写字母`_-*`且在同一个商户号下唯一。
|
||||
}
|
||||
|
||||
// ShippingItem 物流信息
|
||||
type ShippingItem struct {
|
||||
TrackingNo string `json:"tracking_no"` // 物流单号，示例值: "323244567777
|
||||
ExpressCompany string `json:"express_company"` // 物流公司编码，快递公司ID，物流快递发货时必填；参见「查询物流公司编码列表」
|
||||
UploadTime int64 `json:"upload_time"` // 上传物流信息时间，时间戳形式
|
||||
}
|
||||
|
||||
// ShippingDetail 发货信息
|
||||
type ShippingDetail struct {
|
||||
DeliveryMode DeliveryMode `json:"delivery_mode"` // 发货模式
|
||||
LogisticsType LogisticsType `json:"logistics_type"` // 物流模式
|
||||
FinishShipping bool `json:"finish_shipping"` // 是否已全部发货
|
||||
FinishShippingCount int `json:"finish_shipping_count"` // 已完成全部发货的次数
|
||||
GoodsDesc string `json:"goods_desc"` // 在小程序后台发货信息录入页录入的商品描述
|
||||
ShippingList []*ShippingItem `json:"shipping_list"` // 物流信息列表
|
||||
}
|
||||
|
||||
// ShippingOrder 订单发货状态
|
||||
type ShippingOrder struct {
|
||||
TransactionID string `json:"transaction_id"` // 原支付交易对应的微信订单号
|
||||
MerchantTradeNo string `json:"merchant_trade_no"` // 商户系统内部订单号，只能是数字、大小写字母`_-*`且在同一个商户号下唯一
|
||||
MerchantID string `json:"merchant_id"` // 支付下单商户的商户号，由微信支付生成并下发
|
||||
SubMerchantID string `json:"sub_merchant_id"` // 二级商户号
|
||||
Description string `json:"description"` // 以分号连接的该支付单的所有商品描述，当超过120字时自动截断并以 “...” 结尾
|
||||
PaidAmount int64 `json:"paid_amount"` // 支付单实际支付金额，整型，单位：分钱
|
||||
Openid string `json:"openid"` // 支付者openid
|
||||
TradeCreateTime int64 `json:"trade_create_time"` // 交易创建时间，时间戳形式
|
||||
PayTime int64 `json:"pay_time"` // 支付时间，时间戳形式
|
||||
InComplaint bool `json:"in_complaint"` // 是否处在交易纠纷中
|
||||
OrderState State `json:"order_state"` // 订单状态枚举：(1) 待发货；(2) 已发货；(3) 确认收货；(4) 交易完成；(5) 已退款
|
||||
Shipping *ShippingDetail `json:"shipping"` // 订单发货信息
|
||||
}
|
||||
|
||||
// ShippingOrderResponse 查询订单发货状态返回参数
|
||||
type ShippingOrderResponse struct {
|
||||
util.CommonError
|
||||
Order ShippingOrder `json:"order"` // 订单发货信息
|
||||
}
|
||||
|
||||
// State 订单状态
|
||||
type State uint8
|
||||
|
||||
const (
|
||||
// StateWaitShipment 待发货
|
||||
StateWaitShipment State = 1
|
||||
// StateShipped 已发货
|
||||
StateShipped State = 2
|
||||
// StateConfirm 确认收货
|
||||
StateConfirm State = 3
|
||||
// StateComplete 交易完成
|
||||
StateComplete State = 4
|
||||
// StateRefund 已退款
|
||||
StateRefund State = 5
|
||||
)
|
||||
|
||||
// GetShippingOrderListRequest 查询订单列表请求参数
|
||||
type GetShippingOrderListRequest struct {
|
||||
PayTimeRange *TimeRange `json:"pay_time_range"` // 支付时间范围
|
||||
OrderState State `json:"order_state,omitempty"` // 订单状态
|
||||
Openid string `json:"openid,omitempty"` // 支付者openid
|
||||
LastIndex string `json:"last_index,omitempty"` // 翻页时使用，获取第一页时不用传入，如果查询结果中 has_more 字段为 true，则传入该次查询结果中返回的 last_index 字段可获取下一页
|
||||
PageSize int64 `json:"page_size"` // 每页数量，最多50条
|
||||
}
|
||||
|
||||
// TimeRange 时间范围
|
||||
type TimeRange struct {
|
||||
BeginTime int64 `json:"begin_time,omitempty"` // 查询开始时间，时间戳形式
|
||||
EndTime int64 `json:"end_time,omitempty"` // 查询结束时间，时间戳形式
|
||||
}
|
||||
|
||||
// GetShippingOrderListResponse 查询订单列表返回参数
|
||||
type GetShippingOrderListResponse struct {
|
||||
util.CommonError
|
||||
OrderList []*ShippingOrder `json:"order_list"`
|
||||
LastIndex string `json:"last_index"`
|
||||
HasMore bool `json:"has_more"`
|
||||
}
|
||||
|
||||
// NotifyConfirmReceiveRequest 确认收货提醒接口请求参数
|
||||
type NotifyConfirmReceiveRequest struct {
|
||||
TransactionID string `json:"transaction_id"` // 原支付交易对应的微信订单号
|
||||
MerchantID string `json:"merchant_id"` // 支付下单商户的商户号，由微信支付生成并下发
|
||||
SubMerchantID string `json:"sub_merchant_id"` // 二级商户号
|
||||
MerchantTradeNo string `json:"merchant_trade_no"` // 商户系统内部订单号，只能是数字、大小写字母`_-*`且在同一个商户号下唯一
|
||||
ReceivedTime int64 `json:"received_time"` // 收货时间，时间戳形式
|
||||
}
|
||||
@@ -117,24 +117,6 @@ const (
|
||||
|
||||
// queryPublishGoods 查询批量发布道具任务状态
|
||||
queryPublishGoods = "/xpay/query_publish_goods"
|
||||
|
||||
// queryBizBalance 查询商家账户里的可提现余额
|
||||
queryBizBalance = "/xpay/query_biz_balance"
|
||||
|
||||
// queryTransferAccount 查询广告金充值账户
|
||||
queryTransferAccount = "/xpay/query_transfer_account"
|
||||
|
||||
// queryAdverFunds 查询广告金发放记录
|
||||
queryAdverFunds = "/xpay/query_adver_funds"
|
||||
|
||||
// createFundsBill 充值广告金
|
||||
createFundsBill = "/xpay/create_funds_bill"
|
||||
|
||||
// bindTransferAccount 绑定广告金充值账户
|
||||
bindTransferAccount = "/xpay/bind_transfer_accout"
|
||||
|
||||
// defaultUnifiedOrderURL default unified order url
|
||||
defaultUnifiedOrderURL = "requestVirtualPayment"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -145,8 +145,6 @@ type OrderItem struct {
|
||||
WxOrderID string `json:"wx_order_id"` // 微信内部单号
|
||||
ChannelOrderID string `json:"channel_order_id"` // 渠道订单号，为用户微信支付详情页面上的商户单号
|
||||
WxPayOrderID string `json:"wxpay_order_id"` // 微信支付交易单号，为用户微信支付详情页面上的交易单号
|
||||
SettTime int64 `json:"sett_time"` // 结算时间，unix 秒级时间戳，结算时间的秒级时间戳，大于 0 表示结算成功
|
||||
SettState uint `json:"sett_state"` // 结算状态 0-未开始结算 1-结算中 2-结算成功
|
||||
}
|
||||
|
||||
// QueryOrderResponse 查询创建的订单（现金单，非代币单）响应参数
|
||||
|
||||
@@ -479,7 +479,6 @@ func (s *VirtualPayment) requestAddress(params URLParams) (url string, err error
|
||||
case queryUserBalance:
|
||||
case currencyPay:
|
||||
case cancelCurrencyPay:
|
||||
case defaultUnifiedOrderURL:
|
||||
if params.PaySign, params.Signature, err = s.PaySignature(params.Path, params.Content); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@ func (srv *Server) Serve() error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// 非安全模式下，请求处理方法返回为nil则直接回复success给微信服务器
|
||||
// 非安全模式下，请求处理方法返回为 nil 则直接回复 success 给微信服务器
|
||||
if response == nil && !srv.isSafeMode {
|
||||
srv.String("success")
|
||||
return nil
|
||||
@@ -198,7 +198,7 @@ func (srv *Server) parseRequestMessage(rawXMLMsgBytes []byte) (msg *message.MixM
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
// nonstandard json, 目前小程序订阅消息返回数据格式不标准，订阅消息模板单个List返回是对象，多个List返回是数组。
|
||||
// nonstandard json, 目前小程序订阅消息返回数据格式不标准，订阅消息模板单个 List 返回是对象，多个 List 返回是数组。
|
||||
if msg.MsgType == message.MsgTypeEvent {
|
||||
listData := gjson.Get(string(rawXMLMsgBytes), "List")
|
||||
if listData.IsObject() {
|
||||
@@ -284,7 +284,7 @@ func (srv *Server) Send() (err error) {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
// TODO 如果获取不到timestamp nonce 则自己生成
|
||||
// TODO 如果获取不到 timestamp nonce 则自己生成
|
||||
timestamp := srv.timestamp
|
||||
timestampStr := strconv.FormatInt(timestamp, 10)
|
||||
msgSignature := util.Signature(srv.Token, timestampStr, srv.nonce, string(encryptedMsg))
|
||||
|
||||
@@ -7,8 +7,6 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
// departmentCreateURL 创建部门
|
||||
departmentCreateURL = "https://qyapi.weixin.qq.com/cgi-bin/department/create?access_token=%s"
|
||||
// departmentSimpleListURL 获取子部门ID列表
|
||||
departmentSimpleListURL = "https://qyapi.weixin.qq.com/cgi-bin/department/simplelist?access_token=%s&id=%d"
|
||||
// departmentListURL 获取部门列表
|
||||
@@ -16,20 +14,6 @@ const (
|
||||
)
|
||||
|
||||
type (
|
||||
// DepartmentCreateRequest 创建部门数据请求
|
||||
DepartmentCreateRequest struct {
|
||||
Name string `json:"name"`
|
||||
NameEn string `json:"name_en,omitempty"`
|
||||
ParentID int `json:"parentid"`
|
||||
Order int `json:"order,omitempty"`
|
||||
ID int `json:"id,omitempty"`
|
||||
}
|
||||
// DepartmentCreateResponse 创建部门数据响应
|
||||
DepartmentCreateResponse struct {
|
||||
util.CommonError
|
||||
ID int `json:"id"`
|
||||
}
|
||||
|
||||
// DepartmentSimpleListResponse 获取子部门ID列表响应
|
||||
DepartmentSimpleListResponse struct {
|
||||
util.CommonError
|
||||
@@ -58,27 +42,6 @@ type (
|
||||
}
|
||||
)
|
||||
|
||||
// DepartmentCreate 创建部门
|
||||
// see https://developer.work.weixin.qq.com/document/path/90205
|
||||
func (r *Client) DepartmentCreate(req *DepartmentCreateRequest) (*DepartmentCreateResponse, error) {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(departmentCreateURL, accessToken), req); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result := &DepartmentCreateResponse{}
|
||||
if err = util.DecodeWithError(response, result, "DepartmentCreate"); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
// DepartmentSimpleList 获取子部门ID列表
|
||||
// see https://developer.work.weixin.qq.com/document/path/95350
|
||||
func (r *Client) DepartmentSimpleList(departmentID int) ([]*DepartmentID, error) {
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package addresslist
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/silenceper/wechat/v2/util"
|
||||
@@ -10,12 +9,8 @@ import (
|
||||
const (
|
||||
// userSimpleListURL 获取部门成员
|
||||
userSimpleListURL = "https://qyapi.weixin.qq.com/cgi-bin/user/simplelist"
|
||||
// userCreateURL 创建成员
|
||||
userCreateURL = "https://qyapi.weixin.qq.com/cgi-bin/user/create?access_token=%s"
|
||||
// userGetURL 读取成员
|
||||
userGetURL = "https://qyapi.weixin.qq.com/cgi-bin/user/get"
|
||||
// userDeleteURL 删除成员
|
||||
userDeleteURL = "https://qyapi.weixin.qq.com/cgi-bin/user/delete"
|
||||
// userListIDURL 获取成员ID列表
|
||||
userListIDURL = "https://qyapi.weixin.qq.com/cgi-bin/user/list_id"
|
||||
// convertToOpenIDURL userID转openID
|
||||
@@ -67,98 +62,6 @@ func (r *Client) UserSimpleList(departmentID int) ([]*UserList, error) {
|
||||
return result.UserList, nil
|
||||
}
|
||||
|
||||
type (
|
||||
// UserCreateRequest 创建成员数据请求
|
||||
UserCreateRequest struct {
|
||||
UserID string `json:"userid"`
|
||||
Name string `json:"name"`
|
||||
Alias string `json:"alias"`
|
||||
Mobile string `json:"mobile"`
|
||||
Department []int `json:"department"`
|
||||
Order []int `json:"order"`
|
||||
Position string `json:"position"`
|
||||
Gender int `json:"gender"`
|
||||
Email string `json:"email"`
|
||||
BizMail string `json:"biz_mail"`
|
||||
IsLeaderInDept []int `json:"is_leader_in_dept"`
|
||||
DirectLeader []string `json:"direct_leader"`
|
||||
Enable int `json:"enable"`
|
||||
AvatarMediaid string `json:"avatar_mediaid"`
|
||||
Telephone string `json:"telephone"`
|
||||
Address string `json:"address"`
|
||||
MainDepartment int `json:"main_department"`
|
||||
Extattr struct {
|
||||
Attrs []ExtraAttr `json:"attrs"`
|
||||
} `json:"extattr"`
|
||||
ToInvite bool `json:"to_invite"`
|
||||
ExternalPosition string `json:"external_position"`
|
||||
ExternalProfile ExternalProfile `json:"external_profile"`
|
||||
}
|
||||
// ExtraAttr 扩展属性
|
||||
ExtraAttr struct {
|
||||
Type int `json:"type"`
|
||||
Name string `json:"name"`
|
||||
Text struct {
|
||||
Value string `json:"value"`
|
||||
} `json:"text,omitempty"`
|
||||
Web struct {
|
||||
URL string `json:"url"`
|
||||
Title string `json:"title"`
|
||||
} `json:"web,omitempty"`
|
||||
}
|
||||
// ExternalProfile 成员对外信息
|
||||
ExternalProfile struct {
|
||||
ExternalCorpName string `json:"external_corp_name"`
|
||||
WechatChannels struct {
|
||||
Nickname string `json:"nickname"`
|
||||
Status int `json:"status"`
|
||||
} `json:"wechat_channels"`
|
||||
ExternalAttr []ExternalProfileAttr `json:"external_attr"`
|
||||
}
|
||||
// ExternalProfileAttr 成员对外信息属性
|
||||
ExternalProfileAttr struct {
|
||||
Type int `json:"type"`
|
||||
Name string `json:"name"`
|
||||
Text struct {
|
||||
Value string `json:"value"`
|
||||
} `json:"text,omitempty"`
|
||||
Web struct {
|
||||
URL string `json:"url"`
|
||||
Title string `json:"title"`
|
||||
} `json:"web,omitempty"`
|
||||
Miniprogram struct {
|
||||
Appid string `json:"appid"`
|
||||
Pagepath string `json:"pagepath"`
|
||||
Title string `json:"title"`
|
||||
} `json:"miniprogram,omitempty"`
|
||||
}
|
||||
// UserCreateResponse 创建成员数据响应
|
||||
UserCreateResponse struct {
|
||||
util.CommonError
|
||||
}
|
||||
)
|
||||
|
||||
// UserCreate 创建成员
|
||||
// @see https://developer.work.weixin.qq.com/document/path/90195
|
||||
func (r *Client) UserCreate(req *UserCreateRequest) (*UserCreateResponse, error) {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(userCreateURL, accessToken), req); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result := &UserCreateResponse{}
|
||||
if err = util.DecodeWithError(response, result, "UserCreate"); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
// UserGetResponse 获取部门成员响应
|
||||
type UserGetResponse struct {
|
||||
util.CommonError
|
||||
@@ -251,40 +154,6 @@ func (r *Client) UserGet(UserID string) (*UserGetResponse, error) {
|
||||
return result, nil
|
||||
}
|
||||
|
||||
type (
|
||||
// UserDeleteResponse 删除成员数据响应
|
||||
UserDeleteResponse struct {
|
||||
util.CommonError
|
||||
}
|
||||
)
|
||||
|
||||
// UserDelete 删除成员
|
||||
// @see https://developer.work.weixin.qq.com/document/path/90334
|
||||
func (r *Client) UserDelete(userID string) (*UserDeleteResponse, error) {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.HTTPGet(strings.Join([]string{
|
||||
userDeleteURL,
|
||||
util.Query(map[string]interface{}{
|
||||
"access_token": accessToken,
|
||||
"userid": userID,
|
||||
}),
|
||||
}, "?")); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result := &UserDeleteResponse{}
|
||||
if err = util.DecodeWithError(response, result, "UserDelete"); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
// UserListIDRequest 获取成员ID列表请求
|
||||
type UserListIDRequest struct {
|
||||
Cursor string `json:"cursor"`
|
||||
|
||||
@@ -1,326 +0,0 @@
|
||||
package externalcontact
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/silenceper/wechat/v2/util"
|
||||
)
|
||||
|
||||
const (
|
||||
// listLinkUrl 获取获客链接列表
|
||||
listLinkURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/customer_acquisition/list_link?access_token=%s"
|
||||
// getCustomerAcquisition 获取获客链接详情
|
||||
getCustomerAcquisitionURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/customer_acquisition/get?access_token=%s"
|
||||
// createCustomerAcquisitionLink 创建获客链接
|
||||
createCustomerAcquisitionLinkURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/customer_acquisition/create_link?access_token=%s"
|
||||
// updateCustomerAcquisitionLink 编辑获客链接
|
||||
updateCustomerAcquisitionLinkURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/customer_acquisition/update_link?access_token=%s"
|
||||
// deleteCustomerAcquisitionLink 删除获客链接
|
||||
deleteCustomerAcquisitionLinkURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/customer_acquisition/delete_link?access_token=%s"
|
||||
// getCustomerInfoWithCustomerAcquisitionLinkURL 获取由获客链接添加的客户信息
|
||||
getCustomerInfoWithCustomerAcquisitionLinkURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/customer_acquisition/customer?access_token=%s"
|
||||
// customerAcquisitionQuota 查询剩余使用量
|
||||
customerAcquisitionQuotaURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/customer_acquisition_quota?access_token=%s"
|
||||
// customerAcquisitionStatistic 查询链接使用详情
|
||||
customerAcquisitionStatisticURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/customer_acquisition/statistic?access_token=%s"
|
||||
)
|
||||
|
||||
type (
|
||||
// ListLinkRequest 获取获客链接列表请求
|
||||
ListLinkRequest struct {
|
||||
Limit int `json:"limit"`
|
||||
Cursor string `json:"cursor"`
|
||||
}
|
||||
// ListLinkResponse 获取获客链接列表响应
|
||||
ListLinkResponse struct {
|
||||
util.CommonError
|
||||
LinkIDList []string `json:"link_id_list"`
|
||||
NextCursor string `json:"next_cursor"`
|
||||
}
|
||||
)
|
||||
|
||||
// ListLink 获客助手--获取获客链接列表
|
||||
// see https://developer.work.weixin.qq.com/document/path/97297
|
||||
func (r *Client) ListLink(req *ListLinkRequest) (*ListLinkResponse, error) {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(listLinkURL, accessToken), req); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result := &ListLinkResponse{}
|
||||
if err = util.DecodeWithError(response, result, "ListLink"); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
type (
|
||||
// GetCustomerAcquisitionRequest 获取获客链接详情请求
|
||||
GetCustomerAcquisitionRequest struct {
|
||||
LinkID string `json:"link_id"`
|
||||
}
|
||||
// GetCustomerAcquisitionResponse 获取获客链接详情响应
|
||||
GetCustomerAcquisitionResponse struct {
|
||||
util.CommonError
|
||||
Link Link `json:"link"`
|
||||
Range CustomerAcquisitionRange `json:"range"`
|
||||
SkipVerify bool `json:"skip_verify"`
|
||||
}
|
||||
// Link 获客链接
|
||||
Link struct {
|
||||
LinkID string `json:"link_id"`
|
||||
LinkName string `json:"link_name"`
|
||||
URL string `json:"url"`
|
||||
CreateTime int64 `json:"create_time"`
|
||||
}
|
||||
|
||||
// CustomerAcquisitionRange 该获客链接使用范围
|
||||
CustomerAcquisitionRange struct {
|
||||
UserList []string `json:"user_list"`
|
||||
DepartmentList []int64 `json:"department_list"`
|
||||
}
|
||||
)
|
||||
|
||||
// GetCustomerAcquisition 获客助手--获取获客链接详情
|
||||
// see https://developer.work.weixin.qq.com/document/path/97297
|
||||
func (r *Client) GetCustomerAcquisition(req *GetCustomerAcquisitionRequest) (*GetCustomerAcquisitionResponse, error) {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(getCustomerAcquisitionURL, accessToken), req); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result := &GetCustomerAcquisitionResponse{}
|
||||
if err = util.DecodeWithError(response, result, "GetCustomerAcquisition"); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
type (
|
||||
// CreateCustomerAcquisitionLinkRequest 创建获客链接请求
|
||||
CreateCustomerAcquisitionLinkRequest struct {
|
||||
LinkName string `json:"link_name"`
|
||||
Range CustomerAcquisitionRange `json:"range"`
|
||||
SkipVerify bool `json:"skip_verify"`
|
||||
}
|
||||
// CreateCustomerAcquisitionLinkResponse 创建获客链接响应
|
||||
CreateCustomerAcquisitionLinkResponse struct {
|
||||
util.CommonError
|
||||
Link Link `json:"link"`
|
||||
}
|
||||
)
|
||||
|
||||
// CreateCustomerAcquisitionLink 获客助手--创建获客链接
|
||||
// see https://developer.work.weixin.qq.com/document/path/97297
|
||||
func (r *Client) CreateCustomerAcquisitionLink(req *CreateCustomerAcquisitionLinkRequest) (*CreateCustomerAcquisitionLinkResponse, error) {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(createCustomerAcquisitionLinkURL, accessToken), req); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result := &CreateCustomerAcquisitionLinkResponse{}
|
||||
if err = util.DecodeWithError(response, result, "CreateCustomerAcquisitionLink"); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
type (
|
||||
// UpdateCustomerAcquisitionLinkRequest 编辑获客链接请求
|
||||
UpdateCustomerAcquisitionLinkRequest struct {
|
||||
LinkID string `json:"link_id"`
|
||||
LinkName string `json:"link_name"`
|
||||
Range CustomerAcquisitionRange `json:"range"`
|
||||
SkipVerify bool `json:"skip_verify"`
|
||||
}
|
||||
// UpdateCustomerAcquisitionLinkResponse 编辑获客链接响应
|
||||
UpdateCustomerAcquisitionLinkResponse struct {
|
||||
util.CommonError
|
||||
}
|
||||
)
|
||||
|
||||
// UpdateCustomerAcquisitionLink 获客助手--编辑获客链接
|
||||
// see https://developer.work.weixin.qq.com/document/path/97297
|
||||
func (r *Client) UpdateCustomerAcquisitionLink(req *UpdateCustomerAcquisitionLinkRequest) (*UpdateCustomerAcquisitionLinkResponse, error) {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(updateCustomerAcquisitionLinkURL, accessToken), req); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result := &UpdateCustomerAcquisitionLinkResponse{}
|
||||
if err = util.DecodeWithError(response, result, "UpdateCustomerAcquisitionLink"); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
type (
|
||||
// DeleteCustomerAcquisitionLinkRequest 删除获客链接请求
|
||||
DeleteCustomerAcquisitionLinkRequest struct {
|
||||
LinkID string `json:"link_id"`
|
||||
}
|
||||
// DeleteCustomerAcquisitionLinkResponse 删除获客链接响应
|
||||
DeleteCustomerAcquisitionLinkResponse struct {
|
||||
util.CommonError
|
||||
}
|
||||
)
|
||||
|
||||
// DeleteCustomerAcquisitionLink 获客助手--删除获客链接
|
||||
// see https://developer.work.weixin.qq.com/document/path/97297
|
||||
func (r *Client) DeleteCustomerAcquisitionLink(req *DeleteCustomerAcquisitionLinkRequest) (*DeleteCustomerAcquisitionLinkResponse, error) {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(deleteCustomerAcquisitionLinkURL, accessToken), req); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result := &DeleteCustomerAcquisitionLinkResponse{}
|
||||
if err = util.DecodeWithError(response, result, "DeleteCustomerAcquisitionLink"); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
type (
|
||||
// GetCustomerInfoWithCustomerAcquisitionLinkRequest 获取由获客链接添加的客户信息请求
|
||||
GetCustomerInfoWithCustomerAcquisitionLinkRequest struct {
|
||||
LinkID string `json:"link_id"`
|
||||
Limit int64 `json:"limit"`
|
||||
Cursor string `json:"cursor"`
|
||||
}
|
||||
// GetCustomerInfoWithCustomerAcquisitionLinkResponse 获取由获客链接添加的客户信息响应
|
||||
GetCustomerInfoWithCustomerAcquisitionLinkResponse struct {
|
||||
util.CommonError
|
||||
CustomerList []CustomerList `json:"customer_list"`
|
||||
NextCursor string `json:"next_cursor"`
|
||||
}
|
||||
// CustomerList 客户列表
|
||||
CustomerList struct {
|
||||
ExternalUserid string `json:"external_userid"`
|
||||
Userid string `json:"userid"`
|
||||
ChatStatus int64 `json:"chat_status"`
|
||||
State string `json:"state"`
|
||||
}
|
||||
)
|
||||
|
||||
// GetCustomerInfoWithCustomerAcquisitionLink 获客助手--获取由获客链接添加的客户信息
|
||||
// see https://developer.work.weixin.qq.com/document/path/97298
|
||||
func (r *Client) GetCustomerInfoWithCustomerAcquisitionLink(req *GetCustomerInfoWithCustomerAcquisitionLinkRequest) (*GetCustomerInfoWithCustomerAcquisitionLinkResponse, error) {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(getCustomerInfoWithCustomerAcquisitionLinkURL, accessToken), req); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result := &GetCustomerInfoWithCustomerAcquisitionLinkResponse{}
|
||||
if err = util.DecodeWithError(response, result, "GetCustomerInfoWithCustomerAcquisitionLink"); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
type (
|
||||
// CustomerAcquisitionQuotaResponse 查询剩余使用量响应
|
||||
CustomerAcquisitionQuotaResponse struct {
|
||||
util.CommonError
|
||||
Total int64 `json:"total"`
|
||||
Balance int64 `json:"balance"`
|
||||
QuotaList []QuotaList `json:"quota_list"`
|
||||
}
|
||||
// QuotaList 额度
|
||||
QuotaList struct {
|
||||
ExpireDate int64 `json:"expire_date"`
|
||||
Balance int64 `json:"balance"`
|
||||
}
|
||||
)
|
||||
|
||||
// CustomerAcquisitionQuota 获客助手额度管理与使用统计--查询剩余使用量
|
||||
// see https://developer.work.weixin.qq.com/document/path/97375
|
||||
func (r *Client) CustomerAcquisitionQuota() (*CustomerAcquisitionQuotaResponse, error) {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.HTTPGet((fmt.Sprintf(customerAcquisitionQuotaURL, accessToken))); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result := &CustomerAcquisitionQuotaResponse{}
|
||||
if err = util.DecodeWithError(response, result, "CustomerAcquisitionQuota"); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
type (
|
||||
// CustomerAcquisitionStatisticRequest 查询链接使用详情请求
|
||||
CustomerAcquisitionStatisticRequest struct {
|
||||
LinkID string `json:"link_id"`
|
||||
StartTime int64 `json:"start_time"`
|
||||
EndTime int64 `json:"end_time"`
|
||||
}
|
||||
// CustomerAcquisitionStatisticResponse 查询链接使用详情响应
|
||||
CustomerAcquisitionStatisticResponse struct {
|
||||
util.CommonError
|
||||
ClickLinkCustomerCnt int64 `json:"click_link_customer_cnt"`
|
||||
NewCustomerCnt int64 `json:"new_customer_cnt"`
|
||||
}
|
||||
)
|
||||
|
||||
// CustomerAcquisitionStatistic 获客助手额度管理与使用统计--查询链接使用详情
|
||||
// see https://developer.work.weixin.qq.com/document/path/97375
|
||||
func (r *Client) CustomerAcquisitionStatistic(req *CustomerAcquisitionStatisticRequest) (*CustomerAcquisitionStatisticResponse, error) {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(customerAcquisitionStatisticURL, accessToken), req); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result := &CustomerAcquisitionStatisticResponse{}
|
||||
if err = util.DecodeWithError(response, result, "CustomerAcquisitionStatistic"); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
@@ -25,10 +25,6 @@ const (
|
||||
getGroupWelcomeTemplateURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/group_welcome_template/get?access_token=%s"
|
||||
// delGroupWelcomeTemplateURL 删除入群欢迎语素材
|
||||
delGroupWelcomeTemplateURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/group_welcome_template/del?access_token=%s"
|
||||
// remindGroupMsgSendURL 提醒成员群发
|
||||
remindGroupMsgSendURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/remind_groupmsg_send?access_token=%s"
|
||||
// cancelGroupMsgSendURL 停止企业群发
|
||||
cancelGroupMsgSendURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/cancel_groupmsg_send?access_token=%s"
|
||||
)
|
||||
|
||||
// AddMsgTemplateRequest 创建企业群发请求
|
||||
@@ -426,47 +422,3 @@ func (r *Client) DelGroupWelcomeTemplate(req *DelGroupWelcomeTemplateRequest) er
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// RemindGroupMsgSendRequest 提醒成员群发请求
|
||||
type RemindGroupMsgSendRequest struct {
|
||||
MsgID string `json:"msgid"`
|
||||
}
|
||||
|
||||
// RemindGroupMsgSend 提醒成员群发
|
||||
// see https://developer.work.weixin.qq.com/document/path/97610
|
||||
func (r *Client) RemindGroupMsgSend(req *RemindGroupMsgSendRequest) error {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||
return err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(remindGroupMsgSendURL, accessToken), req); err != nil {
|
||||
return err
|
||||
}
|
||||
return util.DecodeWithCommonError(response, "RemindGroupMsgSend")
|
||||
}
|
||||
|
||||
// CancelGroupMsgSendRequest 停止企业群发请求
|
||||
type CancelGroupMsgSendRequest struct {
|
||||
MsgID string `json:"msgid"`
|
||||
}
|
||||
|
||||
// CancelGroupMsgSend 提醒成员群发
|
||||
// see https://developer.work.weixin.qq.com/document/path/97611
|
||||
func (r *Client) CancelGroupMsgSend(req *CancelGroupMsgSendRequest) error {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||
return err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(cancelGroupMsgSendURL, accessToken), req); err != nil {
|
||||
return err
|
||||
}
|
||||
return util.DecodeWithCommonError(response, "CancelGroupMsgSend")
|
||||
}
|
||||
|
||||
@@ -1,359 +0,0 @@
|
||||
package kf
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/silenceper/wechat/v2/util"
|
||||
)
|
||||
|
||||
const (
|
||||
// addKnowledgeGroupURL 知识库分组添加
|
||||
addKnowledgeGroupURL = "https://qyapi.weixin.qq.com/cgi-bin/kf/knowledge/add_group?access_token=%s"
|
||||
// delKnowledgeGroupURL 知识库分组删除
|
||||
delKnowledgeGroupURL = "https://qyapi.weixin.qq.com/cgi-bin/kf/knowledge/del_group?access_token=%s"
|
||||
// modKnowledgeGroupURL 知识库分组修改
|
||||
modKnowledgeGroupURL = "https://qyapi.weixin.qq.com/cgi-bin/kf/knowledge/mod_group?access_token=%s"
|
||||
// listKnowledgeGroupURL 知识库分组列表
|
||||
listKnowledgeGroupURL = "https://qyapi.weixin.qq.com/cgi-bin/kf/knowledge/list_group?access_token=%s"
|
||||
// addKnowledgeIntentURL 知识库问答添加
|
||||
addKnowledgeIntentURL = "https://qyapi.weixin.qq.com/cgi-bin/kf/knowledge/add_intent?access_token=%s"
|
||||
// delKnowledgeIntentURL 知识库问答删除
|
||||
delKnowledgeIntentURL = "https://qyapi.weixin.qq.com/cgi-bin/kf/knowledge/del_intent?access_token=%s"
|
||||
// modKnowledgeIntentURL 知识库问答修改
|
||||
modKnowledgeIntentURL = "https://qyapi.weixin.qq.com/cgi-bin/kf/knowledge/mod_intent?access_token=%s"
|
||||
// listKnowledgeIntentURL 知识库问答列表
|
||||
listKnowledgeIntentURL = "https://qyapi.weixin.qq.com/cgi-bin/kf/knowledge/list_intent?access_token=%s"
|
||||
)
|
||||
|
||||
// AddKnowledgeGroupRequest 知识库分组添加请求
|
||||
type AddKnowledgeGroupRequest struct {
|
||||
Name string `json:"name"`
|
||||
}
|
||||
|
||||
// AddKnowledgeGroupResponse 知识库分组添加响应
|
||||
type AddKnowledgeGroupResponse struct {
|
||||
util.CommonError
|
||||
GroupID string `json:"group_id"`
|
||||
}
|
||||
|
||||
// AddKnowledgeGroup 知识库分组添加
|
||||
// see https://developer.work.weixin.qq.com/document/path/95971#%E6%B7%BB%E5%8A%A0%E5%88%86%E7%BB%84
|
||||
func (r *Client) AddKnowledgeGroup(req *AddKnowledgeGroupRequest) (*AddKnowledgeGroupResponse, error) {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(addKnowledgeGroupURL, accessToken), req); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result := &AddKnowledgeGroupResponse{}
|
||||
err = util.DecodeWithError(response, result, "AddKnowledgeGroup")
|
||||
return result, err
|
||||
}
|
||||
|
||||
// DelKnowledgeGroupRequest 知识库分组删除请求
|
||||
type DelKnowledgeGroupRequest struct {
|
||||
GroupID string `json:"group_id"`
|
||||
}
|
||||
|
||||
// DelKnowledgeGroup 知识库分组删除
|
||||
// see https://developer.work.weixin.qq.com/document/path/95971#%E5%88%A0%E9%99%A4%E5%88%86%E7%BB%84
|
||||
func (r *Client) DelKnowledgeGroup(req *DelKnowledgeGroupRequest) error {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
|
||||
return err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(delKnowledgeGroupURL, accessToken), req); err != nil {
|
||||
return err
|
||||
}
|
||||
return util.DecodeWithCommonError(response, "DelKnowledgeGroup")
|
||||
}
|
||||
|
||||
// ModKnowledgeGroupRequest 知识库分组修改请求
|
||||
type ModKnowledgeGroupRequest struct {
|
||||
GroupID string `json:"group_id"`
|
||||
Name string `json:"name"`
|
||||
}
|
||||
|
||||
// ModKnowledgeGroup 知识库分组修改
|
||||
// see https://developer.work.weixin.qq.com/document/path/95971#%E4%BF%AE%E6%94%B9%E5%88%86%E7%BB%84
|
||||
func (r *Client) ModKnowledgeGroup(req *ModKnowledgeGroupRequest) error {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
|
||||
return err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(modKnowledgeGroupURL, accessToken), req); err != nil {
|
||||
return err
|
||||
}
|
||||
return util.DecodeWithCommonError(response, "ModKnowledgeGroup")
|
||||
}
|
||||
|
||||
// ListKnowledgeGroupRequest 知识库分组列表请求
|
||||
type ListKnowledgeGroupRequest struct {
|
||||
Cursor string `json:"cursor"`
|
||||
Limit int `json:"limit"`
|
||||
GroupID string `json:"group_id"`
|
||||
}
|
||||
|
||||
// ListKnowledgeGroupResponse 知识库分组列表响应
|
||||
type ListKnowledgeGroupResponse struct {
|
||||
util.CommonError
|
||||
NextCursor string `json:"next_cursor"`
|
||||
HasMore int `json:"has_more"`
|
||||
GroupList []KnowledgeGroup `json:"group_list"`
|
||||
}
|
||||
|
||||
// KnowledgeGroup 知识库分组
|
||||
type KnowledgeGroup struct {
|
||||
GroupID string `json:"group_id"`
|
||||
Name string `json:"name"`
|
||||
IsDefault int `json:"is_default"`
|
||||
}
|
||||
|
||||
// ListKnowledgeGroup 知识库分组列表
|
||||
// see https://developer.work.weixin.qq.com/document/path/95971#%E8%8E%B7%E5%8F%96%E5%88%86%E7%BB%84%E5%88%97%E8%A1%A8
|
||||
func (r *Client) ListKnowledgeGroup(req *ListKnowledgeGroupRequest) (*ListKnowledgeGroupResponse, error) {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(listKnowledgeGroupURL, accessToken), req); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result := &ListKnowledgeGroupResponse{}
|
||||
err = util.DecodeWithError(response, result, "ListKnowledgeGroup")
|
||||
return result, err
|
||||
}
|
||||
|
||||
// AddKnowledgeIntentRequest 知识库问答添加请求
|
||||
type AddKnowledgeIntentRequest struct {
|
||||
GroupID string `json:"group_id"`
|
||||
Question IntentQuestion `json:"question"`
|
||||
SimilarQuestions IntentSimilarQuestions `json:"similar_questions"`
|
||||
Answers []IntentAnswerReq `json:"answers"`
|
||||
}
|
||||
|
||||
// IntentQuestion 主问题
|
||||
type IntentQuestion struct {
|
||||
Text IntentQuestionText `json:"text"`
|
||||
}
|
||||
|
||||
// IntentQuestionText 问题文本
|
||||
type IntentQuestionText struct {
|
||||
Content string `json:"content"`
|
||||
}
|
||||
|
||||
// IntentSimilarQuestions 相似问题
|
||||
type IntentSimilarQuestions struct {
|
||||
Items []IntentQuestion `json:"items"`
|
||||
}
|
||||
|
||||
// IntentAnswerReq 回答请求
|
||||
type IntentAnswerReq struct {
|
||||
Text IntentAnswerText `json:"text"`
|
||||
Attachments []IntentAnswerAttachmentReq `json:"attachments"`
|
||||
}
|
||||
|
||||
// IntentAnswerText 回答文本
|
||||
type IntentAnswerText struct {
|
||||
Content string `json:"content"`
|
||||
}
|
||||
|
||||
// IntentAnswerAttachmentReq 回答附件请求
|
||||
type IntentAnswerAttachmentReq struct {
|
||||
MsgType string `json:"msgtype"`
|
||||
Image IntentAnswerAttachmentImgReq `json:"image,omitempty"`
|
||||
Video IntentAnswerAttachmentVideoReq `json:"video,omitempty"`
|
||||
Link IntentAnswerAttachmentLink `json:"link,omitempty"`
|
||||
MiniProgram IntentAnswerAttachmentMiniProgramReq `json:"miniprogram,omitempty"`
|
||||
}
|
||||
|
||||
// IntentAnswerAttachmentImgReq 图片类型回答附件请求
|
||||
type IntentAnswerAttachmentImgReq struct {
|
||||
MediaID string `json:"media_id"`
|
||||
}
|
||||
|
||||
// IntentAnswerAttachmentVideoReq 视频类型回答附件请求
|
||||
type IntentAnswerAttachmentVideoReq struct {
|
||||
MediaID string `json:"media_id"`
|
||||
}
|
||||
|
||||
// IntentAnswerAttachmentLink 链接类型回答附件
|
||||
type IntentAnswerAttachmentLink struct {
|
||||
Title string `json:"title"`
|
||||
PicURL string `json:"picurl"`
|
||||
Desc string `json:"desc"`
|
||||
URL string `json:"url"`
|
||||
}
|
||||
|
||||
// IntentAnswerAttachmentMiniProgramReq 小程序类型回答附件请求
|
||||
type IntentAnswerAttachmentMiniProgramReq struct {
|
||||
Title string `json:"title"`
|
||||
ThumbMediaID string `json:"thumb_media_id"`
|
||||
AppID string `json:"appid"`
|
||||
PagePath string `json:"pagepath"`
|
||||
}
|
||||
|
||||
// AddKnowledgeIntentResponse 知识库问答添加响应
|
||||
type AddKnowledgeIntentResponse struct {
|
||||
util.CommonError
|
||||
IntentID string `json:"intent_id"`
|
||||
}
|
||||
|
||||
// AddKnowledgeIntent 知识库问答添加
|
||||
// see https://developer.work.weixin.qq.com/document/path/95972#%E6%B7%BB%E5%8A%A0%E9%97%AE%E7%AD%94
|
||||
func (r *Client) AddKnowledgeIntent(req *AddKnowledgeIntentRequest) (*AddKnowledgeIntentResponse, error) {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(addKnowledgeIntentURL, accessToken), req); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result := &AddKnowledgeIntentResponse{}
|
||||
err = util.DecodeWithError(response, result, "AddKnowledgeIntent")
|
||||
return result, err
|
||||
}
|
||||
|
||||
// DelKnowledgeIntentRequest 知识库问答删除请求
|
||||
type DelKnowledgeIntentRequest struct {
|
||||
IntentID string `json:"intent_id"`
|
||||
}
|
||||
|
||||
// DelKnowledgeIntent 知识库问答删除
|
||||
// see https://developer.work.weixin.qq.com/document/path/95972#%E5%88%A0%E9%99%A4%E9%97%AE%E7%AD%94
|
||||
func (r *Client) DelKnowledgeIntent(req *DelKnowledgeIntentRequest) error {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
|
||||
return err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(delKnowledgeIntentURL, accessToken), req); err != nil {
|
||||
return err
|
||||
}
|
||||
return util.DecodeWithCommonError(response, "DelKnowledgeIntent")
|
||||
}
|
||||
|
||||
// ModKnowledgeIntentRequest 知识库问答修改请求
|
||||
type ModKnowledgeIntentRequest struct {
|
||||
IntentID string `json:"intent_id"`
|
||||
Question IntentQuestion `json:"question"`
|
||||
SimilarQuestions IntentSimilarQuestions `json:"similar_questions"`
|
||||
Answers []IntentAnswerReq `json:"answers"`
|
||||
}
|
||||
|
||||
// ModKnowledgeIntent 知识库问答修改
|
||||
// see https://developer.work.weixin.qq.com/document/path/95972#%E4%BF%AE%E6%94%B9%E9%97%AE%E7%AD%94
|
||||
func (r *Client) ModKnowledgeIntent(req *ModKnowledgeIntentRequest) error {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
|
||||
return err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(modKnowledgeIntentURL, accessToken), req); err != nil {
|
||||
return err
|
||||
}
|
||||
return util.DecodeWithCommonError(response, "ModKnowledgeIntent")
|
||||
}
|
||||
|
||||
// ListKnowledgeIntentRequest 知识库问答列表请求
|
||||
type ListKnowledgeIntentRequest struct {
|
||||
Cursor string `json:"cursor"`
|
||||
Limit int `json:"limit"`
|
||||
GroupID string `json:"group_id"`
|
||||
IntentID string `json:"intent_id"`
|
||||
}
|
||||
|
||||
// ListKnowledgeIntentResponse 知识库问答列表响应
|
||||
type ListKnowledgeIntentResponse struct {
|
||||
util.CommonError
|
||||
NextCursor string `json:"next_cursor"`
|
||||
HasMore int `json:"has_more"`
|
||||
IntentList []KnowledgeIntent `json:"intent_list"`
|
||||
}
|
||||
|
||||
// KnowledgeIntent 问答摘要
|
||||
type KnowledgeIntent struct {
|
||||
GroupID string `json:"group_id"`
|
||||
IntentID string `json:"intent_id"`
|
||||
Question IntentQuestion `json:"question"`
|
||||
SimilarQuestions IntentSimilarQuestions `json:"similar_questions"`
|
||||
Answers []IntentAnswerRes `json:"answers"`
|
||||
}
|
||||
|
||||
// IntentAnswerRes 回答返回
|
||||
type IntentAnswerRes struct {
|
||||
Text IntentAnswerText `json:"text"`
|
||||
Attachments []IntentAnswerAttachmentRes `json:"attachments"`
|
||||
}
|
||||
|
||||
// IntentAnswerAttachmentRes 回答附件返回
|
||||
type IntentAnswerAttachmentRes struct {
|
||||
MsgType string `json:"msgtype"`
|
||||
Image IntentAnswerAttachmentImgRes `json:"image,omitempty"`
|
||||
Video IntentAnswerAttachmentVideoRes `json:"video,omitempty"`
|
||||
Link IntentAnswerAttachmentLink `json:"link,omitempty"`
|
||||
MiniProgram IntentAnswerAttachmentMiniProgramRes `json:"miniprogram,omitempty"`
|
||||
}
|
||||
|
||||
// IntentAnswerAttachmentImgRes 图片类型回答附件返回
|
||||
type IntentAnswerAttachmentImgRes struct {
|
||||
Name string `json:"name"`
|
||||
}
|
||||
|
||||
// IntentAnswerAttachmentVideoRes 视频类型回答附件返回
|
||||
type IntentAnswerAttachmentVideoRes struct {
|
||||
Name string `json:"name"`
|
||||
}
|
||||
|
||||
// IntentAnswerAttachmentMiniProgramRes 小程序类型回答附件返回
|
||||
type IntentAnswerAttachmentMiniProgramRes struct {
|
||||
Title string `json:"title"`
|
||||
AppID string `json:"appid"`
|
||||
PagePath string `json:"pagepath"`
|
||||
}
|
||||
|
||||
// ListKnowledgeIntent 知识库问答列表
|
||||
// see https://developer.work.weixin.qq.com/document/path/95972#%E8%8E%B7%E5%8F%96%E9%97%AE%E7%AD%94%E5%88%97%E8%A1%A8
|
||||
func (r *Client) ListKnowledgeIntent(req *ListKnowledgeIntentRequest) (*ListKnowledgeIntentResponse, error) {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(listKnowledgeIntentURL, accessToken), req); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result := &ListKnowledgeIntentResponse{}
|
||||
err = util.DecodeWithError(response, result, "ListKnowledgeIntent")
|
||||
return result, err
|
||||
}
|
||||
@@ -1,127 +0,0 @@
|
||||
package kf
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/silenceper/wechat/v2/util"
|
||||
)
|
||||
|
||||
const (
|
||||
// getCorpStatisticURL 获取「客户数据统计」企业汇总数据
|
||||
getCorpStatisticURL = "https://qyapi.weixin.qq.com/cgi-bin/kf/get_corp_statistic?access_token=%s"
|
||||
// getServicerStatisticURL 获取「客户数据统计」接待人员明细数据
|
||||
getServicerStatisticURL = "https://qyapi.weixin.qq.com/cgi-bin/kf/get_servicer_statistic?access_token=%s"
|
||||
)
|
||||
|
||||
// GetCorpStatisticRequest 获取「客户数据统计」企业汇总数据请求
|
||||
type GetCorpStatisticRequest struct {
|
||||
OpenKfID string `json:"open_kfid"`
|
||||
StartTime int64 `json:"start_time"`
|
||||
EndTime int64 `json:"end_time"`
|
||||
}
|
||||
|
||||
// GetCorpStatisticResponse 获取「客户数据统计」企业汇总数据响应
|
||||
type GetCorpStatisticResponse struct {
|
||||
util.CommonError
|
||||
StatisticList []CorpStatisticList `json:"statistic_list"`
|
||||
}
|
||||
|
||||
// CorpStatisticList 企业汇总统计数据列表
|
||||
type CorpStatisticList struct {
|
||||
StatTime int64 `json:"stat_time"`
|
||||
Statistic CorpStatistic `json:"statistic"`
|
||||
}
|
||||
|
||||
// CorpStatistic 企业汇总统计一天的统计数据
|
||||
type CorpStatistic struct {
|
||||
SessionCnt int64 `json:"session_cnt"`
|
||||
CustomerCnt int64 `json:"customer_cnt"`
|
||||
CustomerMsgCnt int64 `json:"customer_msg_cnt"`
|
||||
UpgradeServiceCustomerCnt int64 `json:"upgrade_service_customer_cnt"`
|
||||
AiSessionReplyCnt int64 `json:"ai_session_reply_cnt"`
|
||||
AiTransferRate float64 `json:"ai_transfer_rate"`
|
||||
AiKnowledgeHitRate float64 `json:"ai_knowledge_hit_rate"`
|
||||
MsgRejectedCustomerCnt int64 `json:"msg_rejected_customer_cnt"`
|
||||
}
|
||||
|
||||
// GetCorpStatistic 获取「客户数据统计」企业汇总数据
|
||||
// see https://developer.work.weixin.qq.com/document/path/95489
|
||||
func (r *Client) GetCorpStatistic(req *GetCorpStatisticRequest) (*GetCorpStatisticResponse, error) {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(getCorpStatisticURL, accessToken), req); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result := &GetCorpStatisticResponse{}
|
||||
if err = util.DecodeWithError(response, result, "GetCorpStatistic"); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
// GetServicerStatisticRequest 获取「客户数据统计」接待人员明细数据请求
|
||||
type GetServicerStatisticRequest struct {
|
||||
OpenKfID string `json:"open_kfid"`
|
||||
ServicerUserID string `json:"servicer_userid"`
|
||||
StartTime int64 `json:"start_time"`
|
||||
EndTime int64 `json:"end_time"`
|
||||
}
|
||||
|
||||
// GetServicerStatisticResponse 获取「客户数据统计」接待人员明细数据响应
|
||||
type GetServicerStatisticResponse struct {
|
||||
util.CommonError
|
||||
StatisticList []ServicerStatisticList `json:"statistic_list"`
|
||||
}
|
||||
|
||||
// ServicerStatisticList 接待人员明细统计数据列表
|
||||
type ServicerStatisticList struct {
|
||||
StatTime int64 `json:"stat_time"`
|
||||
Statistic ServicerStatistic `json:"statistic"`
|
||||
}
|
||||
|
||||
// ServicerStatistic 接待人员明细统计一天的统计数据
|
||||
type ServicerStatistic struct {
|
||||
SessionCnt int64 `json:"session_cnt"`
|
||||
CustomerCnt int64 `json:"customer_cnt"`
|
||||
CustomerMsgCnt int64 `json:"customer_msg_cnt"`
|
||||
ReplyRate float64 `json:"reply_rate"`
|
||||
FirstReplyAverageSec float64 `json:"first_reply_average_sec"`
|
||||
SatisfactionInvestgateCnt int64 `json:"satisfaction_investgate_cnt"`
|
||||
SatisfactionParticipationRate float64 `json:"satisfaction_participation_rate"`
|
||||
SatisfiedRate float64 `json:"satisfied_rate"`
|
||||
MiddlingRate float64 `json:"middling_rate"`
|
||||
DissatisfiedRate float64 `json:"dissatisfied_rate"`
|
||||
UpgradeServiceCustomerCnt int64 `json:"upgrade_service_customer_cnt"`
|
||||
UpgradeServiceMemberInviteCnt int64 `json:"upgrade_service_member_invite_cnt"`
|
||||
UpgradeServiceMemberCustomerCnt int64 `json:"upgrade_service_member_customer_cnt"`
|
||||
UpgradeServiceGroupChatInviteCnt int64 `json:"upgrade_service_groupchat_invite_cnt"`
|
||||
UpgradeServiceGroupChatCustomerCnt int64 `json:"upgrade_service_groupchat_customer_cnt"`
|
||||
MsgRejectedCustomerCnt int64 `json:"msg_rejected_customer_cnt"`
|
||||
}
|
||||
|
||||
// GetServicerStatistic 获取「客户数据统计」接待人员明细数据
|
||||
// see https://developer.work.weixin.qq.com/document/path/95490
|
||||
func (r *Client) GetServicerStatistic(req *GetServicerStatisticRequest) (*GetServicerStatisticResponse, error) {
|
||||
var (
|
||||
accessToken string
|
||||
err error
|
||||
)
|
||||
if accessToken, err = r.ctx.GetAccessToken(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var response []byte
|
||||
if response, err = util.PostJSON(fmt.Sprintf(getServicerStatisticURL, accessToken), req); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result := &GetServicerStatisticResponse{}
|
||||
if err = util.DecodeWithError(response, result, "GetServicerStatistic"); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
Reference in New Issue
Block a user