'合并'

src/main/java/com/futu/course/common/intercepter/AuthIntercepter.java

@@ -49,25 +49,18 @@ public class AuthIntercepter implements HandlerInterceptor {
         log.info(request.getRequestURI());
         //log.info("deviceId={},token={},time={}",deviceId,token,time);
         try {
-
             if (!(handler instanceof HandlerMethod)) {
                 return true;
             }
-
             HandlerMethod handlerMethod = (HandlerMethod) handler;
-
             Method method = handlerMethod.getMethod();
-
             NonLoginRequired loginRequired = method.getAnnotation(NonLoginRequired.class);
             //有@LoginRequired注解，需要认证
             if (loginRequired != null) {
-
                 return true;
             }
-
             log.info("---interceptertoken");
             log.info(token);
-
             if (StringUtils.isEmpty(token)) {
                 log.info("*********************》token为空");
                 throw new RRException("token错误,请重新登录", 101);
@@ -81,6 +74,7 @@ public class AuthIntercepter implements HandlerInterceptor {
             log.info("************************************》");
             Long userId = TokenUtils.getUserId(token);
             log.info("userId={}",userId);
+
             Object obj = redisTemplate.opsForValue().get("user");
             if (obj == null) {
                 log.info("************************用户token不存在");
@@ -91,7 +85,6 @@ public class AuthIntercepter implements HandlerInterceptor {
 
         } catch (RRException e) {
             log.info("调用了异常通知" + e.getMessage());
-
             throw e;
         }
 

src/main/java/com/futu/course/cupons/controller/CouponController.java

@@ -17,6 +17,7 @@ public class CouponController {
     @Resource
     private CouponService couponService;
 
+//    可以使用的优惠券
     @RequestMapping("/findAll")
     public R findAll(BigDecimal primary){
         List<Coupon> all = couponService.findAll(primary);