|
@@ -2,10 +2,10 @@ package util
|
|
|
|
|
|
import (
|
|
import (
|
|
"fmt"
|
|
"fmt"
|
|
- "log"
|
|
|
|
"net/rpc"
|
|
"net/rpc"
|
|
|
|
|
|
qu "app.yhyue.com/moapp/jybase/common"
|
|
qu "app.yhyue.com/moapp/jybase/common"
|
|
|
|
+ "app.yhyue.com/moapp/jybase/go-logger/logger"
|
|
"app.yhyue.com/moapp/message/config"
|
|
"app.yhyue.com/moapp/message/config"
|
|
qrpc "app.yhyue.com/moapp/message/model"
|
|
qrpc "app.yhyue.com/moapp/message/model"
|
|
)
|
|
)
|
|
@@ -15,7 +15,7 @@ var PushPool = make(chan bool, config.PushConfig.PushPoolSize)
|
|
func StartPush(mess map[string]interface{}, userid string) {
|
|
func StartPush(mess map[string]interface{}, userid string) {
|
|
//推送微信
|
|
//推送微信
|
|
if isPushOk := SendWeixin(mess); !isPushOk {
|
|
if isPushOk := SendWeixin(mess); !isPushOk {
|
|
- log.Println("推送失败:", userid, mess)
|
|
|
|
|
|
+ logger.Info("推送失败:", userid, mess)
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
@@ -101,13 +101,13 @@ func WxSendTmplMsg(address string, p *qrpc.WxTmplMsg) (bool, error) {
|
|
var repl qrpc.RpcResult
|
|
var repl qrpc.RpcResult
|
|
client, err := rpc.DialHTTP("tcp", address)
|
|
client, err := rpc.DialHTTP("tcp", address)
|
|
if err != nil {
|
|
if err != nil {
|
|
- log.Println(p.OpenId, err)
|
|
|
|
|
|
+ logger.Info("tcp err:", p.OpenId, err)
|
|
return false, err
|
|
return false, err
|
|
}
|
|
}
|
|
defer client.Close()
|
|
defer client.Close()
|
|
err = client.Call("WeiXinRpc.SendTmplMsg", p, &repl)
|
|
err = client.Call("WeiXinRpc.SendTmplMsg", p, &repl)
|
|
if err != nil {
|
|
if err != nil {
|
|
- log.Println(p.OpenId, err)
|
|
|
|
|
|
+ logger.Info("wxRpc err:", p.OpenId, err)
|
|
return false, err
|
|
return false, err
|
|
}
|
|
}
|
|
return repl == "Y", nil
|
|
return repl == "Y", nil
|