From 71393da390d096cd120bed99acd7c8f1dc132df2 Mon Sep 17 00:00:00 2001 From: Gordon <46924906+FGadvancer@users.noreply.github.com> Date: Fri, 11 Aug 2023 09:57:23 +0800 Subject: [PATCH] chore: network mode change to start server normally (#847) * fix: to start im or chat, ZooKeeper must be started first. * fix: msg gateway start output err info Signed-off-by: Gordon <1432970085@qq.com> * fix: msg gateway start output err info Signed-off-by: Gordon <1432970085@qq.com> * chore: package path changes Signed-off-by: withchao <993506633@qq.com> * fix: go mod update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * chore: package path changes Signed-off-by: withchao <993506633@qq.com> * chore: package path changes Signed-off-by: withchao <993506633@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: get all userID Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: msggateway add online status call Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * refactor: log change Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * refactor: log change Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * chore: network mode change Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> --------- Signed-off-by: Gordon <1432970085@qq.com> Signed-off-by: withchao <993506633@qq.com> Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> Co-authored-by: withchao <993506633@qq.com> Co-authored-by: Xinwei Xiong <3293172751NSS@gmail.com> --- docker-compose.yaml | 4 +++- internal/msggateway/message_handler.go | 16 ++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 2c0c98bd7..d71d4c932 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -62,6 +62,7 @@ services: environment: TZ: Asia/Shanghai restart: always + network_mode: "host" kafka: image: wurstmeister/kafka @@ -72,7 +73,7 @@ services: environment: TZ: Asia/Shanghai KAFKA_BROKER_ID: 0 - KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 + KAFKA_ZOOKEEPER_CONNECT: 127.0.0.1:2181 KAFKA_CREATE_TOPICS: "latestMsgToRedis:8:1,msgToPush:8:1,offlineMsgToMongoMysql:8:1" KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9092 KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093 @@ -80,6 +81,7 @@ services: KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE depends_on: - zookeeper + network_mode: "host" minio: image: minio/minio diff --git a/internal/msggateway/message_handler.go b/internal/msggateway/message_handler.go index fdf0a6943..6c26e5906 100644 --- a/internal/msggateway/message_handler.go +++ b/internal/msggateway/message_handler.go @@ -40,7 +40,13 @@ type Req struct { } func (r *Req) String() string { - return utils.StructToJsonString(r) + var tReq Req + tReq.ReqIdentifier = r.ReqIdentifier + tReq.Token = r.Token + tReq.SendID = r.SendID + tReq.OperationID = r.OperationID + tReq.MsgIncr = r.MsgIncr + return utils.StructToJsonString(tReq) } type Resp struct { @@ -53,7 +59,13 @@ type Resp struct { } func (r *Resp) String() string { - return utils.StructToJsonString(r) + var tResp Resp + tResp.ReqIdentifier = r.ReqIdentifier + tResp.MsgIncr = r.MsgIncr + tResp.OperationID = r.OperationID + tResp.ErrCode = r.ErrCode + tResp.ErrMsg = r.ErrMsg + return utils.StructToJsonString(tResp) } type MessageHandler interface {