修改日志输出格式

functions/exchange_functions.go

@@ -3,12 +3,13 @@ package functions
 import (
 	"time"
 
+	"git.x2erp.com/qdy/go-base/ctx"
 	"git.x2erp.com/qdy/go-base/types"
 	"git.x2erp.com/qdy/go-db/factory/rabbitmq"
 )
 
 // CreateExchange 创建交换机
-func CreateExchange(rabbitFactory *rabbitmq.RabbitMQFactory, req types.ExchangeRequest) *types.QueryResult {
+func CreateExchange(rabbitFactory *rabbitmq.RabbitMQFactory, req types.ExchangeRequest, reqCtx *ctx.RequestContext) *types.QueryResult {
 	// 设置默认值
 	if req.ChannelName == "" {
 		req.ChannelName = "default"

functions/message_functions.go

@@ -4,13 +4,14 @@ import (
 	"encoding/json"
 	"time"
 
+	"git.x2erp.com/qdy/go-base/ctx"
 	"git.x2erp.com/qdy/go-base/types"
 	"git.x2erp.com/qdy/go-db/factory/rabbitmq"
 	"github.com/streadway/amqp"
 )
 
 // SendMessage 发送JSON消息
-func SendMessage(rabbitFactory *rabbitmq.RabbitMQFactory, req types.MessageRequest) *types.QueryResult {
+func SendMessage(rabbitFactory *rabbitmq.RabbitMQFactory, req types.MessageRequest, reqCtx *ctx.RequestContext) *types.QueryResult {
 	// 设置默认值
 	if req.ChannelName == "" {
 		req.ChannelName = "default"
@@ -94,7 +95,7 @@ func SendMessage(rabbitFactory *rabbitmq.RabbitMQFactory, req types.MessageReque
 }
 
 // SendBytesMessage 发送字节消息
-func SendBytesMessage(rabbitFactory *rabbitmq.RabbitMQFactory, req types.BytesMessageRequest) *types.QueryResult {
+func SendBytesMessage(rabbitFactory *rabbitmq.RabbitMQFactory, req types.BytesMessageRequest, reqCtx *ctx.RequestContext) *types.QueryResult {
 	// 设置默认值
 	if req.ChannelName == "" {
 		req.ChannelName = "default"

functions/queue_functions.go

@@ -3,12 +3,13 @@ package functions
 import (
 	"time"
 
+	"git.x2erp.com/qdy/go-base/ctx"
 	"git.x2erp.com/qdy/go-base/types"
 	"git.x2erp.com/qdy/go-db/factory/rabbitmq"
 )
 
 // CreateQueue 创建队列
-func CreateQueue(rabbitFactory *rabbitmq.RabbitMQFactory, req types.QueueRequest) *types.QueryResult {
+func CreateQueue(rabbitFactory *rabbitmq.RabbitMQFactory, req types.QueueRequest, reqCtx *ctx.RequestContext) *types.QueryResult {
 	// 设置默认值
 	if req.ChannelName == "" {
 		req.ChannelName = "default"
@@ -55,7 +56,7 @@ func CreateQueue(rabbitFactory *rabbitmq.RabbitMQFactory, req types.QueueRequest
 }
 
 // BindQueue 绑定队列到交换机
-func BindQueue(rabbitFactory *rabbitmq.RabbitMQFactory, req types.QueueBindRequest) *types.QueryResult {
+func BindQueue(rabbitFactory *rabbitmq.RabbitMQFactory, req types.QueueBindRequest, reqCtx *ctx.RequestContext) *types.QueryResult {
 	// 设置默认值
 	if req.ChannelName == "" {
 		req.ChannelName = "default"

functions/utility_functions.go

@@ -5,6 +5,7 @@ import (
 	"net/http"
 	"time"
 
+	"git.x2erp.com/qdy/go-base/ctx"
 	"git.x2erp.com/qdy/go-base/types"
 	"git.x2erp.com/qdy/go-db/factory/rabbitmq"
 )
@@ -36,7 +37,7 @@ func HealthCheck(w http.ResponseWriter, r *http.Request, rabbitFactory *rabbitmq
 }
 
 // GetQueueInfo 获取队列信息
-func GetQueueInfo(rabbitFactory *rabbitmq.RabbitMQFactory, req types.QueueInfoRequest) *types.QueryResult {
+func GetQueueInfo(rabbitFactory *rabbitmq.RabbitMQFactory, req types.QueueInfoRequest, reqCtx *ctx.RequestContext) *types.QueryResult {
 	// 设置默认值
 	if req.ChannelName == "" {
 		req.ChannelName = "default"

gct.sh

@@ -1,82 +1,25 @@
 #!/bin/bash
 
-# 脚本用法：./git-commit-and-tag.sh "你的提交描述" "版本号"
+# 使用命令行参数，如果没有提供则使用默认值
+COMMIT_MSG="${1:-初始提交}"
+TAG_VERSION="${2:-v0.1.0}"
 
-# 检查参数数量
-if [ $# -ne 2 ]; then
-    echo "错误: 脚本需要2个参数。"
-    echo "用法: $0 \"提交描述\" \"版本号\""
-    echo "示例: $0 \"修复了登录问题\" \"v1.2.3\""
-    exit 1
-fi
+echo "提交信息: $COMMIT_MSG"
+echo "标签版本: $TAG_VERSION"
 
-# 分配参数
-COMMIT_MESSAGE="$1"
-VERSION_TAG="$2"
+# 提交和推送
+git add .
+git commit -m "$COMMIT_MSG"
+git push -u origin master
 
-# 检查当前目录是否为Git仓库
-if ! git rev-parse --git-dir > /dev/null 2>&1; then
-    echo "错误: 当前目录不是一个Git仓库。"
-    exit 1
-fi
+# 创建标签（关键修改在这里）
+# 方法1：使用注释标签（推荐，不会打开编辑器）
+git tag -a "$TAG_VERSION" -m "Release $TAG_VERSION"
 
-echo "开始处理提交和版本标签..."
-echo "提交描述: $COMMIT_MESSAGE"
-echo "版本标签: $VERSION_TAG"
+# 或者方法2：如果你需要GPG签名，使用这个
+# GIT_EDITOR=true git tag -s "$TAG_VERSION" -m "Release $TAG_VERSION"
 
-# 检查是否有未提交的更改
-if [ -n "$(git status --porcelain)" ]; then
-    echo "检测到未提交的更改，正在提交..."
-    
-    # 添加所有更改到暂存区
-    git add .
-    
-    # 进行提交
-    git commit -m "$COMMIT_MESSAGE"
-    if [ $? -ne 0 ]; then
-        echo "错误: 提交失败。"
-        exit 1
-    fi
-    echo "✅ 更改已提交"
-else
-    echo "提示: 没有未提交的更改，跳过提交步骤"
-    
-    # 检查是否有未提交的commit但未推送
-    LOCAL_COMMITS=$(git log @{u}..HEAD --oneline 2>/dev/null | wc -l)
-    if [ $LOCAL_COMMITS -eq 0 ]; then
-        echo "错误: 没有需要推送的提交。"
-        exit 1
-    else
-        echo "检测到 $LOCAL_COMMITS 个本地提交等待推送"
-    fi
-fi
+# 推送标签
+git push origin "$TAG_VERSION"
 
-# 检查标签是否已存在
-if git rev-parse "$VERSION_TAG" >/dev/null 2>&1; then
-    echo "错误: 标签 '$VERSION_TAG' 已经存在。"
-    exit 1
-fi
-
-# 创建标签
-git tag "$VERSION_TAG"
-if [ $? -ne 0 ]; then
-    echo "错误: 创建标签失败。"
-    exit 1
-fi
-echo "✅ 标签 '$VERSION_TAG' 已创建"
-
-# 推送到远程仓库并推送标签
-echo "正在推送到远程仓库..."
-git push
-if [ $? -ne 0 ]; then
-    echo "错误: 推送提交失败。"
-    exit 1
-fi
-
-git push origin "$VERSION_TAG"
-if [ $? -ne 0 ]; then
-    echo "错误: 推送标签失败。"
-    exit 1
-fi
-
-echo "✅ 完成！提交已推送，版本标签 $VERSION_TAG 已创建并推送。"
+echo "完成！"

main.go

@@ -18,7 +18,10 @@ import (
 )
 
 func main() {
-	cfg := config.GetConfig()
+	cfg, err := config.GetConfig()
+	if err != nil {
+		log.Fatalf("Failed to create RabbitMQ factory: %v", err)
+	}
 	serviceConfig := cfg.GetService()
 
 	log.Printf("RabbitMQ Service Starting...")
@@ -26,13 +29,11 @@ func main() {
 	log.Printf("Service Name: %s", serviceConfig.ServiceName)
 
 	// 启动微服务
-	startRabbitMQService()
+	startRabbitMQService(cfg)
 }
 
 // 启动RabbitMQ微服务
-func startRabbitMQService() {
-	cfg := config.GetConfig()
-	//serviceConfig := cfg.GetService()
+func startRabbitMQService(cfg config.IConfig) {
 
 	// 初始化RabbitMQ工厂
 	rabbitFactory, err := rabbitmq.NewRabbitMQFactory()

test/my_create_exchange_test.go

@@ -45,7 +45,7 @@ func TestCreateexchange(t *testing.T) {
 	}
 
 	queueBindRequest := types.QueueBindRequest{
-		ChannelName:  requestData.ChannelName,
+		//ChannelName:  requestData.ChannelName,
 		QueueName:    queueRequest.QueueName,
 		ExchangeName: requestData.ExchangeName,
 		RoutingKey:   "v-bdx.#",