1116PM

controllers/component.go

@@ -230,7 +230,17 @@ func (c *WechatController) WxReceive() {
 			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(""))
+			// }
 
+			break
 		}
 
 		break

controllers/wechatimg/wechatimt.go

@@ -36,7 +36,6 @@ func (c *WechatImgController) GetWechatImgCount() {
 	if err != nil {
 		c.ResponseError(err)
 	}
-	// appid := c.GetString(":appid")
 	wxclient, err := utils.Component.GetWxClient(appid)
 	if err != nil {
 		utils.LogError("获取微信信息失败: " + err.Error())
@@ -52,29 +51,47 @@ func (c *WechatImgController) GetWechatImgCount() {
 	c.ResponseJSON(count[matype+"_count"])
 }
 
+// func (c *WechatImgController) GetWechatImgList() {
+// 	user := c.Context.Get("user").(*model.SysUser)
+// 	appid, err := c.sdao.GetAppIdByOrgId(user.OrgId)
+// 	if err != nil {
+// 		c.ResponseError(err)
+// 	}
+// 	// appid := c.GetString(":appid")
+// 	wxclient, err := utils.Component.GetWxClient(appid)
+// 	if err != nil {
+// 		utils.LogError("获取微信信息失败: " + err.Error())
+// 		c.ResponseError(err)
+// 	}
+
+// 	// total, err := c.dao.GetWechatImgCount()
+// 	// if err != nil {
+// 	// 	utils.LogError("获取微信信息失败: " + err.Error())
+// 	// 	c.ResponseError(err)
+// 	// }
+
+// 	var data = map[string]string{}
+// 	data["offset"] = "0"
+// 	data["type"] = c.GetString(":type")
+// 	data["count"] = "10"
+
+// 	wechatImgs, err := wxclient.GetMaterialList(data)
+// 	if err != nil {
+// 		utils.LogError("获取微信详情失败: " + err.Error())
+// 		c.ResponseError(err)
+// 	}
+// 	c.ResponseJSON(wechatImgs)
+// }
+
 func (c *WechatImgController) GetWechatImgList() {
 	user := c.Context.Get("user").(*model.SysUser)
-	appid, err := c.sdao.GetAppIdByOrgId(user.OrgId)
-	if err != nil {
-		c.ResponseError(err)
-	}
-	// appid := c.GetString(":appid")
-	wxclient, err := utils.Component.GetWxClient(appid)
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	list, err := c.dao.GetWechatImgList(user.OrgId, page, pageSize)
 	if err != nil {
-		utils.LogError("获取微信信息失败: " + err.Error())
-		c.ResponseError(err)
-	}
-	var data = map[string]string{}
-	data["offset"] = "0"
-	data["type"] = c.GetString(":type")
-	data["count"] = "10"
-
-	wechatImgs, err := wxclient.GetMaterialList(data)
-	if err != nil {
-		utils.LogError("获取微信详情失败: " + err.Error())
 		c.ResponseError(err)
 	}
-	c.ResponseJSON(wechatImgs)
+	c.ResponseJSON(list)
 }
 
 func (c *WechatImgController) SyncWechatImg() {

controllers/wechatmenu/wechatmenu.go

@@ -34,27 +34,27 @@ type Wehchatmenu struct {
 	WechatJson string
 }
 type WechatMenuDetailSub struct {
-	Name     string
-	Type     string
+	Name     string `json:"name"`
+	Type     string `json:"type"`
 	Value    string `json:"value,omitempty"`
 	Url      string `json:"url,omitempty"`
 	Media_Id string `json:"media_id,omitempty"`
 	Key      string `json:"key,omitempty"`
 }
 type WechatMenuDetail struct {
-	Name       string
-	Type       string
-	Value      string `json:"value,omitempty"`
-	Url        string `json:"url,omitempty"`
-	Media_Id   string `json:"media_id,omitempty"`
-	Key        string `json:"key,omitempty"`
-	Sub_Button []WechatMenuDetailSub
+	Name       string                `json:"name"`
+	Type       string                `json:"type"`
+	Value      string                `json:"value,omitempty"`
+	Url        string                `json:"url,omitempty"`
+	Media_Id   string                `json:"media_id,omitempty"`
+	Key        string                `json:"key,omitempty"`
+	Sub_Button []WechatMenuDetailSub `json:"sub_button"`
 }
 type WechatMenu struct {
-	Button []WechatMenuDetail
+	Button []WechatMenuDetail `json:"button"`
 }
-type Wechat struct {
-	Menu WechatMenu
+type WechatMenus struct {
+	Menu WechatMenu `json:"menu"`
 }
 
 func (c *MenuController) GetMenuList() {
@@ -68,33 +68,38 @@ func (c *MenuController) GetMenuList() {
 		c.ResponseError(err)
 	}
 	menu, err := client.GetMenu()
-
-	wechatmenu := menu["button"].([]WechatMenuDetail)
-	beego.Error("___________wechatmenulist____________")
-	beego.Error(wechatmenu)
-	beego.Error("_________________________________")
+	beego.Error(menu)
 	var keyList []*model.TaWechatKeyValue
-	for i := 0; i < len(wechatmenu); i++ {
-		if wechatmenu[i].Type == "click" {
-			key, err := c.kdao.GetValueByKey(wechatmenu[i].Key)
-			if err != nil {
-				c.ResponseError(err)
+	if menu != nil {
+		menus := menu["menu"].(map[string]interface{})
+		wechatmenu := menus["button"].([]interface{})
+		for i := 0; i < len(wechatmenu); i++ {
+			m := wechatmenu[i].(map[string]interface{})
+			if m["type"] != nil {
+				if m["type"].(string) == "click" {
+					key, err := c.kdao.GetValueByKey(m["key"].(string))
+					if err != nil {
+						c.ResponseError(err)
+					}
+					keyList = append(keyList, key)
+				}
 			}
-			keyList = append(keyList, key)
-		}
-		for j := 0; j < len(wechatmenu[i].Sub_Button); j++ {
-			if wechatmenu[i].Sub_Button[j].Type == "click" {
-				key, err := c.kdao.GetValueByKey(wechatmenu[i].Key)
-				if err != nil {
-					c.ResponseError(err)
+			if m["sub_button"] != nil {
+				subbuttons := m["sub_button"].([]interface{})
+				for j := 0; j < len(subbuttons); j++ {
+					subb := subbuttons[j].(map[string]interface{})
+					if subb["type"].(string) == "click" {
+						key, err := c.kdao.GetValueByKey(subb["key"].(string))
+						if err != nil {
+							c.ResponseError(err)
+						}
+						keyList = append(keyList, key)
+					}
 				}
-				keyList = append(keyList, key)
 			}
 		}
 	}
-	beego.Error("___________keylist____________")
-	beego.Error(keyList)
-	beego.Error("_________________________________")
+
 	if err != nil {
 		var code string = err.Error()
 		if strings.Contains(code, "46003") {
@@ -116,19 +121,14 @@ func (c *MenuController) RefreshMenu() {
 		c.ResponseError(err)
 	}
 	str := wechatJson.WechatJson
-	beego.Error("____________str___________")
-	beego.Error(str)
-	beego.Error("__________________________")
-	var menu Wechat
+	var menu WechatMenus
 	err := json.Unmarshal([]byte(str), &menu)
 	//var data []byte = []byte(str)
 	if err != nil {
 		c.ResponseError(err)
 	}
 	wechatmenu := menu.Menu.Button
-	beego.Error("___________wechatmenu____________")
 	beego.Error(wechatmenu)
-	beego.Error("_________________________________")
 	for i := 0; i < len(wechatmenu); i++ {
 		if wechatmenu[i].Type == "text" {
 			wechatmenu[i].Type = "click"
@@ -159,14 +159,14 @@ func (c *MenuController) RefreshMenu() {
 			}
 		}
 	}
-	beego.Error("___________wechatmenuData____________")
 	beego.Error(wechatmenu)
-	beego.Error("_________________________________")
-	menuData, err := json.Marshal(wechatmenu)
+	var upwechat WechatMenu
+	upwechat.Button = wechatmenu
+	menuData, err := json.Marshal(upwechat)
 	if err != nil {
 		c.ResponseError(err)
 	}
-
+	beego.Error(string(menuData))
 	err = c.dao.UpdateWechatMenu(string(menuData), user.OrgId)
 	if err != nil {
 		c.ResponseError(err)
@@ -183,4 +183,5 @@ func (c *MenuController) RefreshMenu() {
 	if err != nil {
 		c.ResponseError(err)
 	}
+	c.ResponseJSON("操作成功!")
 }

models/wechatimg/wechatimg.go

@@ -31,7 +31,7 @@ func (m *WechatImgDAO) GetWechatImgList(orgId string, page, pagesize int) ([]mod
 	err := m.db.Sql(sql).Find(&img)
 	return img, err
 }
-func (m *WechatImgDAO) GetWechatImgListCount(orgId string, page, pagesize int) (int, error) {
+func (m *WechatImgDAO) GetWechatImgListCount(orgId string) (int, error) {
 	var img []model.TaWechatImg
 	sql := `SELECT * FROM ta_wechat_img WHERE status > ` + strconv.Itoa(models.STATUS_DEL) + `
 	and org_id = '` + orgId + `'`

service/wechatimg/wechatimg.go

@@ -6,6 +6,7 @@ import (
 	"wechat-conf/models"
 	"wechat-conf/models/model"
 	"wechat-conf/models/wechatimg"
+	"wechat-conf/service"
 	"wechat-conf/utils"
 
 	"github.com/astaxie/beego"
@@ -72,3 +73,25 @@ func (s *WechatImgServ) DeleteImg(mediaId string) error {
 	}
 	return nil
 }
+
+func (s *WechatImgServ) GetWechatImgList(orgId string, page, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	list, err := s.dao.GetWechatImgList(orgId, page, pageSize)
+	if err != nil {
+		utils.LogError("获取微信资源列表失败: " + err.Error())
+		return nil, errors.New("获取微信资源列表失败")
+	}
+	total, err := s.dao.GetWechatImgListCount(orgId)
+	if err != nil {
+		utils.LogError("获取微信资源列表失败: " + err.Error())
+		return nil, errors.New("获取微信资源列表失败")
+	}
+	return map[string]interface{}{
+		"list":     list,
+		"pageSize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, nil
+}