From cd510b43b1ef85202ddf9018271aaadf695f3c8d Mon Sep 17 00:00:00 2001
From: hewenqiang <1527468660@qq.com>
Date: 星期二, 25 一月 2022 17:17:06 +0800
Subject: [PATCH] fix 优化登录、注册校验方式，在接口通过@Validated进行数据基础校验，以及服务执行到异常后，抛出异常结束方法执行（减少if-else嵌套）。
---
ruoyi-admin/src/main/resources/i18n/messages.properties | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/i18n/messages.properties b/ruoyi-admin/src/main/resources/i18n/messages.properties
index d63aa1f..06e85c1 100644
--- a/ruoyi-admin/src/main/resources/i18n/messages.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages.properties
@@ -1,32 +1,35 @@
#閿欒娑堟伅
not.null=* 蹇呴』濉啓
+user.jcaptcha.blank=楠岃瘉鐮佷笉鑳戒负绌�
user.jcaptcha.error=楠岃瘉鐮侀敊璇�
user.jcaptcha.expire=楠岃瘉鐮佸凡澶辨晥
-user.not.exists=鐢ㄦ埛涓嶅瓨鍦�/瀵嗙爜閿欒
+user.not.exists=瀵逛笉璧�, 鎮ㄧ殑璐﹀彿锛歿0} 涓嶅瓨鍦�.
user.password.not.match=鐢ㄦ埛涓嶅瓨鍦�/瀵嗙爜閿欒
user.password.retry.limit.count=瀵嗙爜杈撳叆閿欒{0}娆�
-user.password.retry.limit.exceed=瀵嗙爜杈撳叆閿欒{0}娆★紝甯愭埛閿佸畾10鍒嗛挓
-user.password.delete=瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿宸茶鍒犻櫎
-user.blocked=鐢ㄦ埛宸插皝绂侊紝璇疯仈绯荤鐞嗗憳
+user.password.retry.limit.exceed=瀵嗙爜閿欒娆℃暟杩囧锛屽笎鎴烽攣瀹歿0}鍒嗛挓
+user.password.delete=瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛歿0} 宸茶鍒犻櫎
+user.blocked=瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛歿0} 宸茬鐢紝璇疯仈绯荤鐞嗗憳
role.blocked=瑙掕壊宸插皝绂侊紝璇疯仈绯荤鐞嗗憳
user.logout.success=閫�鍑烘垚鍔�
-
length.not.valid=闀垮害蹇呴』鍦▄min}鍒皗max}涓瓧绗︿箣闂�
-
+user.username.not.blank=鐢ㄦ埛鍚嶄笉鑳戒负绌�
user.username.not.valid=* 2鍒�20涓眽瀛椼�佸瓧姣嶃�佹暟瀛楁垨涓嬪垝绾跨粍鎴愶紝涓斿繀椤讳互闈炴暟瀛楀紑澶�
+user.username.length.valid=璐︽埛闀垮害蹇呴』鍦▄min}鍒皗max}涓瓧绗︿箣闂�
+user.password.not.blank=鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖
+user.password.length.valid=鐢ㄦ埛瀵嗙爜闀垮害蹇呴』鍦▄min}鍒皗max}涓瓧绗︿箣闂�
user.password.not.valid=* 5-50涓瓧绗�
-
user.email.not.valid=閭鏍煎紡閿欒
user.mobile.phone.number.not.valid=鎵嬫満鍙锋牸寮忛敊璇�
user.login.success=鐧诲綍鎴愬姛
+user.register.success=娉ㄥ唽鎴愬姛
+user.register.save.error=淇濆瓨鐢ㄦ埛 {0} 澶辫触锛屾敞鍐岃处鍙峰凡瀛樺湪
+user.register.error=娉ㄥ唽澶辫触锛岃鑱旂郴绯荤粺绠＄悊浜哄憳
user.notfound=璇烽噸鏂扮櫥褰�
user.forcelogout=绠＄悊鍛樺己鍒堕��鍑猴紝璇烽噸鏂扮櫥褰�
user.unknown.error=鏈煡閿欒锛岃閲嶆柊鐧诲綍
-
##鏂囦欢涓婁紶娑堟伅
upload.exceed.maxSize=涓婁紶鐨勬枃浠跺ぇ灏忚秴鍑洪檺鍒剁殑鏂囦欢澶у皬锛�<br/>鍏佽鐨勬枃浠舵渶澶уぇ灏忔槸锛歿0}MB锛�
upload.filename.exceed.length=涓婁紶鐨勬枃浠跺悕鏈�闀縶0}涓瓧绗�
-
##鏉冮檺
no.permission=鎮ㄦ病鏈夋暟鎹殑鏉冮檺锛岃鑱旂郴绠＄悊鍛樻坊鍔犳潈闄� [{0}]
no.create.permission=鎮ㄦ病鏈夊垱寤烘暟鎹殑鏉冮檺锛岃鑱旂郴绠＄悊鍛樻坊鍔犳潈闄� [{0}]
--
Gitblit v1.9.3