From c9c654245c9c64e0743f57b0c8d687f5950de38b Mon Sep 17 00:00:00 2001 From: Burce Date: Sun, 17 May 2020 12:13:29 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E7=9B=B4=E6=92=AD]=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E7=AD=96=E7=95=A5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/aop/RedisCacheAspect.java | 9 +++++++-- .../src/main/java/com/iformall/aop/RedisCacheAspect.java | 8 ++++++-- .../java/com/iformall/controller/WxLiveController.java | 6 ++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/aop/RedisCacheAspect.java b/mallinkBApi/src/main/java/com/iformall/aop/RedisCacheAspect.java index 31500c136..463eb0a0a 100644 --- a/mallinkBApi/src/main/java/com/iformall/aop/RedisCacheAspect.java +++ b/mallinkBApi/src/main/java/com/iformall/aop/RedisCacheAspect.java @@ -26,6 +26,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Method; import java.util.Arrays; +import java.util.Objects; @Slf4j @Aspect @@ -66,8 +67,12 @@ public class RedisCacheAspect { token = request.getParameter("token"); } String tenantId; - WxBuser wxBuser = userTokenService.getByToken(token); - if (wxBuser == null || wxBuser.getExpireTime().getTime() < System.currentTimeMillis()) { + + WxBuser wxBuser = null; + if (StringUtils.isNotBlank(token)) { + wxBuser = userTokenService.getByToken(token); + } + if (Objects.isNull(wxBuser) || wxBuser.getExpireTime().getTime() < System.currentTimeMillis()) { tenantId = "0"; } else { tenantId = wxBuser.getTenantId(); diff --git a/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java b/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java index 43e6bb644..a451b2cac 100644 --- a/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java +++ b/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java @@ -24,6 +24,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Method; import java.util.Arrays; +import java.util.Objects; @Slf4j @Aspect @@ -64,8 +65,11 @@ public class RedisCacheAspect { token = request.getParameter("token"); } String tenantId; - WxCUser wxCUser = userTokenService.getByToken(token); - if (wxCUser == null || wxCUser.getExpireTime().getTime() < System.currentTimeMillis()) { + WxCUser wxCUser = null ; + if(StringUtils.isNotBlank(token)) { + wxCUser = userTokenService.getByToken(token); + } + if (Objects.isNull(wxCUser) || wxCUser.getExpireTime().getTime() < System.currentTimeMillis()) { tenantId = "0"; } else { tenantId = wxCUser.getTenantId(); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java index ca3a2cce0..fc239aadf 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java @@ -13,6 +13,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.*; +import java.util.concurrent.TimeUnit; + @RestController @RequestMapping("/api/live") @Api(tags = "微信直播相关接口") @@ -25,7 +27,7 @@ public class WxLiveController extends BaseController { * @return */ @ApiOperation("获取所有直播间和商品信息") - @RedisCache + @RedisCache(expireTime = 30,dateUnit = TimeUnit.MINUTES) @GetMapping("/roomList") public ResultData getLiveinfos(String appId) { ResultData resultData = new ResultData(); @@ -50,7 +52,7 @@ public class WxLiveController extends BaseController { * @return */ @ApiOperation("获取直播房间回放数据和商品信息") - @RedisCache + @RedisCache(expireTime = 30,dateUnit = TimeUnit.MINUTES) @GetMapping("/replayList") public ResultData getLiveReplay(Integer room_id, Integer start, Integer limit) { ResultData resultData = new ResultData();