diff --git a/ad-platform-auth/src/main/java/com/baiye/translator/CustomWebRespExceptionTranslator.java b/ad-platform-auth/src/main/java/com/baiye/translator/CustomWebRespExceptionTranslator.java index e0a9c04e..2e66250e 100644 --- a/ad-platform-auth/src/main/java/com/baiye/translator/CustomWebRespExceptionTranslator.java +++ b/ad-platform-auth/src/main/java/com/baiye/translator/CustomWebRespExceptionTranslator.java @@ -34,6 +34,11 @@ public class CustomWebRespExceptionTranslator implements WebResponseExceptionTra message = "刷新令牌已过期,请重新登录"; return buildResponseEntity(ApiError.error(message)); } + if (e instanceof InvalidTokenException + && StringUtils.containsIgnoreCase(e.getMessage(), "Token was not recognised")) { + message = "登录信息已过期,请重新登录"; + return buildResponseEntity(ApiError.error(message)); + } if (e instanceof InvalidScopeException) { message = "不是有效的scope值"; return buildResponseEntity(ApiError.error(message)); diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/util/CSVFileUtil.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/util/CSVFileUtil.java index f5370299..5d0de716 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/util/CSVFileUtil.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/util/CSVFileUtil.java @@ -66,7 +66,7 @@ public class CSVFileUtil { // 去除重复 List phoneSets = Lists.newArrayList(Sets.newHashSet(phoneList)); - File csvFile = new File("C:\\Users\\a\\Desktop\\12-16-dmp.csv"); + File csvFile = new File("C:\\Users\\a\\Desktop\\1-3-dmp.csv"); //导入HuTool中CSV工具包的CsvWriter类 //设置导出字符类型, CHARSET_UTF_8 CsvWriter writer = CsvUtil.getWriter(csvFile, CharsetUtil.CHARSET_UTF_8); diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/controller/ClueController.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/controller/ClueController.java index 04fdbf1b..3b17c3d8 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/controller/ClueController.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/controller/ClueController.java @@ -12,11 +12,14 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.http.server.ServerHttpRequest; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/MailSourceTask.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/MailSourceTask.java index 1a264db4..392f81ad 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/MailSourceTask.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/MailSourceTask.java @@ -139,6 +139,7 @@ public class MailSourceTask { } } } + // 修改为接收参数 if (CollUtil.isNotEmpty(decryptList)) { log.info("=================== the decryptList size as {} =====================", decryptList.size()); // 将imei转为线索