From 07ab80dfa771b71311d268b5399b5091a470ee92 Mon Sep 17 00:00:00 2001 From: rianli Date: Mon, 25 Nov 2024 09:35:09 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dexamples/receive-and-send?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8A=A0=E8=BD=BD=E9=80=BB=E8=BE=91=20(merge?= =?UTF-8?q?=20request=20!101)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Squash merge branch 'fix_20241122_demo_recevie_and_send' into 'master' 修复examples/receive-and-send配置加载逻辑 --- dto/webhook.go | 5 +- examples/apitest/main_test.go | 2 +- examples/{apitest => }/config.yaml.demo | 0 examples/custom-filter/config.yaml.demo | 3 -- examples/custom-logger/config.yaml.demo | 3 -- examples/custom-logger/main.go | 1 - examples/go.mod | 5 +- examples/go.sum | 2 + examples/img.png | Bin 3892 -> 0 bytes examples/receive-and-send/config.yaml.demo | 3 -- examples/receive-and-send/main.go | 5 +- .../config.yaml.demo | 3 -- examples/simulate-callback-request/main.go | 4 +- interaction/signature/interaction_test.go | 51 ++++++++++++------ interaction/webhook/webhook.go | 2 +- 15 files changed, 45 insertions(+), 44 deletions(-) rename examples/{apitest => }/config.yaml.demo (100%) delete mode 100644 examples/custom-filter/config.yaml.demo delete mode 100644 examples/custom-logger/config.yaml.demo delete mode 100644 examples/img.png delete mode 100644 examples/receive-and-send/config.yaml.demo delete mode 100644 examples/simulate-callback-request/config.yaml.demo diff --git a/dto/webhook.go b/dto/webhook.go index a53dd52..7ba54d3 100644 --- a/dto/webhook.go +++ b/dto/webhook.go @@ -8,6 +8,7 @@ type WHValidationReq struct { // WHValidationRsp 机器人回调验证响应结果 type WHValidationRsp struct { - PlainToken string `json:"plain_token"` - Signature string `json:"signature"` + PlainToken string `json:"plain_token"` + Signature string `json:"signature"` + DataVersion string `json:"data_version"` //数据格式版本号 } diff --git a/examples/apitest/main_test.go b/examples/apitest/main_test.go index fcab8b7..314b51c 100644 --- a/examples/apitest/main_test.go +++ b/examples/apitest/main_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "github.com/tencent-connect/botgo" "github.com/tencent-connect/botgo/openapi" diff --git a/examples/apitest/config.yaml.demo b/examples/config.yaml.demo similarity index 100% rename from examples/apitest/config.yaml.demo rename to examples/config.yaml.demo diff --git a/examples/custom-filter/config.yaml.demo b/examples/custom-filter/config.yaml.demo deleted file mode 100644 index 0f8790a..0000000 --- a/examples/custom-filter/config.yaml.demo +++ /dev/null @@ -1,3 +0,0 @@ -# 在这个配置文件中补充你的 appid 和 secret，并修改文件名为 config.yaml -appid : -secret : \ No newline at end of file diff --git a/examples/custom-logger/config.yaml.demo b/examples/custom-logger/config.yaml.demo deleted file mode 100644 index 0f8790a..0000000 --- a/examples/custom-logger/config.yaml.demo +++ /dev/null @@ -1,3 +0,0 @@ -# 在这个配置文件中补充你的 appid 和 secret，并修改文件名为 config.yaml -appid : -secret : \ No newline at end of file diff --git a/examples/custom-logger/main.go b/examples/custom-logger/main.go index 808dfa9..e0cf573 100644 --- a/examples/custom-logger/main.go +++ b/examples/custom-logger/main.go @@ -35,7 +35,6 @@ func main() { } // 把新的 logger 设置到 sdk 上，替换掉老的控制台 logger botgo.SetLogger(logger) - content, err := os.ReadFile("config.yaml") if err != nil { log.Fatalln("load config file failed, err:", err) diff --git a/examples/go.mod b/examples/go.mod index 85b0575..9bc4b78 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -4,9 +4,8 @@ go 1.21 require ( github.com/google/uuid v1.3.0 - github.com/tencent-connect/botgo v0.0.0-00010101000000-000000000000 + github.com/tencent-connect/botgo v0.1.7 go.uber.org/zap v1.19.1 - gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -22,5 +21,3 @@ require ( golang.org/x/oauth2 v0.23.0 // indirect golang.org/x/sync v0.1.0 // indirect ) - -replace github.com/tencent-connect/botgo => ../ diff --git a/examples/go.sum b/examples/go.sum index d8da5c7..3eab351 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -69,6 +69,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/tencent-connect/botgo v0.1.7 h1:+RkHW9T4WOBRGQtOcFAO52VvZEKoTXFq162k2xo0Jac= +github.com/tencent-connect/botgo v0.1.7/go.mod h1:oO1sG9ybhXNickvt+CVym5khwQ+uKhTR+IhTqEfOVsI= github.com/tidwall/gjson v1.9.3 h1:hqzS9wAHMO+KVBBkLxYdkEeeFHuqr95GfClRLKlgK0E= github.com/tidwall/gjson v1.9.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= diff --git a/examples/img.png b/examples/img.png deleted file mode 100644 index 6e2099d64c4e9987ab9cfd3cc8163aebdb6bc1de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3892 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