🎨 complete SMS login function

api/api.go

@@ -1,14 +1,14 @@
 package api
 
 import (
-	"schisandra-cloud-album/api/auth_api"
 	"schisandra-cloud-album/api/captcha_api"
 	"schisandra-cloud-album/api/sms_api"
+	"schisandra-cloud-album/api/user_api"
 )
 
 // Apis 统一导出的api
 type Apis struct {
-	AuthApi    auth_api.AuthAPI
+	UserApi    user_api.UserAPI
 	CaptchaApi captcha_api.CaptchaAPI
 	SmsApi     sms_api.SmsAPI
 }

api/auth_api/auth.go

@@ -1,3 +0,0 @@
-package auth_api
-
-type AuthAPI struct{}

api/auth_api/auth_api.go

@@ -1,159 +0,0 @@
-package auth_api
-
-import (
-	ginI18n "github.com/gin-contrib/i18n"
-	"github.com/gin-gonic/gin"
-	"reflect"
-	"schisandra-cloud-album/common/result"
-	"schisandra-cloud-album/model"
-	"schisandra-cloud-album/service"
-	"schisandra-cloud-album/utils"
-)
-
-var authService = service.Service.AuthService
-
-// GetUserList
-// @Summary 获取所有用户列表
-// @Tags 鉴权模块
-// @Success 200 {string} json
-// @Router /api/auth/user/List [get]
-func (AuthAPI) GetUserList(c *gin.Context) {
-	userList := authService.GetUserList()
-	result.OkWithData(userList, c)
-}
-
-// QueryUserByUsername
-// @Summary 根据用户名查询用户
-// @Tags 鉴权模块
-// @Param username query string true "用户名"
-// @Success 200 {string} json
-// @Router /api/auth/user/query_by_username [get]
-func (AuthAPI) QueryUserByUsername(c *gin.Context) {
-	username := c.Query("username")
-	user := authService.QueryUserByUsername(username)
-	if reflect.DeepEqual(user, model.ScaAuthUser{}) {
-		result.FailWithMessage(ginI18n.MustGetMessage(c, "NotFoundUser"), c)
-		return
-	}
-	result.OkWithData(user, c)
-}
-
-// QueryUserByUuid
-// @Summary 根据uuid查询用户
-// @Tags 鉴权模块
-// @Param uuid query string true "用户uuid"
-// @Success 200 {string} json
-// @Router /api/auth/user/query_by_uuid [get]
-func (AuthAPI) QueryUserByUuid(c *gin.Context) {
-	uuid := c.Query("uuid")
-	user := authService.QueryUserByUuid(uuid)
-	if reflect.DeepEqual(user, model.ScaAuthUser{}) {
-		result.FailWithMessage(ginI18n.MustGetMessage(c, "NotFoundUser"), c)
-		return
-	}
-	result.OkWithData(user, c)
-}
-
-// DeleteUser 删除用户
-// @Summary 删除用户
-// @Tags 鉴权模块
-// @Param uuid query string true "用户uuid"
-// @Success 200 {string} json
-// @Router /api/auth/user/delete [delete]
-func (AuthAPI) DeleteUser(c *gin.Context) {
-	uuid := c.Query("uuid")
-	err := authService.DeleteUser(uuid)
-	if err != nil {
-		result.FailWithMessage(ginI18n.MustGetMessage(c, "DeletedFailed"), c)
-		return
-	}
-	result.OkWithMessage(ginI18n.MustGetMessage(c, "DeletedSuccess"), c)
-}
-
-// QueryUserByPhone 根据手机号查询用户
-// @Summary 根据手机号查询用户
-// @Tags 鉴权模块
-// @Param phone query string true "手机号"
-// @Success 200 {string} json
-// @Router /api/auth/user/query_by_phone [get]
-func (AuthAPI) QueryUserByPhone(c *gin.Context) {
-	phone := c.Query("phone")
-	user := authService.QueryUserByPhone(phone)
-	if reflect.DeepEqual(user, model.ScaAuthUser{}) {
-		result.FailWithMessage(ginI18n.MustGetMessage(c, "NotFoundUser"), c)
-		return
-	}
-	result.OkWithData(user, c)
-}
-
-// AccountLogin 账号登录
-// @Summary 账号登录
-// @Tags 鉴权模块
-// @Param account query string true "账号"
-// @Param password query string true "密码"
-// @Success 200 {string} json
-// @Router /api/auth/user/login [post]
-func (AuthAPI) AccountLogin(c *gin.Context) {
-	account := c.PostForm("account")
-	password := c.PostForm("password")
-	isPhone := utils.IsPhone(account)
-	if isPhone {
-		user := authService.QueryUserByPhone(account)
-		if reflect.DeepEqual(user, model.ScaAuthUser{}) {
-			result.FailWithMessage(ginI18n.MustGetMessage(c, "PhoneNotRegister"), c)
-		} else {
-			verify := utils.Verify(password, *user.Password)
-			if verify {
-				result.OkWithData(user, c)
-			} else {
-				result.FailWithMessage(ginI18n.MustGetMessage(c, "PasswordError"), c)
-			}
-		}
-	}
-	isEmail := utils.IsEmail(account)
-	if isEmail {
-		user := authService.QueryUserByEmail(account)
-		if reflect.DeepEqual(user, model.ScaAuthUser{}) {
-			result.FailWithMessage(ginI18n.MustGetMessage(c, "EmailNotRegister"), c)
-		} else {
-			verify := utils.Verify(password, *user.Password)
-			if verify {
-				result.OkWithData(user, c)
-			} else {
-				result.FailWithMessage(ginI18n.MustGetMessage(c, "PasswordError"), c)
-			}
-		}
-	}
-	isUsername := utils.IsUsername(account)
-	if isUsername {
-		user := authService.QueryUserByUsername(account)
-		if reflect.DeepEqual(user, model.ScaAuthUser{}) {
-			result.FailWithMessage(ginI18n.MustGetMessage(c, "UsernameNotRegister"), c)
-		} else {
-			verify := utils.Verify(password, *user.Password)
-			if verify {
-				result.OkWithData(user, c)
-			} else {
-				result.FailWithMessage(ginI18n.MustGetMessage(c, "PasswordError"), c)
-			}
-		}
-
-	}
-}
-
-// Register 用户注册
-// @Summary 用户注册
-// @Tags 鉴权模块
-// @Param user body model.ScaAuthUser true "用户信息"
-// @Success 200 {string} json
-// @Router /api/auth/user/register [post]
-func (AuthAPI) Register(c *gin.Context) {
-	var user model.ScaAuthUser
-	_ = c.ShouldBindJSON(&user)
-	err := authService.AddUser(user)
-	if err != nil {
-		result.FailWithMessage("用户注册失败！", c)
-		return
-	}
-	result.OkWithMessage("用户注册成功！", c)
-}

api/captcha_api/captcha_api.go

@@ -10,7 +10,7 @@ import (
 	"github.com/wenlng/go-captcha/v2/rotate"
 	"github.com/wenlng/go-captcha/v2/slide"
 	"log"
-	"schisandra-cloud-album/api/captcha_api/model"
+	"schisandra-cloud-album/api/captcha_api/dto"
 	"schisandra-cloud-album/common/redis"
 	"schisandra-cloud-album/common/result"
 	"schisandra-cloud-album/global"
@@ -44,7 +44,7 @@ func (CaptchaAPI) GenerateRotateCaptcha(c *gin.Context) {
 		return
 	}
 	key := helper.StringToMD5(string(dotsByte))
-	err = redis.Set(key, dotsByte, time.Minute).Err()
+	err = redis.Set("user:login:client:"+key, dotsByte, time.Minute).Err()
 	if err != nil {
 		result.FailWithNull(c)
 		return
@@ -66,7 +66,7 @@ func (CaptchaAPI) GenerateRotateCaptcha(c *gin.Context) {
 // @Success 200 {string} json
 // @Router /api/captcha/rotate/check [post]
 func (CaptchaAPI) CheckRotateData(c *gin.Context) {
-	rotateRequest := model.RotateCaptchaRequest{}
+	rotateRequest := dto.RotateCaptchaRequest{}
 	err := c.ShouldBindJSON(&rotateRequest)
 	angle := rotateRequest.Angle
 	key := rotateRequest.Key
@@ -74,7 +74,7 @@ func (CaptchaAPI) CheckRotateData(c *gin.Context) {
 		result.FailWithNull(c)
 		return
 	}
-	cacheDataByte, err := redis.Get(key).Bytes()
+	cacheDataByte, err := redis.Get("user:login:client:" + key).Bytes()
 	if len(cacheDataByte) == 0 || err != nil {
 		result.FailWithCodeAndMessage(1011, ginI18n.MustGetMessage(c, "CaptchaExpired"), c)
 		return
@@ -126,7 +126,7 @@ func (CaptchaAPI) GenerateBasicTextCaptcha(c *gin.Context) {
 		return
 	}
 	key := helper.StringToMD5(string(dotsByte))
-	err = redis.Set(key, dotsByte, time.Minute).Err()
+	err = redis.Set("user:login:client:"+key, dotsByte, time.Minute).Err()
 	if err != nil {
 		result.FailWithNull(c)
 		return
@@ -154,7 +154,7 @@ func (CaptchaAPI) CheckClickData(c *gin.Context) {
 		result.FailWithNull(c)
 		return
 	}
-	cacheDataByte, err := redis.Get(key).Bytes()
+	cacheDataByte, err := redis.Get("user:login:client:" + key).Bytes()
 	if len(cacheDataByte) == 0 || err != nil {
 		result.FailWithNull(c)
 		return

api/captcha_api/dto/request_dto.go

@@ -1,4 +1,4 @@
-package model
+package dto
 
 type RotateCaptchaRequest struct {
 	Angle int    `json:"angle"`

api/role_api/role.go

@@ -0,0 +1,3 @@
+package role_api
+
+type RoleAPI struct{}

api/role_api/role_api.go

@@ -0,0 +1 @@
+package role_api

api/sms_api/sms_api.go

@@ -7,9 +7,11 @@ import (
 	"github.com/pkg6/go-sms/gateways"
 	"github.com/pkg6/go-sms/gateways/aliyun"
 	"github.com/pkg6/go-sms/gateways/smsbao"
+	"schisandra-cloud-album/common/redis"
 	"schisandra-cloud-album/common/result"
 	"schisandra-cloud-album/global"
 	"schisandra-cloud-album/utils"
+	"time"
 )
 
 // SendMessageByAli 发送短信验证码
@@ -46,6 +48,8 @@ func (SmsAPI) SendMessageByAli(c *gin.Context) {
 		result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaSendFailed"), c)
 		return
 	}
+	result.OkWithMessage(ginI18n.MustGetMessage(c, "CaptchaSendSuccess"), c)
+
 }
 
 // SendMessageBySmsBao 短信宝发送短信验证码
@@ -78,3 +82,32 @@ func (SmsAPI) SendMessageBySmsBao(c *gin.Context) {
 	}
 	result.OkWithMessage(ginI18n.MustGetMessage(c, "CaptchaSendSuccess"), c)
 }
+
+// SendMessageTest 发送测试短信验证码
+// @Summary 发送测试短信验证码
+// @Description 发送测试短信验证码
+// @Tags 短信验证码
+// @Produce json
+// @Param phone query string true "手机号"
+// @Router /api/sms/test/send [get]
+func (SmsAPI) SendMessageTest(c *gin.Context) {
+	phone := c.Query("phone")
+	if phone == "" {
+		result.FailWithMessage(ginI18n.MustGetMessage(c, "PhoneNotEmpty"), c)
+		return
+	}
+	isPhone := utils.IsPhone(phone)
+	if !isPhone {
+		result.FailWithMessage(ginI18n.MustGetMessage(c, "PhoneError"), c)
+		return
+	}
+	code := utils.GenValidateCode(6)
+	err := redis.Set("user:login:sms:"+phone, code, time.Minute).Err()
+	if err != nil {
+		global.LOG.Error(err)
+		result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaSendFailed"), c)
+		return
+	}
+	result.OkWithMessage(ginI18n.MustGetMessage(c, "CaptchaSendSuccess"), c)
+
+}

api/user_api/dto/request_dto.go

@@ -0,0 +1,30 @@
+package dto
+
+import "encoding/json"
+
+// RefreshTokenRequest 刷新token请求
+type RefreshTokenRequest struct {
+	RefreshToken string `json:"refresh_token"`
+}
+
+// PhoneLoginRequest 手机号登录请求
+type PhoneLoginRequest struct {
+	Phone   string `json:"phone"`
+	Captcha string `json:"captcha"`
+}
+
+// ResponseData 返回数据
+type ResponseData struct {
+	AccessToken  string  `json:"access_token"`
+	RefreshToken string  `json:"refresh_token"`
+	ExpiresAt    int64   `json:"expires_at"`
+	UID          *string `json:"uid"`
+}
+
+func (res ResponseData) MarshalBinary() ([]byte, error) {
+	return json.Marshal(res)
+}
+
+func (res ResponseData) UnmarshalBinary(data []byte) error {
+	return json.Unmarshal(data, &res)
+}

api/user_api/user.go

@@ -0,0 +1,3 @@
+package user_api
+
+type UserAPI struct{}

api/user_api/user_api.go

@@ -0,0 +1,307 @@
+package user_api
+
+import (
+	ginI18n "github.com/gin-contrib/i18n"
+	"github.com/gin-gonic/gin"
+	"github.com/yitter/idgenerator-go/idgen"
+	"reflect"
+	"schisandra-cloud-album/api/user_api/dto"
+	"schisandra-cloud-album/common/enum"
+	"schisandra-cloud-album/common/redis"
+	"schisandra-cloud-album/common/result"
+	"schisandra-cloud-album/global"
+	"schisandra-cloud-album/model"
+	"schisandra-cloud-album/service"
+	"schisandra-cloud-album/utils"
+	"strconv"
+	"time"
+)
+
+var userService = service.Service.UserService
+var userRoleService = service.Service.UserRoleService
+
+// GetUserList
+// @Summary 获取所有用户列表
+// @Tags 鉴权模块
+// @Success 200 {string} json
+// @Router /api/auth/user/List [get]
+func (UserAPI) GetUserList(c *gin.Context) {
+	userList := userService.GetUserList()
+	result.OkWithData(userList, c)
+}
+
+// QueryUserByUsername
+// @Summary 根据用户名查询用户
+// @Tags 鉴权模块
+// @Param username query string true "用户名"
+// @Success 200 {string} json
+// @Router /api/auth/user/query_by_username [get]
+func (UserAPI) QueryUserByUsername(c *gin.Context) {
+	username := c.Query("username")
+	user := userService.QueryUserByUsername(username)
+	if reflect.DeepEqual(user, model.ScaAuthUser{}) {
+		result.FailWithMessage(ginI18n.MustGetMessage(c, "NotFoundUser"), c)
+		return
+	}
+	result.OkWithData(user, c)
+}
+
+// QueryUserByUuid
+// @Summary 根据uuid查询用户
+// @Tags 鉴权模块
+// @Param uuid query string true "用户uuid"
+// @Success 200 {string} json
+// @Router /api/auth/user/query_by_uuid [get]
+func (UserAPI) QueryUserByUuid(c *gin.Context) {
+	uuid := c.Query("uuid")
+	user := userService.QueryUserByUuid(uuid)
+	if reflect.DeepEqual(user, model.ScaAuthUser{}) {
+		result.FailWithMessage(ginI18n.MustGetMessage(c, "NotFoundUser"), c)
+		return
+	}
+	result.OkWithData(user, c)
+}
+
+// DeleteUser 删除用户
+// @Summary 删除用户
+// @Tags 鉴权模块
+// @Param uuid query string true "用户uuid"
+// @Success 200 {string} json
+// @Router /api/auth/user/delete [delete]
+func (UserAPI) DeleteUser(c *gin.Context) {
+	uuid := c.Query("uuid")
+	err := userService.DeleteUser(uuid)
+	if err != nil {
+		result.FailWithMessage(ginI18n.MustGetMessage(c, "DeletedFailed"), c)
+		return
+	}
+	result.OkWithMessage(ginI18n.MustGetMessage(c, "DeletedSuccess"), c)
+}
+
+// QueryUserByPhone 根据手机号查询用户
+// @Summary 根据手机号查询用户
+// @Tags 鉴权模块
+// @Param phone query string true "手机号"
+// @Success 200 {string} json
+// @Router /api/auth/user/query_by_phone [get]
+func (UserAPI) QueryUserByPhone(c *gin.Context) {
+	phone := c.Query("phone")
+	user := userService.QueryUserByPhone(phone)
+	if reflect.DeepEqual(user, model.ScaAuthUser{}) {
+		result.FailWithMessage(ginI18n.MustGetMessage(c, "NotFoundUser"), c)
+		return
+	}
+	result.OkWithData(user, c)
+}
+
+// AccountLogin 账号登录
+// @Summary 账号登录
+// @Tags 鉴权模块
+// @Param account query string true "账号"
+// @Param password query string true "密码"
+// @Success 200 {string} json
+// @Router /api/user/login [post]
+func (UserAPI) AccountLogin(c *gin.Context) {
+	account := c.PostForm("account")
+	password := c.PostForm("password")
+	isPhone := utils.IsPhone(account)
+	if isPhone {
+		user := userService.QueryUserByPhone(account)
+		if reflect.DeepEqual(user, model.ScaAuthUser{}) {
+			result.FailWithMessage(ginI18n.MustGetMessage(c, "PhoneNotRegister"), c)
+			return
+		} else {
+			verify := utils.Verify(password, *user.Password)
+			if verify {
+				result.OkWithData(user, c)
+				return
+			} else {
+				result.FailWithMessage(ginI18n.MustGetMessage(c, "PasswordError"), c)
+				return
+			}
+		}
+	}
+	isEmail := utils.IsEmail(account)
+	if isEmail {
+		user := userService.QueryUserByEmail(account)
+		if reflect.DeepEqual(user, model.ScaAuthUser{}) {
+			result.FailWithMessage(ginI18n.MustGetMessage(c, "EmailNotRegister"), c)
+			return
+		} else {
+			verify := utils.Verify(password, *user.Password)
+			if verify {
+				result.OkWithData(user, c)
+				return
+			} else {
+				result.FailWithMessage(ginI18n.MustGetMessage(c, "PasswordError"), c)
+				return
+			}
+		}
+	}
+	isUsername := utils.IsUsername(account)
+	if isUsername {
+		user := userService.QueryUserByUsername(account)
+		if reflect.DeepEqual(user, model.ScaAuthUser{}) {
+			result.FailWithMessage(ginI18n.MustGetMessage(c, "UsernameNotRegister"), c)
+			return
+		} else {
+			verify := utils.Verify(password, *user.Password)
+			if verify {
+				result.OkWithData(user, c)
+				return
+			} else {
+				result.FailWithMessage(ginI18n.MustGetMessage(c, "PasswordError"), c)
+				return
+			}
+		}
+
+	}
+}
+
+// PhoneLogin 手机号登录/注册
+// @Summary 手机号登录/注册
+// @Tags 鉴权模块
+// @Param phone query string true "手机号"
+// @Param captcha query string true "验证码"
+// @Success 200 {string} json
+// @Router /api/user/phone_login [post]
+func (UserAPI) PhoneLogin(c *gin.Context) {
+	request := dto.PhoneLoginRequest{}
+	err := c.ShouldBindJSON(&request)
+	if err != nil {
+		result.FailWithMessage(ginI18n.MustGetMessage(c, "ParamsError"), c)
+		return
+	}
+	phone := request.Phone
+	captcha := request.Captcha
+	if phone == "" || captcha == "" {
+		result.FailWithMessage(ginI18n.MustGetMessage(c, "PhoneAndCaptchaNotEmpty"), c)
+		return
+	}
+	isPhone := utils.IsPhone(phone)
+	if !isPhone {
+		result.FailWithMessage(ginI18n.MustGetMessage(c, "PhoneErrorFormat"), c)
+		return
+	}
+
+	user := userService.QueryUserByPhone(phone)
+	if reflect.DeepEqual(user, model.ScaAuthUser{}) {
+		// 未注册
+		code := redis.Get("user:login:sms:" + phone)
+		if code == nil {
+			result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaExpired"), c)
+			return
+		} else {
+			uid := idgen.NextId()
+			uidStr := strconv.FormatInt(uid, 10)
+			createUser := model.ScaAuthUser{
+				UID:   &uidStr,
+				Phone: &phone,
+			}
+			addUser, err := userService.AddUser(createUser)
+			if err != nil {
+				result.FailWithMessage(ginI18n.MustGetMessage(c, "RegisterUserError"), c)
+				return
+			}
+			userRole := model.ScaAuthUserRole{
+				UserID: addUser.ID,
+				RoleID: enum.User,
+			}
+			e := userRoleService.AddUserRole(userRole)
+			if e != nil {
+				result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
+				return
+			}
+			ids, err := userRoleService.GetUserRoleIdsByUserId(addUser.ID)
+			if err != nil {
+				result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
+				return
+			}
+			accessToken, refreshToken, expiresAt := utils.GenerateAccessTokenAndRefreshToken(utils.JWTPayload{UserID: addUser.UID, RoleID: ids})
+
+			data := dto.ResponseData{
+				AccessToken:  accessToken,
+				RefreshToken: refreshToken,
+				ExpiresAt:    expiresAt,
+				UID:          addUser.UID,
+			}
+			fail := redis.Set("user:login:token:"+*addUser.UID, data, time.Hour*24*30).Err()
+			if fail != nil {
+				result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
+				return
+			}
+			result.OkWithData(data, c)
+			return
+		}
+	} else {
+		code := redis.Get("user:login:sms:" + phone)
+		if code == nil {
+			result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaExpired"), c)
+			return
+		} else {
+			if captcha != code.Val() {
+				result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaError"), c)
+				return
+			} else {
+				ids, err := userRoleService.GetUserRoleIdsByUserId(user.ID)
+				if err != nil {
+					result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
+					return
+				}
+				accessToken, refreshToken, expiresAt := utils.GenerateAccessTokenAndRefreshToken(utils.JWTPayload{UserID: user.UID, RoleID: ids})
+
+				data := dto.ResponseData{
+					AccessToken:  accessToken,
+					RefreshToken: refreshToken,
+					ExpiresAt:    expiresAt,
+					UID:          user.UID,
+				}
+				fail := redis.Set("user:login:token:"+*user.UID, data, time.Hour*24*30).Err()
+				if fail != nil {
+					result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginFailed"), c)
+					return
+				}
+				result.OkWithData(data, c)
+				return
+			}
+		}
+
+	}
+
+}
+
+// RefreshHandler 刷新token
+// @Summary 刷新token
+// @Tags 鉴权模块
+// @Param refresh_token query string true "刷新token"
+// @Success 200 {string} json
+// @Router /api/auth/token/refresh [post]
+func (UserAPI) RefreshHandler(c *gin.Context) {
+	refreshToken := c.Query("refresh_token")
+	if refreshToken == "" {
+		result.FailWithMessage("refresh_token不能为空！", c)
+		return
+	}
+	parseRefreshToken, isUpd, err := utils.ParseToken(refreshToken)
+	if err != nil {
+		global.LOG.Errorln(err)
+		result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginExpired"), c)
+		return
+	}
+	if isUpd {
+		accessTokenString, refreshTokenString, expiresAt := utils.GenerateAccessTokenAndRefreshToken(utils.JWTPayload{UserID: parseRefreshToken.UserID, RoleID: parseRefreshToken.RoleID})
+		data := dto.ResponseData{
+			AccessToken:  accessTokenString,
+			RefreshToken: refreshTokenString,
+			ExpiresAt:    expiresAt,
+			UID:          parseRefreshToken.UserID,
+		}
+		fail := redis.Set("user:login:token:"+*parseRefreshToken.UserID, data, time.Hour*24*30).Err()
+		if fail != nil {
+			result.FailWithMessage(ginI18n.MustGetMessage(c, "LoginExpired"), c)
+			return
+		}
+		result.OkWithData(data, c)
+		return
+	}
+}