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

controllers/component.go

@@ -3,8 +3,10 @@ package controllers
 import (
 	"encoding/base64"
 	"encoding/json"
+	"encoding/xml"
 	"io/ioutil"
 	"net/http"
+	"strconv"
 	"wechat-conf/models"
 	"wechat-conf/models/model"
 	"wechat-conf/service/autoreply"
@@ -150,6 +152,8 @@ func (c *WechatController) ComponentPush() {
 		// 删除wechatConf信息，同时将org解绑
 		appid := msg["AuthorizerAppid"]
 		c.wechatServ.UnAuthorized(appid)
+		// 删除第三方中的微信信息
+		utils.Component.DelWxClient(appid)
 		break
 	}
 	c.ResponseRaw([]byte("success"))
@@ -168,17 +172,50 @@ func (c *WechatController) WechatInfo() {
 
 // WxReceive 微信消息接收
 func (c *WechatController) WxReceive() {
+	beego.Error("微信消息接入")
 	appid := c.GetString(":appid")
 	wechat, err := utils.Component.GetWxClient(appid)
 	if err != nil {
 		utils.LogError("获取微信失败: " + err.Error())
 	}
-	val, err := wechat.TransformMessage(string(c.Ctx.Input.RequestBody))
+	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"))
+	}
+	EncodingAESKey := conf.Aeskey
 
+	AESKey, err := base64.StdEncoding.DecodeString(EncodingAESKey + "=")
+	if err != nil {
+		utils.LogError("DecodeString失败：", err)
+		c.ResponseRaw([]byte("success"))
+	}
+	EncryptVal, err := base64.StdEncoding.DecodeString(encrypt)
+	if err != nil {
+		utils.LogError("密文base64解析", err)
+		c.ResponseRaw([]byte("success"))
+	}
+	msgbyte, err := utils.AesDecrypt(EncryptVal, AESKey)
+	if err != nil {
+		utils.LogError("解密失败：", err)
+		c.ResponseRaw([]byte("success"))
+	}
+	utils.LogError("解密成功")
+	// 解析xml
+	val, err := xp.Parse(string(msgbyte))
+	if err != nil {
+		utils.LogError("xml解析失败：", err)
+		c.ResponseRaw([]byte("success"))
+	}
+	utils.LogError("xml解析成功：", val)
 	var replay = new(model.TaAutoReply)
 	switch val["MsgType"] {
 	case "text":
@@ -196,24 +233,52 @@ func (c *WechatController) WxReceive() {
 		utils.LogError("获取微信自动回复信息失败: " + err.Error())
 		c.ResponseRaw([]byte(""))
 	}
-
 	if replay == nil {
 		c.ResponseRaw([]byte(""))
 	}
 	openID := val["FromUserName"]
-	message, err := c.getReplayMessage(replay, openID, wechat)
+	signature := c.GetString("msg_signature")
+	nonce := c.GetString("nonce")
+	timestamp, _ := strconv.Atoi(c.GetString("timestamp"))
+	beego.Error("signature:", signature, ",nonce：", nonce, ",timestamp:", timestamp)
+	message, err := c.getReplayMessage(replay, openID, AESKey, wechat)
 	if err != nil {
 		utils.LogError("转换回复信息失败: " + err.Error())
 		c.ResponseRaw([]byte(""))
 	}
-	c.ResponseRaw(message, false)
+	// message, err = utils.AesEncrypt(message, AESKey)
+	// if err != nil {
+	// 	utils.LogError("加密失败：", err)
+	// 	c.ResponseRaw([]byte(""))
+	// }
+	// beego.Error(string(message))
+	// data := PassiveMessage{
+	// 	Encrypt:      component.CDATA{string(message)},
+	// 	MsgSignature: component.CDATA{signature},
+	// 	TimeStamp:    int64(timestamp),
+	// 	Nonce:        component.CDATA{nonce},
+	// }
+	// beego.Error(data)
+	// res, err := xml.Marshal(data)
+	// beego.Error(err)
+	// beego.Error(string(res))
+	c.ResponseRaw(message)
 	c.DestroyContext()
 	c.StopRun()
 }
 
-func (c *WechatController) getReplayMessage(replay *model.TaAutoReply, openid string, wx *component.WxClient) ([]byte, error) {
+// PassiveMessage 加密后的返回信息
+type PassiveMessage struct {
+	XMLName      xml.Name        `xml:"xml"`
+	Encrypt      component.CDATA `xml:"Encrypt"`
+	MsgSignature component.CDATA `xml:"MsgSignature"`
+	TimeStamp    int64           `xml:"TimeStamp"`
+	Nonce        component.CDATA `xml:"Nonce"`
+}
+
+func (c *WechatController) getReplayMessage(replay *model.TaAutoReply, openid string, Aeskey []byte, wx *component.WxClient) ([]byte, error) {
 	switch replay.MessageType {
-	case models.MESSAGE_TYPE_CONTENT:
+	case models.MESSAGE_TYPE_PARAGRAPH:
 		msg, err := wx.ResponseMessageText(openid, replay.MessageParagraph)
 		return msg, err
 	case models.MESSAGE_TYPE_IMG:

models/wechat/wechat.go

@@ -107,3 +107,10 @@ func (m *WechatDAO) GetWechatConfByConfId(confid string) (*model.SysWechatConf,
 	_, err := m.db.Where("conf_id=?", confid).And("status>?", models.STATUS_DEL).Get(&conf)
 	return &conf, err
 }
+
+// DelWechatConf 删除微信信息
+func (m *WechatDAO) DelWechatConf(confid string) error {
+	sql := `delete from sys_wechat_conf where conf_id=?`
+	_, err := m.db.Exec(sql, confid)
+	return err
+}

service/wechat/wechat.go

@@ -76,13 +76,14 @@ func (s *WechatServ) UnAuthorized(appid string) error {
 		utils.LogError("解绑获取微信信息为空")
 		return nil
 	}
-	var wxConf = model.SysWechatConf{
-		ConfId: conf.ConfId,
-		Status: models.STATUS_DEL,
-	}
-	err = s.dao.UpdateWechatConf(wxConf, []string{
-		"status",
-	})
+	// var wxConf = model.SysWechatConf{
+	// 	ConfId: conf.ConfId,
+	// 	Status: models.STATUS_DEL,
+	// }
+	// err = s.dao.UpdateWechatConf(wxConf, []string{
+	// 	"status",
+	// })
+	err = s.dao.DelWechatConf(conf.ConfId)
 	if err != nil {
 		return err
 	}