推送消息的时候同时判断是否下发短信

client.go

@@ -0,0 +1,140 @@
+package msgrpc
+
+import (
+	"encoding/json"
+	"errors"
+	"log"
+	"strconv"
+	"time"
+
+	"git.tetele.net/tgo/crypter"
+
+	"github.com/golang/protobuf/proto"
+)
+
+func SendMsg(site_id, dbname, business_id, domainname, msg_type, order_sn, memo string, data interface{}, url ...string) (*MsgSend, error) {
+
+	conn, err := rpc_server_conn(url...)
+	if err != nil {
+		return nil, err
+	}
+	defer conn.Close()
+
+	arg_data, err := json.Marshal(data)
+	if err != nil {
+		log.Println("json marshal error:", err)
+	}
+
+	arg := MsgBody{}
+	arg.SiteId = site_id
+	arg.Dbname = dbname
+	arg.Platform = "1"
+	arg.BusinessId = business_id
+	arg.Domainname = domainname
+	arg.Type = msg_type
+	arg.Data = string(arg_data)
+	arg.OrderSn = order_sn
+	arg.Memo = memo
+
+	data_json, err := json.Marshal(arg)
+	if err != nil {
+		return nil, err
+	}
+	now_int64 := time.Now().Unix()
+
+	encryData := crypter.DesEn(string(data_json), DES_KEY)
+
+	now := strconv.FormatInt(now_int64, 10)
+
+	sign := Sign(encryData, now)
+
+	req := &Request{proto.String(encryData), proto.String(now), proto.String(sign), nil}
+
+	res := &Response{}
+
+	err = conn.SendMsg(req, res)
+
+	if err != nil {
+		return nil, err
+	}
+
+	res_data, err := GetOrgData(res)
+
+	var res_arr MsgSend
+
+	err = json.Unmarshal([]byte(res_data), &res_arr)
+
+	if err != nil {
+		return nil, err
+	}
+	return &res_arr, nil
+
+}
+
+// target_type:目标类型，商品或文章   target_id：目标ID
+func SendNotcie(site_id, dbname, domain, user_id, manager_id, target_type, target_id string, template_data map[string]string, sms_data []string, url ...string) (bool, error) {
+	if site_id == "" || dbname == "" || manager_id == "" || user_id == "" {
+		return false, errors.New("参数错误")
+	}
+
+	conn, err := rpc_server_conn(url...)
+
+	if err != nil {
+		return false, err
+	}
+	defer conn.Close()
+
+	arg := NoticeSend{}
+	arg.SiteId = site_id
+	arg.Dbname = dbname
+	arg.Domain = domain
+	arg.UserId = user_id
+	arg.ManagerId = manager_id
+	arg.TargetType = target_type
+	arg.TargetId = target_id
+	arg.TemplateData = template_data
+	arg.SmsData = sms_data
+
+	data_json, err := json.Marshal(arg)
+
+	if err != nil {
+		return false, err
+	}
+	now_int64 := time.Now().Unix()
+
+	encryData := crypter.DesEn(string(data_json), DES_KEY)
+
+	now := strconv.FormatInt(now_int64, 10)
+
+	sign := Sign(encryData, now)
+
+	req := &Request{proto.String(encryData), proto.String(now), proto.String(sign), nil}
+
+	res := &Response{}
+
+	err = conn.SendNotcie(req, res)
+
+	if err != nil {
+		log.Println("msgrpc SendNotcie error:", err)
+		return false, err
+	}
+
+	res_data, err := GetOrgData(res)
+
+	if err != nil {
+		return false, err
+	}
+	if res_data == "" {
+		return false, nil
+	}
+
+	var notice_res bool
+
+	err = json.Unmarshal([]byte(res_data), &notice_res)
+
+	if err != nil {
+		return false, err
+	}
+	return notice_res, nil
+
+}

client_test.go

@@ -0,0 +1,40 @@
+package msgrpc
+
+import (
+	"testing"
+)
+
+func Test_SendMsg(t *testing.T) {
+
+	site_id := "100064"
+	dbname := "dev_tetele_net"
+	business_id := "12"
+	domainname := "http://dev6.tetele.net"
+	msg_type := "order_create"
+	data := map[string]string{"vv": "dd", "cc": "ss"}
+	order_sn := ""
+	memo := "testing"
+
+	ret, err := SendMsg(site_id, dbname, business_id, domainname, msg_type, order_sn, memo, data)
+
+	t.Log(ret)
+	t.Log(err)
+}
+
+func Test_SendNotcie(t *testing.T) {
+
+	site_id := "1058278"
+	dbname := "shop_v2_org"
+	domain := "http://dev6.tetele.net"
+	user_id := "2"
+	manager_id := "28"
+	target_type := "product"
+	target_id := "10"
+	template_data := map[string]string{"order_name": "商品订单名1", "score_get": "10"}
+	sms_data := []string{}
+
+	ret, err := SendNotcie(site_id, dbname, domain,user_id,manager_id,target_type,target_id,template_data,sms_data)
+
+	t.Log(ret)
+	t.Log(err)
+}

common.go

@@ -1,9 +1,5 @@
 package msgrpc
 
-import (
-	"git.tetele.net/tgo/conf"
-)
-
 const DES_KEY = "msgsirpc"
 
 type Req struct {
@@ -22,9 +18,24 @@ type MsgBody struct {
 	Memo       string
 }
 
+type MsgSend struct {
+	Id string
+}
+
+type NoticeSend struct {
+	Req
+	Domain       string
+	UserId       string
+	ManagerId    string
+	TargetType   string
+	TargetId     string
+	TemplateData map[string]string
+	SmsData      []string
+}
+
 func rpc_server_conn(url ...string) (*MsgRpcServiceClient, error) {
 
-	var wx_rpc_url string = "127.0.0.1:" + conf.MSG_RPC_PORT
+	var wx_rpc_url string = "127.0.0.1:7954"
 	if len(url) > 0 && url[0] != "" {
 		wx_rpc_url = url[0]
 	}

go.mod

@@ -0,0 +1,11 @@
+module git.tetele.net/tgo/msgrpc
+
+go 1.14
+
+require (
+	git.tetele.net/tgo/crypter v0.2.2
+	github.com/chai2010/protorpc v1.1.3
+	github.com/golang/protobuf v1.0.0
+	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+)

go.sum

@@ -0,0 +1,17 @@
+git.tetele.net/tgo/crypter v0.2.2 h1:YMQJh2Gj5Po4ZfelJUmXBKi01UbmtiSy3bmqRfnYQMo=
+git.tetele.net/tgo/crypter v0.2.2/go.mod h1:vfvRLZA8+lHNgNXneOcgvVhDyuv25ZRb+C6xHOmXNx0=
+github.com/chai2010/protorpc v1.1.3 h1:VJK5hIoZn0XCGol0GmbxZkUG6FbTI5LP2Lam6RVd15w=
+github.com/chai2010/protorpc v1.1.3/go.mod h1:/wO0kiyVdu7ug8dCMrA2yDr2vLfyhsLEuzLa9J2HJ+I=
+github.com/golang/protobuf v1.0.0 h1:lsek0oXi8iFE9L+EXARyHIjU5rlWIhhTkjDz3vHhWWQ=
+github.com/golang/protobuf v1.0.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA=
+github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a h1:kr2P4QFmQr29mSLA43kwrOcgcReGTfbE9N577tCTuBc=
+golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

msg.pb.go

@@ -99,6 +99,7 @@ func init() {
 
 type MsgRpcService interface {
 	SendMsg(in *Request, out *Response) error
+	SendNotcie(in *Request, out *Response) error
 }
 
 // AcceptMsgRpcServiceClient accepts connections on the listener and serves requests
@@ -173,6 +174,9 @@ func NewMsgRpcServiceClient(conn io.ReadWriteCloser) (*MsgRpcServiceClient, *rpc
 func (c *MsgRpcServiceClient) SendMsg(in *Request, out *Response) error {
 	return c.Call("MsgRpcService.SendMsg", in, out)
 }
+func (c *MsgRpcServiceClient) SendNotcie(in *Request, out *Response) error {
+	return c.Call("MsgRpcService.SendNotcie", in, out)
+}
 
 // DialMsgRpcService connects to an MsgRpcService at the specified network address.
 func DialMsgRpcService(network, addr string) (*MsgRpcServiceClient, *rpc.Client, error) {

msg.proto

@@ -19,4 +19,5 @@ message Response {
 // rpc方法
 service MsgRpcService {
     rpc sendMsg (Request) returns (Response);    // 发送消息
+    rpc sendNotcie (Request) returns (Response);    // 跃横推送消息
 }

sign.go

@@ -3,9 +3,7 @@ package msgrpc
 import (
 	"crypto/md5"
 	"encoding/hex"
-	"encoding/json"
 	"errors"
-	"log"
 	"strconv"
 	"strings"
 	"time"