wangfei 6 gadus atpakaļ
vecāks
revīzija
3973707a18
3 mainītis faili ar 20 papildinājumiem un 15 dzēšanām
  1. 2
    2
      conf/db.conf
  2. 17
    11
      controllers/wechatmenu/wechatmenu.go
  3. 1
    2
      models/wechatimg/wechatimg.go

+ 2
- 2
conf/db.conf Parādīt failu

5
 con_protocol = tcp
5
 con_protocol = tcp
6
 
6
 
7
 ; 数据库地址,可以使用IP
7
 ; 数据库地址,可以使用IP
8
-db_addr      = 47.101.36.130
8
+;db_addr      = 47.101.36.130
9
 # db_addr        = 192.168.0.122
9
 # db_addr        = 192.168.0.122
10
-; db_addr = localhost
10
+db_addr = localhost
11
 # db_addr      = rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com
11
 # db_addr      = rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com
12
 
12
 
13
 ; 端口
13
 ; 端口

+ 17
- 11
controllers/wechatmenu/wechatmenu.go Parādīt failu

1
 package wechatmenu
1
 package wechatmenu
2
 
2
 
3
 import (
3
 import (
4
+	"bytes"
4
 	"encoding/json"
5
 	"encoding/json"
5
 	"strings"
6
 	"strings"
6
 	"wechat-conf/controllers"
7
 	"wechat-conf/controllers"
38
 }
39
 }
39
 type WechatMenuDetailSub struct {
40
 type WechatMenuDetailSub struct {
40
 	Name     string `json:"name"`
41
 	Name     string `json:"name"`
41
-	Type     string `json:"type"`
42
+	Type     string `json:"type,omitempty"`
42
 	Value    string `json:"value,omitempty"`
43
 	Value    string `json:"value,omitempty"`
43
 	Url      string `json:"url,omitempty"`
44
 	Url      string `json:"url,omitempty"`
44
 	Media_Id string `json:"media_id,omitempty"`
45
 	Media_Id string `json:"media_id,omitempty"`
46
 }
47
 }
47
 type WechatMenuDetail struct {
48
 type WechatMenuDetail struct {
48
 	Name       string                `json:"name"`
49
 	Name       string                `json:"name"`
49
-	Type       string                `json:"type"`
50
+	Type       string                `json:"type,omitempty"`
50
 	Value      string                `json:"value,omitempty"`
51
 	Value      string                `json:"value,omitempty"`
51
 	Url        string                `json:"url,omitempty"`
52
 	Url        string                `json:"url,omitempty"`
52
 	Media_Id   string                `json:"media_id,omitempty"`
53
 	Media_Id   string                `json:"media_id,omitempty"`
71
 		c.ResponseError(err)
72
 		c.ResponseError(err)
72
 	}
73
 	}
73
 	menu, err := client.GetMenu()
74
 	menu, err := client.GetMenu()
74
-	beego.Error(menu)
75
 	var keyList []*model.TaWechatKeyValue
75
 	var keyList []*model.TaWechatKeyValue
76
 	var imgList []*model.TaWechatImg
76
 	var imgList []*model.TaWechatImg
77
 	if menu != nil {
77
 	if menu != nil {
202
 	utils.LogInfo(wechatmenu)
202
 	utils.LogInfo(wechatmenu)
203
 	var upwechat WechatMenu
203
 	var upwechat WechatMenu
204
 	upwechat.Button = wechatmenu
204
 	upwechat.Button = wechatmenu
205
-	menuData, err := json.Marshal(upwechat)
206
-	if err != nil {
207
-		c.ResponseError(err)
208
-	}
209
-	beego.Error(string(menuData))
205
+
206
+	b := bytes.NewBuffer([]byte{})
207
+	jsonEncoder := json.NewEncoder(b)
208
+	jsonEncoder.SetEscapeHTML(false)
209
+	jsonEncoder.Encode(upwechat)
210
+	// menuData, err := json.Marshal(upwechat)
211
+	// if err != nil {
212
+	// 	c.ResponseError(err)
213
+	// }
214
+	menuData := b.String()
215
+	beego.Error(menuData)
210
 	utils.LogInfo("↓↓↓↓_________________________↓↓↓↓wechamenu when upload(upload)↓↓↓↓___________________↓↓↓↓")
216
 	utils.LogInfo("↓↓↓↓_________________________↓↓↓↓wechamenu when upload(upload)↓↓↓↓___________________↓↓↓↓")
211
-	utils.LogInfo(string(menuData))
212
-	err = c.dao.UpdateWechatMenu(string(menuData), user.OrgId)
217
+	utils.LogInfo(menuData)
218
+	err = c.dao.UpdateWechatMenu(menuData, user.OrgId)
213
 	if err != nil {
219
 	if err != nil {
214
 		c.ResponseError(err)
220
 		c.ResponseError(err)
215
 	}
221
 	}
221
 	if err != nil {
227
 	if err != nil {
222
 		c.ResponseError(err)
228
 		c.ResponseError(err)
223
 	}
229
 	}
224
-	err = client.RefreshMenu(menuData)
230
+	err = client.RefreshMenu([]byte(menuData))
225
 	if err != nil {
231
 	if err != nil {
226
 		c.ResponseError(err)
232
 		c.ResponseError(err)
227
 	}
233
 	}

+ 1
- 2
models/wechatimg/wechatimg.go Parādīt failu

69
 	return err
69
 	return err
70
 }
70
 }
71
 func (m *WechatImgDAO) IsExist(mediaId string) (bool, error) {
71
 func (m *WechatImgDAO) IsExist(mediaId string) (bool, error) {
72
-	flag, err := m.db.Exist(model.TaWechatImg{MediaId: mediaId})
72
+	flag, err := m.db.Exist(&model.TaWechatImg{MediaId: mediaId})
73
 	return flag, err
73
 	return flag, err
74
-
75
 }
74
 }