Merge branch 'fix_email_20220513' of hongze/hongze_mobile_admin into master

main.go

@@ -6,6 +6,7 @@ import (
 	"github.com/beego/beego/v2/server/web/context"
 	"hongze/hongze_mobile_admin/models"
 	_ "hongze/hongze_mobile_admin/routers"
+	"hongze/hongze_mobile_admin/services/alarm_msg"
 	"hongze/hongze_mobile_admin/utils"
 	"runtime"
 	"time"
@@ -52,7 +53,8 @@ func Recover(ctx *context.Context, config *web.Config) {
 			logs.Critical(fmt.Sprintf("%s:%d", file, line))
 			stack = stack + fmt.Sprintln(fmt.Sprintf("%s:%d</br>", file, line))
 		}
-		go utils.SendEmail(utils.APPNAME+"崩了"+time.Now().Format("2006-01-02 15:04:05"), stack, utils.EmailSendToUsers)
+		//go utils.SendEmail(utils.APPNAME+"崩了"+time.Now().Format("2006-01-02 15:04:05"), stack, utils.EmailSendToUsers)
+		go alarm_msg.SendAlarmMsg(utils.APPNAME+"崩了"+time.Now().Format("2006-01-02 15:04:05")+";Err:"+stack, 3)
 	}
 	return
 }

services/alarm_msg/alarm_msg.go

@@ -0,0 +1,29 @@
+package alarm_msg
+
+import (
+	"encoding/json"
+	"github.com/rdlucklib/rdluck_tools/http"
+	"hongze/hongze_mobile_admin/utils"
+)
+
+var (
+	AlarmMsgUrl = "http://127.0.0.1:8606/api/alarm/send"
+)
+
+//projectName-项目名称
+//runMode-运行模式
+//msgBody-消息内容
+//level:消息基本,1:提示消息,2:警告消息,3:严重错误信息,默认为1 提示消息
+func SendAlarmMsg(msgBody string, level int) {
+	params := make(map[string]interface{})
+	params["ProjectName"] = utils.APPNAME
+	params["RunMode"] = utils.RunMode
+	params["MsgBody"] = msgBody
+	params["Level"] = level
+	param, err := json.Marshal(params)
+	if err != nil {
+		utils.FileLog.Info("SendAlarmMsg json.Marshal Err:" + err.Error())
+		return
+	}
+	http.Post(AlarmMsgUrl, string(param))
+}

services/company.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"hongze/hongze_mobile_admin/models"
 	"hongze/hongze_mobile_admin/models/tables/company_operation_record"
+	"hongze/hongze_mobile_admin/services/alarm_msg"
 	"hongze/hongze_mobile_admin/utils"
 	"time"
 )
@@ -52,7 +53,8 @@ func CheckCompanyUserButton(roleTypeCode string, itemSellerId, sysUserId, produc
 func AddCompanyOperationRecord(companyId, sellerId, sysUserId, productId, approveAdminId int, companyName, productName, sysUserRealName, remark, operation, approveContent, approveUserRealName, approveRemark, status string) (err error) {
 	defer func() {
 		if err != nil {
-			go utils.SendEmail(utils.APPNAME+"失败提醒"+utils.RunMode, "services:AddCompanyOperationRecord;Err"+err.Error(), utils.EmailSendToUsers)
+			//go utils.SendEmail(utils.APPNAME+"失败提醒"+utils.RunMode, "services:AddCompanyOperationRecord;Err"+err.Error(), utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("services:AddCompanyOperationRecord;Err"+err.Error(), 3)
 		}
 	}()
 	record := new(company_operation_record.CompanyOperationRecord)

services/company_approval/company_approval.go

@@ -19,6 +19,7 @@ import (
 	"hongze/hongze_mobile_admin/models/tables/contract_approval"
 	"hongze/hongze_mobile_admin/models/tables/contract_approval_record"
 	"hongze/hongze_mobile_admin/services"
+	"hongze/hongze_mobile_admin/services/alarm_msg"
 	"hongze/hongze_mobile_admin/services/flow"
 	"hongze/hongze_mobile_admin/utils"
 	"strings"
@@ -561,7 +562,8 @@ func afterApproved(companyApprovalId int, opUserId int, opUserName string) (err
 	defer func() {
 		if err != nil {
 			//fmt.Println("异常提醒:"+utils.RunMode, "合同审批通过后，生成pdf失败，ERR:"+err.Error()+"", utils.EmailSendToUsers)
-			go utils.SendEmail("异常提醒:"+utils.RunMode, "合同审批通过后，生成pdf失败，ERR:"+err.Error()+"", utils.EmailSendToUsers)
+			//go utils.SendEmail("异常提醒:"+utils.RunMode, "合同审批通过后，生成pdf失败，ERR:"+err.Error()+"", utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("合同审批通过后，生成pdf失败，ERR:"+err.Error()+"", 3)
 		}
 
 	}()
@@ -821,7 +823,8 @@ func afterReject(companyApprovalId, opUserId int, opUserName, remark string) (er
 	defer func() {
 		if err != nil {
 			fmt.Println("异常提醒:"+utils.RunMode, "合同审批通过后，生成pdf失败，ERR:"+err.Error()+"", utils.EmailSendToUsers)
-			go utils.SendEmail("异常提醒:"+utils.RunMode, "合同审批通过后，生成pdf失败，ERR:"+err.Error()+"", utils.EmailSendToUsers)
+			//go utils.SendEmail("异常提醒:"+utils.RunMode, "合同审批通过后，生成pdf失败，ERR:"+err.Error()+"", utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("合同审批通过后，生成pdf失败，ERR:"+err.Error()+"", 3)
 		}
 
 	}()

services/company_approval_message.go

@@ -3,6 +3,7 @@ package services
 import (
 	"fmt"
 	"hongze/hongze_mobile_admin/models/tables/company_approval_message"
+	"hongze/hongze_mobile_admin/services/alarm_msg"
 	"hongze/hongze_mobile_admin/utils"
 	"time"
 )
@@ -12,7 +13,8 @@ func AddCompanyApprovalMessage(createUserId, receiveUserId, companyId, companyAp
 	defer func() {
 		if err != nil {
 			fmt.Println("异常提醒:"+utils.RunMode, "给用户发送消息失败，ERR:"+err.Error()+"", utils.EmailSendToUsers)
-			go utils.SendEmail("异常提醒:"+utils.RunMode, "给用户发送消息失败，ERR:"+err.Error()+"", utils.EmailSendToUsers)
+			//go utils.SendEmail("异常提醒:"+utils.RunMode, "给用户发送消息失败，ERR:"+err.Error()+"", utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("给用户发送消息失败，ERR:"+err.Error(), 3)
 		}
 	}()
 	if msgType == 2 {

services/contract/contract_approval.go

@@ -17,6 +17,7 @@ import (
 	"hongze/hongze_mobile_admin/models/tables/contract_operation_record"
 	"hongze/hongze_mobile_admin/models/tables/contract_relation"
 	"hongze/hongze_mobile_admin/services"
+	"hongze/hongze_mobile_admin/services/alarm_msg"
 	"hongze/hongze_mobile_admin/services/flow"
 	"hongze/hongze_mobile_admin/utils"
 	"math"
@@ -689,7 +690,8 @@ func messageToUser(contractApprovalRecordList []*contract_approval_record.Contra
 func AfterApproved(contractId int) (err error) {
 	defer func() {
 		if err != nil {
-			go utils.SendEmail("异常提醒:"+utils.RunMode, "合同审批通过后，生成pdf失败，ERR:"+err.Error()+"", utils.EmailSendToUsers)
+			//go utils.SendEmail("异常提醒:"+utils.RunMode, "合同审批通过后，生成pdf失败，ERR:"+err.Error()+"", utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("合同审批通过后，生成pdf失败，ERR:"+err.Error()+"", 3)
 		}
 
 	}()
@@ -820,7 +822,8 @@ func AfterApproved(contractId int) (err error) {
 func FixPdf(contractId int) (err error) {
 	defer func() {
 		if err != nil {
-			go utils.SendEmail("异常提醒:"+utils.RunMode, "合同审批通过后，生成pdf失败，ERR:"+err.Error()+"", utils.EmailSendToUsers)
+			//go utils.SendEmail("异常提醒:"+utils.RunMode, "合同审批通过后，生成pdf失败，ERR:"+err.Error()+"", utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("合同审批通过后，生成pdf失败，ERR:"+err.Error()+"", 3)
 		}
 
 	}()

services/rs/calendar.go

@@ -7,6 +7,7 @@ import (
 	"github.com/rdlucklib/rdluck_tools/http"
 	"hongze/hongze_mobile_admin/models/roadshow"
 	"hongze/hongze_mobile_admin/models/tables/admin"
+	"hongze/hongze_mobile_admin/services/alarm_msg"
 	"hongze/hongze_mobile_admin/utils"
 	"io/ioutil"
 	netHttp "net/http"
@@ -20,7 +21,8 @@ import (
 func getAccessToken() (tokenData roadshow.TokenData, err error) {
 	defer func() {
 		if err != nil {
-			go utils.SendEmail(utils.APPNAME+"更新上海的token失败："+time.Now().Format("2006-01-02 15:04:05"), err.Error(), utils.EmailSendToUsers)
+			//go utils.SendEmail(utils.APPNAME+"更新上海的token失败："+time.Now().Format("2006-01-02 15:04:05"), err.Error(), utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("更新上海的token失败："+time.Now().Format("2006-01-02 15:04:05")+";Err:"+err.Error(), 3)
 		}
 	}()
 	getUrl := fmt.Sprintf(utils.CRM_OPEN_API_URL+"/v1/auth/getAccessToken?app_key=%s&app_secret=%s", utils.CRM_OPEN_API_APP_KEY, utils.CRM_OPEN_API_APP_SECRET)
@@ -48,7 +50,8 @@ func getAccessToken() (tokenData roadshow.TokenData, err error) {
 func refreshAccessToken() (token string, err error) {
 	defer func() {
 		if err != nil {
-			go utils.SendEmail(utils.APPNAME+"获取上海的token失败："+time.Now().Format("2006-01-02 15:04:05"), err.Error(), utils.EmailSendToUsers)
+			//go utils.SendEmail(utils.APPNAME+"获取上海的token失败："+time.Now().Format("2006-01-02 15:04:05"), err.Error(), utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("获取上海的token失败："+time.Now().Format("2006-01-02 15:04:05")+";Err:"+err.Error(), 3)
 		}
 	}()
 	tokenInfo, tmpErr := getAccessToken()
@@ -61,7 +64,8 @@ func refreshAccessToken() (token string, err error) {
 	//token存入redis
 	err = utils.Rc.Put("SH_ACCESS_TOKEN", token, time.Duration(tokenInfo.ExpireIn-600)*time.Second)
 	if err != nil {
-		go utils.SendEmail(utils.APPNAME+"获取上海的token失败："+time.Now().Format("2006-01-02 15:04:05"), "上海token存入redis失败：", utils.EmailSendToUsers)
+		//go utils.SendEmail(utils.APPNAME+"获取上海的token失败："+time.Now().Format("2006-01-02 15:04:05"), "上海token存入redis失败：", utils.EmailSendToUsers)
+		go alarm_msg.SendAlarmMsg("获取上海的token失败："+time.Now().Format("2006-01-02 15:04:05")+";Err:上海token存入redis失败", 3)
 	}
 	return
 }
@@ -208,9 +212,12 @@ type ShResponse struct {
 
 // getCurl get请求上海接口
 func getCurl(urlStr string, params url.Values, num int) (body []byte, err error) {
-	if err != nil {
-		go utils.SendEmail(utils.APPNAME+"get请求上海接口失败："+time.Now().Format("2006-01-02 15:04:05"), "get请求上海接口失败："+err.Error(), utils.EmailSendToUsers)
-	}
+	defer func() {
+		if err != nil {
+			//go utils.SendEmail(utils.APPNAME+"get请求上海接口失败："+time.Now().Format("2006-01-02 15:04:05"), "get请求上海接口失败："+err.Error(), utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("get请求上海接口失败："+time.Now().Format("2006-01-02 15:04:05")+";Err:get请求上海接口失败", 3)
+		}
+	}()
 	token, err := GetAccessToken(false)
 	if err != nil {
 		return
@@ -259,7 +266,8 @@ func postCurl(urlStr string, form url.Values, num int) (body []byte, err error,
 		if err != nil {
 			if logMsg != `` {
 				errMsg = logMsg
-				go utils.SendEmail(utils.APPNAME+"post请求上海接口失败："+time.Now().Format("2006-01-02 15:04:05"), "post请求上海接口失败："+errMsg, utils.EmailSendToUsers)
+				//go utils.SendEmail(utils.APPNAME+"post请求上海接口失败："+time.Now().Format("2006-01-02 15:04:05"), "post请求上海接口失败："+errMsg, utils.EmailSendToUsers)
+				go alarm_msg.SendAlarmMsg("post请求上海接口失败："+time.Now().Format("2006-01-02 15:04:05")+";Err:"+errMsg, 3)
 			}
 		}
 	}()
@@ -318,7 +326,8 @@ func postCurl(urlStr string, form url.Values, num int) (body []byte, err error,
 func GetAccessToken(isRefresh bool) (token string, err error) {
 	defer func() {
 		if err != nil {
-			go utils.SendEmail(utils.APPNAME+"获取上海的token失败："+time.Now().Format("2006-01-02 15:04:05"), err.Error(), utils.EmailSendToUsers)
+			//go utils.SendEmail(utils.APPNAME+"获取上海的token失败："+time.Now().Format("2006-01-02 15:04:05"), err.Error(), utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("获取上海的token失败："+time.Now().Format("2006-01-02 15:04:05")+";Err:"+err.Error(), 3)
 		}
 	}()
 	token, redisErr := utils.Rc.RedisString("SH_ACCESS_TOKEN")
@@ -336,7 +345,8 @@ func CalendarToSH(rsCalendar roadshow.RsCalendar, researcher roadshow.RsCalendar
 	defer func() {
 		if err != nil {
 			errMsg = err.Error() + ";" + errMsg
-			go utils.SendEmail(utils.APPNAME+"新建上海研究员日历失败："+time.Now().Format("2006-01-02 15:04:05"), err.Error(), utils.EmailSendToUsers)
+			//go utils.SendEmail(utils.APPNAME+"新建上海研究员日历失败："+time.Now().Format("2006-01-02 15:04:05"), err.Error(), utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("新建上海研究员日历失败："+time.Now().Format("2006-01-02 15:04:05")+";Err:"+err.Error(), 3)
 		}
 	}()
 	//redis获取创建者及研究员信息
@@ -394,7 +404,8 @@ func MatterToSH(matter roadshow.RsMatters) (err error) {
 	defer func() {
 		if err != nil {
 			errMsg = err.Error() + ";" + errMsg
-			go utils.SendEmail(utils.APPNAME+"新建上海研究员事项失败："+time.Now().Format("2006-01-02 15:04:05"), err.Error(), utils.EmailSendToUsers)
+			//go utils.SendEmail(utils.APPNAME+"新建上海研究员事项失败："+time.Now().Format("2006-01-02 15:04:05"), err.Error(), utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("新建上海研究员事项失败："+time.Now().Format("2006-01-02 15:04:05")+";Err:"+err.Error(), 3)
 		}
 	}()
 	//获取研究员信息
@@ -430,7 +441,8 @@ func UpdateSHCalendar(rsCalendarId, rsCalendarResearcherId int, activityType, ro
 	errMsg := ``
 	defer func() {
 		if errMsg != `` {
-			go utils.SendEmail(utils.APPNAME+"更新上海日历活动失败："+time.Now().Format("2006-01-02 15:04:05"), errMsg, utils.EmailSendToUsers)
+			//go utils.SendEmail(utils.APPNAME+"更新上海日历活动失败："+time.Now().Format("2006-01-02 15:04:05"), errMsg, utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("更新上海日历活动失败："+time.Now().Format("2006-01-02 15:04:05")+";Err:"+errMsg, 3)
 		}
 	}()
 
@@ -442,7 +454,8 @@ func UpdateSHCalendar(rsCalendarId, rsCalendarResearcherId int, activityType, ro
 	relationItem, err := roadshow.GetRelationByPars(condition, pars)
 	if err != nil {
 		err = errors.New("GetRelationByPars err:" + err.Error())
-		go utils.SendEmail(utils.APPNAME+"上海关联表查询失败："+time.Now().Format("2006-01-02 15:04:05"), err.Error(), utils.EmailSendToUsers)
+		//go utils.SendEmail(utils.APPNAME+"上海关联表查询失败："+time.Now().Format("2006-01-02 15:04:05"), err.Error(), utils.EmailSendToUsers)
+		go alarm_msg.SendAlarmMsg("上海关联表查询失败："+time.Now().Format("2006-01-02 15:04:05")+";Err:"+err.Error(), 3)
 		fmt.Println(err)
 		return
 	}
@@ -498,7 +511,8 @@ func UpdateSHCalendar(rsCalendarId, rsCalendarResearcherId int, activityType, ro
 func UpdateSHCalendarByMatter(req roadshow.UpdateMattersReq) (err error) {
 	defer func() {
 		if err != nil {
-			go utils.SendEmail(utils.APPNAME+"更新上海日历活动失败："+time.Now().Format("2006-01-02 15:04:05"), err.Error(), utils.EmailSendToUsers)
+			//go utils.SendEmail(utils.APPNAME+"更新上海日历活动失败："+time.Now().Format("2006-01-02 15:04:05"), err.Error(), utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("更新上海日历活动失败："+time.Now().Format("2006-01-02 15:04:05")+";Err:"+err.Error(), 3)
 		}
 	}()
 	if err != nil {
@@ -514,7 +528,8 @@ func UpdateSHCalendarByMatter(req roadshow.UpdateMattersReq) (err error) {
 	relationItem, err := roadshow.GetRelationByPars(condition, pars)
 	if err != nil {
 		err = errors.New("GetRelationByPars err:" + err.Error())
-		go utils.SendEmail(utils.APPNAME+"上海关联表查询失败："+time.Now().Format("2006-01-02 15:04:05"), err.Error(), utils.EmailSendToUsers)
+		//go utils.SendEmail(utils.APPNAME+"上海关联表查询失败："+time.Now().Format("2006-01-02 15:04:05"), err.Error(), utils.EmailSendToUsers)
+		go alarm_msg.SendAlarmMsg("上海关联表查询失败："+time.Now().Format("2006-01-02 15:04:05")+";Err:"+err.Error(), 3)
 		fmt.Println(err)
 		return
 	}
@@ -545,7 +560,8 @@ func UpdateSHCalendarByMatter(req roadshow.UpdateMattersReq) (err error) {
 func DeleteSHCalendar(rsCalendarResearcherId int) (err error) {
 	defer func() {
 		if err != nil {
-			go utils.SendEmail(utils.APPNAME+"删除上海日历活动失败："+time.Now().Format("2006-01-02 15:04:05"), fmt.Sprint("关系id：", rsCalendarResearcherId, ";err:", err.Error()), utils.EmailSendToUsers)
+			//go utils.SendEmail(utils.APPNAME+"删除上海日历活动失败："+time.Now().Format("2006-01-02 15:04:05"), fmt.Sprint("关系id：", rsCalendarResearcherId, ";err:", err.Error()), utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("删除上海日历活动失败："+time.Now().Format("2006-01-02 15:04:05")+";Err:"+fmt.Sprint("关系id：", rsCalendarResearcherId, ";err:", err.Error()), 3)
 		}
 	}()
 
@@ -585,7 +601,8 @@ func DeleteSHCalendar(rsCalendarResearcherId int) (err error) {
 func DeleteSHMatter(matterId int) (err error) {
 	defer func() {
 		if err != nil {
-			go utils.SendEmail(utils.APPNAME+"删除上海日历事项失败:", "删除上海研究员日历失败 "+err.Error(), utils.EmailSendToUsers)
+			//go utils.SendEmail(utils.APPNAME+"删除上海日历事项失败:", "删除上海研究员日历失败 "+err.Error(), utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("删除上海研究员日历失败："+time.Now().Format("2006-01-02 15:04:05")+";Err:"+err.Error(), 3)
 		}
 	}()
 	var condition string
@@ -622,7 +639,8 @@ func SyncCalendarFromShanghai(userPhone, startDate, endDate string) (err error)
 	defer func() {
 		if errMsg != `` {
 			//fmt.Println("err:", errMsg)
-			go utils.SendEmail(utils.APPNAME+"上海路演数据同步到自系统失败："+time.Now().Format("2006-01-02 15:04:05"), errMsg, utils.EmailSendToUsers)
+			//go utils.SendEmail(utils.APPNAME+"上海路演数据同步到自系统失败："+time.Now().Format("2006-01-02 15:04:05"), errMsg, utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("上海路演数据同步到自系统失败："+time.Now().Format("2006-01-02 15:04:05")+";Err:"+errMsg, 3)
 		}
 	}()
 	//fmt.Println(userPhone, startDate, endDate)
@@ -891,7 +909,8 @@ func CreateOaUser(mobile, username string, groupId int) (err error) {
 	defer func() {
 		if err != nil {
 			errMsg := fmt.Sprint("手机号：", mobile, ";username:", username, ";分组id：", groupId, ";err:", err.Error())
-			go utils.SendEmail(utils.APPNAME+"系统用户同步到上海失败："+time.Now().Format("2006-01-02 15:04:05"), errMsg, utils.EmailSendToUsers)
+			//go utils.SendEmail(utils.APPNAME+"系统用户同步到上海失败："+time.Now().Format("2006-01-02 15:04:05"), errMsg, utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("系统用户同步到上海失败："+time.Now().Format("2006-01-02 15:04:05")+";Err:"+errMsg, 3)
 		}
 	}()
 	finalUrl := utils.CRM_OPEN_API_URL + "/v1/OaUser/create"

services/seal/approval.go

@@ -12,6 +12,7 @@ import (
 	"hongze/hongze_mobile_admin/models/tables/contract_approval_record"
 	"hongze/hongze_mobile_admin/models/tables/seal"
 	"hongze/hongze_mobile_admin/services"
+	"hongze/hongze_mobile_admin/services/alarm_msg"
 	"hongze/hongze_mobile_admin/services/flow"
 	"hongze/hongze_mobile_admin/utils"
 	"strconv"
@@ -557,7 +558,8 @@ func approvedByCc(approvedRemark string, sourceApprovalRecord *contract_approval
 func messageToNodeUser(flowNodeId, createUserId, contractApprovalId, messageType, approvalStatus int, companyName, content string) (err error) {
 	defer func() {
 		if err != nil {
-			go utils.SendEmail("抄送信息给用户失败"+time.Now().Format("2006-01-02 15:04:05"), ";Err:"+err.Error(), utils.EmailSendToUsers)
+			//go utils.SendEmail("抄送信息给用户失败"+time.Now().Format("2006-01-02 15:04:05"), ";Err:"+err.Error(), utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("抄送信息给用户失败："+time.Now().Format("2006-01-02 15:04:05")+";Err:"+err.Error(), 3)
 			utils.FileLog.Info("抄送信息给用户失败,Err:%s,%s", err.Error())
 		}
 	}()

services/wechat_send_msg.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"hongze/hongze_mobile_admin/models/tables/report"
 	"hongze/hongze_mobile_admin/models/tables/wx_user"
+	"hongze/hongze_mobile_admin/services/alarm_msg"
 	"hongze/hongze_mobile_admin/utils"
 	"io/ioutil"
 	"net/http"
@@ -17,7 +18,8 @@ func SendWxTemplateMsg(reportId int) (err error) {
 	var msg string
 	defer func() {
 		if err != nil {
-			go utils.SendEmail("发送模版消息失败"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg(fmt.Sprintf("发送模版消息失败,Err:%s,%s", err.Error(), msg), 3)
+			//go utils.SendEmail("发送模版消息失败"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
 			utils.FileLog.Info("发送模版消息失败,Err:%s,%s", err.Error(), msg)
 		}
 		if msg != "" {
@@ -132,7 +134,8 @@ func SendCompanyApplyWxTemplateMsg(mobile, redirectUrl, wxAppPath string, wxMsgM
 	var msg string
 	defer func() {
 		if err != nil {
-			go utils.SendEmail("发送模版消息失败"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg(fmt.Sprintf("发送模版消息失败,Err:%s,%s", err.Error(), msg), 3)
+			//go utils.SendEmail("发送模版消息失败"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
 			utils.FileLog.Info("发送模版消息失败,Err:%s,%s", err.Error(), msg)
 		}
 		if msg != "" {
@@ -213,7 +216,8 @@ func SendWxMsgWithRoadshowDetailResult(first, keyword1, keyword2, remark,mobile,
 	var msg string
 	defer func() {
 		if err != nil {
-			go utils.SendEmail("发送模版消息失败"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg(fmt.Sprintf("发送模版消息失败,Err:%s,%s", err.Error(), msg), 3)
+			//go utils.SendEmail("发送模版消息失败"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
 			utils.FileLog.Info("发送模版消息失败,Err:%s,%s", err.Error(), msg)
 		}
 		if msg != "" {
@@ -276,7 +280,8 @@ func SendWxMsgWithRoadshowPending(first, keyword1, keyword2, keyword3, keyword4,
 	var msg string
 	defer func() {
 		if err != nil {
-			go utils.SendEmail("发送模版消息失败"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
+			//go utils.SendEmail("发送模版消息失败"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("发送模版消息失败,Err:"+err.Error()+msg, 3)
 			utils.FileLog.Info("发送模版消息失败,Err:"+err.Error()+msg)
 		}
 		if msg != "" {
@@ -338,7 +343,8 @@ func SendWxMsgWithRoadshowDeleteNotice(first, keyword1, keyword2, remark, wxAppP
 	var msg string
 	defer func() {
 		if err != nil {
-			go utils.SendEmail("发送模版消息失败"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
+			//go utils.SendEmail("发送模版消息失败"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
+			go alarm_msg.SendAlarmMsg("发送模版消息失败"+time.Now().Format("2006-01-02 15:04:05")+";Msg:"+msg+";Err:"+err.Error(), 3)
 			utils.FileLog.Info("发送模版消息失败,Err:%s,%s", err.Error(), msg)
 		}
 		if msg != "" {