diff --git a/internal/message_util.go b/consumer/message_util.go similarity index 85% rename from internal/message_util.go rename to consumer/message_util.go index 882b9139..18b2ce7b 100644 --- a/internal/message_util.go +++ b/consumer/message_util.go @@ -1,9 +1,10 @@ -package internal +package consumer import ( "errors" "fmt" + "github.com/apache/rocketmq-client-go/v2/internal" "github.com/apache/rocketmq-client-go/v2/primitive" ) @@ -25,8 +26,8 @@ func CreateReplyMessage(requestMessage *primitive.MessageExt, body []byte) (*pri var replayMessage primitive.Message replayMessage.UnmarshalProperties(body) - replayMessage.Topic = GetReplyTopic(cluster) - replayMessage.WithProperty(primitive.PropertyMsgType, ReplyMessageFlag) + replayMessage.Topic = internal.GetReplyTopic(cluster) + replayMessage.WithProperty(primitive.PropertyMsgType, internal.ReplyMessageFlag) replayMessage.WithProperty(primitive.PropertyCorrelationID, correlationId) replayMessage.WithProperty(primitive.PropertyMessageReplyToClient, replyTo) replayMessage.WithProperty(primitive.PropertyMessageTTL, ttl) diff --git a/examples/consumer/rpc/main.go b/examples/consumer/rpc/main.go index c2bf07c9..4e228943 100644 --- a/examples/consumer/rpc/main.go +++ b/examples/consumer/rpc/main.go @@ -6,7 +6,6 @@ import ( "time" "github.com/apache/rocketmq-client-go/v2/consumer" - "github.com/apache/rocketmq-client-go/v2/internal" "github.com/apache/rocketmq-client-go/v2/primitive" "github.com/apache/rocketmq-client-go/v2/producer" ) @@ -54,13 +53,13 @@ func main() { fmt.Println("consumer sleep over, start reply") replyContent := []byte("reply message contents.") - replyMessage, err := internal.CreateReplyMessage(msg, replyContent) + replyMessage, err := consumer.CreateReplyMessage(msg, replyContent) if err != nil { fmt.Printf("create reply message err:%v\n", err) continue } - replyTo := internal.GetReplyToClient(msg) + replyTo := consumer.GetReplyToClient(msg) replyResult, err := replyProducer.SendSync(context.Background(), replyMessage) if err != nil { fmt.Printf("send message error: %s\n", err) diff --git a/internal/client.go b/internal/client.go index 138dcf39..538c7353 100644 --- a/internal/client.go +++ b/internal/client.go @@ -21,7 +21,6 @@ import ( "context" "errors" "fmt" - errors2 "github.com/apache/rocketmq-client-go/v2/errors" "net" "os" "sort" @@ -30,6 +29,7 @@ import ( "sync" "time" + errors2 "github.com/apache/rocketmq-client-go/v2/errors" "github.com/apache/rocketmq-client-go/v2/internal/remote" "github.com/apache/rocketmq-client-go/v2/internal/utils" "github.com/apache/rocketmq-client-go/v2/primitive"