Merge branch 'feature/migrate_wecht_msg' into debug

# Conflicts:
#	controllers/wechat.go
#	models/tables/admin/admin.go
#	utils/config.go

controllers/wechat.go

@@ -303,7 +303,7 @@ func (c *WeChatCommon) AdminWeChatLogin() {
 		c.FailWithMessage(fmt.Sprintf("%v", err), fmt.Sprintf("%v", err))
 		return
 	}
-	
+
 	if item.Errcode != 0 {
 		if item.Errcode == 40163 {
 			c.FailWithCodeUsed("获取用户信息失败", "获取access_token 失败 errCode:"+strconv.Itoa(item.Errcode)+" ;errMsg:"+item.Errmsg)

models/tables/admin/admin.go

@@ -184,4 +184,4 @@ func GetOpenIdListByMobile(mobile, openIdStr string) (items []*OpenIdList, err e
 	}
 	_, err = orm.NewOrm().Raw(sql, mobile).QueryRows(&items)
 	return
-}
+}

utils/config.go

@@ -220,6 +220,7 @@ func wxConfig() {
 		//内部员工公众号（弘则部门）
 		AdminWxAppId = "wx1392111da5426e9e"
 		AdminWxAppSecret = "30eceb7cf29bf2f046031155ab55d7b4"
+
 		SendWxTemplateMsgUrl = "http://127.0.0.1:8086/v1/wechat/send_template_msg"
 	}
 

utils/constants.go

@@ -143,6 +143,12 @@ const (
 	TEMPLATE_MSG_CYGX_ARTICLE_ADD                 //查研观向报告更新推送  13
 	TEMPLATE_MSG_YB_PRICE_DRIVEN                  //研报价格驱动 14
 	TEMPLATE_MSG_SEAL_FINISHED                    //用印申请已迁回通知 15
+	TEMPLATE_MSG_YB_COMMUNITY_VIDEO               //研报视频社区 16
+	TEMPLATE_MSG_MOVE_SELLER                      //销售"移动/删除联系人"权限变更通知 17
+	TEMPLATE_MSG_YB_VOICE_BROADCAST               //研报语音播报 18
+	TEMPLATE_MSG_YB_VIDEO_UPLOAD                  //研报视频上传 19
+	TEMPLATE_MSG_YB_ROAD_VIDEO                    //研报线上路演 20
+	TEMPLATE_MSG_CYGX_ROADSHOW_VIDEO              //查研观向微路演视频 21
 )