1.增加任务卡片(taskcard)消息

2.取消sendmsg的agentid参数

Author: esap

.travis.yml

@@ -2,7 +2,6 @@ language: go
 
 go:
   - 1.9
-  - 1.8
 
 sudo: required
 

README.md

@@ -29,6 +29,7 @@ func main() {
 	}
 
 	app := wechat.New(cfg)
+	app.SendText("@all", "Hello,World!")
 
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		app.VerifyURL(w, r).NewText("客服消息1").Send().NewText("客服消息2").Send().NewText("查询OK").Reply()
@@ -60,28 +61,29 @@ func main() {
 	cfg := &wechat.WxConfig{
 		Token:          "yourToken",
 		AppId:          "yourCorpID",
+		AgentId:        "yourAgentId",
 		Secret:         "yourSecret",
 		EncodingAESKey: "yourEncodingAesKey",
 		AppType:        1,
 	}
 ```
 
-### 直接发提醒消息
+## 主动推送消息
 
-用户关注后，企业微信可以直接发，服务号需要用户48小时内进入过。
+用户关注后，企业微信可以主动推送消息，服务号需要用户48小时内进入过。
 
 ```go
-	app.SendText(to, agentId, msg)
-	app.SendImage(to, id, mediaId)
-	app.SendVoice(to, id, mediaId)
-	app.SendFile(to, id, mediaId)
-	app.SendVideo(to, id, mediaId, title, desc)
-	app.SendTextcard(to, id, title, desc, url)
-	app.SendMusic(to, id, mediaId, title, desc, musicUrl, qhMusicUrl)
-	app.SendNews(to, id, arts...)
-	app.SendMpNews(to, id, arts...)
-	app.SendMpNewsId(to, id, mediaId)
-	app.SendMarkDown(to, id, content)
+	app.SendText(to, msg)
+	app.SendImage(to, mediaId)
+	app.SendVoice(to, mediaId)
+	app.SendFile(to, mediaId)
+	app.SendVideo(to, mediaId, title, desc)
+	app.SendTextcard(to, title, desc, url)
+	app.SendMusic(to, mediaId, title, desc, musicUrl, qhMusicUrl)
+	app.SendNews(to, arts...)
+	app.SendMpNews(to, arts...)
+	app.SendMpNewsId(to, mediaId)
+	app.SendMarkDown(to, content)
 ```
 
 ## 消息回调
@@ -160,7 +162,7 @@ func wxApiPost(c echo.Context) error {
 	ctx.NewText("客服消息1").Send().NewText("客服消息2").Send()
 ```
 
-* 被动回复可直接调用ReplySuccess()，表示已收到，然后调用客服消息。
+* 被动回复可直接调用Reply()，表示已收到，然后调用客服消息。
 
 ####  文本消息
 

accesstoken.go

@@ -49,11 +49,10 @@ func (s *Server) GetUserAccessToken() string {
 
 func (s *Server) getAccessToken() (err error) {
 	if s.ExternalTokenHandler != nil {
-		Printf("远程获取token")
 		s.accessToken = s.ExternalTokenHandler(s.AppId, s.AppName)
+		Printf("***%v[%v]远程获取token:%v", util.Substr(s.AppId, 14, 30), s.AgentId, s.accessToken)
 		return
 	}
-	Printf("本地获取token")
 	url := fmt.Sprintf(s.TokenUrl, s.AppId, s.Secret)
 	at := new(AccessToken)
 	if err = util.GetJson(url, at); err != nil {
@@ -62,9 +61,9 @@ func (s *Server) getAccessToken() (err error) {
 	if at.ErrCode > 0 {
 		return at.Error()
 	}
-	Printf("%v[%v]:%+v", s.AppId, s.AgentId, *at)
 	at.ExpiresIn = time.Now().Unix() + at.ExpiresIn - 5
 	s.accessToken = at
+	Printf("***%v[%v]本地获取token:%v", util.Substr(s.AppId, 14, 30), s.AgentId, s.accessToken)
 	return
 
 }

context.go

@@ -14,53 +14,41 @@ type Context struct {
 	Timestamp string
 	Nonce     string
 	Msg       *WxMsg
-	MsgEnc    *WxMsgEnc
 	Resp      interface{}
 	Writer    http.ResponseWriter
 	Request   *http.Request
-	repCount  int
+	hasReply  bool
 }
 
 // Reply 被动回复消息
 func (c *Context) Reply() (err error) {
-	if c.Request.Method != "POST" || c.repCount > 0 {
-		return errors.New("Reply err: no reply")
+	if c.hasReply {
+		return errors.New("重复调用错误")
 	}
+
+	c.hasReply = true
+
+	if c.Resp == nil {
+		return nil
+	}
+
 	Printf("Wechat <== %+v", c.Resp)
 	if c.SafeMode {
 		b, err := xml.MarshalIndent(c.Resp, "", "  ")
 		if err != nil {
-			c.Writer.Write([]byte{})
 			return err
 		}
 		c.Resp, err = c.EncryptMsg(b, c.Timestamp, c.Nonce)
 		if err != nil {
-			c.Writer.Write([]byte{})
 			return err
 		}
 	}
 	c.Writer.Header().Set("Content-Type", "application/xml;charset=UTF-8")
-	c.repCount++
 	return xml.NewEncoder(c.Writer).Encode(c.Resp)
 }
 
-// ReplySuccess 如果不能在5秒内处理完，应该先回复success，然后通过客服消息通知用户
-func (c *Context) ReplySuccess() (err error) {
-	if c.Request.Method != http.MethodPost || c.repCount > 0 {
-		return errors.New("Reply err: no reply")
-	}
-	_, err = c.Writer.Write([]byte("success"))
-	return
-}
-
 // Send 主动发送消息(客服)
 func (c *Context) Send() *Context {
-	go c.SendMsg(c.Resp)
-	return c
-}
-
-// SendAdd 添加主动消息队列(客服)
-func (c *Context) SendAdd() *Context {
 	c.AddMsg(c.Resp)
 	return c
 }

send.go

@@ -25,76 +25,76 @@ func (s *Server) SendMsg(v interface{}) *WxErr {
 	if err != nil {
 		return &WxErr{-1, err.Error()}
 	}
-	Printf("发送消息:%+v\n回执:%+v", v, *rst)
+	Printf("[*] 发送消息:%+v\n[*] 回执:%+v", v, *rst)
 	return rst
 }
 
 // SendText 发送客服text消息,过长时按500长度自动拆分
-func (s *Server) SendText(to string, agentId int, msg string, safe ...int) (e *WxErr) {
-	if len(safe) > 0 && safe[0] == 1 {
-		s.SafeOpen()
-		defer s.SafeClose()
-	}
-	//	m := strings.Join(msg, "")
+func (s *Server) SendText(to, msg string) (e *WxErr) {
 	leng := utf8.RuneCountInString(msg)
 	n := leng/500 + 1
 
 	if n == 1 {
-		return s.SendMsg(s.NewText(to, agentId, msg))
+		return s.SendMsg(s.NewText(to, msg))
 	}
 	for i := 0; i < n; i++ {
-		e = s.SendMsg(s.NewText(to, agentId, fmt.Sprintf("%s\n(%v/%v)", util.Substr(msg, i*500, (i+1)*500), i+1, n)))
+		e = s.SendMsg(s.NewText(to, fmt.Sprintf("%s\n(%v/%v)", util.Substr(msg, i*500, (i+1)*500), i+1, n)))
 	}
 
 	return
 }
 
 // SendImage 发送客服Image消息
-func (s *Server) SendImage(to string, id int, mediaId string) *WxErr {
-	return s.SendMsg(s.NewImage(to, id, mediaId))
+func (s *Server) SendImage(to string, mediaId string) *WxErr {
+	return s.SendMsg(s.NewImage(to, mediaId))
 }
 
 // SendVoice 发送客服Voice消息
-func (s *Server) SendVoice(to string, id int, mediaId string) *WxErr {
-	return s.SendMsg(s.NewVoice(to, id, mediaId))
+func (s *Server) SendVoice(to string, mediaId string) *WxErr {
+	return s.SendMsg(s.NewVoice(to, mediaId))
 }
 
 // SendFile 发送客服File消息
-func (s *Server) SendFile(to string, id int, mediaId string) *WxErr {
-	return s.SendMsg(s.NewFile(to, id, mediaId))
+func (s *Server) SendFile(to string, mediaId string) *WxErr {
+	return s.SendMsg(s.NewFile(to, mediaId))
 }
 
 // SendVideo 发送客服Video消息
-func (s *Server) SendVideo(to string, id int, mediaId, title, desc string) *WxErr {
-	return s.SendMsg(s.NewVideo(to, id, mediaId, title, desc))
+func (s *Server) SendVideo(to string, mediaId, title, desc string) *WxErr {
+	return s.SendMsg(s.NewVideo(to, mediaId, title, desc))
 }
 
 // SendTextcard 发送客服extcard消息
-func (s *Server) SendTextcard(to string, id int, title, desc, url string) *WxErr {
-	return s.SendMsg(s.NewTextcard(to, id, title, desc, url))
+func (s *Server) SendTextcard(to string, title, desc, url string) *WxErr {
+	return s.SendMsg(s.NewTextcard(to, title, desc, url))
 }
 
 // SendMusic 发送客服Music消息
-func (s *Server) SendMusic(to string, id int, mediaId, title, desc, musicUrl, qhMusicUrl string) *WxErr {
-	return s.SendMsg(s.NewMusic(to, id, mediaId, title, desc, musicUrl, qhMusicUrl))
+func (s *Server) SendMusic(to string, mediaId, title, desc, musicUrl, qhMusicUrl string) *WxErr {
+	return s.SendMsg(s.NewMusic(to, mediaId, title, desc, musicUrl, qhMusicUrl))
 }
 
 // SendNews 发送客服news消息
-func (s *Server) SendNews(to string, id int, arts ...Article) *WxErr {
-	return s.SendMsg(s.NewNews(to, id, arts...))
+func (s *Server) SendNews(to string, arts ...Article) *WxErr {
+	return s.SendMsg(s.NewNews(to, arts...))
 }
 
 // SendMpNews 发送加密新闻mpnews消息(仅企业号可用)
-func (s *Server) SendMpNews(to string, id int, arts ...MpArticle) *WxErr {
-	return s.SendMsg(s.NewMpNews(to, id, arts...))
+func (s *Server) SendMpNews(to string, arts ...MpArticle) *WxErr {
+	return s.SendMsg(s.NewMpNews(to, arts...))
 }
 
 // SendMpNewsId 发送加密新闻mpnews消息(直接使用mediaId)
-func (s *Server) SendMpNewsId(to string, id int, mediaId string) *WxErr {
-	return s.SendMsg(s.NewMpNewsId(to, id, mediaId))
+func (s *Server) SendMpNewsId(to string, mediaId string) *WxErr {
+	return s.SendMsg(s.NewMpNewsId(to, mediaId))
+}
+
+// SendMarkDown 发送加密新闻mpnews消息(直接使用mediaId)
+func (s *Server) SendMarkDown(to string, content string) *WxErr {
+	return s.SendMsg(s.NewMarkDown(to, content))
 }
 
-// SendMarkdown 发送加密新闻mpnews消息(直接使用mediaId)
-func (s *Server) SendMarkDown(to string, id int, content string) *WxErr {
-	return s.SendMsg(s.NewMarkDown(to, id, content))
+// SendTaskCard 发送任务卡片taskcard消息
+func (s *Server) SendTaskCard(to string, Title, Desc, Url, TaskId, Btn string) *WxErr {
+	return s.SendMsg(s.NewTaskCard(to, Title, Desc, Url, TaskId, Btn))
 }