1.update auth condition for web client

main
Gary 5 months ago
parent f6e1f51cae
commit 90bad757d5

@ -227,13 +227,14 @@ public class JournalController {
@GlobalInterceptor
public Result<JournalRespDTO> findByJournalNo(
@RequestHeader(value = "Authorization", required = false) String authorization,
@RequestHeader(value = "device_type", required = false) String deviceType,
@PathVariable @VerifyParam(required = true) String journalNo) {
JournalRespDTO journalRespDTO=journalService.queryJournalByJournalNo(journalNo);
if(null==journalRespDTO) {
return Result.failed(StatusCode.MUSIC_COMMON_FAILED,"根据期刊号无法找到期刊, 期刊号: "+journalNo);
}
UserLoginDto user = jwtUtil.getUserLoginDto(authorization);
if (null == user && !isLatest10(journalNo)) {
if (!DeviceTypeUtil.isWeb(deviceType) && null == user && !isLatest10(journalNo)) {
return Result.unauthorized(null);
}
boolean isCollect=null == user ? false:userCollectInfoService.isCollect(user.getUserId(),journalRespDTO.getId(), CollectTypeEnum.JOURNAL);
@ -247,9 +248,15 @@ public class JournalController {
@ApiOperation(value = "4.获取期刊筛选条件")
@GetMapping("/filter")
@GlobalInterceptor(checkAppUserLogin = true)
@GlobalInterceptor
public Result<JournalFilterDTO> getFilterList(
@RequestHeader(value = "Authorization", required = false) String authorization) {
@RequestHeader(value = "Authorization", required = false) String authorization,
@RequestHeader(value = "device_type", required = false) String deviceType
) {
UserLoginDto user = jwtUtil.getUserLoginDto(authorization);
if (!DeviceTypeUtil.isWeb(deviceType) && null == user) {
return Result.unauthorized(null);
}
return Result.success(journalService.getJournalFilterDTO());
}
@ -258,9 +265,10 @@ public class JournalController {
@GlobalInterceptor
public Result<List<JournalRespDTO>> recommendById(
@RequestHeader(value = "Authorization", required = false) String authorization,
@RequestHeader(value = "device_type", required = false) String deviceType,
@PathVariable @VerifyParam(required = true) String id,@PathVariable(required=false) Integer limit) {
UserLoginDto user = jwtUtil.getUserLoginDto(authorization);
if (null == user && !journalService.isLatest10ByJournalId(id)) {
if (!DeviceTypeUtil.isWeb(deviceType) && null == user && !journalService.isLatest10ByJournalId(id)) {
return Result.unauthorized(null);
}
if(null == limit) {
@ -274,6 +282,7 @@ public class JournalController {
.collect(Collectors.toList());
return Result.success(list);
}
@ApiOperation(value = "5.1 根据收藏数推荐8期",notes="web 端用收藏数前50中随机取8期返回")
@GetMapping(value="/recommend")
@GlobalInterceptor

Loading…
Cancel
Save