From 399225f41ca6e32bb457eecb89022a7a8274017e Mon Sep 17 00:00:00 2001 From: lijianbin <513837235@.qq.com> Date: Tue, 9 Nov 2021 11:30:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E9=80=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=9B=BE=E7=89=87=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client.go | 180 +++++++++++++++++++++++++++--------------------------- common.go | 1 + 2 files changed, 91 insertions(+), 90 deletions(-) diff --git a/client.go b/client.go index 6af3b0d..4cb4dea 100644 --- a/client.go +++ b/client.go @@ -1,135 +1,135 @@ package msgrpc import ( - "encoding/json" - "errors" - "log" - "strconv" - "time" + "encoding/json" + "errors" + "log" + "strconv" + "time" - "git.tetele.net/tgo/crypter" + "git.tetele.net/tgo/crypter" - "github.com/golang/protobuf/proto" + "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() + 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_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 + 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() + 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) + encryData := crypter.DesEn(string(data_json), DES_KEY) - now := strconv.FormatInt(now_int64, 10) + now := strconv.FormatInt(now_int64, 10) - sign := Sign(encryData, now) + sign := Sign(encryData, now) - req := &Request{proto.String(encryData), proto.String(now), proto.String(sign), nil} + req := &Request{proto.String(encryData), proto.String(now), proto.String(sign), nil} - res := &Response{} + res := &Response{} - err = conn.SendMsg(req, res) + err = conn.SendMsg(req, res) - if err != nil { - return nil, err - } + if err != nil { + return nil, err + } - res_data, err := GetOrgData(res) + res_data, err := GetOrgData(res) - var res_arr MsgSend + var res_arr MsgSend - err = json.Unmarshal([]byte(res_data), &res_arr) + err = json.Unmarshal([]byte(res_data), &res_arr) - if err != nil { - return nil, err - } - return &res_arr, nil + if err != nil { + return nil, err + } + return &res_arr, nil } +func SendNotcie(site_id, dbname, manager_id, thumb string, template_Data map[string]string, url ...string) (bool, error) { + if dbname == "" || dbname == "" || manager_id == "" { + return false, errors.New("参数错误") + } -func SendNotcie(site_id, dbname, manager_id string, template_Data map[string]string, url ...string) (bool, error) { - if dbname == "" || dbname == "" || manager_id == ""{ - return false, errors.New("参数错误") - } + conn, err := rpc_server_conn(url...) - conn, err := rpc_server_conn(url...) + if err != nil { + return false, err + } + defer conn.Close() - if err != nil { - return false, err - } - defer conn.Close() + arg := NoticeSend{} + arg.SiteId = site_id + arg.Dbname = dbname + arg.ManagerId = manager_id + arg.Thumb = thumb + arg.TemplateData = template_Data - arg := NoticeSend{} - arg.SiteId = site_id - arg.Dbname = dbname - arg.ManagerId = manager_id - arg.TemplateData = template_Data + data_json, err := json.Marshal(arg) - data_json, err := json.Marshal(arg) + if err != nil { + return false, err + } + now_int64 := time.Now().Unix() - if err != nil { - return false, err - } - now_int64 := time.Now().Unix() + encryData := crypter.DesEn(string(data_json), DES_KEY) - encryData := crypter.DesEn(string(data_json), DES_KEY) + now := strconv.FormatInt(now_int64, 10) - now := strconv.FormatInt(now_int64, 10) + sign := Sign(encryData, now) - sign := Sign(encryData, now) + req := &Request{proto.String(encryData), proto.String(now), proto.String(sign), nil} - req := &Request{proto.String(encryData), proto.String(now), proto.String(sign), nil} + res := &Response{} - res := &Response{} + err = conn.SendNotcie(req, res) - err = conn.SendNotcie(req, res) + if err != nil { + log.Println("msgrpc SendNotcie error:", err) + return false, err + } - if err != nil { - log.Println("msgrpc SendNotcie error:", err) - return false, err - } + res_data, err := GetOrgData(res) - res_data, err := GetOrgData(res) + if err != nil { + return false, err + } + if res_data == "" { + return false, nil + } - if err != nil { - return false, err - } - if res_data == "" { - return false, nil - } + var notice_res bool - var notice_res bool + err = json.Unmarshal([]byte(res_data), ¬ice_res) - err = json.Unmarshal([]byte(res_data), ¬ice_res) - - if err != nil { - return false, err - } - return notice_res, nil + if err != nil { + return false, err + } + return notice_res, nil } diff --git a/common.go b/common.go index 98c3a42..efccdf3 100644 --- a/common.go +++ b/common.go @@ -25,6 +25,7 @@ type MsgSend struct { type NoticeSend struct { Req ManagerId string + Thumb string TemplateData map[string]string }