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/send_code.go b/internal/demo/register/send_code.go index ef00be045..1305ee801 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: ", "area code: ", params.AreaCode, "Phone Number: ", params.PhoneNumber) var account string if params.Email != "" { account = params.Email diff --git a/internal/demo/register/verify.go b/internal/demo/register/verify.go index 5e8ecdffc..ebce69908 100644 --- a/internal/demo/register/verify.go +++ b/internal/demo/register/verify.go @@ -5,7 +5,7 @@ import ( "Open_IM/pkg/common/constant" "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" - + "Open_IM/pkg/common/utils" "github.com/gin-gonic/gin" "net/http" ) @@ -21,18 +21,23 @@ type paramsCertification struct { func Verify(c *gin.Context) { params := paramsCertification{} + operationID := params.OperationID + 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) + if operationID == "" { + operationID = utils.OperationIDGenerator() + } + log.NewInfo(operationID, "recv req: ", params) var account string if params.Email != "" { account = params.Email } else { - account = params.AreaCode + params.PhoneNumber + account = params.PhoneNumber } if params.VerificationCode == config.Config.Demo.SuperCode { @@ -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{})