diff --git a/QMPlusServer/config/config.go b/QMPlusServer/config/config.go index 331af5ff4e894eca380909f97beb8dfb6358d2c9..60d116fa55ee44ea26c96717369279f9e20e18a2 100644 --- a/QMPlusServer/config/config.go +++ b/QMPlusServer/config/config.go @@ -13,6 +13,7 @@ type Config struct { RedisAdmin RedisAdmin `json:"redisAdmin"` System System `json:"system"` JWT JWT `json:"jwt"` + Captcha Captcha `json:"captcha"` } type System struct { // 系统配置 @@ -47,6 +48,12 @@ type Qiniu struct { // 七牛 密钥配置 SecretKey string `json:"secretKey"` } +type Captcha struct { // 验证码配置 + KeyLong int `json:"keyLong"` + ImgWidth int `json:"imgWidth"` + ImgHeight int `json:"imgHeight"` +} + var GinVueAdminconfig Config var VTool *viper.Viper diff --git a/QMPlusServer/controller/api/sys_captcha.go b/QMPlusServer/controller/api/sys_captcha.go index 237cb5d607788378c404b42b7d1a88b73929412c..42068a0d2c4c2f1c23d21a75c52fac9ab1aa37e6 100644 --- a/QMPlusServer/controller/api/sys_captcha.go +++ b/QMPlusServer/controller/api/sys_captcha.go @@ -1,6 +1,7 @@ package api import ( + "gin-vue-admin/config" "gin-vue-admin/controller/servers" "github.com/dchest/captcha" "github.com/gin-gonic/gin" @@ -15,11 +16,11 @@ import ( // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" // @Router /base/captcha [post] func Captcha(c *gin.Context) { - captchaId := captcha.NewLen(6) - servers.ReportFormat(c,true,"验证码获取成功",gin.H{ - "captchaId":captchaId, - "picPath":"/base/captcha/"+captchaId+".png", - }) + captchaId := captcha.NewLen(config.GinVueAdminconfig.Captcha.KeyLong) + servers.ReportFormat(c, true, "验证码获取成功", gin.H{ + "captchaId": captchaId, + "picPath": "/base/captcha/" + captchaId + ".png", + }) } // @Tags base @@ -32,10 +33,3 @@ func Captcha(c *gin.Context) { func CaptchaImg(c *gin.Context) { servers.GinCapthcaServeHTTP(c.Writer, c.Request) } - - - - - - - diff --git a/QMPlusServer/controller/servers/captcha.go b/QMPlusServer/controller/servers/captcha.go index f7be5b9e95c92c58c19ebfa7cfde351e38c50bbb..e92b84015a4a9f75766904362525fe724aaf292e 100644 --- a/QMPlusServer/controller/servers/captcha.go +++ b/QMPlusServer/controller/servers/captcha.go @@ -3,6 +3,7 @@ package servers import ( "bytes" "fmt" + "gin-vue-admin/config" "github.com/dchest/captcha" "net/http" "path" @@ -25,7 +26,7 @@ func GinCapthcaServeHTTP(w http.ResponseWriter, r *http.Request) { } lang := strings.ToLower(r.FormValue("lang")) download := path.Base(dir) == "download" - if Serve(w, r, id, ext, lang, download, 120, 40) == captcha.ErrNotFound { + if Serve(w, r, id, ext, lang, download, config.GinVueAdminconfig.Captcha.ImgWidth, config.GinVueAdminconfig.Captcha.ImgHeight) == captcha.ErrNotFound { http.NotFound(w, r) } } @@ -52,4 +53,3 @@ func Serve(w http.ResponseWriter, r *http.Request, id, ext, lang string, downloa http.ServeContent(w, r, id+ext, time.Time{}, bytes.NewReader(content.Bytes())) return nil } - diff --git a/QMPlusServer/static/config/config.json b/QMPlusServer/static/config/config.json index 78acfd3b63e4332d9a48212206d21559efcf039d..ccdec3c722ec5fd54575268d5506277907c95717 100644 --- a/QMPlusServer/static/config/config.json +++ b/QMPlusServer/static/config/config.json @@ -25,5 +25,10 @@ "useMultipoint": false, "env": "develop", "addr": 8888 + }, + "captcha": { + "keyLong": 6, + "imgWidth": 120, + "imgHeight": 40 } } \ No newline at end of file diff --git a/QMPlusVuePage/src/view/login/login.vue b/QMPlusVuePage/src/view/login/login.vue index f84a81d9d2c73ace96e402424cc792475ac12b88..ac98838527bf4993c7b33a6b146ef10d61cafc75 100644 --- a/QMPlusVuePage/src/view/login/login.vue +++ b/QMPlusVuePage/src/view/login/login.vue @@ -16,10 +16,11 @@ - + 请输入验证码 @@ -121,6 +122,7 @@ export default { .vPic{ position: absolute; right: 10px; + bottom: 0px; // 适配ie } }