blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/superGroup' into superGroup

Browse Source
This commit is contained in:
Gordon 2022-07-01 15:29:52 +08:00
commit e555a047e6
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.yaml
View File

@ -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

8
internal/demo/register/send_code.go
View File

@ -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(&params); 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

15
internal/demo/register/verify.go
View File

@ -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(&params); 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{})