7 Commits

Author SHA1 Message Date
  guzeng 533ce943ff 增加怡亚通队列 2 years ago
  guzeng 6ad4d0cdf2 增加v2订单队列 2 years ago
  guzeng 4a240d1152 修改rpc端口获取方式 2 years ago
  guzeng 5326293550 修改远程调用地址,增加配置判断 2 years ago
  guzeng 0450bd09b8 增加常量声明 2 years ago
  guzeng 696335381a 修改单元测试文件 2 years ago
  guzeng db7fa46c30 修改数据类型 2 years ago
7 changed files with 197 additions and 8 deletions
Split View
  1. +1
    -3
      client_test.go
  2. +146
    -4
      common.go
  3. +21
    -0
      const_v2.go
  4. +1
    -0
      go.mod
  5. +2
    -0
      go.sum
  6. +1
    -1
      send_delay.go
  7. +25
    -0
      send_delay_test.go

+ 1
- 3
client_test.go View File

@ -1,7 +1,6 @@
package rabbitmqrpc
import (
"encoding/json"
"testing"
)
@ -18,9 +17,8 @@ func Test_Send(t *testing.T) {
"order_sn": "cccc",
},
}
data, _ := json.Marshal(msg)
ret, err := Send(exchange, key, string(data))
ret, err := Send(exchange, key, msg)
t.Log(ret)
t.Log(err)


+ 146
- 4
common.go View File

@ -1,5 +1,9 @@
package rabbitmqrpc
import (
"git.tetele.net/tgo/conf"
)
const DES_KEY = "mqbitrab"
type MsgBody struct {
@ -11,19 +15,157 @@ type DelayMsgBody struct {
Exchange string
Key string
Data string
Delay int
Delay int64
}
type MsgSend struct {
Result string
}
//订单路由
const ORDER_EXCHANGE string = "ex_order"
//已创建订单route key
const ORDER_CREATED_KEY string = "created"
//订单已创建队列,订单服务用
const ORDER_CREATED_QUEUE = "order_created_queue"
//已创建订单队列,串货服务用
const CHANNEL_ORDER_CREATED_QUEUE = "channel_order_created_queue"
//已支付订单route key
const ORDER_PAYED_KEY string = "payed"
//订单已支付队列,订单服务用
const ORDER_PAYED_QUEUE = "order_payed_queue"
//订单已支付队列,串货服务用
const CHANNEL_ORDER_PAYED_QUEUE = "channel_order_payed_queue"
//订单已支付队列,配送服务用
const DELIVERY_ORDER_PAYED_QUEUE = "delivery_order_payed_queue"
//订单已支付队列,打印服务用
const PRINT_ORDER_PAYED_QUEUE = "print_order_payed_queue"
//订单状态更新route key
const ORDER_STATUS_CHANGE_KEY string = "status_change"
//订单状态更新队列,订单服务用
const ORDER_STATUS_UPDATE_QUEUE = "order_status_update_queue"
//订单状态更新,串货服务用
const CHANNEL_ORDER_STATUS_CHANGE_QUEUE = "channel_order_update_status"
//订单取消route key
const ORDER_CANCELED_KEY string = "canceled"
//订单取消队列,订单服务用
const ORDER_CANCELED_QUEUE = "order_canceled_queue"
//订单取消队列,串货服务用
const CHANNEL_ORDER_CANCELED_QUEUE = "channel_order_canceled_queue"
//订单发货route key
const ORDER_DELIVERED_KEY string = "delivered"
//订单发货队列,订单服务用
const ORDER_DELIVERED_QUEUE = "order_delivered_queue"
//订单发货队列,串货服务用
const CHANNEL_ORDER_DELIVERED_QUEUE = "channel_order_delivered_queue"
//订单收货route key
const ORDER_RECEIVED_KEY string = "received"
//订单取消队列,订单服务用
const ORDER_RECEIVED_QUEUE = "order_received_queue"
//订单取消队列,串货服务用
const CHANNEL_ORDER_RECEIVED_QUEUE = "channel_order_received_queue"
//订单退款route key
const ORDER_REFUNDED_KEY string = "refunded"
//订单退款队列,订单服务用
const ORDER_REFUNDED_QUEUE = "order_refunded_queue"
//订单退款队列,串货服务用
const CHANNEL_ORDER_REFUNDED_QUEUE = "channel_order_refunded_queue"
//订单完成route key
const ORDER_FINISHED_KEY string = "finished"
//订单退款队列,订单服务用
const ORDER_FINISHED_QUEUE = "order_finished_queue"
//订单退款队列,串货服务用
const CHANNEL_ORDER_FINISHED_QUEUE = "channel_order_finished_queue"
//订单等待创建key,订单服务用
const ORDER_ADD_KEY = "add"
//订单等待创建队列,订单服务用
const ORDER_ADD_QUEUE = "order_add_queue"
//订单核销key
const ORDER_VERIFY_KEY = "verify"
//订单核销打印队列,打印服务用
const PRINT_ORDER_VERIFY_QUEUE = "print_order_verify_queue"
//订单延迟队列路由
const ORDER_DELAY_EXCHANGE string = "ex_order_delay"
//未支付订单过期自动取消key
const ORDER_AUTO_CANCEL_KEY string = "order_auto_cancel"
//未支付订单过期自动取消队列
const ORDER_AUTO_CANCEL_QUEUE string = "order_auto_cancel_queue"
//未支付订单过期自动取消队列,串货服务用
const CHANNEL_ORDER_AUTO_CANCEL_QUEUE string = "channel_order_auto_cancel_queue"
//订单发货后到期自动收货key
const ORDER_AUTO_RECEIVE_KEY string = "order_auto_received"
//订单发货后到期自动收货队列
const ORDER_AUTO_RECEIVE_QUEUE string = "order_auto_receive_queue"
//订单自动收货队列,串货服务用
const CHANNEL_ORDER_AUTO_RECEIVE_QUEUE string = "channel_order_auto_receive_queue"
//订单申请退款消息key
const ORDER_ASK_FOR_REFUND_KEY string = "order_ask_for_refund"
//订单申请退款消息队列
const ORDER_ASK_FOR_REFUND_QUEUE string = "order_ask_for_refund_queue"
//订单申请退款队列,串货服务用
const CHANNEL_ORDER_ASK_FOR_REFUND_QUEUE string = "channel_order_ask_for_refund_queue"
// --串货--
//串货订单路由
const CHANNEL_ORDER_EXCHANGE string = "ex_channel_order"
//串货订单请求支付route key
const CHANNEL_ORDER_ASKPAY_KEY = "channel_order_askpay"
//订单请求支付队列,串货服务用
const CHANNEL_ORDER_ASKPAY_QUEUE = "channel_order_askpay_queue"
func rpc_server_conn(url ...string) (*RabbitmqServiceClient, error) {
var wx_rpc_url string = "127.0.0.1:7955"
var rpc_url string
if len(url) > 0 && url[0] != "" {
wx_rpc_url = url[0]
rpc_url = url[0]
} else if conf.RABBITMQ_RPC_URL != "" {
rpc_url = conf.RABBITMQ_RPC_URL
} else {
rpc_url = "127.0.0.1:" + conf.RABBITMQ_RPC_PORT
}
conn, _, err := DialRabbitmqService("tcp", wx_rpc_url)
conn, _, err := DialRabbitmqService("tcp", rpc_url)
if err != nil {
return nil, err
}


+ 21
- 0
const_v2.go View File

@ -0,0 +1,21 @@
package rabbitmqrpc
//v2
//订单路由
const ORDER_EXCHANGE_V2 string = "ex_order_v2"
//已创建订单route key
const ORDER_CREATED_KEY_V2 string = "created_v2"
//订单已创建队列,订单服务用
const ORDER_CREATED_QUEUE_V2 = "order_created_queue_v2"
//已支付订单route key
const ORDER_PAYED_KEY_V2 string = "payed_v2"
//订单已支付队列,订单服务用
const ORDER_PAYED_QUEUE_V2 = "order_payed_queue_v2"
//怡亚通订单已支付队列,怡亚通订单服务用
const ORDER_PAYED_QUEUE_V2_380STAR = "order_payed_queue_v2_380star"

+ 1
- 0
go.mod View File

@ -3,6 +3,7 @@ module git.tetele.net/tgo/rabbitmqrpc
go 1.14
require (
git.tetele.net/tgo/conf v0.38.0 // indirect
git.tetele.net/tgo/crypter v0.2.2 // indirect
github.com/chai2010/protorpc v1.0.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect


+ 2
- 0
go.sum View File

@ -1,3 +1,5 @@
git.tetele.net/tgo/conf v0.38.0 h1:mqiljzhjY9SbTmS2yL8p5clrTkkiD5JzeLrG1FT+gHM=
git.tetele.net/tgo/conf v0.38.0/go.mod h1:AWVIBEDE5dtotthUgR0SWaR2Qa6/f+O5WQ3s7Tj8q7A=
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.0.0 h1:aJ45G9sl1utSKo35EqnBSTs5jqTpdJDJAuZMMYPAtFo=


+ 1
- 1
send_delay.go View File

@ -11,7 +11,7 @@ import (
"github.com/golang/protobuf/proto"
)
func SendDelay(exchange, key string, data interface{}, delay int, url ...string) (*MsgSend, error) {
func SendDelay(exchange, key string, data interface{}, delay int64, url ...string) (*MsgSend, error) {
conn, err := rpc_server_conn(url...)
if err != nil {


+ 25
- 0
send_delay_test.go View File

@ -0,0 +1,25 @@
package rabbitmqrpc
import (
"testing"
)
func Test_SendDelay(t *testing.T) {
exchange := "ex_order_delay"
key := "order_expire"
msg := map[string]interface{}{
"site_id": "100002",
"dbname": "testing",
"data": map[string]string{
"order_id": "111",
"order_sn": "cccc",
},
}
ret, err := SendDelay(exchange, key, msg, 20)
t.Log(ret)
t.Log(err)
}

Loading…
Cancel
Save