1.新增微信通知方式

2.通知模板变量更改
3.删除沉余sql
4.readme.md更新
This commit is contained in:
linxiaozhi
2019-02-17 07:07:33 +08:00
parent 34a3de6cfd
commit e392e4c12e
21 changed files with 201 additions and 94 deletions

View File

@@ -16,7 +16,7 @@ import (
"github.com/pkg/errors"
)
type AjaxReturn struct {
type SmsAjaxReturn struct {
Status int `json:"status"`
Message string `json:"message"`
Data interface{} `json:"data"`
@@ -78,7 +78,7 @@ func (s *Sms) SendSms() error {
return err
}
ajaxData := AjaxReturn{}
ajaxData := SmsAjaxReturn{}
jsonErr := json.Unmarshal([]byte(res), &ajaxData)
if jsonErr != nil {

89
notify/wechat.go Normal file
View File

@@ -0,0 +1,89 @@
package notify
import (
"github.com/astaxie/beego"
"github.com/george518/PPGo_Job/libs"
"log"
"time"
"encoding/json"
"github.com/pkg/errors"
)
type WechatAjaxReturn struct {
Status int `json:"status"`
Message string `json:"message"`
Data interface{} `json:"data"`
}
type Wechat struct {
Accounts map[string]string
Param map[string]string
}
var WechatChan chan *Wechat
var WechatUrl string
func init() {
WechatUrl = beego.AppConfig.String("wechat.url")
poolSize, _ := beego.AppConfig.Int("wechat.pool")
//创建通道
WechatChan = make(chan *Wechat, poolSize)
go func() {
for {
select {
case m, ok := <-WechatChan:
if !ok {
return
}
if err := m.SendWechat(); err != nil {
beego.Error("SendWechat:", err.Error())
}
}
}
}()
}
func SendWechatToChan(accounts map[string]string, param map[string]string) bool {
wechat := &Wechat{
Accounts: accounts,
Param: param,
}
select {
case WechatChan <- wechat:
return true
case <-time.After(time.Second * 3):
return false
}
}
func (s *Wechat) SendWechat() error {
for _, v := range s.Accounts {
s.Param["account"] = v
res, err := libs.HttpGet(WechatUrl, s.Param)
if err != nil {
log.Println(err)
return err
}
ajaxData := WechatAjaxReturn{}
jsonErr := json.Unmarshal([]byte(res), &ajaxData)
if jsonErr != nil {
return jsonErr
}
if ajaxData.Status != 200 {
return errors.Errorf("msg %s", ajaxData.Message)
}
return nil
}
return nil
}