修改注解名称

src/main/java/cn/quantgroup/xyqb/aspect/captcha/DeviceInterceptor.java → src/main/java/cn/quantgroup/xyqb/aspect/captcha/LoginInterceptor.java

@@ -3,6 +3,6 @@ package cn.quantgroup.xyqb.aspect.captcha;
 /**
  * 设备拦截器
  */
-public @interface DeviceInterceptor {
+public @interface LoginInterceptor {
 
 }

src/main/java/cn/quantgroup/xyqb/aspect/captcha/DeviceInterceptorAspect.java → src/main/java/cn/quantgroup/xyqb/aspect/captcha/LoginInterceptorAspect.java

@@ -37,7 +37,7 @@ import java.util.Set;
 @Component
 @Slf4j
 @Order(10)//比较靠后执行
-public class DeviceInterceptorAspect {
+public class LoginInterceptorAspect {
     @Resource
     private LoginInfoRepository loginInfoRepository;
 
@@ -65,7 +65,7 @@ public class DeviceInterceptorAspect {
     }
 
 
-    @Pointcut("@annotation(cn.quantgroup.xyqb.aspect.captcha.DeviceInterceptor)")
+    @Pointcut("@annotation(cn.quantgroup.xyqb.aspect.captcha.LoginInterceptor)")
     public void pointCutAt() {
     }
 

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

@@ -3,6 +3,7 @@ package cn.quantgroup.xyqb.controller.external;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.aspect.accessable.IpValidator;
 import cn.quantgroup.xyqb.aspect.captcha.CaptchaFiniteValidator;
+import cn.quantgroup.xyqb.aspect.captcha.LoginInterceptor;
 import cn.quantgroup.xyqb.aspect.limit.PasswordFreeAccessValidator;
 import cn.quantgroup.xyqb.aspect.lock.PasswordErrorFiniteValidator;
 import cn.quantgroup.xyqb.controller.IBaseController;
@@ -94,6 +95,7 @@ public class UserController implements IBaseController {
      * @param dimension
      * @return
      */
+    @LoginInterceptor
     @CaptchaFiniteValidator
     @RequestMapping("/loginV1")
     public JsonResult loginV1(
@@ -156,6 +158,7 @@ public class UserController implements IBaseController {
         return loginFast(channelId, appChannel, createdFrom, key, btRegisterChannelId, dimension, clickId, request);
     }
 
+    @LoginInterceptor
     @RequestMapping("/login/fast")
     public JsonResult loginFast(
             @RequestParam(required = false, defaultValue = "1") Long channelId, String appChannel,

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

 package cn.quantgroup.xyqb.controller.internal.user;
 
 import cn.quantgroup.xyqb.aspect.accessable.IpValidator;
+import cn.quantgroup.xyqb.aspect.captcha.LoginInterceptor;
 import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.entity.Merchant;
 import cn.quantgroup.xyqb.entity.User;
@@ -17,8 +18,6 @@ import cn.quantgroup.xyqb.util.IpUtil;
 import cn.quantgroup.xyqb.util.ValidationUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -175,7 +174,7 @@ public class AppController implements IBaseController {
      * @param request
      * @return Token和phoneNo
      */
-
+    @LoginInterceptor
     @IpValidator
     @RequestMapping("/login2")
     @ApiOperation(value = "免密登陆, 新手机号不自动注册", notes = "免密登陆, 新手机号不自动注册", httpMethod = "POST")