From 4db8470507c1535a4e9a3b4e57ba38293f0b7fab Mon Sep 17 00:00:00 2001
From: zchengo <1933757688@qq.com>
Date: Sat, 24 Dec 2022 19:42:29 +0800
Subject: [PATCH] refactor: remove update mail api

---
 server/api/user.go          | 11 -----------
 server/initialize/router.go |  1 -
 server/models/user.go       | 11 +++--------
 server/service/user.go      | 32 ++++++++++++--------------------
 web/src/api/user.js         | 20 +-------------------
 5 files changed, 16 insertions(+), 59 deletions(-)

diff --git a/server/api/user.go b/server/api/user.go
index 459e767..1933544 100644
--- a/server/api/user.go
+++ b/server/api/user.go
@@ -70,17 +70,6 @@ func (u *UserApi) ForgotPass(context *gin.Context) {
 	response.Result(errCode, nil, context)
 }
 
-// 修改邮箱
-func (u *UserApi) UpdateMail(context *gin.Context) {
-	var param models.UserMailParam
-	if err := context.ShouldBind(&param); err != nil {
-		response.Result(response.ErrCodeParamInvalid, nil, context)
-		return
-	}
-	errCode := u.userService.UpdateMail(&param)
-	response.Result(errCode, nil, context)
-}
-
 // 注销账号
 func (u *UserApi) Delete(context *gin.Context) {
 	var param models.UserDeleteParam
diff --git a/server/initialize/router.go b/server/initialize/router.go
index 3994109..497b224 100644
--- a/server/initialize/router.go
+++ b/server/initialize/router.go
@@ -21,7 +21,6 @@ func Router() {
 		// 用户模块，订阅模块
 		route.GET("/user/verifycode", api.NewUserApi().GetVerifyCode)
 		route.GET("/user/info", api.NewUserApi().GetInfo)
-		route.PUT("/user/mail", api.NewUserApi().UpdateMail)
 		route.POST("/user/login", api.NewUserApi().Login)
 		route.POST("/user/register", api.NewUserApi().Register)
 		route.POST("/user/pass", api.NewUserApi().ForgotPass)
diff --git a/server/models/user.go b/server/models/user.go
index bca9a4f..e4efd66 100644
--- a/server/models/user.go
+++ b/server/models/user.go
@@ -37,18 +37,13 @@ type UserPassParam struct {
 	Password string `json:"password" binding:"required"`
 }
 
-type UserMailParam struct {
-	Email    string `json:"email" binding:"required,email"`
-	Code     string `json:"code" binding:"required,len=6"`
-	NewEmail string `json:"newEmail" binding:"required,email"`
-}
-
 type UserInfo struct {
 	Uid   int64  `json:"uid"`
 	Token string `json:"token"`
 }
 
 type UserPersonInfo struct {
-	Name  string `json:"name"`
-	Email string `json:"email"`
+	Name    string `json:"name"`
+	Email   string `json:"email"`
+	Version int    `json:"version"`
 }
diff --git a/server/service/user.go b/server/service/user.go
index 34a5718..aecad8a 100644
--- a/server/service/user.go
+++ b/server/service/user.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"golang.org/x/crypto/bcrypt"
+	"gorm.io/gorm"
 )
 
 const (
@@ -159,25 +160,6 @@ func (u *UserService) ForgotPass(param *models.UserPassParam) int {
 	return response.ErrCodeSuccess
 }
 
-// 修改邮箱
-func (u *UserService) UpdateMail(param *models.UserMailParam) int {
-	// 校验验证码是否正确
-	key := fmt.Sprintf("user:%s:code", param.Email)
-	code := global.Rdb.Get(ctx, key).Val()
-	if code != param.Code {
-		return response.ErrCodeVerityCodeInvalid
-	}
-	user := models.User{
-		Email:   param.NewEmail,
-		Updated: time.Now().Unix(),
-	}
-	err := global.Db.Table(USER).Where("email = ?", param.Email).Updates(&user).Error
-	if err != nil {
-		return response.ErrCodeFailed
-	}
-	return response.ErrCodeSuccess
-}
-
 // 注销账号
 func (u *UserService) Delete(param models.UserDeleteParam) int {
 	// 校验验证码是否正确
@@ -196,7 +178,17 @@ func (u *UserService) Delete(param models.UserDeleteParam) int {
 // 获取用户信息
 func (u *UserService) GetInfo(uid int64) (*models.UserPersonInfo, int) {
 	var user models.UserPersonInfo
-	err := global.Db.Table(USER).Where("id = ?", uid).First(&user).Error
+	err := global.Db.Transaction(func(tx *gorm.DB) error {
+		if err := global.Db.Table(USER).Where("id = ?", uid).First(&user).Error; err != nil {
+			return err
+		}
+		var subscribe models.Subscribe
+		if err := global.Db.Table(SUBSCRIBE).Select("version").Where("uid = ?", uid).First(&subscribe).Error; err != nil {
+			return err
+		}
+		user.Version = subscribe.Version
+		return nil
+	})
 	if err != nil {
 		return nil, response.ErrCodeFailed
 	}
diff --git a/web/src/api/user.js b/web/src/api/user.js
index 1a471fb..4ad390d 100644
--- a/web/src/api/user.js
+++ b/web/src/api/user.js
@@ -36,15 +36,6 @@ export function userForgotPass(param) {
 	})
 }
 
-// 修改邮箱
-export function updateMail(param) {
-    return request({
-		url: '/user/mail',
-		method: 'put',
-		data: param,
-	})
-}
-
 // 注销账号
 export function userDelete(param) {
     return request({
@@ -61,13 +52,4 @@ export function getUserInfo(param) {
 		method: 'get',
 		params: param,
 	})
-}
-
-// 订阅个人版
-export function userBuy(param) {
-    return request({
-		url: '/user/buy',
-		method: 'put',
-		data: param,
-	})
-}
+}
\ No newline at end of file