From 9c5310603395cab83c4abefa715a52732e31c174 Mon Sep 17 00:00:00 2001
From: xiangheng <11675084@qq.com>
Date: Wed, 12 Jun 2024 14:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=AA=8C=E8=AF=81=E7=A0=81?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/components/verify/Verify/VerifyPoints.vue           | 4 ++--
 server/.vscode/settings.json                                  | 4 ++++
 .../util/aj-captcha-go/service/click_word_captcha_service.go  | 4 ++--
 server/util/aj-captcha-go/util/image_util.go                  | 3 ++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/verify/Verify/VerifyPoints.vue b/admin/src/components/verify/Verify/VerifyPoints.vue
index 065efd6..a1cfed3 100644
--- a/admin/src/components/verify/Verify/VerifyPoints.vue
+++ b/admin/src/components/verify/Verify/VerifyPoints.vue
@@ -220,8 +220,8 @@ export default {
         //坐标转换函数
         const pointTransform = function (pointArr) {
             const newPointArr = pointArr.map((p) => {
-                const x = null // Math.round((310 * p.x) / parseInt(props.imgSize.width))
-                const y = null //Math.round((155 * p.y) / parseInt(props.imgSize.height))
+                const x = Math.round((310 * p.x) / parseInt(props.imgSize.width))
+                const y = Math.round((155 * p.y) / parseInt(props.imgSize.height))
                 return { x, y }
             })
             return newPointArr
diff --git a/server/.vscode/settings.json b/server/.vscode/settings.json
index 350e3a8..05a5c9f 100644
--- a/server/.vscode/settings.json
+++ b/server/.vscode/settings.json
@@ -1,13 +1,17 @@
 {
     "cSpell.words": [
         "excelize",
+        "fontsize",
+        "freetype",
         "gocode",
         "gonic",
         "gorm",
         "Infof",
+        "Inno",
         "jinzhu",
         "mapstructure",
         "rmvb",
+        "uniapp",
         "Warnf",
         "webp",
         "x_admin"
diff --git a/server/util/aj-captcha-go/service/click_word_captcha_service.go b/server/util/aj-captcha-go/service/click_word_captcha_service.go
index b620dec..9b7c98c 100644
--- a/server/util/aj-captcha-go/service/click_word_captcha_service.go
+++ b/server/util/aj-captcha-go/service/click_word_captcha_service.go
@@ -85,11 +85,11 @@ func (c *ClickWordCaptchaService) Check(token string, pointJson string) error {
 	if err != nil {
 		return err
 	}
-	fontsize := c.factory.config.ClickWord.FontSize
+	fontSize := c.factory.config.ClickWord.FontSize
 	for i, pointVO := range cachePoint {
 		targetPoint := userPoint[i]
 
-		if targetPoint.X >= pointVO.X-10 && targetPoint.X <= pointVO.X+fontsize+10 && targetPoint.Y >= pointVO.Y-10 && targetPoint.Y <= pointVO.Y+fontsize+10 {
+		if targetPoint.X >= pointVO.X-10 && targetPoint.X <= pointVO.X+fontSize+10 && targetPoint.Y >= pointVO.Y-10 && targetPoint.Y <= pointVO.Y+fontSize+10 {
 
 		} else {
 			return errors.New("验证失败")
diff --git a/server/util/aj-captcha-go/util/image_util.go b/server/util/aj-captcha-go/util/image_util.go
index ccadcd4..fa376ad 100644
--- a/server/util/aj-captcha-go/util/image_util.go
+++ b/server/util/aj-captcha-go/util/image_util.go
@@ -31,7 +31,8 @@ type ImageUtil struct {
 func NewImageUtil(src string, fontPath string) *ImageUtil {
 	srcImage := OpenPngImage(src)
 
-	return &ImageUtil{Src: src,
+	return &ImageUtil{
+		Src:       src,
 		SrcImage:  srcImage,
 		RgbaImage: ImageToRGBA(srcImage),
 		Width:     srcImage.Bounds().Dx(),