更正名称

src/main/java/cn/quantgroup/xyqb/Constants.java

@@ -49,7 +49,7 @@ public interface Constants {
     String CHECK_FAIL = "fail";
     String SPLIT_CHAR = ":";
     String TOKEN_MASTER = "*";
-    String PASSWORDD_HEADER = "Basic ";
+    String PASSWORD_HEADER = "Basic ";
     int AUTHORIZE_HEADER_SIZE = 2;
     String PAGE_NEXT_KEY_XYQB = "xyqb";
     /**

src/main/java/cn/quantgroup/xyqb/aspect/captcha/CaptchaFiniteValidateAdvisor.java

@@ -151,11 +151,11 @@ public class CaptchaFiniteValidateAdvisor {
      */
     private Map<String, String> getHeaderParam(HttpServletRequest request) {
         String credential = request.getHeader("authorization");
-        if (StringUtils.isBlank(credential) || !credential.startsWith(Constants.PASSWORDD_HEADER)) {
+        if (StringUtils.isBlank(credential) || !credential.startsWith(Constants.PASSWORD_HEADER)) {
             LOGGER.info("参数无效, credential:{}", credential);
             return null;
         }
-        credential = credential.substring(Constants.PASSWORDD_HEADER.length());
+        credential = credential.substring(Constants.PASSWORD_HEADER.length());
         byte[] buf = Base64.decodeBase64(credential);
         credential = new String(buf, Charset.forName("UTF-8"));
         String[] credentialArr = credential.split(":");

src/main/java/cn/quantgroup/xyqb/controller/external/UserController.java

@@ -166,8 +166,9 @@ public class UserController implements IBaseController {
             HttpServletRequest request) {
         Map<String, JsonResult> validMap = getHeaderParam(request);
         log.info("login/fast -> channelId:{},appChannel:{},createdFrom:{},btRegisterChannelId:{},key:{},dimension:{},clickId:{}", channelId, appChannel, createdFrom, btRegisterChannelId, key, dimension, clickId);
-        if (null != validMap.get(Constants.CHECK_FAIL)) {
-            return validMap.get(Constants.CHECK_FAIL);
+        JsonResult failResult = validMap.get(Constants.CHECK_FAIL);
+        if (null != failResult) {
+            return failResult;
         }
         Merchant merchant = merchantService.findMerchantByName(key);
         if (merchant == null) {
@@ -463,10 +464,10 @@ public class UserController implements IBaseController {
 
     private User verificateUserNameAndPassword(HttpServletRequest request) {
         String credential = request.getHeader("authorization");
-        if (StringUtils.isBlank(credential) || !credential.startsWith(Constants.PASSWORDD_HEADER)) {
+        if (StringUtils.isBlank(credential) || !credential.startsWith(Constants.PASSWORD_HEADER)) {
             return null;
         }
-        credential = credential.substring(Constants.PASSWORDD_HEADER.length());
+        credential = credential.substring(Constants.PASSWORD_HEADER.length());
         byte[] buf = Base64.decodeBase64(credential);
         String bufStr = "";
         try {