From c0ce0771ac5e03a3880747393128af3050e6294a Mon Sep 17 00:00:00 2001 From: lijianbin <513837235@.qq.com> Date: Fri, 10 Dec 2021 15:47:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0site=5Fid=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common.go | 2 +- go.mod | 4 ++-- go.sum | 12 ++++++------ miniapp_qrcode.client.go | 5 +++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/common.go b/common.go index b2e64c1..8b810bd 100644 --- a/common.go +++ b/common.go @@ -1,7 +1,7 @@ package weixinrpc import ( - "git.tetele.net/tgo/conf" + "git.tetele.net/yueheng/conf" ) const DES_KEY = "wxserrpc" diff --git a/go.mod b/go.mod index c0d65ba..1a5dae4 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,10 @@ module git.tetele.net/tgo/weixinrpc go 1.14 require ( - git.tetele.net/tgo/conf v0.39.3 + git.tetele.net/yueheng/conf v1.2.4 git.tetele.net/tgo/crypter v0.2.2 git.tetele.net/tgo/helper v0.2.6 - github.com/chai2010/protorpc v1.0.0 + github.com/chai2010/protorpc v1.1.3 github.com/golang/protobuf v1.0.0 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect diff --git a/go.sum b/go.sum index 2181e0d..fcd4120 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,15 @@ -git.tetele.net/tgo/conf v0.39.3 h1:yjeJKmOHMJUeRl5Q3FVCLjIdIcor7UkohycyM87cGng= -git.tetele.net/tgo/conf v0.39.3/go.mod h1:AWVIBEDE5dtotthUgR0SWaR2Qa6/f+O5WQ3s7Tj8q7A= +git.tetele.net/yueheng/conf v0.39.3 h1:yjeJKmOHMJUeRl5Q3FVCLjIdIcor7UkohycyM87cGng= +git.tetele.net/yueheng/conf v0.39.3/go.mod h1:AWVIBEDE5dtotthUgR0SWaR2Qa6/f+O5WQ3s7Tj8q7A= git.tetele.net/tgo/crypter v0.2.2 h1:YMQJh2Gj5Po4ZfelJUmXBKi01UbmtiSy3bmqRfnYQMo= git.tetele.net/tgo/crypter v0.2.2/go.mod h1:vfvRLZA8+lHNgNXneOcgvVhDyuv25ZRb+C6xHOmXNx0= git.tetele.net/tgo/helper v0.2.6 h1:JC+N+If/bGvcwuUSklva17YDNtKBV2Qpvl5RQpMySOY= git.tetele.net/tgo/helper v0.2.6/go.mod h1:89mQwyfqZ+t8YXiVwzSxA70gLlUNqoZGDEUxvV46jXk= -github.com/chai2010/protorpc v1.0.0 h1:aJ45G9sl1utSKo35EqnBSTs5jqTpdJDJAuZMMYPAtFo= -github.com/chai2010/protorpc v1.0.0/go.mod h1:woR3WwjaQDqFjlzdVsFEKiK5Ur12QL8mYxVPjfr5z54= +github.com/chai2010/protorpc v1.1.3 h1:VJK5hIoZn0XCGol0GmbxZkUG6FbTI5LP2Lam6RVd15w= +github.com/chai2010/protorpc v1.1.3/go.mod h1:/wO0kiyVdu7ug8dCMrA2yDr2vLfyhsLEuzLa9J2HJ+I= github.com/golang/protobuf v1.0.0 h1:lsek0oXi8iFE9L+EXARyHIjU5rlWIhhTkjDz3vHhWWQ= github.com/golang/protobuf v1.0.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/snappy v0.0.0-20170215233205-553a64147049 h1:K9KHZbXKpGydfDN0aZrsoHpLJlZsBrGMFWbgLDGnPZk= -github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= diff --git a/miniapp_qrcode.client.go b/miniapp_qrcode.client.go index 37bbff5..0a6de1e 100644 --- a/miniapp_qrcode.client.go +++ b/miniapp_qrcode.client.go @@ -10,7 +10,7 @@ import ( "github.com/golang/protobuf/proto" ) -func GetMiniAppQrcode(appId, appSecret string, qrcodeParams map[string]interface{}, url ...string) (string, error) { +func GetMiniAppQrcode(siteId, appId, appSecret string, qrcodeParams map[string]interface{}, url ...string) (string, error) { conn, err := rpc_server_conn(url...) if err != nil { @@ -19,6 +19,7 @@ func GetMiniAppQrcode(appId, appSecret string, qrcodeParams map[string]interface defer conn.Close() data := map[string]interface{}{} + data["site_id"] = siteId data["app_id"] = appId data["app_secret"] = appSecret data["qrcode"] = qrcodeParams @@ -50,7 +51,7 @@ func GetMiniAppQrcode(appId, appSecret string, qrcodeParams map[string]interface return "", err } - //解密 + // 解密 res_data_de, err := GetOrgData(res) if err != nil {