From e675bc260d42061bae769bd0d99764273f78f22f Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 16 Jul 2022 16:30:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:art:=20=E8=AE=BF=E9=97=AE=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E7=A0=81=E8=BE=93=E5=85=A5=E9=94=99=E8=AF=AF=203=20?= =?UTF-8?q?=E6=AC=A1=E5=90=8E=E5=8A=A0=E5=85=A5=E9=AA=8C=E8=AF=81=E7=A0=81?= =?UTF-8?q?=20https://github.com/siyuan-note/siyuan/issues/5429?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/appearance/langs/en_US.json | 4 ++-- app/appearance/langs/es_ES.json | 4 ++-- app/appearance/langs/fr_FR.json | 4 ++-- app/appearance/langs/zh_CHT.json | 4 ++-- app/appearance/langs/zh_CN.json | 4 ++-- kernel/model/session.go | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index c00861ca4..49f44efcf 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -776,8 +776,8 @@ "18": "Get community user account failed", "19": "User information has expired, please log in again", "20": "Cannot be converted to heading when including sub-documents", - "21": "TODO", - "22": "TODO", + "21": "Please enter the captcha", + "22": "The captcha is incorrect", "23": "TODO", "24": "TODO", "25": "The attribute name only supports English letters and digits", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 2f5023c3c..4254a61f5 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -776,8 +776,8 @@ "18": "Falló la obtención de la cuenta de usuario de la comunidad", "19": "La información del usuario ha caducado, por favor, inicie sesión de nuevo", "20": "No se puede convertir en título al incluir subdocumentos", - "21": "TODO", - "22": "TODO", + "21": "Por favor ingrese el captcha", + "22": "El captcha es incorrecto", "23": "TODO", "24": "TODO", "25": "El nombre del atributo sólo admite letras y dígitos en inglés", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 666e52d1c..de473b2c2 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -776,8 +776,8 @@ "18": "Échec de la récupération du compte utilisateur communautaire", "19": "Les informations de l'utilisateur ont expiré, veuillez vous connecter à nouveau.", "20": "Ne peut pas être converti en titre lorsque des sous-documents sont inclus.", - "21": "TODO", - "22": "TODO", + "21": "Veuillez entrer le captcha", + "22": "Le captcha est incorrect", "23": "TODO", "24": "TODO", "25": "Le nom de l'attribut ne supporte que les lettres et les chiffres anglais.", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 39f6e6fa4..047256684 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -776,8 +776,8 @@ "18": "獲取社區用戶帳號失敗", "19": "使用者資訊已過期，請重新登入帳號", "20": "包含子文檔時無法轉換為標題", - "21": "TODO", - "22": "TODO", + "21": "請輸入驗證碼", + "22": "驗證碼不正確", "23": "TODO", "24": "TODO", "25": "屬性名僅支援英文字母和阿拉伯數字", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index d79d9490e..6f0f3e02a 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -777,8 +777,8 @@ "18": "获取社区用户账号失败", "19": "用户信息已过期，请重新登录账号", "20": "包含子文档时无法转换为标题", - "21": "TODO", - "22": "TODO", + "21": "请输入验证码", + "22": "验证码不正确", "23": "TODO", "24": "TODO", "25": "属性名仅支持英文字母和阿拉伯数字", diff --git a/kernel/model/session.go b/kernel/model/session.go index de75918bc..7804ed3f2 100644 --- a/kernel/model/session.go +++ b/kernel/model/session.go @@ -66,14 +66,14 @@ func LoginAuth(c *gin.Context) { captchaArg := arg["captcha"] if nil == captchaArg { ret.Code = 1 - ret.Msg = "need input captcha" + ret.Msg = Conf.Language(21) return } inputCaptcha = captchaArg.(string) if session.Captcha != inputCaptcha { ret.Code = 1 - ret.Msg = "invalid captcha" + ret.Msg = Conf.Language(22) return } } From a32e2eb1c019148dd21e8b96308235be6dfa8945 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 16 Jul 2022 16:41:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:art:=20=E8=AE=BF=E9=97=AE=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E7=A0=81=E8=BE=93=E5=85=A5=E9=94=99=E8=AF=AF=203=20?= =?UTF-8?q?=E6=AC=A1=E5=90=8E=E5=8A=A0=E5=85=A5=E9=AA=8C=E8=AF=81=E7=A0=81?= =?UTF-8?q?=20https://github.com/siyuan-note/siyuan/issues/5429?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/session.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/model/session.go b/kernel/model/session.go index 7804ed3f2..105848967 100644 --- a/kernel/model/session.go +++ b/kernel/model/session.go @@ -71,7 +71,7 @@ func LoginAuth(c *gin.Context) { } inputCaptcha = captchaArg.(string) - if session.Captcha != inputCaptcha { + if strings.ToLower(session.Captcha) != strings.ToLower(inputCaptcha) { ret.Code = 1 ret.Msg = Conf.Language(22) return @@ -109,10 +109,9 @@ func LoginAuth(c *gin.Context) { func GetCaptcha(c *gin.Context) { img, err := captcha.New(100, 26, func(options *captcha.Options) { - options.CharPreset = "abcdefghjkmnpqrtuvwxyz2346789" + options.CharPreset = "ABCDEFGHKLMNPQRSTUVWXYZ23456789" options.Noise = 0.5 options.CurveNumber = 0 - options.FontScale = 1.2 }) if nil != err { util.LogErrorf("generates captcha failed: " + err.Error())