You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by du...@apache.org on 2022/07/19 02:39:39 UTC
[rocketmq-client-go] branch master updated: feat: exchange messages_utils dir
This is an automated email from the ASF dual-hosted git repository.
duhengforever pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-client-go.git
The following commit(s) were added to refs/heads/master by this push:
new a4143a1 feat: exchange messages_utils dir
new 4ed9c80 Merge pull request #858 from georgehao/fix/message_util
a4143a1 is described below
commit a4143a1ea60db795ec1c95d0e7c1446f4eb1f6f9
Author: georgehao <ha...@gmail.com>
AuthorDate: Tue Jul 19 00:32:59 2022 +0800
feat: exchange messages_utils dir
---
{internal => consumer}/message_util.go | 7 ++++---
examples/consumer/rpc/main.go | 5 ++---
internal/client.go | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
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 882b913..18b2ce7 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 c2bf07c..4e22894 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 138dcf3..538c735 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"