bug fix

controllers/autoreply/autoreply.go

@@ -4,11 +4,13 @@ import (
 	"wechat-conf/controllers"
 	"wechat-conf/models/model"
 	"wechat-conf/service/autoreply"
+	"wechat-conf/service/wechatimg"
 )
 
 // AutoreplyController 信息
 type AutoreplyController struct {
-	dao *autoreply.AutoreplyServ
+	dao    *autoreply.AutoreplyServ
+	imgdao *wechatimg.WechatImgServ
 	controllers.BaseController
 }
 
@@ -17,6 +19,7 @@ type AutoreplyController struct {
 // @Description 初始化 Controller, 系统自动调用
 func (c *AutoreplyController) Constructor() {
 	c.dao = autoreply.NewAutoreplyServ(c.Context)
+	c.imgdao = wechatimg.NewWechatImgServ(c.Context)
 }
 
 func (c *AutoreplyController) GetAutoReplyList() {

controllers/component.go

@@ -348,6 +348,8 @@ func (c *WechatController) getReplayMessage(receviceData map[string]string, wech
 
 		break
 	case "event":
+		beego.Info("_______________这里是event————————————————")
+		beego.Info(receviceData["Event"])
 		switch receviceData["Event"] {
 		case "subscribe":
 			if replay, err = c.serv.GetSubscribeByAppID(appID); err != nil {
@@ -356,7 +358,8 @@ func (c *WechatController) getReplayMessage(receviceData map[string]string, wech
 			}
 
 			break
-		case "CLICK":
+		case "CLICK", "LICK":
+			beego.Info("_______________这里是CLICK————————————————")
 			target := receviceData["EventKey"]
 			if target != "" {
 				var replyText string

controllers/wechatmenu/wechatmenu.go

@@ -165,7 +165,7 @@ func (c *MenuController) RefreshMenu() {
 		if wechatmenu[i].Type == "text" {
 			wechatmenu[i].Type = "click"
 			var keyvalue = model.TaWechatKeyValue{
-				KeyId: utils.GetGUID(),
+				KeyId: user.OrgId + wechatmenu[i].Name,
 				Value: wechatmenu[i].Value,
 				OrgId: user.OrgId,
 			}
@@ -173,6 +173,8 @@ func (c *MenuController) RefreshMenu() {
 			if err != nil {
 				c.ResponseError(err)
 			}
+			utils.LogInfo("↓↓↓↓_________________________↓↓↓↓keyId button(controller)↓↓↓↓___________________↓↓↓↓")
+			utils.LogInfo(keyvalue.KeyId)
 			wechatmenu[i].Key = keyvalue.KeyId
 			wechatmenu[i].Value = ""
 		}
@@ -180,7 +182,7 @@ func (c *MenuController) RefreshMenu() {
 			if wechatmenu[i].Sub_Button[j].Type == "text" {
 				wechatmenu[i].Sub_Button[j].Type = "click"
 				var keyvalue = model.TaWechatKeyValue{
-					KeyId: utils.GetGUID(),
+					KeyId: user.OrgId + wechatmenu[i].Sub_Button[j].Name,
 					Value: wechatmenu[i].Sub_Button[j].Value,
 					OrgId: user.OrgId,
 				}
@@ -188,6 +190,8 @@ func (c *MenuController) RefreshMenu() {
 				if err != nil {
 					c.ResponseError(err)
 				}
+				utils.LogInfo("↓↓↓↓_________________________↓↓↓↓keyId sub button(controller)↓↓↓↓___________________↓↓↓↓")
+				utils.LogInfo(keyvalue.KeyId)
 				wechatmenu[i].Sub_Button[j].Key = keyvalue.KeyId
 				wechatmenu[i].Sub_Button[j].Value = ""
 			}

models/autoreply/autoreply.go

@@ -133,7 +133,7 @@ func (m *AutoreplyDAO) GetAutoReplayByAppID(appid, val string) (*model.TaAutoRep
 		return &reply[0], nil
 	}
 	// 模糊查询
-	sql = `SELECT
+	sql = `SELECT DISTINCT
 						a.*
 					FROM
 						ta_auto_reply a
@@ -147,7 +147,7 @@ func (m *AutoreplyDAO) GetAutoReplayByAppID(appid, val string) (*model.TaAutoRep
 					AND b.status > ?
 					AND a.auto_type = ?
 					AND a.pair_type = ?
-					AND ? like CONCAT('%', d.keywords, '%') order by a.create_date desc`
+					AND d.keywords like CONCAT('%',?, '%') order by a.create_date desc`
 	err = m.db.Sql(sql, appid, models.AUTOREPLY_IS_USE_ON, models.STATUS_DEL, models.STATUS_DEL, models.AUTOREPLY_KEYWORDS, models.PAIR_TYPE_BLUR, val).Find(&reply)
 	if err != nil {
 		return nil, err

models/keyvalue/keyvalue.go

@@ -6,6 +6,8 @@ import (
 	"wechat-conf/models/model"
 	"wechat-conf/utils"
 
+	"github.com/astaxie/beego"
+
 	"github.com/go-xorm/xorm"
 )
 
@@ -33,14 +35,20 @@ WHERE
 	key_id = '` + key + `'
 	and status > ` + strconv.Itoa(models.STATUS_DEL)
 	err := m.db.Sql(sql).Find(&keyvalue)
+	beego.Info(sql)
+	beego.Info("______________________这里是model key——————————————————————————————————")
+	beego.Info(keyvalue)
 	if len(keyvalue) > 0 {
 		return &keyvalue[0], err
 	}
+
 	return nil, err
 }
 
 func (m *KeyvalueDAO) AddValueKey(valueKey model.TaWechatKeyValue) error {
 	valueKey.Status = models.STATUS_NORMAL
+	utils.LogInfo("↓↓↓↓_________________________↓↓↓↓keyId button(model)↓↓↓↓___________________↓↓↓↓")
+	utils.LogInfo(valueKey.KeyId)
 	_, err := m.db.Insert(valueKey)
 	return err
 }

models/model/ta_wechat_menu.go

@@ -5,7 +5,7 @@ import (
 )
 
 type TaWechatMenu struct {
-	WechatConfigId   string    `xorm:"not null pk VARCHAR(64)"`
+	WechatConfigId   string    `xorm:"not null pk VARCHAR(128)"`
 	WechatConfigJson string    `xorm:"TEXT"`
 	Status           int       `xorm:"SMALLINT(6)"`
 	OrgId            string    `xorm:"VARCHAR(64)"`

models/wechatmenu/wechatmenu.go

@@ -7,6 +7,8 @@ import (
 	"wechat-conf/models/model"
 	"wechat-conf/utils"
 
+	"github.com/astaxie/beego"
+
 	"github.com/go-xorm/xorm"
 )
 
@@ -48,9 +50,15 @@ func (m *WechatMenuDAO) UpdateWechatMenu(wechatMenu, orgId string) error {
 	var cols = []string{
 		"wechat_config_json",
 	}
-	_, err := m.db.Cols(cols...).Where("org_id = ?", menu.WechatConfigId).And("status > ?", strconv.Itoa(models.STATUS_DEL)).Update(menu)
+	beego.Info("__________________________更新微信菜单——————————————————————————————————————")
+	beego.Info(menu)
+	_, err := m.db.Cols(cols...).Where("org_id = ?", menu.OrgId).And("status > ?", strconv.Itoa(models.STATUS_DEL)).Update(menu)
 	return err
 }
+
+// func (m *WechatMenuDAO) GetMenuByOrgId(orgId string) (*model.TaWechatMenu, error) {
+
+// }
 func (m *WechatMenuDAO) DeleteWechatMenu(wechatConfigId string) error {
 	var menu = model.TaWechatMenu{
 		WechatConfigId: wechatConfigId,

service/wechat/wechat.go

@@ -98,6 +98,8 @@ func (s *WechatServ) UnAuthorized(appid string) error {
 // GetMenuReplyText 获取菜单的文字返回
 func (s *WechatServ) GetMenuReplyText(key string) (string, error) {
 	res, err := s.kvDAO.GetValueByKey(key)
+	utils.LogInfo("_______________________________________res________________________________")
+	utils.LogInfo(res)
 	if err != nil {
 		return "", err
 	}