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

demo

Browse Source
This commit is contained in:
wangchuxiao 2022-07-05 11:01:10 +08:00
parent b0669b7eea
commit d0e7147911
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/demo/register/login.go
View File

@ -15,6 +15,7 @@ import (
) )
type ParamsLogin struct { type ParamsLogin struct {
UserID string `json:"userID"`
Email string `json:"email"` Email string `json:"email"`
PhoneNumber string `json:"phoneNumber"` PhoneNumber string `json:"phoneNumber"`
Password string `json:"password"` Password string `json:"password"`
@ -32,11 +33,13 @@ func Login(c *gin.Context) {
var account string var account string
if params.Email != "" { if params.Email != "" {
account = params.Email account = params.Email
} else { } else if params.PhoneNumber != "" {
account = params.PhoneNumber account = params.PhoneNumber
} else {
account = params.UserID
} }
r, err := im_mysql_model.GetRegister(account, params.AreaCode) r, err := im_mysql_model.GetRegister(account, params.AreaCode, params.UserID)
if err != nil { if err != nil {
log.NewError(params.OperationID, "user have not register", params.Password, account, err.Error()) log.NewError(params.OperationID, "user have not register", params.Password, account, err.Error())
c.JSON(http.StatusOK, gin.H{"errCode": constant.NotRegistered, "errMsg": "Mobile phone number is not registered"}) c.JSON(http.StatusOK, gin.H{"errCode": constant.NotRegistered, "errMsg": "Mobile phone number is not registered"})

2
internal/demo/register/reset_password.go
View File

@ -44,7 +44,7 @@ func ResetPassword(c *gin.Context) {
return return
} }
} }
user, err := im_mysql_model.GetRegister(account, req.AreaCode) user, err := im_mysql_model.GetRegister(account, req.AreaCode, "")
if err != nil || user.Account == "" { if err != nil || user.Account == "" {
if err != nil { if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "get register error", err.Error()) log.NewError(req.OperationID, utils.GetSelfFuncName(), "get register error", err.Error())

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

@ -66,7 +66,7 @@ func SendVerificationCode(c *gin.Context) {
} }
switch params.UsedFor { switch params.UsedFor {
case constant.VerificationCodeForRegister: case constant.VerificationCodeForRegister:
_, err := im_mysql_model.GetRegister(account, params.AreaCode) _, err := im_mysql_model.GetRegister(account, params.AreaCode, "")
if err == nil { if err == nil {
log.NewError(params.OperationID, "The phone number has been registered", params) log.NewError(params.OperationID, "The phone number has been registered", params)
c.JSON(http.StatusOK, gin.H{"errCode": constant.HasRegistered, "errMsg": "The phone number has been registered"}) c.JSON(http.StatusOK, gin.H{"errCode": constant.HasRegistered, "errMsg": "The phone number has been registered"})

6
pkg/common/db/mysql_model/im_mysql_model/demo_model.go
View File

@ -5,14 +5,14 @@ import (
_ "github.com/jinzhu/gorm" _ "github.com/jinzhu/gorm"
) )
func GetRegister(account, areaCode string) (*db.Register, error) { func GetRegister(account, areaCode, userID string) (*db.Register, error) {
dbConn, err := db.DB.MysqlDB.DefaultGormDB() dbConn, err := db.DB.MysqlDB.DefaultGormDB()
if err != nil { if err != nil {
return nil, err return nil, err
} }
var r db.Register var r db.Register
return &r, dbConn.Table("registers").Where("account = ? or account =? and area_code=?", return &r, dbConn.Table("registers").Where("user_id = ? and user_id != ? or account = ? or account =? and area_code=?",
account, account, areaCode).Take(&r).Error userID, "", account, account, areaCode).Take(&r).Error
} }
func SetPassword(account, password, ex, userID, areaCode string) error { func SetPassword(account, password, ex, userID, areaCode string) error {