option: replace leveldb with redis in storing message code

This commit is contained in:
RockYang
2023-11-22 10:57:24 +08:00
parent b314dd0900
commit cfe6f27d48
12 changed files with 35 additions and 154 deletions

View File

@@ -7,7 +7,6 @@ import (
"chatplus/handler"
logger2 "chatplus/logger"
"chatplus/service/mj"
"chatplus/store"
"chatplus/store/model"
"chatplus/store/vo"
"chatplus/utils"
@@ -34,15 +33,13 @@ var logger = logger2.GetLogger()
type ChatHandler struct {
handler.BaseHandler
db *gorm.DB
leveldb *store.LevelDB
redis *redis.Client
mjService *mj.Service
}
func NewChatHandler(app *core.AppServer, db *gorm.DB, levelDB *store.LevelDB, redis *redis.Client, service *mj.Service) *ChatHandler {
func NewChatHandler(app *core.AppServer, db *gorm.DB, redis *redis.Client, service *mj.Service) *ChatHandler {
h := ChatHandler{
db: db,
leveldb: levelDB,
redis: redis,
mjService: service,
}

View File

@@ -4,23 +4,23 @@ import (
"chatplus/core"
"chatplus/core/types"
"chatplus/service"
"chatplus/store"
"chatplus/utils"
"chatplus/utils/resp"
"github.com/gin-gonic/gin"
"github.com/go-redis/redis/v8"
)
const CodeStorePrefix = "/verify/codes/"
type SmsHandler struct {
BaseHandler
leveldb *store.LevelDB
redis *redis.Client
sms *service.AliYunSmsService
captcha *service.CaptchaService
}
func NewSmsHandler(app *core.AppServer, db *store.LevelDB, sms *service.AliYunSmsService, captcha *service.CaptchaService) *SmsHandler {
handler := &SmsHandler{leveldb: db, sms: sms, captcha: captcha}
func NewSmsHandler(app *core.AppServer, client *redis.Client, sms *service.AliYunSmsService, captcha *service.CaptchaService) *SmsHandler {
handler := &SmsHandler{redis: client, sms: sms, captcha: captcha}
handler.App = app
return handler
}
@@ -50,7 +50,7 @@ func (h *SmsHandler) SendCode(c *gin.Context) {
}
// 存储验证码,等待后面注册验证
err = h.leveldb.Put(CodeStorePrefix+data.Mobile, code)
_, err = h.redis.Set(c, CodeStorePrefix+data.Mobile, code, 0).Result()
if err != nil {
resp.ERROR(c, "验证码保存失败")
return

View File

@@ -3,7 +3,6 @@ package handler
import (
"chatplus/core"
"chatplus/core/types"
"chatplus/store"
"chatplus/store/model"
"chatplus/store/vo"
"chatplus/utils"
@@ -23,7 +22,6 @@ type UserHandler struct {
BaseHandler
db *gorm.DB
searcher *xdb.Searcher
leveldb *store.LevelDB
redis *redis.Client
}
@@ -31,9 +29,8 @@ func NewUserHandler(
app *core.AppServer,
db *gorm.DB,
searcher *xdb.Searcher,
levelDB *store.LevelDB,
client *redis.Client) *UserHandler {
handler := &UserHandler{db: db, searcher: searcher, leveldb: levelDB, redis: client}
handler := &UserHandler{db: db, searcher: searcher, redis: client}
handler.App = app
return handler
}
@@ -44,7 +41,7 @@ func (h *UserHandler) Register(c *gin.Context) {
var data struct {
Mobile string `json:"mobile"`
Password string `json:"password"`
Code int `json:"code"`
Code string `json:"code"`
}
if err := c.ShouldBindJSON(&data); err != nil {
resp.ERROR(c, types.InvalidArgs)
@@ -64,8 +61,7 @@ func (h *UserHandler) Register(c *gin.Context) {
// 检查验证码
key := CodeStorePrefix + data.Mobile
if h.App.SysConfig.EnabledMsg {
var code int
err := h.leveldb.Get(key, &code)
code, err := h.redis.Get(c, key).Result()
if err != nil || code != data.Code {
resp.ERROR(c, "短信验证码错误")
return
@@ -107,7 +103,7 @@ func (h *UserHandler) Register(c *gin.Context) {
}
if h.App.SysConfig.EnabledMsg {
_ = h.leveldb.Delete(key) // 注册成功,删除短信验证码
_ = h.redis.Del(c, key) // 注册成功,删除短信验证码
}
// 自动登录创建 token
@@ -323,13 +319,21 @@ func (h *UserHandler) Password(c *gin.Context) {
func (h *UserHandler) BindMobile(c *gin.Context) {
var data struct {
Mobile string `json:"mobile"`
Code int `json:"code"`
Code string `json:"code"`
}
if err := c.ShouldBindJSON(&data); err != nil {
resp.ERROR(c, types.InvalidArgs)
return
}
// 检查验证码
key := CodeStorePrefix + data.Mobile
code, err := h.redis.Get(c, key).Result()
if err != nil || code != data.Code {
resp.ERROR(c, "短信验证码错误")
return
}
// 检查手机号是否被其他账号绑定
var item model.User
res := h.db.Where("mobile = ?", data.Mobile).First(&item)
@@ -338,15 +342,6 @@ func (h *UserHandler) BindMobile(c *gin.Context) {
return
}
// 检查验证码
key := CodeStorePrefix + data.Mobile
var code int
err := h.leveldb.Get(key, &code)
if err != nil || code != data.Code {
resp.ERROR(c, "短信验证码错误")
return
}
user, err := utils.GetLoginUser(c, h.db)
if err != nil {
resp.NotAuth(c)
@@ -359,6 +354,6 @@ func (h *UserHandler) BindMobile(c *gin.Context) {
return
}
_ = h.leveldb.Delete(key) // 删除短信验证码
_ = h.redis.Del(c, key) // 删除短信验证码
resp.SUCCESS(c)
}