From a9788994d3c198c67ab84409a1b9d134de35ce36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 11 Aug 2021 13:38:25 +0800
Subject: [PATCH] 'commit'

---
 dsSzxy/.idea/workspace.xml                    |  7 ++---
 .../CaptchaController/CaptchaController.go    | 30 ++++++++++++++-----
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/dsSzxy/.idea/workspace.xml b/dsSzxy/.idea/workspace.xml
index 91020ddc..4c1c6859 100644
--- a/dsSzxy/.idea/workspace.xml
+++ b/dsSzxy/.idea/workspace.xml
@@ -5,11 +5,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="19c8c37d-a056-451c-a29d-fb612b9a3e2f" name="Default Changelist" comment="commit">
-      <change beforePath="$PROJECT_DIR$/Tools/Distribute.go" beforeDir="false" afterPath="$PROJECT_DIR$/Tools/Distribute.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/WinBuild/Distribute.exe" beforeDir="false" afterPath="$PROJECT_DIR$/WinBuild/Distribute.exe" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/Config/logo.txt" beforeDir="false" afterPath="$PROJECT_DIR$/build/Config/logo.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/dsSzxy" beforeDir="false" afterPath="$PROJECT_DIR$/build/dsSzxy" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/一键发布.cmd" beforeDir="false" afterPath="$PROJECT_DIR$/一键发布.cmd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Business/CaptchaRelate/CaptchaController/CaptchaController.go" beforeDir="false" afterPath="$PROJECT_DIR$/Business/CaptchaRelate/CaptchaController/CaptchaController.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/dsSzxy/Business/CaptchaRelate/CaptchaController/CaptchaController.go b/dsSzxy/Business/CaptchaRelate/CaptchaController/CaptchaController.go
index 61dc673f..927a2501 100644
--- a/dsSzxy/Business/CaptchaRelate/CaptchaController/CaptchaController.go
+++ b/dsSzxy/Business/CaptchaRelate/CaptchaController/CaptchaController.go
@@ -67,22 +67,38 @@ func CaptMake() (string, string) {
 	//https://captcha.mojotv.cn/
 
 	//四则运算
-	driver := &base64Captcha.DriverMath{
-		Height:     60,
-		Width:      240,
-		NoiseCount: 0,
+	//driver := &base64Captcha.DriverMath{
+	//	Height:     60,
+	//	Width:      240,
+	//	NoiseCount: 0,
+	//	BgColor: &color.RGBA{
+	//		R: 52,
+	//		G: 56,
+	//		B: 98,
+	//		A: 58,
+	//	},
+	//	Fonts: []string{"wqy-microhei.ttc"},
+	//}
+	//driver.ConvertFonts()
+
+	//中文
+	driver := &base64Captcha.DriverChinese{
+		Height:          50,
+		Width:           300,
+		NoiseCount:      0,
+		ShowLineOptions: 1,
+		Length:          2,
 		BgColor: &color.RGBA{
 			R: 52,
 			G: 56,
 			B: 98,
 			A: 58,
 		},
-		Fonts: []string{"wqy-microhei.ttc"},
+		Source: "东师理想,大数据,超融合,智慧校园,数字校园,黄海,吴缤,超人气,抗疫情,努力,加油,长春",
+		Fonts:  []string{"wqy-microhei.ttc"},
 	}
 	driver.ConvertFonts()
 
-	//中文
-
 	// 生成base64图片
 	c, err := cache.New(cache.Cfg{
 		Driver: "redis",