SCHISANDRA/schisandra-cloud-album
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ add api validation signature

Browse Source
This commit is contained in:
landaiqing
2024-09-28 00:20:13 +08:00
parent 03c5b92515
commit bd2e8b8f6c
14 changed files with 173 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/permission_api/dto/request_dto.go
View File

@@ -15,3 +15,6 @@ type AddPermissionToRoleRequestDto struct {
Permission string `json:"permission"`
Method string `json:"method"`
}
type GetPermissionRequest struct {
UserId string `json:"user_id" binding:"required"`
}

9
api/permission_api/permission_api.go
View File

@@ -71,12 +71,13 @@ func (PermissionAPI) AssignPermissionsToRole(c *gin.Context) {
// GetUserPermissions 获取用户角色权限
func (PermissionAPI) GetUserPermissions(c *gin.Context) {
userId := c.Query("user_id")
if userId == "" {
result.FailWithMessage("user_id is required", c)
getPermissionRequest := dto.GetPermissionRequest{}
err := c.ShouldBindJSON(&getPermissionRequest)
if err != nil {
global.LOG.Error(err)
return
}
data, err := global.Casbin.GetImplicitRolesForUser(userId)
data, err := global.Casbin.GetImplicitRolesForUser(getPermissionRequest.UserId)
if err != nil {
result.FailWithMessage("Get user permissions failed", c)
return

7
api/sms_api/dto/request_dto.go Normal file
View File

@@ -0,0 +1,7 @@
package dto
type SmsRequest struct {
Phone string `json:"phone" binding:"required"`
Angle int64 `json:"angle" binding:"required"`
Key string `json:"key" binding:"required"`
}

61
api/sms_api/sms_api.go
View File

@@ -7,6 +7,7 @@ import (
"github.com/pkg6/go-sms/gateways"
"github.com/pkg6/go-sms/gateways/aliyun"
"github.com/pkg6/go-sms/gateways/smsbao"
"schisandra-cloud-album/api/sms_api/dto"
"schisandra-cloud-album/common/constant"
"schisandra-cloud-album/common/redis"
"schisandra-cloud-album/common/result"
@@ -23,17 +24,23 @@ import (
// @Param phone query string true "手机号"
// @Router /api/sms/ali/send [get]
func (SmsAPI) SendMessageByAli(c *gin.Context) {
phone := c.Query("phone")
if phone == "" {
result.FailWithMessage(ginI18n.MustGetMessage(c, "PhoneNotEmpty"), c)
smsRequest := dto.SmsRequest{}
err := c.ShouldBindJSON(&smsRequest)
if err != nil {
result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaSendFailed"), c)
return
}
isPhone := utils.IsPhone(phone)
checkRotateData := utils.CheckRotateData(smsRequest.Angle, smsRequest.Key)
if !checkRotateData {
result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaVerifyError"), c)
return
}
isPhone := utils.IsPhone(smsRequest.Phone)
if !isPhone {
result.FailWithMessage(ginI18n.MustGetMessage(c, "PhoneErrorFormat"), c)
return
}
val := redis.Get(constant.UserLoginSmsRedisKey + phone).Val()
val := redis.Get(constant.UserLoginSmsRedisKey + smsRequest.Phone).Val()
if val != "" {
result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaTooOften"), c)
return
@@ -46,12 +53,12 @@ func (SmsAPI) SendMessageByAli(c *gin.Context) {
},
})
code := utils.GenValidateCode(6)
wrong := redis.Set(constant.UserLoginSmsRedisKey+phone, code, time.Minute).Err()
wrong := redis.Set(constant.UserLoginSmsRedisKey+smsRequest.Phone, code, time.Minute).Err()
if wrong != nil {
global.LOG.Error(wrong)
return
}
_, err := sms.Send(phone, gosms.MapStringAny{
_, err = sms.Send(smsRequest.Phone, gosms.MapStringAny{
"content": "您的验证码是：****。请不要把验证码泄露给其他人。",
"template": global.CONFIG.SMS.Ali.TemplateID,
//"signName": global.CONFIG.SMS.Ali.Signature,
@@ -74,19 +81,25 @@ func (SmsAPI) SendMessageByAli(c *gin.Context) {
// @Tags 短信验证码
// @Produce json
// @Param phone query string true "手机号"
// @Router /api/sms/smsbao/send [get]
// @Router /api/sms/smsbao/send [post]
func (SmsAPI) SendMessageBySmsBao(c *gin.Context) {
phone := c.Query("phone")
if phone == "" {
result.FailWithMessage(ginI18n.MustGetMessage(c, "PhoneNotEmpty"), c)
smsRequest := dto.SmsRequest{}
err := c.ShouldBindJSON(&smsRequest)
if err != nil {
result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaSendFailed"), c)
return
}
isPhone := utils.IsPhone(phone)
checkRotateData := utils.CheckRotateData(smsRequest.Angle, smsRequest.Key)
if !checkRotateData {
result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaVerifyError"), c)
return
}
isPhone := utils.IsPhone(smsRequest.Phone)
if !isPhone {
result.FailWithMessage(ginI18n.MustGetMessage(c, "PhoneErrorFormat"), c)
return
}
val := redis.Get(constant.UserLoginSmsRedisKey + phone).Val()
val := redis.Get(constant.UserLoginSmsRedisKey + smsRequest.Phone).Val()
if val != "" {
result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaTooOften"), c)
return
@@ -98,12 +111,12 @@ func (SmsAPI) SendMessageBySmsBao(c *gin.Context) {
},
})
code := utils.GenValidateCode(6)
wrong := redis.Set(constant.UserLoginSmsRedisKey+phone, code, time.Minute).Err()
wrong := redis.Set(constant.UserLoginSmsRedisKey+smsRequest.Phone, code, time.Minute).Err()
if wrong != nil {
global.LOG.Error(wrong)
return
}
_, err := sms.Send(phone, gosms.MapStringAny{
_, err = sms.Send(smsRequest.Phone, gosms.MapStringAny{
"content": "您的验证码是：" + code + "。请不要把验证码泄露给其他人。",
}, nil)
if err != nil {
@@ -120,20 +133,26 @@ func (SmsAPI) SendMessageBySmsBao(c *gin.Context) {
// @Tags 短信验证码
// @Produce json
// @Param phone query string true "手机号"
// @Router /api/sms/test/send [get]
// @Router /api/sms/test/send [post]
func (SmsAPI) SendMessageTest(c *gin.Context) {
phone := c.Query("phone")
if phone == "" {
result.FailWithMessage(ginI18n.MustGetMessage(c, "PhoneNotEmpty"), c)
smsRequest := dto.SmsRequest{}
err := c.ShouldBindJSON(&smsRequest)
if err != nil {
result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaSendFailed"), c)
return
}
isPhone := utils.IsPhone(phone)
checkRotateData := utils.CheckRotateData(smsRequest.Angle, smsRequest.Key)
if !checkRotateData {
result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaVerifyError"), c)
return
}
isPhone := utils.IsPhone(smsRequest.Phone)
if !isPhone {
result.FailWithMessage(ginI18n.MustGetMessage(c, "PhoneError"), c)
return
}
code := utils.GenValidateCode(6)
err := redis.Set(constant.UserLoginSmsRedisKey+phone, code, time.Minute).Err()
err = redis.Set(constant.UserLoginSmsRedisKey+smsRequest.Phone, code, time.Minute).Err()
if err != nil {
global.LOG.Error(err)
result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaSendFailed"), c)

2
api/user_api/dto/request_dto.go
View File

@@ -19,6 +19,8 @@ type AccountLoginRequest struct {
Account string `json:"account" binding:"required"`
Password string `json:"password" binding:"required"`
AutoLogin bool `json:"auto_login" binding:"required"`
Angle int64 `json:"angle" binding:"required"`
Key string `json:"key" binding:"required"`
}
// AddUserRequest 新增用户请求

5
api/user_api/user_api.go
View File

@@ -117,6 +117,11 @@ func (UserAPI) AccountLogin(c *gin.Context) {
result.FailWithMessage(ginI18n.MustGetMessage(c, "ParamsError"), c)
return
}
rotateData := utils.CheckRotateData(accountLoginRequest.Angle, accountLoginRequest.Key)
if !rotateData {
result.FailWithMessage(ginI18n.MustGetMessage(c, "CaptchaVerifyError"), c)
return
}
account := accountLoginRequest.Account
password := accountLoginRequest.Password