修改账户登录的错误提示,统一改成 账户错误或者密码错误

src/main/java/cn/quantgroup/xyqb/constant/UserConstant.java

+package cn.quantgroup.xyqb.constant;
+
+public class UserConstant {
+  public static final String USER_ERROR_OR_PASSWORD_ERROR = "帐号或密码错误";
+}

src/main/java/cn/quantgroup/xyqb/controller/external/user/AppController.java

@@ -31,6 +31,8 @@ import javax.servlet.http.HttpServletRequest;
 import java.sql.Timestamp;
 import java.util.Random;
 
+import static cn.quantgroup.xyqb.constant.UserConstant.USER_ERROR_OR_PASSWORD_ERROR;
+
 /**
  * @author mengfan.feng
  * @time 2015-10-27 11:41
@@ -63,17 +65,16 @@ public class AppController implements IBaseController {
 
   /**
    * 第三方用户登录
-     *
    */
   @RequestMapping("/login")
   public JsonResult login(
       String phoneNo,
       @RequestParam(required = false, defaultValue = "1") Long registerFrom,
       @RequestParam(required = false, defaultValue = "1") Long channelId,
-            String idNo, String name, String key, @RequestParam(required = false, defaultValue = "")String appChannel, HttpServletRequest request
+      String idNo, String name, String key, @RequestParam(required = false, defaultValue = "") String appChannel, HttpServletRequest request
   ) {
     if (!ValidationUtil.validatePhoneNo(phoneNo)) {
-            return JsonResult.buildErrorStateResult("该用户名不存在，<br/>请重新输入或注册新账号。", null);
+      return JsonResult.buildErrorStateResult(USER_ERROR_OR_PASSWORD_ERROR, null);
     }
 
     String requestIp = IPUtil.getRemoteIP(request);
@@ -83,7 +84,7 @@ public class AppController implements IBaseController {
       user = register(registerFrom, phoneNo, idNo, name, channelId);
     }
     if (user == null) {
-            return JsonResult.buildErrorStateResult("该用户名不存在，<br/>请重新输入或注册新账号。", null);
+      return JsonResult.buildErrorStateResult(USER_ERROR_OR_PASSWORD_ERROR, null);
     }
     Merchant merchant = merchantService.findMerchantByName(key);
     if (merchant == null) {
@@ -104,17 +105,16 @@ public class AppController implements IBaseController {
 
   /**
    * 第三方用户登录并返回用户信息
-     *
    */
   @RequestMapping("/login_super")
-    public JsonResult loginSuper (
+  public JsonResult loginSuper(
       String phoneNo,
       @RequestParam(required = false, defaultValue = "1") Long registerFrom,
       @RequestParam(required = false, defaultValue = "1") Long channelId,
-            String idNo, String name, String key, @RequestParam(required = false, defaultValue = "")String appChannel, HttpServletRequest request
+      String idNo, String name, String key, @RequestParam(required = false, defaultValue = "") String appChannel, HttpServletRequest request
   ) {
     if (!ValidationUtil.validatePhoneNo(phoneNo)) {
-            return JsonResult.buildErrorStateResult("该用户名不存在，<br/>请重新输入或注册新账号。", null);
+      return JsonResult.buildErrorStateResult(USER_ERROR_OR_PASSWORD_ERROR, null);
     }
 
     String requestIp = IPUtil.getRemoteIP(request);
@@ -124,7 +124,7 @@ public class AppController implements IBaseController {
       user = register(registerFrom, phoneNo, idNo, name, channelId);
     }
     if (user == null) {
-            return JsonResult.buildErrorStateResult("该用户名不存在，<br/>请重新输入或注册新账号。", null);
+      return JsonResult.buildErrorStateResult(USER_ERROR_OR_PASSWORD_ERROR, null);
     }
     Merchant merchant = merchantService.findMerchantByName(key);
     if (merchant == null) {
@@ -166,7 +166,7 @@ public class AppController implements IBaseController {
     LOGGER.info("第三方登录用户，保存 User");
 
     User user = new User();
-        if(channelId == 222L) {
+    if (channelId == 222L) {
       user.setRegisteredFrom(channelId);
     } else {
       user.setRegisteredFrom(registerFrom);
@@ -180,7 +180,7 @@ public class AppController implements IBaseController {
     user.setCreatedAt(currentTime);
     userRepository.saveAndFlush(user);
 
-        if(registerFrom != 645L) {
+    if (registerFrom != 645L) {
       smsService.sendAfterRegister(phoneNo);
       LOGGER.info("第三方登录用户注册成功, registerFrom:{}, phoneNo:{}, 并且已发送短信通知", registerFrom, phoneNo);
     }