diff --git a/server/service/commonService/captchaService.go b/server/service/commonService/captchaService.go index 05d3758..a4c7b1b 100644 --- a/server/service/commonService/captchaService.go +++ b/server/service/commonService/captchaService.go @@ -4,24 +4,24 @@ import ( "image/color" "x_admin/core" "x_admin/schema/commonSchema" - config2 "x_admin/util/aj-captcha-go/config" - constant "x_admin/util/aj-captcha-go/const" + "x_admin/util/aj-captcha-go/config" + "x_admin/util/aj-captcha-go/constant" "x_admin/util/aj-captcha-go/service" ) -// var captcha_config = config2.NewConfig()// 默认配置,可以根据项目自行配置,将其他类型配置序列化上去 -var captcha_config = config2.Config{ +// var captcha_config = config.NewConfig()// 默认配置,可以根据项目自行配置,将其他类型配置序列化上去 +var captcha_config = config.Config{ CacheType: constant.RedisCacheKey, - Watermark: &config2.WatermarkConfig{ + Watermark: &config.WatermarkConfig{ FontSize: 12, Color: color.RGBA{R: 255, G: 255, B: 255, A: 255}, Text: "admin", }, - ClickWord: &config2.ClickWordConfig{ + ClickWord: &config.ClickWordConfig{ FontSize: 25, FontNum: 4, }, - BlockPuzzle: &config2.BlockPuzzleConfig{Offset: 10}, + BlockPuzzle: &config.BlockPuzzleConfig{Offset: 10}, CacheExpireSec: 2 * 60, // 缓存有效时间 } diff --git a/server/util/aj-captcha-go/config/config.go b/server/util/aj-captcha-go/config/config.go index 677a9e3..7f2bfd7 100644 --- a/server/util/aj-captcha-go/config/config.go +++ b/server/util/aj-captcha-go/config/config.go @@ -2,7 +2,7 @@ package config import ( "image/color" - constant "x_admin/util/aj-captcha-go/const" + "x_admin/util/aj-captcha-go/constant" ) // WatermarkConfig 水印设置 diff --git a/server/util/aj-captcha-go/const/const.go b/server/util/aj-captcha-go/constant/const.go similarity index 72% rename from server/util/aj-captcha-go/const/const.go rename to server/util/aj-captcha-go/constant/const.go index c2abb93..4cc1f7e 100644 --- a/server/util/aj-captcha-go/const/const.go +++ b/server/util/aj-captcha-go/constant/const.go @@ -23,11 +23,11 @@ const ( const ( // DefaultTemplateImageDirectory 滑动模板图文件目录地址 - DefaultTemplateImageDirectory = "/resources/defaultImages/jigsaw/slidingBlock" + DefaultTemplateImageDirectory = "resources/defaultImages/jigsaw/slidingBlock" // DefaultBackgroundImageDirectory 背景图片目录地址 - DefaultBackgroundImageDirectory = "/resources/defaultImages/jigsaw/original" + DefaultBackgroundImageDirectory = "resources/defaultImages/jigsaw/original" // DefaultClickBackgroundImageDirectory 点击背景图默认地址 - DefaultClickBackgroundImageDirectory = "/resources/defaultImages/pic-click" + DefaultClickBackgroundImageDirectory = "resources/defaultImages/pic-click" // DefaultFont 字体文件地址 - DefaultFont = "/resources/fonts/WenQuanZhengHei.ttf" + DefaultFont = "resources/fonts/WenQuanZhengHei.ttf" ) diff --git a/server/util/aj-captcha-go/service/captcha_service_block_puzzle.go b/server/util/aj-captcha-go/service/captcha_service_block_puzzle.go index c25caa0..282417f 100644 --- a/server/util/aj-captcha-go/service/captcha_service_block_puzzle.go +++ b/server/util/aj-captcha-go/service/captcha_service_block_puzzle.go @@ -6,7 +6,7 @@ import ( "fmt" "log" "math" - constant "x_admin/util/aj-captcha-go/const" + "x_admin/util/aj-captcha-go/constant" "x_admin/util/aj-captcha-go/model/vo" "x_admin/util/aj-captcha-go/util" img "x_admin/util/aj-captcha-go/util/image" diff --git a/server/util/aj-captcha-go/service/captcha_service_click_word.go b/server/util/aj-captcha-go/service/captcha_service_click_word.go index f4693f1..17eced6 100644 --- a/server/util/aj-captcha-go/service/captcha_service_click_word.go +++ b/server/util/aj-captcha-go/service/captcha_service_click_word.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" "log" - constant "x_admin/util/aj-captcha-go/const" + "x_admin/util/aj-captcha-go/constant" "x_admin/util/aj-captcha-go/model/vo" "x_admin/util/aj-captcha-go/util" img "x_admin/util/aj-captcha-go/util/image" diff --git a/server/util/aj-captcha-go/util/image/image.go b/server/util/aj-captcha-go/util/image/image.go index 4e2de6b..7b41ad4 100644 --- a/server/util/aj-captcha-go/util/image/image.go +++ b/server/util/aj-captcha-go/util/image/image.go @@ -4,7 +4,7 @@ import ( "log" "os" "path/filepath" - constant "x_admin/util/aj-captcha-go/const" + "x_admin/util/aj-captcha-go/constant" "x_admin/util/aj-captcha-go/util" )