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

conf/db.conf

@@ -21,7 +21,7 @@ password     = spaceofcheng
 # password     = c;a|vK)Xv/=L@c[6Fx,v[ITD5;WpR}+Y
 
 ; 数据库名或者schema
-database     = spaceofcheng
+database     = wechatconfig
 
 ; 前缀，目前尚未使用
 dbprefix     = 

controllers/wechatimg/wechatimt.go

@@ -39,12 +39,11 @@ func (c *WechatImgController) GetWechatImgList() {
 	}
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
-	count, _ := c.GetInt("count")
 	offset := page * (pageSize - 1)
 	var data map[string]string
 	data["offset"] = strconv.Itoa(offset)
 	data["type"] = "image"
-	data["count"] = strconv.Itoa(count)
+	data["count"] = strconv.Itoa(pageSize)
 	wechatImg, err := client.GetMaterialList(data)
 	if err != nil {
 		c.ResponseError(err)

controllers/wechatmenu/wechatmenu.go

@@ -37,15 +37,24 @@ func (c *MenuController) GetMenuList() {
 	c.ResponseJSON(menu)
 }
 
-// func (c *MenuController) RefreshMenu() {
-// 	user := c.Context.Get("user").(*model.SysUser)
-// 	appId, err := c.sdao.GetAppIdByOrgId(user.OrgId)
-// 	if err != nil {
-// 		c.ResponseError(err)
-// 	}
-// 	client, err := utils.Component.GetWxClient(appId)
-// 	if err != nil {
-// 		c.ResponseError(err)
-// 	}
-// 	err = client.RefreshMenu()
-// }
+func (c *MenuController) RefreshMenu() {
+	user := c.Context.Get("user").(*model.SysUser)
+	str := c.GetString("wechatJson")
+	var data []byte = []byte(str)
+	err := c.dao.UpdateWechatMenu(str, user.OrgId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	appId, err := c.sdao.GetAppIdByOrgId(user.OrgId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	client, err := utils.Component.GetWxClient(appId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	err = client.RefreshMenu(data)
+	if err != nil {
+		c.ResponseError(err)
+	}
+}

models/wechatmenu/wechatmenu.go

@@ -40,11 +40,15 @@ func (m *WechatMenuDAO) AddWechatMenu(menu model.TaWechatMenu) (*model.TaWechatM
 	_, err := m.db.Insert(menu)
 	return &menu, err
 }
-func (m *WechatMenuDAO) UpdateWechatMenu(menu model.TaWechatMenu) error {
+func (m *WechatMenuDAO) UpdateWechatMenu(wechatMenu, orgId string) error {
+	var menu = model.TaWechatMenu{
+		OrgId:            orgId,
+		WechatConfigJson: wechatMenu,
+	}
 	var cols = []string{
 		"wechat_config_json",
 	}
-	_, err := m.db.Cols(cols...).Where("wechat_config_id = ?", menu.WechatConfigId).Update(menu)
+	_, err := m.db.Cols(cols...).Where("org_id = ?", menu.WechatConfigId).Update(menu)
 	return err
 }
 func (m *WechatMenuDAO) DeleteWechatMenu(wechatConfigId string) error {

routers/router.go

@@ -9,6 +9,8 @@ package routers
 
 import (
 	"wechat-conf/controllers"
+	"wechat-conf/controllers/autoreply"
+	"wechat-conf/controllers/menu"
 
 	"github.com/astaxie/beego"
 )
@@ -18,6 +20,16 @@ func RouteInit() {
 	ns := beego.NewNamespace("/api",
 		// 解决跨域时 先发送 options 问题
 		beego.NSRouter("*", &controllers.BaseController{}, "options:Options"),
+		// 菜单
+		beego.NSRouter("/menu", &menu.MenuController{}, "get:GetMenuList"),
+		// 自动回复
+		beego.NSRouter("/autoreply", &autoreply.AutoreplyController{}, "get:GetAutoReplyList"),
+		beego.NSRouter("/autoreply/:autoreplyId", &autoreply.AutoreplyController{}, "get:GetAutoReplyById"),
+		beego.NSRouter("/autoreply/", &autoreply.AutoreplyController{}, "post:SaveAutoreply"),
+		beego.NSRouter("/autoreply/", &autoreply.AutoreplyController{}, "put:SaveAutoreply"),
+		beego.NSRouter("/autoreply/", &autoreply.AutoreplyController{}, "delete:DeleteAutoReply"),
+		//图片资源
+
 		beego.NSRouter("/ticket", &controllers.WechatController{}, "post:ComponentPush"),
 		beego.NSRouter("/ticket", &controllers.WechatController{}, "get:ComponentPush"),
 		beego.NSRouter("/:appid/callback", &controllers.WechatController{}, "get:WxReceive"),

service/wechatmenu/wechatmenu.go

@@ -1,6 +1,7 @@
 package wechatmenu
 
 import (
+	"errors"
 	"wechat-conf/models/wechatmenu"
 	"wechat-conf/utils"
 )
@@ -18,3 +19,12 @@ func NewWechatmenuServ(ctx *utils.Context) *WechatmenuServ {
 		dao: wechatmenu.NewWechatMenuDAO(ctx),
 	}
 }
+
+func (s *WechatmenuServ) UpdateWechatMenu(wechatMenu, orgId string) error {
+	err := s.dao.UpdateWechatMenu(wechatMenu, orgId)
+	if err != nil {
+		utils.LogError("更新菜单失败: " + err.Error())
+		return errors.New("更新菜单失败")
+	}
+	return nil
+}