From 634584400a8249fc8a9b7a6fb780e59c070c01f7 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 5 Apr 2022 11:50:26 +0800 Subject: [PATCH 1/6] tag and set private tips --- internal/msg_gateway/gate/logic.go | 3 ++- internal/msg_gateway/gate/validate.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/msg_gateway/gate/logic.go b/internal/msg_gateway/gate/logic.go index be3053e6a..ab3618c44 100644 --- a/internal/msg_gateway/gate/logic.go +++ b/internal/msg_gateway/gate/logic.go @@ -214,7 +214,8 @@ func (ws *WServer) sendSignalMsgReq(conn *UserConn, m *Req) { } rtcClient := pbRtc.NewRtcServiceClient(connGrpc) req := &pbRtc.SignalMessageAssembleReq{ - SignalReq: pData.(*pbRtc.SignalReq), + SignalReq: pData.(*pbRtc.SignalReq), + OperationID: m.OperationID, } respPb, err := rtcClient.SignalMessageAssemble(context.Background(), req) if err != nil { diff --git a/internal/msg_gateway/gate/validate.go b/internal/msg_gateway/gate/validate.go index d34883c5c..329f93655 100644 --- a/internal/msg_gateway/gate/validate.go +++ b/internal/msg_gateway/gate/validate.go @@ -9,6 +9,7 @@ package gate import ( "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" + pbRtc "Open_IM/pkg/proto/rtc" open_im_sdk "Open_IM/pkg/proto/sdk_ws" "github.com/golang/protobuf/proto" ) @@ -71,7 +72,7 @@ func (ws *WServer) argsValidate(m *Req, r int32) (isPass bool, errCode int32, er } return true, 0, "", data case constant.WSSendSignalMsg: - data := open_im_sdk.SignalReq{} + data := pbRtc.SignalReq{} if err := proto.Unmarshal(m.Data, &data); err != nil { log.ErrorByKv("Decode Data struct err", "", "err", err.Error(), "reqIdentifier", r) return false, 203, err.Error(), nil From 26f8172b1a7f76a60bfca68aef84c110554527a8 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 5 Apr 2022 11:55:40 +0800 Subject: [PATCH 2/6] tag and set private tips --- internal/msg_gateway/gate/logic.go | 6 +++--- pkg/proto/sdk_ws/ws.proto | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/msg_gateway/gate/logic.go b/internal/msg_gateway/gate/logic.go index ab3618c44..a8220a5e6 100644 --- a/internal/msg_gateway/gate/logic.go +++ b/internal/msg_gateway/gate/logic.go @@ -224,13 +224,13 @@ func (ws *WServer) sendSignalMsgReq(conn *UserConn, m *Req) { return } signalResp.Payload = respPb.SignalResp.Payload - msgData := &sdk_ws.MsgData{} - utils.CopyStructFields(msgData, respPb.MsgData) + msgData := sdk_ws.MsgData{} + utils.CopyStructFields(&msgData, respPb.MsgData) if respPb.IsPass { pbData := pbChat.SendMsgReq{ Token: m.Token, OperationID: m.OperationID, - MsgData: msgData, + MsgData: &msgData, } log.NewInfo(m.OperationID, "Ws call success to sendSignalMsgReq middle", m.ReqIdentifier, m.SendID, m.MsgIncr, msgData) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName) diff --git a/pkg/proto/sdk_ws/ws.proto b/pkg/proto/sdk_ws/ws.proto index 1f9cb5bb1..12ff7b15d 100644 --- a/pkg/proto/sdk_ws/ws.proto +++ b/pkg/proto/sdk_ws/ws.proto @@ -506,7 +506,7 @@ message DelMsgListReq{ } message DelMsgListResp{ - int32 errCode = 1; + int32 errCode = 1; string errMsg = 2; } From e7bc82d1527dc19f6d26dab5358a1a6e5d866a74 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 5 Apr 2022 12:03:54 +0800 Subject: [PATCH 3/6] tag and set private tips --- internal/msg_gateway/gate/logic.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/msg_gateway/gate/logic.go b/internal/msg_gateway/gate/logic.go index a8220a5e6..239f4711a 100644 --- a/internal/msg_gateway/gate/logic.go +++ b/internal/msg_gateway/gate/logic.go @@ -223,6 +223,7 @@ func (ws *WServer) sendSignalMsgReq(conn *UserConn, m *Req) { ws.sendSignalMsgResp(conn, 204, "grpc SignalMessageAssemble failed: "+err.Error(), m, &signalResp) return } + log.NewInfo(m.OperationID, utils.GetSelfFuncName(), respPb.String()) signalResp.Payload = respPb.SignalResp.Payload msgData := sdk_ws.MsgData{} utils.CopyStructFields(&msgData, respPb.MsgData) From 146aa497f9ad6a8a110451a3a72133926ebba186 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 5 Apr 2022 12:09:55 +0800 Subject: [PATCH 4/6] tag and set private tips --- pkg/common/config/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index d93385632..3c597fbbf 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -378,7 +378,7 @@ type config struct { } } Rtc struct { - Port int `yaml:"rtcPort"` + Port int `yaml:"port"` Address string `yaml:"address"` } `yaml:"rtc"` } From 6ba51fb3382c79787af0b6e15a85fd0eea2af75c Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 5 Apr 2022 14:27:13 +0800 Subject: [PATCH 5/6] tag and set private tips --- internal/msg_gateway/gate/logic.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/msg_gateway/gate/logic.go b/internal/msg_gateway/gate/logic.go index 239f4711a..4368c066a 100644 --- a/internal/msg_gateway/gate/logic.go +++ b/internal/msg_gateway/gate/logic.go @@ -219,20 +219,21 @@ func (ws *WServer) sendSignalMsgReq(conn *UserConn, m *Req) { } respPb, err := rtcClient.SignalMessageAssemble(context.Background(), req) if err != nil { - log.NewError(m.OperationID, utils.GetSelfFuncName(), "SignalMessageAssemble", err.Error()) + log.NewError(m.OperationID, utils.GetSelfFuncName(), "SignalMessageAssemble", err.Error(), config.Config.Rtc.Address+":"+strconv.Itoa(config.Config.Rtc.Port)) ws.sendSignalMsgResp(conn, 204, "grpc SignalMessageAssemble failed: "+err.Error(), m, &signalResp) return } - log.NewInfo(m.OperationID, utils.GetSelfFuncName(), respPb.String()) signalResp.Payload = respPb.SignalResp.Payload msgData := sdk_ws.MsgData{} utils.CopyStructFields(&msgData, respPb.MsgData) + log.NewInfo(m.OperationID, utils.GetSelfFuncName(), respPb.String()) if respPb.IsPass { pbData := pbChat.SendMsgReq{ Token: m.Token, OperationID: m.OperationID, MsgData: &msgData, } + log.NewInfo(m.OperationID, utils.GetSelfFuncName(), "pbData: ", pbData) log.NewInfo(m.OperationID, "Ws call success to sendSignalMsgReq middle", m.ReqIdentifier, m.SendID, m.MsgIncr, msgData) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName) client := pbChat.NewChatClient(etcdConn) From 5a9b5db99b9812884746f4e1d33a5ce2e44fd656 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 5 Apr 2022 14:47:47 +0800 Subject: [PATCH 6/6] Check environment before deployment --- cmd/Open-IM-SDK-Core | 2 +- script/env_check.sh | 30 +++++++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/cmd/Open-IM-SDK-Core b/cmd/Open-IM-SDK-Core index 7b66c0ab7..650b201aa 160000 --- a/cmd/Open-IM-SDK-Core +++ b/cmd/Open-IM-SDK-Core @@ -1 +1 @@ -Subproject commit 7b66c0ab78be494ce2cfe23de37543dd11c2d354 +Subproject commit 650b201aa792c30261ddc94be07b809e67238b78 diff --git a/script/env_check.sh b/script/env_check.sh index a3a9857f6..2d81390f7 100644 --- a/script/env_check.sh +++ b/script/env_check.sh @@ -1,12 +1,36 @@ #!/usr/bin/env bash source ./style_info.cfg -echo -e "check environment......................................." +echo -e "check login user........................................" +user=`whoami` +if [ $user == "root" ] ; then + echo -e ${GREEN_PREFIX} "ok: login user is root" ${COLOR_SUFFIX} +else + echo -e ${RED_PREFIX}"Warning: The current user is not root "${COLOR_SUFFIX} +fi + + + +echo -e "check docker............................................" +docker_running=`systemctl status docker | grep running | grep active | wc -l` + +docker_version=`docker-compose -v; docker -v` + +if [ $docker_running -gt 0 ]; then + echo -e ${GREEN_PREFIX} "ok: docker is running" ${COLOR_SUFFIX} + echo -e ${GREEN_PREFIX} $docker_version ${COLOR_SUFFIX} + +else + echo -e ${RED_PREFIX}"docker not running"${COLOR_SUFFIX} +fi + + +echo -e "check environment......................................." SYSTEM=`uname -s` if [ $SYSTEM != "Linux" ] ; then echo -e ${RED_PREFIX}"Warning: Currently only Linux is supported"${COLOR_SUFFIX} else - echo -e ${GREEN_PREFIX} "Linux system is ok"${COLOR_SUFFIX} + echo -e ${GREEN_PREFIX} "ok: system is linux"${COLOR_SUFFIX} fi echo -e "check memory............................................" @@ -15,5 +39,5 @@ if [ $available -lt 2000 ] ; then echo -e ${RED_PREFIX}"Warning: Your memory not enough, available is: " "$available"m${COLOR_SUFFIX}"\c" echo -e ${RED_PREFIX}", must be greater than 2000m"${COLOR_SUFFIX} else - echo -e ${GREEN_PREFIX} "Memory is ok, available is: "$available"m${COLOR_SUFFIX}" + echo -e ${GREEN_PREFIX} "ok: available memory is: "$available"m${COLOR_SUFFIX}" fi