From 9d84bf8f4c9b503370e5a53745af4baa7ed93abf Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Fri, 1 Jul 2022 14:59:53 +0800 Subject: [PATCH 1/7] log --- config/config.yaml | 4 ++-- internal/demo/register/verify.go | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index bd7a2039b..bf9f3309c 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -70,11 +70,11 @@ kafka: #如果是单机模式，用0.0.0.0或者不填，默认即可 serverip: 0.0.0.0 +#作为rpc时，注册到etcd的地址，单机默认即可，如果是集群部署，需要修改（具体使用内网地址还是外网地址，要依情况而定，目的是api/gateway能访问到） rpcRegisterIP: 127.0.0.1 +#默认即可 listenIP: 0.0.0.0 - - # endpoints 内部组件间访问的端点host名称，访问时，可以内部直接访问 host:port 来访问 endpoints: api: openim_api diff --git a/internal/demo/register/verify.go b/internal/demo/register/verify.go index 5e8ecdffc..798e8e9e0 100644 --- a/internal/demo/register/verify.go +++ b/internal/demo/register/verify.go @@ -5,6 +5,7 @@ import ( "Open_IM/pkg/common/constant" "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" + "Open_IM/pkg/utils" "github.com/gin-gonic/gin" "net/http" @@ -21,12 +22,16 @@ type paramsCertification struct { func Verify(c *gin.Context) { params := paramsCertification{} + operationID := params.OperationID + if operationID == "" { + operationID = utils.OperationIDGenerator() + } if err := c.BindJSON(¶ms); err != nil { - log.NewError("", "request params json parsing failed", "", "err", err.Error()) + log.NewError(operationID, "request params json parsing failed", "", "err", err.Error()) c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.FormattingError, "errMsg": err.Error()}) return } - log.NewInfo("recv req: ", params) + log.NewInfo(operationID, "recv req: ", params) var account string if params.Email != "" { @@ -57,7 +62,7 @@ func Verify(c *gin.Context) { } code, err := db.DB.GetAccountCode(accountKey) - log.NewInfo(params.OperationID, "redis phone number and verificating Code", accountKey, code, params) + log.NewInfo(params.OperationID, "redis phone number and verificating Code", "key: ", accountKey, "code: ", code, "params: ", params) if err != nil { log.NewError(params.OperationID, "Verification code expired", accountKey, "err", err.Error()) data := make(map[string]interface{}) From 658d97ff4e4bf24e5c433465d3b294e0830fd90f Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Fri, 1 Jul 2022 15:07:22 +0800 Subject: [PATCH 2/7] log --- internal/demo/register/send_code.go | 8 ++++++++ internal/demo/register/verify.go | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/internal/demo/register/send_code.go b/internal/demo/register/send_code.go index ef00be045..b39d04df4 100644 --- a/internal/demo/register/send_code.go +++ b/internal/demo/register/send_code.go @@ -6,11 +6,13 @@ import ( "Open_IM/pkg/common/db" "Open_IM/pkg/common/db/mysql_model/im_mysql_model" "Open_IM/pkg/common/log" + "Open_IM/pkg/common/utils" "fmt" "github.com/gin-gonic/gin" "gopkg.in/gomail.v2" "math/rand" "net/http" + "time" ) @@ -41,11 +43,17 @@ type paramsVerificationCode struct { func SendVerificationCode(c *gin.Context) { params := paramsVerificationCode{} + if err := c.BindJSON(¶ms); err != nil { log.NewError("", "BindJSON failed", "err:", err.Error(), "phoneNumber", params.PhoneNumber, "email", params.Email) c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.FormattingError, "errMsg": err.Error()}) return } + operationID := params.OperationID + if operationID == "" { + operationID = utils.OperationIDGenerator() + } + log.Info(operationID, "SendVerificationCode args: ", params) var account string if params.Email != "" { account = params.Email diff --git a/internal/demo/register/verify.go b/internal/demo/register/verify.go index 798e8e9e0..5c27d910c 100644 --- a/internal/demo/register/verify.go +++ b/internal/demo/register/verify.go @@ -5,8 +5,7 @@ import ( "Open_IM/pkg/common/constant" "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" - "Open_IM/pkg/utils" - + "Open_IM/pkg/common/utils" "github.com/gin-gonic/gin" "net/http" ) @@ -23,14 +22,15 @@ type paramsCertification struct { func Verify(c *gin.Context) { params := paramsCertification{} operationID := params.OperationID - if operationID == "" { - operationID = utils.OperationIDGenerator() - } + if err := c.BindJSON(¶ms); err != nil { log.NewError(operationID, "request params json parsing failed", "", "err", err.Error()) c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.FormattingError, "errMsg": err.Error()}) return } + if operationID == "" { + operationID = utils.OperationIDGenerator() + } log.NewInfo(operationID, "recv req: ", params) var account string From 4783e3d0618d8944d70e0dfee039fda775640947 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Fri, 1 Jul 2022 15:11:33 +0800 Subject: [PATCH 3/7] log --- internal/demo/register/send_code.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/demo/register/send_code.go b/internal/demo/register/send_code.go index b39d04df4..1305ee801 100644 --- a/internal/demo/register/send_code.go +++ b/internal/demo/register/send_code.go @@ -53,7 +53,7 @@ func SendVerificationCode(c *gin.Context) { if operationID == "" { operationID = utils.OperationIDGenerator() } - log.Info(operationID, "SendVerificationCode args: ", params) + log.Info(operationID, "SendVerificationCode args: ", "area code: ", params.AreaCode, "Phone Number: ", params.PhoneNumber) var account string if params.Email != "" { account = params.Email From 54566997b29f88a0d60199a69014d364c07c26d1 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Fri, 1 Jul 2022 15:25:06 +0800 Subject: [PATCH 4/7] fix bug --- internal/demo/register/verify.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/demo/register/verify.go b/internal/demo/register/verify.go index 5c27d910c..ebce69908 100644 --- a/internal/demo/register/verify.go +++ b/internal/demo/register/verify.go @@ -37,7 +37,7 @@ func Verify(c *gin.Context) { if params.Email != "" { account = params.Email } else { - account = params.AreaCode + params.PhoneNumber + account = params.PhoneNumber } if params.VerificationCode == config.Config.Demo.SuperCode { From f993ddf8763955e4a449c7f7ea0e8721cc809f3f Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 1 Jul 2022 15:29:22 +0800 Subject: [PATCH 5/7] test --- docker-compose.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index df9c69b9d..0d234cc60 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -74,11 +74,10 @@ services: KAFKA_BROKER_ID: 0 KAFKA_ZOOKEEPER_CONNECT: 127.0.0.1:2181 KAFKA_CREATE_TOPICS: "ws2ms_chat:8:1,ms2ps_chat:8:1,msg_to_mongo:8:1" - KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9093 + KAFKA_ADVERTISED_LISTENERS: INSIDE://172.19.0.14:9092,OUTSIDE://103.116.45.174:9093 KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093 KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT" KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE - network_mode: "host" depends_on: - zookeeper From ed52ecb259cd3e8e553d95863b1003d163f227f3 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Fri, 1 Jul 2022 15:29:45 +0800 Subject: [PATCH 6/7] fix bug --- internal/demo/register/verify.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/demo/register/verify.go b/internal/demo/register/verify.go index ebce69908..7777e6ec7 100644 --- a/internal/demo/register/verify.go +++ b/internal/demo/register/verify.go @@ -37,7 +37,7 @@ func Verify(c *gin.Context) { if params.Email != "" { account = params.Email } else { - account = params.PhoneNumber + account = params.AreaCode + params.PhoneNumber } if params.VerificationCode == config.Config.Demo.SuperCode { @@ -56,9 +56,9 @@ func Verify(c *gin.Context) { var accountKey string switch params.UsedFor { case constant.VerificationCodeForRegister: - accountKey = params.AreaCode + account + "_" + constant.VerificationCodeForRegisterSuffix + accountKey = account + "_" + constant.VerificationCodeForRegisterSuffix case constant.VerificationCodeForReset: - accountKey = params.AreaCode + account + "_" + constant.VerificationCodeForResetSuffix + accountKey = account + "_" + constant.VerificationCodeForResetSuffix } code, err := db.DB.GetAccountCode(accountKey) From 813b6a6a68618bd257f917594af605adc72be003 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 1 Jul 2022 15:33:35 +0800 Subject: [PATCH 7/7] test --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 0d234cc60..33128d3d8 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -74,7 +74,7 @@ services: KAFKA_BROKER_ID: 0 KAFKA_ZOOKEEPER_CONNECT: 127.0.0.1:2181 KAFKA_CREATE_TOPICS: "ws2ms_chat:8:1,ms2ps_chat:8:1,msg_to_mongo:8:1" - KAFKA_ADVERTISED_LISTENERS: INSIDE://172.19.0.14:9092,OUTSIDE://103.116.45.174:9093 + KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9093 KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093 KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT" KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE