邮件附件推送完善

controllers/resource.go

@@ -93,46 +93,3 @@ func (this *ResourceController) Upload() {
 	br.Data = resp
 	return
 }
-
-//type ChartPermissionRepMore struct {
-//	PermissionName string `description:"名称"`
-//}
-//
-//func init() {
-//	var list []*ChartPermissionRepMore
-//	//lista := []*ChartPermissionRepMore{{PermissionName: "A1"}}
-//	lista := []*ChartPermissionRepMore{{PermissionName: "A1"}, {PermissionName: "A2"}, {PermissionName: "A3"}, {PermissionName: "A4"}, {PermissionName: "A5"}, {PermissionName: "A6"}, {PermissionName: "A7"}, {PermissionName: "A8"}, {PermissionName: "A9"}, {PermissionName: "A10"}}
-//	//listb := []*ChartPermissionRepMore{{PermissionName: "B1"}, {PermissionName: "B2"}, {PermissionName: "B3"}, {PermissionName: "B4"}, {PermissionName: "B5"}, {PermissionName: "B6"}, {PermissionName: "B7"}, {PermissionName: "B8"}, {PermissionName: "B9"}, {PermissionName: "B10"}, {PermissionName: "11"}, {PermissionName: "B12"}}
-//	listb := []*ChartPermissionRepMore{{PermissionName: "B1"}, {PermissionName: "B2"}, {PermissionName: "B3"}, {PermissionName: "B4"}, {PermissionName: "B5"}, {PermissionName: "B6"}, {PermissionName: "B7"}, {PermissionName: "B8"}, {PermissionName: "B9"}, {PermissionName: "B10"}}
-//
-//	if len(lista) == 0 {
-//		list = listb
-//	} else if len(listb) == 0 {
-//		list = lista
-//	} else {
-//		var maxNum, forMinNum int
-//		if len(lista)-1 >= len(listb) {
-//			maxNum = len(lista)
-//		} else {
-//			maxNum = len(listb)
-//		}
-//		list = append(list, lista[0])
-//
-//		forMinNum = maxNum / 2
-//		for i := 0; i <= forMinNum; i++ {
-//			for k, v := range listb {
-//				if k/2 < i+1 && k/2 >= i {
-//					list = append(list, v)
-//				}
-//			}
-//			for k, v := range lista {
-//				if k > 2*i && k <= 2*(i+1) && k != 0 {
-//					list = append(list, v)
-//				}
-//			}
-//		}
-//	}
-//	for _, v := range list {
-//		fmt.Println(v)
-//	}
-//}

main.go

@@ -51,6 +51,7 @@ func Recover(ctx *context.Context, config *web.Config) {
 			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.SendAlarmMsg(stack, 1)
 	}
 	return
 }

models/activity.go

@@ -203,7 +203,7 @@ func GetActivityListByDateTime(startDate, endDate, activityIds string) (items []
 	if activityIds != "" {
 		sql += ` AND activity_id  NOT IN (` + activityIds + `) `
 	}
-	sql += `  OR activity_id IN (SELECT config_value FROM cygx_config WHERE config_code = 'jin_meng_activity_id')`
+	sql += `  OR activity_id IN (1027,1029,1030,1031,1032,1033)`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }

services/article.go

@@ -303,6 +303,7 @@ func GetArticleListByApi(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("GetArticleListByApi Err:" + err.Error())
+			go utils.SendAlarmMsg("获取图表信息失败", 2)
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "GetArticleListByApi ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()

services/send_company_user.go

@@ -49,6 +49,7 @@ func SendComapnyToShanghai(url, jsonCompany, postType string) (err error) {
 	var msg string
 	defer func() {
 		if err != nil {
+			go utils.SendAlarmMsg(msg, 1)
 			go utils.SendEmail("同步策略平台获取数据信息失败"+"【"+utils.APPNAME+"】"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToExpert)
 		}
 	}()
@@ -91,9 +92,9 @@ func SendComapnyToShanghai(url, jsonCompany, postType string) (err error) {
 	item.Result = string(body)
 	go models.AddCygxShanghaiCompanyLog(item)
 
-	if strings.Index(string(body), "必填") > 0 || strings.Index(string(body), "失败") > 0 || strings.Index(string(body), "社会信用代码格式错误") > 0 {
-		go utils.SendEmail("同步策略平台信息失败"+"【"+utils.APPNAME+"】"+time.Now().Format("2006-01-02 15:04:05"), string(body), utils.EmailSendToExpert)
-	}
+	//if strings.Index(string(body), "必填") > 0 || strings.Index(string(body), "失败") > 0 || strings.Index(string(body), "社会信用代码格式错误") > 0 {
+	//	go utils.SendEmail("同步策略平台信息失败"+"【"+utils.APPNAME+"】"+time.Now().Format("2006-01-02 15:04:05"), string(body), utils.EmailSendToExpert)
+	//}
 	//var companyCode string
 	for _, v := range result.Data.FailInfo {
 		if v.ErrMsg != "" {
@@ -146,6 +147,7 @@ func DotongbuShangHaApi(condition string) (err error) {
 	var msg string
 	defer func() {
 		if err != nil {
+			go utils.SendAlarmMsg("同步策略平台获取数据信息失败", 2)
 			go utils.SendEmail("同步策略平台获取数据信息失败"+"【"+utils.APPNAME+"】"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToExpert)
 		}
 	}()

services/sms.go

@@ -1,9 +1,9 @@
 package services
 
 import (
-	"hongze/hongze_cygx/utils"
 	"encoding/json"
 	"fmt"
+	"hongze/hongze_cygx/utils"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -21,6 +21,7 @@ func SendSmsCode(mobile, vcode string) bool {
 	var netReturn map[string]interface{}
 	err = json.Unmarshal(result, &netReturn)
 	if err != nil {
+		go utils.SendAlarmMsg("短信验证码发送失败", 1)
 		go utils.SendEmail("短信验证码发送失败", "err:"+err.Error()+" result"+string(result), utils.EmailSendToUsers)
 		flag = false
 	}
@@ -28,6 +29,7 @@ func SendSmsCode(mobile, vcode string) bool {
 		fmt.Printf("接口返回result字段是:\r\n%v", netReturn["result"])
 		flag = true
 	} else {
+		go utils.SendAlarmMsg("短信验证码发送失败", 1)
 		go utils.SendEmail("短信验证码发送失败", " result"+string(result), utils.EmailSendToUsers)
 		flag = false
 	}
@@ -61,10 +63,9 @@ func sendSms(mobile, tplId, code string) (rs []byte, err error) {
 	return ioutil.ReadAll(resp.Body)
 }
 
-
-func SendSmsCodeGj(mobile, vcode,areaNum string) bool {
+func SendSmsCodeGj(mobile, vcode, areaNum string) bool {
 	flag := false
-	result, err := sendSmsGj(mobile, vcode,areaNum)
+	result, err := sendSmsGj(mobile, vcode, areaNum)
 	if err != nil {
 		fmt.Println("发送短信失败")
 		return false
@@ -73,6 +74,7 @@ func SendSmsCodeGj(mobile, vcode,areaNum string) bool {
 	var netReturn map[string]interface{}
 	err = json.Unmarshal(result, &netReturn)
 	if err != nil {
+		go utils.SendAlarmMsg("短信验证码发送失败", 1)
 		go utils.SendEmail("短信验证码发送失败", "err:"+err.Error()+" result"+string(result), utils.EmailSendToUsers)
 		flag = false
 	}
@@ -80,24 +82,24 @@ func SendSmsCodeGj(mobile, vcode,areaNum string) bool {
 		fmt.Printf("接口返回result字段是:\r\n%v", netReturn["result"])
 		flag = true
 	} else {
+		go utils.SendAlarmMsg("短信验证码发送失败", 1)
 		go utils.SendEmail("短信验证码发送失败", " result"+string(result), utils.EmailSendToUsers)
 		flag = false
 	}
 	return flag
 }
 
-
-func sendSmsGj(mobile, code,areaNum string) (rs []byte, err error) {
+func sendSmsGj(mobile, code, areaNum string) (rs []byte, err error) {
 	var Url *url.URL
 	apiURL := "http://v.juhe.cn/smsInternational/send.php"
 	//初始化参数
 	param := url.Values{}
 	//配置请求参数,方法内部已处理urlencode问题,中文参数可以直接传参
-	param.Set("mobile", mobile)            //接受短信的用户手机号码
-	param.Set("tplId", "10054")             //您申请的短信模板ID，根据实际情况修改
+	param.Set("mobile", mobile)           //接受短信的用户手机号码
+	param.Set("tplId", "10054")           //您申请的短信模板ID，根据实际情况修改
 	param.Set("tplValue", "#code#="+code) //您设置的模板变量，根据实际情况
-	param.Set("key", utils.JhGjAppKey)     //应用APPKEY(应用详细页查询)
-	param.Set("areaNum", areaNum)     //应用APPKEY(应用详细页查询)
+	param.Set("key", utils.JhGjAppKey)    //应用APPKEY(应用详细页查询)
+	param.Set("areaNum", areaNum)         //应用APPKEY(应用详细页查询)
 
 	Url, err = url.Parse(apiURL)
 	if err != nil {

utils/elastic.go

@@ -20,6 +20,7 @@ func init() {
 		elastic.SetSniff(false))
 	Client = client
 	if err != nil {
+		go SendAlarmMsg("ElasticSearch连接失败", 2)
 		go SendEmail("ElasticSearch连接失败"+time.Now().Format("2006-01-02 15:04:05"), err.Error(), EmailSendToUsers)
 	}
 	return

utils/email.go

@@ -37,7 +37,6 @@ func SendEmail(title, content string, touser string) bool {
 	if err := d.DialAndSend(m); err != nil {
 		return false
 	}
-	go SendAlarmMsg(content, 1)
 	return true
 }