From 40da24ada401420d67f81d50bae3d7a47fde51b6 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 9 Jun 2020 00:05:12 +0800 Subject: [PATCH] fix bug --- .../controller/WxCouponOrderController.java | 6 +- .../interceptor/AuthorizationInterceptor.java | 66 +++++++++---------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index aa8703832..03390dda2 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -111,9 +111,9 @@ public class WxCouponOrderController extends BaseController { if (wxCouponOrderCVo == null) { return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); } -// if (!wxCouponOrderCVo.getCUserId().equals(getUserId())) { -// return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); -// } + if (!wxCouponOrderCVo.getCUserId().equals(getUserId())) { + return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); + } WxCouponCVo wxCouponCVo = null; String key = "cd:" + wxCouponOrderCVo.getCouponId(); ValueOperations operations = cdRedisTemplate.opsForValue(); diff --git a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index c641cdf37..451e9328b 100644 --- a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -32,39 +32,39 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { System.out.println(" requesturi......"+request.getRequestURL()); -// AuthIgnore annotation; -// if(handler instanceof HandlerMethod) { -// annotation = ((HandlerMethod) handler).getMethodAnnotation(AuthIgnore.class); -// }else{ -// return true; -// } -// -// //如果有@IgnoreAuth注解,则不验证token -// if(annotation != null){ -// return true; -// } -// -// //从header中获取token -// String token = request.getHeader("token"); -// //如果header中不存在token,则从参数中获取token -// if(StringUtils.isBlank(token)){ -// token = request.getParameter("token"); -// } -// -// //token为空 -// if(StringUtils.isBlank(token)){ -// throw new MallinkException(ErrorCode.NET_TOKEN_EMPTY); -// } -// -// // 查询token信息 -// WxCUser wxCUser = userTokenService.getByToken(token); -// if(wxCUser == null || wxCUser.getExpireTime().getTime() < System.currentTimeMillis()){ -// throw new MallinkException(ErrorCode.NET_TOKEN_INVALID.getCode(), "URL:" + request.getRequestURL() + " token失效,请重新登录"); -// } -// -// //设置userId到request里,后续根据userId,获取用户信息 -// request.setAttribute(Constant.LOGIN_USER_KEY, wxCUser.getId()); -// request.setAttribute(Constant.TENANT_ID, wxCUser.getTenantId()); + AuthIgnore annotation; + if(handler instanceof HandlerMethod) { + annotation = ((HandlerMethod) handler).getMethodAnnotation(AuthIgnore.class); + }else{ + return true; + } + + //如果有@IgnoreAuth注解,则不验证token + if(annotation != null){ + return true; + } + + //从header中获取token + String token = request.getHeader("token"); + //如果header中不存在token,则从参数中获取token + if(StringUtils.isBlank(token)){ + token = request.getParameter("token"); + } + + //token为空 + if(StringUtils.isBlank(token)){ + throw new MallinkException(ErrorCode.NET_TOKEN_EMPTY); + } + + // 查询token信息 + WxCUser wxCUser = userTokenService.getByToken(token); + if(wxCUser == null || wxCUser.getExpireTime().getTime() < System.currentTimeMillis()){ + throw new MallinkException(ErrorCode.NET_TOKEN_INVALID.getCode(), "URL:" + request.getRequestURL() + " token失效,请重新登录"); + } + + //设置userId到request里,后续根据userId,获取用户信息 + request.setAttribute(Constant.LOGIN_USER_KEY, wxCUser.getId()); + request.setAttribute(Constant.TENANT_ID, wxCUser.getTenantId()); return true; }