From 66d8f35c338e48cd05a664034e2e510f8de32d9f Mon Sep 17 00:00:00 2001
From: Go-Go-Farther <sxp.wushu@gmail.com>
Date: Thu, 14 Jul 2022 00:41:06 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=201.=E4=BF=AE=E6=94=B9=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E6=AD=A3=E5=88=99=EF=BC=8C=E5=85=81=E8=AE=B8=E5=85=A8?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E8=B4=A6=E5=8F=B7=EF=BC=8C=E4=BF=9D=E8=AF=81?=
 =?UTF-8?q?=E8=83=BD=E9=80=9A=E8=BF=87=E5=B7=B2=E6=9C=89=E5=85=A8=E6=95=B0?=
 =?UTF-8?q?=E5=AD=97=E8=B4=A6=E5=8F=B7=E4=BD=93=E7=B3=BB=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=EF=BC=9B2.Prepare=E5=87=BD=E6=95=B0=E9=87=8D=E5=A4=8D=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/enumerate.go                |  2 +-
 controllers/AccountController.go | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/conf/enumerate.go b/conf/enumerate.go
index 3d282179..2fe406a2 100644
--- a/conf/enumerate.go
+++ b/conf/enumerate.go
@@ -20,7 +20,7 @@ const CaptchaSessionName = "__captcha__"
 const RegexpEmail = "^[a-zA-Z0-9.!#$%&'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$"
 
 //允许用户名中出现点号
-const RegexpAccount = `^[a-zA-Z][a-zA-Z0-9\.-]{2,50}$`
+const RegexpAccount = `^[a-zA-Z0-9][a-zA-Z0-9\.-]{2,50}$`
 
 // PageSize 默认分页条数.
 const PageSize = 10
diff --git a/controllers/AccountController.go b/controllers/AccountController.go
index e270d399..cb59b134 100644
--- a/controllers/AccountController.go
+++ b/controllers/AccountController.go
@@ -99,8 +99,6 @@ func (c *AccountController) Prepare() {
 
 // Login 用户登录
 func (c *AccountController) Login() {
-	c.Prepare()
-
 	c.TplName = "account/login.tpl"
 
 	if member, ok := c.GetSession(conf.LoginSessionName).(models.Member); ok && member.MemberId > 0 {
@@ -205,8 +203,6 @@ func (c *AccountController) Login() {
 
 // 钉钉登录
 func (c *AccountController) DingTalkLogin() {
-	c.Prepare()
-
 	code := c.GetString("dingtalk_code")
 	if code == "" {
 		c.JsonResult(500, i18n.Tr(c.Lang, "message.failed_obtain_user_info"), nil)
@@ -259,8 +255,6 @@ func (c *AccountController) DingTalkLogin() {
 
 // WorkWeixinLogin 用户企业微信登录
 func (c *AccountController) WorkWeixinLogin() {
-	c.Prepare()
-
 	logs.Info("UserAgent: ", c.Ctx.Input.UserAgent()) // debug
 
 	if member, ok := c.GetSession(conf.LoginSessionName).(models.Member); ok && member.MemberId > 0 {
@@ -508,8 +502,6 @@ func (c *AccountController) WorkWeixinLoginCallback() {
 
 // WorkWeixinLoginBind 用户企业微信登录-绑定
 func (c *AccountController) WorkWeixinLoginBind() {
-	c.Prepare()
-
 	if user_info, ok := c.GetSession(SessionUserInfoKey).(workweixin.WorkWeixinUserInfo); ok && len(user_info.UserId) > 0 {
 		req_account := c.GetString("account")
 		req_password := c.GetString("password")
@@ -670,8 +662,6 @@ func (c *AccountController) WorkWeixinLoginIgnore() {
 
 // QR二维码登录
 func (c *AccountController) QRLogin() {
-	c.Prepare()
-
 	appName := c.Ctx.Input.Param(":app")
 
 	switch appName {
@@ -969,7 +959,6 @@ func (c *AccountController) FindPassword() {
 
 // 校验邮件并修改密码
 func (c *AccountController) ValidEmail() {
-	c.Prepare()
 	password1 := c.GetString("password1")
 	password2 := c.GetString("password2")
 	captcha := c.GetString("code")
@@ -1043,8 +1032,6 @@ func (c *AccountController) Logout() {
 
 // 验证码
 func (c *AccountController) Captcha() {
-	c.Prepare()
-
 	captchaImage := gocaptcha.NewCaptchaImage(140, 40, gocaptcha.RandLightColor())
 
 	captchaImage.DrawNoise(gocaptcha.CaptchaComplexLower)