fix issues

config.toml

@@ -1,6 +1,13 @@
 [App]
 Mode = "debug"
 
+[Captcha]
+KeyLong = 6
+ImgWidth = 240 #验证码宽度
+ImgHeight = 80 # 验证码高度
+OpenCaptcha = 0 # 防爆破验证码开启此数，0代表每次登录都需要验证码，其他数字代表错误密码此数，如3代表错误三次后出现验证码
+OpenCaptchaTimeOut = 1h # 防爆破验证码超时时间，单位：s(秒)
+
 [Storage]
 Driver = "local"
 
@@ -90,7 +97,7 @@ Port = 3306
 Database = "demos11"
 Username = "root"
 Password = "root"
-Prefix=""
+Prefix = ""
 Singular = false
 MaxIdleConns = 10
 MaxOpenConns = 200

modules/system/container/container.go

@@ -20,7 +20,7 @@ func init() {
 		log.Fatal(err)
 	}
 
-	if err := container.Container.Provide(controller.NewController); err != nil {
+	if err := container.Container.Provide(controller.NewCaptchaController); err != nil {
 		log.Fatal(err)
 	}
 

modules/system/controller/captcha.go

@@ -0,0 +1,44 @@
+package controller
+
+import (
+	"atom/modules/system/dto"
+	"atom/providers/config"
+	"errors"
+
+	"github.com/gin-gonic/gin"
+	"github.com/mojocn/base64Captcha"
+)
+
+type CaptchaController interface {
+	Show(*gin.Context) (dto.SysCaptchaResponse, error)
+}
+
+type captchaControllerImpl struct {
+	conf *config.Config
+}
+
+func NewCaptchaController(conf *config.Config) CaptchaController {
+	return &captchaControllerImpl{conf: conf}
+}
+
+func (c *captchaControllerImpl) Show(ctx *gin.Context) (dto.SysCaptchaResponse, error) {
+	// 判断验证码是否开启
+	var store = base64Captcha.DefaultMemStore
+
+	// 字符,公式,验证码配置
+	// 生成默认数字的driver
+	driver := base64Captcha.NewDriverDigit(c.conf.Captcha.ImgHeight, c.conf.Captcha.ImgWidth, c.conf.Captcha.KeyLong, 0.7, 80)
+	// cp := base64Captcha.NewCaptcha(driver, store.UseWithCtx(c))   // v8下使用redis
+	cp := base64Captcha.NewCaptcha(driver, store)
+	id, b64s, err := cp.Generate()
+	if err != nil {
+		return dto.SysCaptchaResponse{}, errors.New("验证码获取失败")
+	}
+
+	return dto.SysCaptchaResponse{
+		CaptchaId:     id,
+		PicPath:       b64s,
+		CaptchaLength: c.conf.Captcha.KeyLong,
+		OpenCaptcha:   c.conf.Captcha.OpenCaptcha != 0,
+	}, nil
+}

modules/system/controller/controller.go

@@ -1,27 +0,0 @@
-package controller
-
-import (
-	"atom/modules/system/dao"
-	"atom/modules/system/dto"
-	"atom/modules/system/service"
-	"atom/providers/config"
-
-	"github.com/gin-gonic/gin"
-)
-
-type Controller interface {
-	GetName(*gin.Context) (dto.Name, error)
-}
-
-type ControllerImpl struct {
-	Conf *config.Config
-	svc  service.SystemService
-}
-
-func NewController(Conf *config.Config, dao dao.Dao, svc service.SystemService) Controller {
-	return &ControllerImpl{Conf: Conf, svc: svc}
-}
-
-func (c *ControllerImpl) GetName(ctx *gin.Context) (dto.Name, error) {
-	return c.svc.GetName(ctx)
-}

modules/system/dto/captcha.go

@@ -0,0 +1,8 @@
+package dto
+
+type SysCaptchaResponse struct {
+	CaptchaId     string `json:"captcha_id,omitempty"`
+	PicPath       string `json:"pic_path,omitempty"`
+	CaptchaLength int    `json:"captcha_length,omitempty"`
+	OpenCaptcha   bool   `json:"open_captcha,omitempty"`
+}

modules/system/dto/name.go

@@ -1,5 +0,0 @@
-package dto
-
-type Name struct {
-	Name string `json:"name"`
-}

modules/system/routes/routes.go

@@ -9,14 +9,14 @@ import (
 )
 
 type Route struct {
-	controller controller.Controller
+	captcha controller.CaptchaController
-	svc        *http.Service
+	svc     *http.Service
 }
 
-func NewRoute(c controller.Controller, svc *http.Service) contracts.Route {
+func NewRoute(captcha controller.CaptchaController, svc *http.Service) contracts.Route {
-	return &Route{controller: c, svc: svc}
+	return &Route{captcha: captcha, svc: svc}
 }
 
 func (r *Route) Register() {
-	r.svc.Engine.GET("/name", gen.DataFunc(r.controller.GetName))
+	r.svc.Engine.GET("/captcha", gen.DataFunc(r.captcha.GetName))
 }

providers/config/loader.go

@@ -12,6 +12,7 @@ import (
 
 type Config struct {
 	App      App
+	Captcha  Captcha
 	Http     Http
 	Log      Log
 	Database Database

providers/config/section_captcha.go

@@ -0,0 +1,22 @@
+package config
+
+import (
+	"log"
+	"time"
+)
+
+type Captcha struct {
+	KeyLong            int    // 验证码长度
+	ImgWidth           int    // 验证码宽度
+	ImgHeight          int    // 验证码高度
+	OpenCaptcha        int    // 防爆破验证码开启此数，0代表每次登录都需要验证码，其他数字代表错误密码此数，如3代表错误三次后出现验证码
+	OpenCaptchaTimeOut string // 防爆破验证码超时时间，单位：s(秒)
+}
+
+func (c *Captcha) OpenCaptchaTimeOutDuration() time.Duration {
+	d, err := time.ParseDuration(c.OpenCaptchaTimeOut)
+	if err != nil {
+		log.Panic(err)
+	}
+	return d
+}