delete key+media_id return

controllers/wechatimg/wechatimt.go

@@ -179,7 +179,10 @@ func (c *WechatImgController) AddNewImg() {
 	if err != nil {
 		c.ResponseError(err)
 	}
-	c.ResponseJSON("上传成功")
+	c.ResponseJSON(map[string]interface{}{
+		"media_id": img.MediaId,
+		"url":      img.Url,
+	})
 
 }
 func (c *WechatImgController) DeleteImg() {

controllers/wechatmenu/wechatmenu.go

@@ -116,13 +116,17 @@ func (c *MenuController) GetMenuList() {
 
 func (c *MenuController) RefreshMenu() {
 	user := c.Context.Get("user").(*model.SysUser)
+	err := c.kdao.DeleteByOrgId(user.OrgId)
+	if err != nil {
+		c.ResponseError(err)
+	}
 	wechatJson := Wehchatmenu{}
 	if err := c.ParseForm(&wechatJson); err != nil {
 		c.ResponseError(err)
 	}
 	str := wechatJson.WechatJson
 	var menu WechatMenus
-	err := json.Unmarshal([]byte(str), &menu)
+	err = json.Unmarshal([]byte(str), &menu)
 	//var data []byte = []byte(str)
 	if err != nil {
 		c.ResponseError(err)
@@ -135,6 +139,7 @@ func (c *MenuController) RefreshMenu() {
 			var keyvalue = model.TaWechatKeyValue{
 				KeyId: utils.GetGUID(),
 				Value: wechatmenu[i].Value,
+				OrgId: user.OrgId,
 			}
 			err := c.kdao.AddKeyvalue(keyvalue)
 			if err != nil {
@@ -149,6 +154,7 @@ func (c *MenuController) RefreshMenu() {
 				var keyvalue = model.TaWechatKeyValue{
 					KeyId: utils.GetGUID(),
 					Value: wechatmenu[i].Sub_Button[j].Value,
+					OrgId: user.OrgId,
 				}
 				err := c.kdao.AddKeyvalue(keyvalue)
 				if err != nil {

models/model/keyvalue/keyvalue.go → models/keyvalue/keyvalue.go

@@ -44,3 +44,7 @@ func (m *KeyvalueDAO) AddValueKey(valueKey model.TaWechatKeyValue) error {
 	_, err := m.db.Insert(valueKey)
 	return err
 }
+func (m *KeyvalueDAO) DeleteByOrgId(orgId string) error {
+	_, err := m.db.Delete(&model.TaWechatKeyValue{OrgId: orgId})
+	return err
+}

models/model/ta_wechat_key_value.go

@@ -4,4 +4,5 @@ type TaWechatKeyValue struct {
 	KeyId  string `xorm:"not null pk VARCHAR(64)"`
 	Value  string `xorm:"TEXT"`
 	Status int    `xorm:"SMALLINT(6)"`
+	OrgId  string `xorm:"VARCHAR(64)"`
 }

service/keyvalue/keyvalue.go

@@ -2,8 +2,8 @@ package keyvalue
 
 import (
 	"errors"
+	"wechat-conf/models/keyvalue"
 	"wechat-conf/models/model"
-	"wechat-conf/models/model/keyvalue"
 	"wechat-conf/utils"
 )
 
@@ -36,3 +36,11 @@ func (s *KeyvalueServ) AddKeyvalue(keyvalue model.TaWechatKeyValue) error {
 	}
 	return nil
 }
+func (s *KeyvalueServ) DeleteByOrgId(orgId string) error {
+	err := s.dao.DeleteByOrgId(orgId)
+	if err != nil {
+		utils.LogError("删除值失败: " + err.Error())
+		return errors.New("删除值失败")
+	}
+	return nil
+}