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

⬆️ update deps

Browse Source
This commit is contained in:
landaiqing
2024-11-29 10:25:18 +08:00
parent 0879c9d257
commit 58777e4b58
7 changed files with 86 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/core/api/common/captcha/generate/generate_basic_text_captcha.go
View File

@@ -3,6 +3,7 @@ package generate
import (
"context"
"encoding/json"
"errors"
"time"
"github.com/redis/go-redis/v9"
@@ -13,32 +14,38 @@ import (
)
// GenerateBasicTextCaptcha generates a basic text captcha and saves it to redis.
func GenerateBasicTextCaptcha(capt click.Captcha, redis redis.Client, ctx context.Context) map[string]interface{} {
func GenerateBasicTextCaptcha(capt click.Captcha, redis redis.Client, ctx context.Context) (map[string]interface{}, error) {
captData, err := capt.Generate()
if err != nil {
return nil
return nil, err
}
dotData := captData.GetData()
if dotData == nil {
return nil
return nil, errors.New("captcha data is nil")
}
var masterImageBase64, thumbImageBase64 string
masterImageBase64 = captData.GetMasterImage().ToBase64()
thumbImageBase64 = captData.GetThumbImage().ToBase64()
masterImageBase64, err = captData.GetMasterImage().ToBase64()
if err != nil {
return nil, err
}
thumbImageBase64, err = captData.GetThumbImage().ToBase64()
if err != nil {
return nil, err
}
dotsByte, err := json.Marshal(dotData)
if err != nil {
return nil
return nil, err
}
key := helper.StringToMD5(string(dotsByte))
err = redis.Set(ctx, constant.UserCaptchaPrefix+key, dotsByte, time.Minute).Err()
if err != nil {
return nil
return nil, err
}
return map[string]interface{}{
"key": key,
"image": masterImageBase64,
"thumb": thumbImageBase64,
}
}, nil
}

24
app/core/api/common/captcha/generate/generate_click_shape_captcha.go
View File

@@ -3,7 +3,7 @@ package generate
import (
"context"
"encoding/json"
"log"
"errors"
"time"
"github.com/redis/go-redis/v9"
@@ -14,31 +14,37 @@ import (
)
// GenerateClickShapeCaptcha generate click shape captcha
func GenerateClickShapeCaptcha(click click.Captcha, redis redis.Client, ctx context.Context) map[string]interface{} {
func GenerateClickShapeCaptcha(click click.Captcha, redis redis.Client, ctx context.Context) (map[string]interface{}, error) {
captData, err := click.Generate()
if err != nil {
log.Fatalln(err)
return nil, err
}
dotData := captData.GetData()
if dotData == nil {
return nil
return nil, errors.New("captcha data is nil")
}
var masterImageBase64, thumbImageBase64 string
masterImageBase64 = captData.GetMasterImage().ToBase64()
thumbImageBase64 = captData.GetThumbImage().ToBase64()
masterImageBase64, err = captData.GetMasterImage().ToBase64()
if err != nil {
return nil, err
}
thumbImageBase64, err = captData.GetThumbImage().ToBase64()
if err != nil {
return nil, err
}
dotsByte, err := json.Marshal(dotData)
if err != nil {
return nil
return nil, err
}
key := helper.StringToMD5(string(dotsByte))
err = redis.Set(ctx, constant.UserCaptchaPrefix+key, dotsByte, time.Minute).Err()
if err != nil {
return nil
return nil, err
}
return map[string]interface{}{
"key": key,
"image": masterImageBase64,
"thumb": thumbImageBase64,
}
}, nil
}

10
app/core/api/common/captcha/generate/generate_rotate_captcha.go
View File

@@ -22,8 +22,14 @@ func GenerateRotateCaptcha(captcha rotate.Captcha, redis *redis.Client, ctx cont
if blockData == nil {
return nil, nil
}
masterImageBase64 := captchaData.GetMasterImage().ToBase64()
thumbImageBase64 := captchaData.GetThumbImage().ToBase64()
masterImageBase64, err := captchaData.GetMasterImage().ToBase64()
if err != nil {
return nil, err
}
thumbImageBase64, err := captchaData.GetThumbImage().ToBase64()
if err != nil {
return nil, err
}
dotsByte, err := json.Marshal(blockData)
if err != nil {
return nil, err

10
app/core/api/common/captcha/generate/generate_slide_basic_captcha.go
View File

@@ -23,9 +23,15 @@ func GenerateSlideBasicCaptcha(slide slide.Captcha, redis *redis.Client, ctx con
return nil, nil
}
var masterImageBase64, tileImageBase64 string
masterImageBase64 = captData.GetMasterImage().ToBase64()
masterImageBase64, err = captData.GetMasterImage().ToBase64()
if err != nil {
return nil, err
}
tileImageBase64 = captData.GetTileImage().ToBase64()
tileImageBase64, err = captData.GetTileImage().ToBase64()
if err != nil {
return nil, err
}
dotsByte, err := json.Marshal(blockData)
if err != nil {

23
app/core/api/common/captcha/generate/generate_slide_region_captcha.go
View File

@@ -3,6 +3,7 @@ package generate
import (
"context"
"encoding/json"
"errors"
"time"
"github.com/redis/go-redis/v9"
@@ -13,29 +14,35 @@ import (
)
// GenerateSlideRegionCaptcha generate slide region captcha
func GenerateSlideRegionCaptcha(slide slide.Captcha, redis redis.Client, ctx context.Context) map[string]interface{} {
func GenerateSlideRegionCaptcha(slide slide.Captcha, redis redis.Client, ctx context.Context) (map[string]interface{}, error) {
captData, err := slide.Generate()
if err != nil {
return nil
return nil, err
}
blockData := captData.GetData()
if blockData == nil {
return nil
return nil, errors.New("block data is nil")
}
var masterImageBase64, tileImageBase64 string
masterImageBase64 = captData.GetMasterImage().ToBase64()
tileImageBase64 = captData.GetTileImage().ToBase64()
masterImageBase64, err = captData.GetMasterImage().ToBase64()
if err != nil {
return nil, err
}
tileImageBase64, err = captData.GetTileImage().ToBase64()
if err != nil {
return nil, err
}
blockByte, err := json.Marshal(blockData)
if err != nil {
return nil
return nil, err
}
key := helper.StringToMD5(string(blockByte))
err = redis.Set(ctx, constant.UserCaptchaPrefix+key, blockByte, time.Minute).Err()
if err != nil {
return nil
return nil, err
}
return map[string]interface{}{
"code": 0,
@@ -46,5 +53,5 @@ func GenerateSlideRegionCaptcha(slide slide.Captcha, redis redis.Client, ctx con
"tile_height": blockData.Height,
"tile_x": blockData.TileX,
"tile_y": blockData.TileY,
}
}, nil
}