From fd59cc622688e86235d444dc9ec12572c1ea3edd Mon Sep 17 00:00:00 2001
From: Gordon <1432970085@qq.com>
Date: Fri, 11 Feb 2022 17:44:02 +0800
Subject: [PATCH] demo modify

---
 config/config.yaml                               |  3 ---
 internal/demo/register/send_code.go              | 16 +++-------------
 internal/demo/register/set_password.go           |  3 ++-
 pkg/common/config/config.go                      |  4 ----
 .../db/mysql_model/im_mysql_model/demo_model.go  |  3 ++-
 5 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/config/config.yaml b/config/config.yaml
index 9fca55ef2..9a8109a34 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -441,9 +441,6 @@ demo:
     senderAuthorizationCode: "1gxyausfoevlzbfag"
     smtpAddr: "smtp.qq.com"
     smtpPort: 25
-  errMsg:
-    hasRegistered: "用户已经注册"
-    mailSendCodeErr: "邮件发送失败"
 
 
 
diff --git a/internal/demo/register/send_code.go b/internal/demo/register/send_code.go
index 2a76d2c4d..9089b9c78 100644
--- a/internal/demo/register/send_code.go
+++ b/internal/demo/register/send_code.go
@@ -39,13 +39,13 @@ func SendVerificationCode(c *gin.Context) {
 	_, err := im_mysql_model.GetRegister(account)
 	if err == nil {
 		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
 	}
 	ok, err := db.DB.JudgeAccountEXISTS(account)
 	if ok || err != nil {
 		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
 	}
 	log.InfoByKv("begin sendSms", account)
@@ -67,7 +67,7 @@ func SendVerificationCode(c *gin.Context) {
 		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 {
 			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
 		}
 	} else {
@@ -117,13 +117,3 @@ func CreateClient(accessKeyId *string, accessKeySecret *string) (result *dysmsap
 	result, err = dysmsapi20170525.NewClient(c)
 	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 ""
-	}
-}
diff --git a/internal/demo/register/set_password.go b/internal/demo/register/set_password.go
index c8509a8bb..a0558fa5a 100644
--- a/internal/demo/register/set_password.go
+++ b/internal/demo/register/set_password.go
@@ -22,6 +22,7 @@ type ParamsSetPassword struct {
 	Password         string `json:"password"`
 	VerificationCode string `json:"verificationCode"`
 	Platform         int32  `json:"platform" binding:"required,min=1,max=7"`
+	Ex               string `json:"ex"`
 	OperationID      string `json:"operationID" binding:"required"`
 }
 
@@ -68,7 +69,7 @@ func SetPassword(c *gin.Context) {
 		return
 	}
 	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 {
 		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()})
diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go
index d9588788b..f3a4611d5 100644
--- a/pkg/common/config/config.go
+++ b/pkg/common/config/config.go
@@ -293,10 +293,6 @@ type config struct {
 			SmtpAddr                string `yaml:"smtpAddr"`
 			SmtpPort                int    `yaml:"smtpPort"`
 		}
-		ErrMsg struct {
-			HasRegistered   string `yaml:"hasRegistered"`
-			MailSendCodeErr string `yaml:"mailSendCodeErr"`
-		}
 	}
 }
 type PConversation struct {
diff --git a/pkg/common/db/mysql_model/im_mysql_model/demo_model.go b/pkg/common/db/mysql_model/im_mysql_model/demo_model.go
index a36b7cdc7..5af615f97 100644
--- a/pkg/common/db/mysql_model/im_mysql_model/demo_model.go
+++ b/pkg/common/db/mysql_model/im_mysql_model/demo_model.go
@@ -14,10 +14,11 @@ func GetRegister(account string) (*db.Register, error) {
 	return &r, dbConn.Table("registers").Where("account = ?",
 		account).Take(&r).Error
 }
-func SetPassword(account, password string) error {
+func SetPassword(account, password, ex string) error {
 	r := db.Register{
 		Account:  account,
 		Password: password,
+		Ex:       ex,
 	}
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {