release- merge

luoo_user/src/main/java/com/luoo/user/controller/LoginController.java

@@ -1,45 +1,44 @@
 package com.luoo.user.controller;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import annotation.GlobalInterceptor;
+import annotation.VerifyParam;
+import api.Result;
+import api.StatusCode;
 import com.alibaba.fastjson.JSONObject;
+import com.luoo.user.dto.UserNameLoginDto;
 import com.luoo.user.dto.request.*;
-import com.luoo.user.service.WeChatAouth2Service;
-import com.luoo.user.util.IOSTokenUtils;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.*;
-
-import constants.Constants;
-import controller.BaseController;
-
 import com.luoo.user.dto.response.CountryCodeDTO;
 import com.luoo.user.dto.response.CreateImageCode;
 import com.luoo.user.pojo.UserInfo;
 import com.luoo.user.service.UserInfoService;
-import com.luoo.user.util.NickNameUtil;
-
-import annotation.GlobalInterceptor;
-import annotation.VerifyParam;
-import api.Result;
-import api.StatusCode;
+import com.luoo.user.service.WeChatAouth2Service;
+import com.luoo.user.util.IOSTokenUtils;
+import constants.Constants;
+import constants.ErrorConstants;
+import controller.BaseController;
 import enums.RequestFrequencyTypeEnum;
-import enums.VerifyRegexEnum;
+import enums.UserStatusEnum;
+import exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import util.IdWorker;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 import util.JwtUtil;
 import util.StringTools;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
 /**
  * 控制器层
  *