From 7c5041e9db1ba742f88e25fa65da07653e3358e0 Mon Sep 17 00:00:00 2001
From: guzeng <gz@flyrise.cn>
Date: Mon, 29 Mar 2021 23:39:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 access_token.client.go         |  6 +++++-
 common.go                      | 12 ++++++++++++
 send_uniform_message.client.go | 25 +++++++++++++------------
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/access_token.client.go b/access_token.client.go
index ebbc6f5..3574a64 100644
--- a/access_token.client.go
+++ b/access_token.client.go
@@ -14,7 +14,11 @@ func GetAccessToken(dbname, site_id string, appid, secret string, url ...string)
 
 	conn, err := rpc_server_conn(url...)
 
-	data := AccessTokenReq{SiteId: site_id, Dbname: dbname, Appid: appid, Secret: secret}
+	data := AccessTokenReq{}
+	data.SiteId = site_id
+	data.Dbname = dbname
+	data.Appid = appid
+	data.Secret = secret
 
 	data_json, err := json.Marshal(data)
 	if err != nil {
diff --git a/common.go b/common.go
index b8151a5..c75bac2 100644
--- a/common.go
+++ b/common.go
@@ -22,6 +22,18 @@ type AccessTokenRes struct {
 	AccessToken string
 }
 
+type UniformMessageReq struct {
+	Req
+	Appid       string
+	Secret      string
+	Touser      string
+	MpAppid     string
+	TemplateId  string
+	Url         string
+	MiniProgram string
+	Data        string
+}
+
 func rpc_server_conn(url ...string) (*WeixinRpcServiceClient, error) {
 
 	var wx_rpc_url string = "127.0.0.1:7969"
diff --git a/send_uniform_message.client.go b/send_uniform_message.client.go
index 44f77e6..27fb17a 100644
--- a/send_uniform_message.client.go
+++ b/send_uniform_message.client.go
@@ -30,25 +30,26 @@ type UniformMessageReq struct {
  * touser 小程序openid
  * mp_appid 关联公众号appid，要求与小程序有绑定且同主体
  * temp_id 公众号模板id
- * url 跳转的url
+ * redirect_url 跳转的url
  * mini_program 公众号模板消息所要跳转的小程序，小程序的必须与公众号具有绑定关系
  * data 公众号模板消息的数据
  */
 
-func SendUniformMessage(dbname, site_id string, appid, secret, touser, mp_appid, temp_id, url, mini_program, data string, url ...string) (*WxApiRes, error) {
+func SendUniformMessage(dbname, site_id string, appid, secret, touser, mp_appid, temp_id, redirect_url, mini_program, data string, url ...string) (*WxApiRes, error) {
 
 	conn, err := rpc_server_conn(url...)
 
-	data["dbname"] = dbname
-	data["site_id"] = site_id
-	data["appid"] = appid
-	data["secret"] = secret
-	data["touser"] = touser
-	data["mp_appid"] = mp_appid
-	data["temp_id"] = temp_id
-	data["url"] = url
-	data["mini_program"] = mini_program
-	data["data"] = data
+	data := UniformMessageReq{}
+	data.SiteId = site_id
+	data.Dbname = dbname
+	data.Appid = appid
+	data.Secret = secret
+	data.Touser = touser
+	data.MpAppid = mp_appid
+	data.TemplateId = temp_id
+	data.Url = redirect_url
+	data.MiniProgram = mini_program
+	data.Data = data
 
 	data_json, err := json.Marshal(data)
 	if err != nil {