Pre Merge pull request !386 from Princess-Y/test

ruoyi-admin/src/main/resources/application-druid.yml

@@ -1,4 +1,5 @@
 # 数据源配置
+#测试分支
 spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
@@ -8,14 +9,14 @@ spring:
             master:
                 url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: password
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -35,7 +36,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -54,4 +55,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true

ruoyi-admin/src/main/resources/static/i18n/messages.properties

@@ -3,6 +3,10 @@ not.null=* 必须填写
 user.jcaptcha.error=验证码错误
 user.not.exists=用户不存在/密码错误
 user.password.not.match=用户不存在/密码错误
+#新增
+user.account.error = 账号错误
+user.password.error =密码错误
+#
 user.password.retry.limit.count=密码输入错误{0}次
 user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟
 user.password.delete=对不起，您的账号已被删除
@@ -14,7 +18,7 @@ length.not.valid=长度必须在{min}到{max}个字符之间
 
 user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
 user.password.not.valid=* 5-50个字符
- 
+
 user.email.not.valid=邮箱格式错误
 user.mobile.phone.number.not.valid=手机号格式错误
 user.login.success=登录成功

ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java

@@ -2,7 +2,7 @@ package com.ruoyi.common.exception.user;
 
 /**
  * 用户不存在异常类
- * 
+ *
  * @author ruoyi
  */
 public class UserNotExistsException extends UserException
@@ -11,6 +11,7 @@ public class UserNotExistsException extends UserException
 
     public UserNotExistsException()
     {
-        super("user.not.exists", null);
+//        super("user.not.exists", null);
+        super("user.account.error", null);
     }
 }

ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java

@@ -2,7 +2,7 @@ package com.ruoyi.common.exception.user;
 
 /**
  * 用户密码不正确或不符合规范异常类
- * 
+ *
  * @author ruoyi
  */
 public class UserPasswordNotMatchException extends UserException
@@ -11,6 +11,7 @@ public class UserPasswordNotMatchException extends UserException
 
     public UserPasswordNotMatchException()
     {
-        super("user.password.not.match", null);
+//        super("user.password.not.match", null);
+        super("user.password.error", null);
     }
 }