Merge branch 'master' of http://git.ycjcjy.com/default/wechat-conf

controllers/component.go

@@ -1,9 +1,13 @@
+// 微信全网接入测试
+// https://open.weixin.qq.com/cgi-bin/showdocument?action=dir_list&t=resource/res_list&verify=1&id=open1419318611&token=&lang=zh_CN
+
 package controllers
 
 import (
 	"bytes"
 	"encoding/base64"
 	"encoding/json"
+	"errors"
 	"net/http"
 	"strings"
 	"wechat-conf/models"
@@ -40,6 +44,10 @@ const (
 	WX_OFFICE_TEST_USERNAME = "gh_3c884a361561"
 )
 
+const (
+	RESPONSE_CUSTOM_MESSAGE = "response-custom-message"
+)
+
 var nilData = []byte("success")
 
 // Constructor 初始化 Controller
@@ -220,6 +228,14 @@ func (c *WechatController) WxReceive() {
 
 	// 获取返回内容
 	replyMessage, err := c.getReplayMessage(receiveData, wechat)
+	if err != nil && err.Error() == RESPONSE_CUSTOM_MESSAGE {
+		// 微信测试用例会跑到这边
+		// 模拟粉丝发送消息, 并立即调用客户接口, 反馈固定的字串
+		go wechat.SendCustomText(receiveData["FromUserName"], wechat.GetAuthCode()+"_from_api")
+
+		c.ResponseRaw(nil)
+	}
+
 	if err != nil || replyMessage == nil || len(replyMessage) == 0 {
 		c.ResponseRaw(nilData)
 	}
@@ -294,7 +310,6 @@ func (c *WechatController) validReceiveData(receiveData []byte, aesKey string, w
 // encryptReceiveMessage 加密需要发送的信息
 func (c *WechatController) encryptMessage(message []byte, aesKey, token, appID string, wechat *component.WxClient) ([]byte, error) {
 	cipher, err := core.NewCipher(token, aesKey, appID)
-	// cipher, err := core.NewCipher("pamtest", "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFG", "wxb11529c136998cb6")
 	if err != nil {
 		utils.LogError("NewCipher 失败: " + err.Error())
 		return nil, err
@@ -337,6 +352,7 @@ func (c *WechatController) getReplayMessage(receviceData map[string]string, wech
 				// 发送 query_auth_code , 返回空, 并立即调用客服接口
 			} else if strings.Index(content, "QUERY_AUTH_CODE") > -1 {
 				replay = nil
+				return nil, errors.New(RESPONSE_CUSTOM_MESSAGE)
 			}
 			break
 		}
@@ -369,10 +385,12 @@ func (c *WechatController) getReplayMessage(receviceData map[string]string, wech
 					return
 				}
 
-				replay = &model.TaAutoReply{
-					MessageType:      models.MESSAGE_TYPE_PARAGRAPH,
-					MessageParagraph: replyText,
-					IsUse:            models.AUTOREPLY_IS_USE_ON,
+				if replyText != "" {
+					replay = &model.TaAutoReply{
+						MessageType:      models.MESSAGE_TYPE_PARAGRAPH,
+						MessageParagraph: replyText,
+						IsUse:            models.AUTOREPLY_IS_USE_ON,
+					}
 				}
 			}
 			break

controllers/wechatimg/wechatimt.go

@@ -143,6 +143,8 @@ func (c *WechatImgController) AddNewImg() {
 	defer file.Close()
 
 	imgurl := "./upload/" + head.Filename
+	defer os.Remove(imgurl)
+
 	//创建文件
 	fW, err := os.Create(imgurl)
 	if err != nil {

service/wechat/wechat.go

@@ -104,5 +104,9 @@ func (s *WechatServ) GetMenuReplyText(key string) (string, error) {
 		return "", err
 	}
 
+	if res == nil {
+		return "", nil
+	}
+
 	return res.Value, nil
 }