| @@ -26,6 +26,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; | |||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| import java.lang.reflect.Method; | import java.lang.reflect.Method; | ||||
| import java.util.Arrays; | import java.util.Arrays; | ||||
| import java.util.Objects; | |||||
| @Slf4j | @Slf4j | ||||
| @Aspect | @Aspect | ||||
| @@ -66,8 +67,12 @@ public class RedisCacheAspect { | |||||
| token = request.getParameter("token"); | token = request.getParameter("token"); | ||||
| } | } | ||||
| String tenantId; | 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"; | tenantId = "0"; | ||||
| } else { | } else { | ||||
| tenantId = wxBuser.getTenantId(); | tenantId = wxBuser.getTenantId(); | ||||
| @@ -24,6 +24,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; | |||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| import java.lang.reflect.Method; | import java.lang.reflect.Method; | ||||
| import java.util.Arrays; | import java.util.Arrays; | ||||
| import java.util.Objects; | |||||
| @Slf4j | @Slf4j | ||||
| @Aspect | @Aspect | ||||
| @@ -64,8 +65,11 @@ public class RedisCacheAspect { | |||||
| token = request.getParameter("token"); | token = request.getParameter("token"); | ||||
| } | } | ||||
| String tenantId; | 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"; | tenantId = "0"; | ||||
| } else { | } else { | ||||
| tenantId = wxCUser.getTenantId(); | tenantId = wxCUser.getTenantId(); | ||||
| @@ -13,6 +13,8 @@ import org.slf4j.Logger; | |||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||
| import java.util.concurrent.TimeUnit; | |||||
| @RestController | @RestController | ||||
| @RequestMapping("/api/live") | @RequestMapping("/api/live") | ||||
| @Api(tags = "微信直播相关接口") | @Api(tags = "微信直播相关接口") | ||||
| @@ -25,7 +27,7 @@ public class WxLiveController extends BaseController { | |||||
| * @return | * @return | ||||
| */ | */ | ||||
| @ApiOperation("获取所有直播间和商品信息") | @ApiOperation("获取所有直播间和商品信息") | ||||
| @RedisCache | |||||
| @RedisCache(expireTime = 30,dateUnit = TimeUnit.MINUTES) | |||||
| @GetMapping("/roomList") | @GetMapping("/roomList") | ||||
| public ResultData getLiveinfos(String appId) { | public ResultData getLiveinfos(String appId) { | ||||
| ResultData resultData = new ResultData(); | ResultData resultData = new ResultData(); | ||||
| @@ -50,7 +52,7 @@ public class WxLiveController extends BaseController { | |||||
| * @return | * @return | ||||
| */ | */ | ||||
| @ApiOperation("获取直播房间回放数据和商品信息") | @ApiOperation("获取直播房间回放数据和商品信息") | ||||
| @RedisCache | |||||
| @RedisCache(expireTime = 30,dateUnit = TimeUnit.MINUTES) | |||||
| @GetMapping("/replayList") | @GetMapping("/replayList") | ||||
| public ResultData getLiveReplay(Integer room_id, Integer start, Integer limit) { | public ResultData getLiveReplay(Integer room_id, Integer start, Integer limit) { | ||||
| ResultData resultData = new ResultData(); | ResultData resultData = new ResultData(); | ||||