diff --git a/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/AESUtils.java b/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/AESUtils.java index 27d72ee3..318223ca 100644 --- a/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/AESUtils.java +++ b/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/AESUtils.java @@ -105,7 +105,7 @@ public class AESUtils { } public static void main(String[] args) { - System.out.println(AESUtils.encrypt("216f7a59d24498e204ef5efd6b383b39", "DA2023xlb213v1.")); + System.out.println(AESUtils.encrypt("fdb3606c89cb992a17c2db6de91ef4a2", "DA2023xlb213v1.")); System.out.println(AESUtils.decrypt("Lw1oRu+9EoCb++Fj6OrnyoUbr7QPTkCpe+OwvA9ZdH6DLJMxem509vAHRBtb5Kp1", "DB2023xlb213v1.")); } } diff --git a/ad-platform-manage/ad-platform-management/src/main/resources/config/application.yml b/ad-platform-manage/ad-platform-management/src/main/resources/config/application.yml index 7dc0ff7e..25c3fe57 100644 --- a/ad-platform-manage/ad-platform-management/src/main/resources/config/application.yml +++ b/ad-platform-manage/ad-platform-management/src/main/resources/config/application.yml @@ -9,7 +9,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: prod jackson: time-zone: GMT+8 data: diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/ClueService.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/ClueService.java index 8bb141ff..ec48e6b0 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/ClueService.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/ClueService.java @@ -166,6 +166,11 @@ public interface ClueService { /** * 保存线索 + * @param tagList tag列表 + * @param phoneList + * @param taskId 认为id + * @param userId 用户id + * @param num 数量 */ void saveClue(List tagList, List phoneList, Long taskId, Long userId, Integer num); diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java index 73c7cdcf..b7bff045 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java @@ -1131,7 +1131,7 @@ public class ClueServiceImpl implements ClueService { if (StringUtils.isNotBlank(phone)) { Boolean checkPhone = MobileUtil.checkPhone(phone); if (Boolean.FALSE.equals(checkPhone)) { - log.error("============== the exchange phone as {} =====================", phone); + log.info("============== the exchange phone as {} =====================", phone); continue; } Clue clue = new Clue(); 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 ec19a330..b00d3650 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 @@ -124,13 +124,12 @@ public class MailSourceTask { (file.listFiles())[DefaultNumberConstants.ZERO_NUMBER]; // 解析文件 CsvData data = reader.read(parseFile); - CsvRow strings = data.getRows().get(DefaultNumberConstants.ZERO_NUMBER); - String tagStr = strings.get(DefaultNumberConstants.ONE_NUMBER); // csv通配 data.getRows().forEach(clue -> { phoneList.add(clue.size() == DefaultNumberConstants.THREE_NUMBER ? clue.get(DefaultNumberConstants.TWO_NUMBER) : clue.get(DefaultNumberConstants.THREE_NUMBER)); - tagList.add(tagStr); + tagList.add(clue.size() == DefaultNumberConstants.THREE_NUMBER + ? clue.get(DefaultNumberConstants.ZERO_NUMBER) : clue.get(DefaultNumberConstants.ONE_NUMBER)); }); // 去除重复 List phoneSets = Lists.newArrayList(Sets.newHashSet(phoneList)); diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/util/DecryptPnoUtil.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/util/DecryptPnoUtil.java index 77e6cf8b..3040ef1b 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/util/DecryptPnoUtil.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/util/DecryptPnoUtil.java @@ -82,9 +82,6 @@ public class DecryptPnoUtil { .form(paramMap) .timeout(2_000) .execute().body(); - - Console.log(result); - // 解析响应内容 return JSONUtil.toBean(result, SecretResponseBean.class); }