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,7 +9,7 @@ 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:
                 # 从数据源开关/默认关闭

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=对不起，您的账号已被删除

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

@@ -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

@@ -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);
     }
 }