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

demo modify

Browse Source
This commit is contained in:
Gordon 2022-02-11 17:44:02 +08:00
parent 6a8a0f2249
commit fd59cc6226
5 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.yaml
View File

@ -441,9 +441,6 @@ demo:
senderAuthorizationCode: "1gxyausfoevlzbfag" senderAuthorizationCode: "1gxyausfoevlzbfag"
smtpAddr: "smtp.qq.com" smtpAddr: "smtp.qq.com"
smtpPort: 25 smtpPort: 25
errMsg:
hasRegistered: "用户已经注册"
mailSendCodeErr: "邮件发送失败"

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

@ -39,13 +39,13 @@ func SendVerificationCode(c *gin.Context) {
_, err := im_mysql_model.GetRegister(account) _, err := im_mysql_model.GetRegister(account)
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": getErrMsg(constant.HasRegistered)}) c.JSON(http.StatusOK, gin.H{"errCode": constant.HasRegistered, "errMsg": ""})
return return
} }
ok, err := db.DB.JudgeAccountEXISTS(account) ok, err := db.DB.JudgeAccountEXISTS(account)
if ok || err != nil { if ok || 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.RepeatSendCode, "errMsg": getErrMsg(constant.RepeatSendCode)}) c.JSON(http.StatusOK, gin.H{"errCode": constant.RepeatSendCode, "errMsg": ""})
return return
} }
log.InfoByKv("begin sendSms", account) log.InfoByKv("begin sendSms", account)
@ -67,7 +67,7 @@ func SendVerificationCode(c *gin.Context) {
m.SetBody(`text/html`, fmt.Sprintf("%d", code)) m.SetBody(`text/html`, fmt.Sprintf("%d", code))
if err := gomail.NewDialer(config.Config.Demo.Mail.SmtpAddr, config.Config.Demo.Mail.SmtpPort, config.Config.Demo.Mail.SenderMail, config.Config.Demo.Mail.SenderAuthorizationCode).DialAndSend(m); err != nil { if err := gomail.NewDialer(config.Config.Demo.Mail.SmtpAddr, config.Config.Demo.Mail.SmtpPort, config.Config.Demo.Mail.SenderMail, config.Config.Demo.Mail.SenderAuthorizationCode).DialAndSend(m); err != nil {
log.ErrorByKv("send mail error", account, "err", err.Error()) log.ErrorByKv("send mail error", account, "err", err.Error())
c.JSON(http.StatusOK, gin.H{"errCode": constant.MailSendCodeErr, "errMsg": getErrMsg(constant.MailSendCodeErr)}) c.JSON(http.StatusOK, gin.H{"errCode": constant.MailSendCodeErr, "errMsg": ""})
return return
} }
} else { } else {
@ -117,13 +117,3 @@ func CreateClient(accessKeyId *string, accessKeySecret *string) (result *dysmsap
result, err = dysmsapi20170525.NewClient(c) result, err = dysmsapi20170525.NewClient(c)
return result, err return result, err
} }
func getErrMsg(errCode int) string {
switch errCode {
case constant.HasRegistered:
return config.Config.Demo.ErrMsg.HasRegistered
case constant.MailSendCodeErr:
return config.Config.Demo.ErrMsg.MailSendCodeErr
default:
return ""
}
}

3
internal/demo/register/set_password.go
View File

@ -22,6 +22,7 @@ type ParamsSetPassword struct {
Password string `json:"password"` Password string `json:"password"`
VerificationCode string `json:"verificationCode"` VerificationCode string `json:"verificationCode"`
Platform int32 `json:"platform" binding:"required,min=1,max=7"` Platform int32 `json:"platform" binding:"required,min=1,max=7"`
Ex string `json:"ex"`
OperationID string `json:"operationID" binding:"required"` OperationID string `json:"operationID" binding:"required"`
} }
@ -68,7 +69,7 @@ func SetPassword(c *gin.Context) {
return return
} }
log.Info(params.OperationID, "begin store mysql", account, params.Password) log.Info(params.OperationID, "begin store mysql", account, params.Password)
err = im_mysql_model.SetPassword(account, params.Password) err = im_mysql_model.SetPassword(account, params.Password, params.Ex)
if err != nil { if err != nil {
log.NewError(params.OperationID, "set phone number password error", account, "err", err.Error()) log.NewError(params.OperationID, "set phone number password error", account, "err", err.Error())
c.JSON(http.StatusOK, gin.H{"errCode": constant.RegisterFailed, "errMsg": err.Error()}) c.JSON(http.StatusOK, gin.H{"errCode": constant.RegisterFailed, "errMsg": err.Error()})

4
pkg/common/config/config.go
View File

@ -293,10 +293,6 @@ type config struct {
SmtpAddr string `yaml:"smtpAddr"` SmtpAddr string `yaml:"smtpAddr"`
SmtpPort int `yaml:"smtpPort"` SmtpPort int `yaml:"smtpPort"`
} }
ErrMsg struct {
HasRegistered string `yaml:"hasRegistered"`
MailSendCodeErr string `yaml:"mailSendCodeErr"`
}
} }
} }
type PConversation struct { type PConversation struct {

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

@ -14,10 +14,11 @@ func GetRegister(account string) (*db.Register, error) {
return &r, dbConn.Table("registers").Where("account = ?", return &r, dbConn.Table("registers").Where("account = ?",
account).Take(&r).Error account).Take(&r).Error
} }
func SetPassword(account, password string) error { func SetPassword(account, password, ex string) error {
r := db.Register{ r := db.Register{
Account: account, Account: account,
Password: password, Password: password,
Ex: ex,
} }
dbConn, err := db.DB.MysqlDB.DefaultGormDB() dbConn, err := db.DB.MysqlDB.DefaultGormDB()
if err != nil { if err != nil {