feats has bugs

controllers/component.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
+	"strings"
 	"wechat-conf/models"
 	"wechat-conf/models/model"
 	"wechat-conf/service/autoreply"
@@ -26,6 +27,8 @@ type WechatController struct {
 	wechatServ *wechat.WechatServ
 }
 
+var nilData = []byte("success")
+
 // Constructor 初始化 Controller
 // @Title Constructor
 // @Description 初始化 Controller, 系统自动调用
@@ -53,37 +56,37 @@ func (c *WechatController) ComponentPush() {
 	resMsg, err := xp.Parse(string(con))
 	if err != nil {
 		utils.LogError("xml解析失败：", err)
-		c.ResponseRaw([]byte("success"))
+		c.ResponseRaw(nilData)
 	}
 	encrypt := resMsg["Encrypt"]
 	conf, err := c.wechatServ.GetComponentInfo()
 	if err != nil || conf == nil || conf.Appid == "" {
 		utils.LogError("读取微信配置文件失败")
-		c.ResponseRaw([]byte("success"))
+		c.ResponseRaw(nilData)
 	}
 	EncodingAESKey := conf.Aeskey
 
 	AESKey, err := base64.StdEncoding.DecodeString(EncodingAESKey + "=")
 	if err != nil {
 		utils.LogError("DecodeString失败：", err)
-		c.ResponseRaw([]byte("success"))
+		c.ResponseRaw(nilData)
 	}
 	EncryptVal, err := base64.StdEncoding.DecodeString(encrypt)
 	if err != nil {
 		utils.LogError("密文base64解析", err)
-		c.ResponseRaw([]byte("success"))
+		c.ResponseRaw(nilData)
 	}
 	msgbyte, err := utils.AesDecrypt(EncryptVal, AESKey)
 	if err != nil {
 		utils.LogError("解密失败：", err)
-		c.ResponseRaw([]byte("success"))
+		c.ResponseRaw(nilData)
 	}
 	utils.LogError("解密成功")
 	// 解析xml
 	msg, err := xp.Parse(string(msgbyte))
 	if err != nil {
 		utils.LogError("xml解析失败：", err)
-		c.ResponseRaw([]byte("success"))
+		c.ResponseRaw(nilData)
 	}
 	utils.LogError("xml解析成功：", msg)
 	switch msg["InfoType"] {
@@ -106,7 +109,7 @@ func (c *WechatController) ComponentPush() {
 		wxclient := utils.WechatInit(cert, c.wechatServ.UpdateToken)
 		if wxclient == nil {
 			utils.LogError("获取wxclient失败")
-			c.ResponseRaw([]byte("success"))
+			c.ResponseRaw(nilData)
 		}
 		beego.Error(wxclient)
 		utils.AppendWxClient(wxclient)
@@ -115,7 +118,7 @@ func (c *WechatController) ComponentPush() {
 		info, err := wxclient.GetWechatInfo()
 		if err != nil {
 			utils.LogError("获取微信信息失败")
-			c.ResponseRaw([]byte("success"))
+			c.ResponseRaw(nilData)
 		}
 		beego.Error(info)
 		authorizerInfo := (info["authorizer_info"]).(map[string]interface{})
@@ -140,7 +143,7 @@ func (c *WechatController) ComponentPush() {
 		err = c.wechatServ.SaveWechatConf(conf)
 		if err != nil {
 			utils.LogError("保存微信授权信息失败：", err)
-			c.ResponseRaw([]byte("success"))
+			c.ResponseRaw(nilData)
 		}
 		break
 	case INFOTYPE_UPDATEAUTHORIZED:
@@ -155,7 +158,7 @@ func (c *WechatController) ComponentPush() {
 		utils.Component.DelWxClient(appid)
 		break
 	}
-	c.ResponseRaw([]byte("success"))
+	c.ResponseRaw(nilData)
 }
 
 // WechatInfo 微信接入
@@ -171,121 +174,179 @@ func (c *WechatController) WechatInfo() {
 
 // WxReceive 微信消息接收
 func (c *WechatController) WxReceive() {
-	beego.Error("微信消息接入")
+	utils.LogInfo("接收微信事件, URI: ", c.Ctx.Input.URI())
+
+	// 初始化微信客户端
 	appid := c.GetString(":appid")
 	wechat, err := utils.Component.GetWxClient(appid)
 	if err != nil {
 		utils.LogError("获取微信失败: " + err.Error())
+		c.ResponseRaw(nilData)
 	}
-	msg, err := wechat.TransformMessage(string(c.Ctx.Input.RequestBody))
-	if err != nil {
-		utils.LogError("读取微信服务发送内容失败: " + err.Error())
-		c.ResponseRaw([]byte(""))
-	}
-	xp := &core.XMLParse{}
-	beego.Error("消息：", msg)
-	encrypt := msg["Encrypt"]
+
 	conf, err := c.wechatServ.GetComponentInfo()
 	if err != nil || conf == nil || conf.Appid == "" {
-		utils.LogError("读取微信配置文件失败")
-		c.ResponseRaw([]byte("success"))
+		utils.LogError("读取微信配置文件失败", err)
+		c.ResponseRaw(nilData)
 	}
-	EncodingAESKey := conf.Aeskey
 
-	AESKey, err := base64.StdEncoding.DecodeString(EncodingAESKey + "=")
+	// 校验接收数据
+	receiveData, err := c.validReceiveData(c.Ctx.Input.RequestBody, conf.Aeskey, wechat)
 	if err != nil {
-		utils.LogError("DecodeString失败：", err)
-		c.ResponseRaw([]byte("success"))
+		c.ResponseRaw(nilData)
 	}
-	EncryptVal, err := base64.StdEncoding.DecodeString(encrypt)
+
+	// 获取返回内容
+	replyMessage, err := c.getReplayMessage(receiveData, wechat)
+	if err != nil || replyMessage == nil || len(replyMessage) == 0 {
+		c.ResponseRaw(nilData)
+	}
+
+	utils.LogInfo("反馈微信内容: ", string(replyMessage))
+
+	// 加密内容
+	sendData, err := c.encryptMessage(replyMessage, conf.Aeskey, conf.OriginToken, wechat)
+	if err != nil {
+		c.ResponseRaw(nilData)
+	}
+
+	sendMessage := string(sendData)
+
+	// 去掉多余的回车
+	sendMessage = strings.Replace(sendMessage, "\n\n", "\n", -1)
+	sendMessage = strings.Trim(sendMessage, "\n")
+	utils.LogInfo("反馈加密内容: ", sendMessage)
+
+	c.Ctx.Output.Header("Content-Type", "text/xml; charset=utf-8")
+	c.ResponseRaw([]byte(sendMessage))
+}
+
+// validReceiveData 校验接收信息
+// 没有通过 signature 校验，默认是正确的
+func (c *WechatController) validReceiveData(receiveData []byte, aesKey string, wechat *component.WxClient) (data map[string]string, err error) {
+	receiveMessage := string(receiveData)
+	utils.LogInfo("事件内容: ", receiveMessage)
+
+	var msg map[string]string
+	msg, err = wechat.TransformMessage(receiveMessage)
+	if err != nil {
+		utils.LogError("读取微信服务发送内容失败: " + err.Error())
+		return
+	}
+
+	var key []byte
+	var encryptData []byte
+	var decryptData []byte
+
+	key, err = base64.StdEncoding.DecodeString(aesKey + "=")
+	if err != nil {
+		utils.LogError("Base64 decode aes-key 失败：", err)
+		return
+	}
+
+	encryptData, err = base64.StdEncoding.DecodeString(msg["Encrypt"])
 	if err != nil {
 		utils.LogError("密文base64解析", err)
-		c.ResponseRaw([]byte("success"))
+		return
 	}
-	msgbyte, err := utils.AesDecrypt(EncryptVal, AESKey)
+
+	decryptData, err = utils.AesDecrypt(encryptData, key)
 	if err != nil {
 		utils.LogError("解密失败：", err)
-		c.ResponseRaw([]byte("success"))
+		return
 	}
-	utils.LogError("解密成功")
+
+	utils.LogInfo("内容解密: ", string(decryptData))
+
 	// 解析xml
-	val, err := xp.Parse(string(msgbyte))
+	xp := &core.XMLParse{}
+	data, err = xp.Parse(string(decryptData))
 	if err != nil {
 		utils.LogError("xml解析失败：", err)
-		c.ResponseRaw([]byte("success"))
+		return
+	}
+
+	return
+}
+
+// encryptReceiveMessage 加密需要发送的信息
+func (c *WechatController) encryptMessage(message []byte, aesKey, token string, wechat *component.WxClient) ([]byte, error) {
+	cipher, err := core.NewCipher(token, aesKey, wechat.GetAppID())
+	// cipher, err := core.NewCipher("pamtest", "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFG", "wxb11529c136998cb6")
+	if err != nil {
+		utils.LogError("NewCipher 失败: " + err.Error())
+		return nil, err
 	}
-	utils.LogError("xml解析成功：", val)
-	var replay = new(model.TaAutoReply)
-	switch val["MsgType"] {
+
+	dt := bytes.NewBuffer([]byte{})
+
+	nonce := c.GetString("nonce")
+	timestamp := c.GetString("timestamp")
+
+	cipher.Encrypt(dt, message, nonce, timestamp)
+
+	return dt.Bytes(), nil
+}
+
+func (c *WechatController) getReplayMessage(receviceData map[string]string, wechat *component.WxClient) (message []byte, err error) {
+	var replay *model.TaAutoReply
+
+	msgType := receviceData["MsgType"]
+	from := receviceData["ToUserName"]
+	openID := receviceData["FromUserName"]
+	appID := wechat.GetAppID()
+
+	// 暂时支持 文本以及订阅事件消息
+	switch msgType {
 	case "text":
-		content := val["Content"]
-		// 获取数据库存储返回类型
-		replay, err = c.serv.GetAutoReplayByAppID(appid, content)
+		if replay, err = c.serv.GetAutoReplayByAppID(appID, receviceData["Content"]); err != nil {
+			utils.LogError("获取微信自动回复信息失败: " + err.Error())
+			return
+		}
+
 		break
 	case "event":
-		beego.Error(val)
-		switch val["Event"] {
+		switch receviceData["Event"] {
 		case "subscribe":
-			replay, err = c.serv.GetSubscribeByAppID(appid)
+			if replay, err = c.serv.GetSubscribeByAppID(appID); err != nil {
+				utils.LogError("获取微信自动回复信息失败: " + err.Error())
+				return
+			}
+
 			break
-		case "LICK":
-			// 点击事件
-			// key:=val["EventKey"]
-			// keyreplay,err:=c.serv.GetReplayByKey(appid,key)
-			// if err!=nil{
-			// 	utils.LogError("获取按钮点击key失败: " + err.Error())
-			// 	c.ResponseRaw([]byte(""))
-			// }
-			// if keyreplay!=nil && keyreplay.KeywordsId==""{
-			// 	c.ResponseRaw([]byte(""))
-			// }
+		case "CLICK":
+			target := receviceData["EventKey"]
+			if target != "" {
+				var replyText string
+				replyText, err = c.wechatServ.GetMenuReplyText(target)
+				if err != nil {
+					utils.LogError("获取菜单回复信息失败: " + err.Error())
+					return
+				}
 
+				replay = &model.TaAutoReply{
+					MessageType:      models.MESSAGE_TYPE_PARAGRAPH,
+					MessageParagraph: replyText,
+					IsUse:            models.AUTOREPLY_IS_USE_ON,
+				}
+			}
 			break
 		}
 
 		break
 	}
-	if err != nil {
-		utils.LogError("获取微信自动回复信息失败: " + err.Error())
-		c.ResponseRaw([]byte(""))
-	}
-	if replay == nil {
-		c.ResponseRaw([]byte(""))
-	}
-	openID := val["FromUserName"]
-	message, err := c.getReplayMessage(replay, openID, wechat)
-	if err != nil {
-		utils.LogError("转换回复信息失败: " + err.Error())
-		c.ResponseRaw([]byte(""))
-	}
 
-	cipher, err := core.NewCipher(utils.Component.GetToken(), EncodingAESKey, appid)
-	if err != nil {
-		utils.LogError("获取解密失败: " + err.Error())
-		c.ResponseRaw([]byte(""))
+	if replay == nil {
+		return
 	}
 
-	dt := bytes.NewBuffer([]byte{})
-	cipher.Encrypt(dt, []byte(message))
-	beego.Error("=========>", dt)
-
-	c.ResponseRaw(dt.Bytes())
-	// c.ResponseRaw([]byte("success"))
-}
-
-func (c *WechatController) getReplayMessage(replay *model.TaAutoReply, openid string, wx *component.WxClient) ([]byte, error) {
 	switch replay.MessageType {
 	case models.MESSAGE_TYPE_PARAGRAPH:
-		msg, err := wx.ResponseMessageText(openid, replay.MessageParagraph)
-		return msg, err
+		return wechat.ResponseMessageText(from, openID, replay.MessageParagraph)
 	case models.MESSAGE_TYPE_IMG:
-		msg, err := wx.ResponseMessageImage(openid, replay.MessageImg)
-		return msg, err
-		// case models.MESSAGE_TYPE_PARAGRAPH:
-		// 	msg, err := wx.ResponseMessageNews(openid, replay.MessageImg)
-		// 	return msg, err
+		return wechat.ResponseMessageImage(from, openID, replay.MessageImg)
 	}
-	return nil, nil
+	return
 }
 
 // GetPreAuthCode 获取预授权码

models/models.go

@@ -22,7 +22,7 @@ func NewDBEngine() *xorm.Engine {
 	dns := getMySQLDNS()
 
 	engine, err := xorm.NewEngine(dbType, dns)
-	// engine.ShowSQL()
+	engine.ShowSQL()
 
 	if err != nil {
 		panic(err)

models/wechat.go

@@ -26,7 +26,6 @@ func ComponentInit() {
 	if !conf.ExpiresDate.IsZero() {
 		now := time.Now()
 		subd := conf.ExpiresDate.Sub(now)
-		beego.Error(d)
 		d = string(subd)
 	}
 
@@ -86,9 +85,9 @@ func InitWechat() {
 			"authorizer_refresh_token": conf.RefreshToken,
 			"authorization_code":       conf.AuthorizationCode,
 			"appid":                    conf.Appid,
+			"wxid":                     conf.UserName,
 		}
 		client := utils.WechatInit(cert, UpdateToken)
-		beego.Error(client)
 		utils.AppendWxClient(client)
 	}
 }
@@ -102,12 +101,14 @@ func UpdateToken(token map[string]interface{}) {
 	}
 	expire := token["expire_in"].(int64)
 	if expire > 0 {
-		beego.Error(time.Now())
 		expriesTime := time.Now().Local().Add(time.Duration(expire) * time.Second)
-		beego.Error(expriesTime)
 		conf.ExpiresDate = expriesTime
-		sql := `update sys_wechat_conf set token=?,refresh_token=?,expires_date=? where appid=?`
-		_, err := DBEngine.Exec(sql, conf.Token, conf.RefreshToken, expriesTime, conf.Appid)
+		sql := `update sys_wechat_conf 
+		set token='` + conf.Token + `',
+		refresh_token='` + conf.RefreshToken + `',
+		expires_date='` + expriesTime.Format("2006-01-02 15:04:05") + `' 
+		where appid='` + conf.Appid + `'`
+		_, err := DBEngine.Exec(sql)
 		if err != nil {
 			utils.LogError("更新微信token失败：", err)
 		}

models/wechat/wechat.go

@@ -6,7 +6,6 @@ import (
 	"wechat-conf/utils"
 
 	"github.com/astaxie/beego"
-
 	"github.com/go-xorm/xorm"
 )
 
@@ -47,35 +46,36 @@ func (m *WechatDAO) UpdateWechatConf(conf model.SysWechatConf, cols []string) er
 
 // SaveWechatConf 保存微信配置
 func (m *WechatDAO) SaveWechatConf(conf model.SysWechatConf) error {
-	wechatConf, err := m.GetWechatConfByAppID(conf.Appid)
+	// wechatConf, err := m.GetWechatConfByAppID(conf.Appid)
+	// if err != nil {
+	// 	utils.LogError("根据appid获取微信配置失败：", err)
+	// 	return err
+	// }
+	// if wechatConf != nil && wechatConf.ConfId != "" {
+	// 	// 修改
+	// 	beego.Error("修改wechatConf,", conf)
+	// 	conf.ConfId = wechatConf.ConfId
+	// 	var cols = []string{
+	// 		"refresh_token",
+	// 		"token",
+	// 	}
+	// 	if conf.AuthorizationInfo != "" {
+	// 		cols = append(cols, "authorization_info")
+	// 	}
+	// 	err := m.UpdateWechatConf(conf, cols)
+	// 	if err != nil {
+	// 		utils.LogError("修改微信配置失败：", err)
+	// 		return err
+	// 	}
+	// } else {
+	// 	// 新增
+	beego.Error("开始新增：", conf)
+	err := m.AddWechatConf(conf)
 	if err != nil {
-		utils.LogError("根据appid获取微信配置失败：", err)
+		utils.LogError("新增微信配置失败：", err)
 		return err
 	}
-	if wechatConf != nil && wechatConf.ConfId != "" {
-		// 修改
-		conf.ConfId = wechatConf.ConfId
-		var cols = []string{
-			"refresh_token",
-			"token",
-		}
-		if conf.AuthorizationInfo != "" {
-			cols = append(cols, "authorization_info")
-		}
-		err := m.UpdateWechatConf(conf, cols)
-		if err != nil {
-			utils.LogError("修改微信配置失败：", err)
-			return err
-		}
-	} else {
-		// 新增
-		beego.Error("开始新增：", conf)
-		err := m.AddWechatConf(conf)
-		if err != nil {
-			utils.LogError("新增微信配置失败：", err)
-			return err
-		}
-	}
+	// }
 	return nil
 }
 

service/wechat/wechat.go

@@ -2,6 +2,7 @@ package wechat
 
 import (
 	"wechat-conf/models"
+	"wechat-conf/models/keyvalue"
 	"wechat-conf/models/model"
 	"wechat-conf/models/sysorg"
 	"wechat-conf/models/wechat"
@@ -13,6 +14,7 @@ type WechatServ struct {
 	ctx    *utils.Context
 	dao    *wechat.WechatDAO
 	orgdao *sysorg.SysorgDAO
+	kvDAO  *keyvalue.KeyvalueDAO
 }
 
 // NewWechatServ 初始化
@@ -21,6 +23,7 @@ func NewWechatServ(ctx *utils.Context) *WechatServ {
 		ctx:    ctx,
 		dao:    wechat.NewWechatDAO(ctx),
 		orgdao: sysorg.NewSysorgDAO(ctx),
+		kvDAO:  keyvalue.NewKeyvalueDAO(ctx),
 	}
 }
 
@@ -91,3 +94,13 @@ func (s *WechatServ) UnAuthorized(appid string) error {
 	err = s.orgdao.UnAutoOrg(conf.ConfId)
 	return err
 }
+
+// GetMenuReplyText 获取菜单的文字返回
+func (s *WechatServ) GetMenuReplyText(key string) (string, error) {
+	res, err := s.kvDAO.GetValueByKey(key)
+	if err != nil {
+		return "", err
+	}
+
+	return res.Value, nil
+}

utils/log.go

@@ -90,7 +90,7 @@ func LogInfo(v ...interface{}) {
 		preMsg = fmt.Sprintf("file: %s    line=%d : ", file, line)
 	}
 
-	log.Error(preMsg, v...)
+	log.Info(preMsg, v...)
 }
 
 // GetDefaultLogger 获取默认 logger