This commit is contained in:
skiffer-git 2022-07-01 15:07:22 +08:00
parent 3373925acf
commit 658d97ff4e
2 changed files with 13 additions and 5 deletions

View File

@ -6,11 +6,13 @@ import (
"Open_IM/pkg/common/db" "Open_IM/pkg/common/db"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model" "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log" "Open_IM/pkg/common/log"
"Open_IM/pkg/common/utils"
"fmt" "fmt"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gopkg.in/gomail.v2" "gopkg.in/gomail.v2"
"math/rand" "math/rand"
"net/http" "net/http"
"time" "time"
) )
@ -41,11 +43,17 @@ type paramsVerificationCode struct {
func SendVerificationCode(c *gin.Context) { func SendVerificationCode(c *gin.Context) {
params := paramsVerificationCode{} params := paramsVerificationCode{}
if err := c.BindJSON(&params); err != nil { if err := c.BindJSON(&params); err != nil {
log.NewError("", "BindJSON failed", "err:", err.Error(), "phoneNumber", params.PhoneNumber, "email", params.Email) 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()}) c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.FormattingError, "errMsg": err.Error()})
return return
} }
operationID := params.OperationID
if operationID == "" {
operationID = utils.OperationIDGenerator()
}
log.Info(operationID, "SendVerificationCode args: ", params)
var account string var account string
if params.Email != "" { if params.Email != "" {
account = params.Email account = params.Email

View File

@ -5,8 +5,7 @@ import (
"Open_IM/pkg/common/constant" "Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db" "Open_IM/pkg/common/db"
"Open_IM/pkg/common/log" "Open_IM/pkg/common/log"
"Open_IM/pkg/utils" "Open_IM/pkg/common/utils"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"net/http" "net/http"
) )
@ -23,14 +22,15 @@ type paramsCertification struct {
func Verify(c *gin.Context) { func Verify(c *gin.Context) {
params := paramsCertification{} params := paramsCertification{}
operationID := params.OperationID operationID := params.OperationID
if operationID == "" {
operationID = utils.OperationIDGenerator()
}
if err := c.BindJSON(&params); err != nil { if err := c.BindJSON(&params); err != nil {
log.NewError(operationID, "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()}) c.JSON(http.StatusBadRequest, gin.H{"errCode": constant.FormattingError, "errMsg": err.Error()})
return return
} }
if operationID == "" {
operationID = utils.OperationIDGenerator()
}
log.NewInfo(operationID, "recv req: ", params) log.NewInfo(operationID, "recv req: ", params)
var account string var account string