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 2b7ffc0b..ab811e17 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 @@ -2,7 +2,6 @@ package com.baiye.util; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.crypto.digest.DigestUtil; import cn.hutool.crypto.symmetric.SymmetricAlgorithm; import cn.hutool.crypto.symmetric.SymmetricCrypto; import lombok.extern.slf4j.Slf4j; @@ -238,6 +237,7 @@ public class AESUtils { } public static void main(String[] args) { + System.out.println(ValidationUtil.isInteger("null")); System.out.println(ObjectUtil.isNull("")); diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java index ae695eaa..fe085fd4 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java @@ -110,12 +110,14 @@ public class DeliveryBalanceTask { && dmpLimitNum > DefaultNumberConstants.ZERO_NUMBER) { DateTime now = DateUtil.date(); // 统计今天数量 - Integer count = deliveryRecordService.countByUserIdAndDate(userId, DateUtil.beginOfDay(now), DateUtil.endOfDay(now)); + Integer count = deliveryRecordService.countByUserIdAndDate + (userId, DateUtil.beginOfDay(now), DateUtil.endOfDay(now)); + int sum = count + list.size(); // 下载统计 downList = CollUtil.sub(list, sum >= dmpLimitNum - ? DefaultNumberConstants.ZERO_NUMBER : list.size(), dmpLimitNum > sum - ? list.size() : sum - dmpLimitNum); + ? DefaultNumberConstants.ZERO_NUMBER : list.size(), dmpLimitNum > sum + ? list.size() : sum - dmpLimitNum); // 发送统计 list = CollUtil.sub(list, sum >= dmpLimitNum ? Math.min(sum - dmpLimitNum, list.size()) diff --git a/ad-platform-manage/ad-platform-management/src/test/java/com/baiye/FileTest.java b/ad-platform-manage/ad-platform-management/src/test/java/com/baiye/FileTest.java new file mode 100644 index 00000000..0aae3588 --- /dev/null +++ b/ad-platform-manage/ad-platform-management/src/test/java/com/baiye/FileTest.java @@ -0,0 +1,55 @@ +package com.baiye; + +import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.test.context.junit4.SpringRunner; + +import java.io.File; + +/** + * @author Enzo + * @date : 2023/6/6 + */ +@RunWith(SpringRunner.class) +public class FileTest { + + @Test + public void uploadFile() { + + File f2 = new File("C:\\Users\\a\\Desktop\\decryption.csv"); + HttpResponse response = HttpRequest.post("https://api.xiaolanben.com/blue-service/api/v1/open/mobileCheck/upload") + .header("AppId", "baiye") + .header("Authorization", "45244F1E-F813-4237-9E43-66974C64F3E9") + .form("file", f2) + .execute(); + System.out.println(response); + + } + + + @Test + public void queryFileStatus() { + + HttpResponse response = HttpRequest.get("https://api.xiaolanben.com/blue-service/api/v1/open/mobileCheck/query?fileId=161") + .header("AppId", "baiye") + .header("Authorization", "45244F1E-F813-4237-9E43-66974C64F3E9") + .execute(); + System.out.println(response); + + } + + @Test + public void fileDown() { + + HttpResponse response = HttpRequest.get("https://api.xiaolanben.com/blue-service/api/v1/open/mobileCheck/download?fileId=161") + .header("AppId", "baiye") + .header("Authorization", "45244F1E-F813-4237-9E43-66974C64F3E9") + .execute(); + System.out.println(response); + + } + + +} diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/dto/IsBlackResponse.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/dto/IsBlackResponse.java index 8e2a397a..cd807ca3 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/dto/IsBlackResponse.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/dto/IsBlackResponse.java @@ -39,7 +39,7 @@ public class IsBlackResponse { @AllArgsConstructor @NoArgsConstructor public static class Info { - @JsonProperty("gender") + @JsonProperty("forbid") private String forbid; @JsonProperty("to") diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/IsBlackTask.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/IsBlackTask.java new file mode 100644 index 00000000..1e3db204 --- /dev/null +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/IsBlackTask.java @@ -0,0 +1,18 @@ +package com.baiye.task; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +/** + * @author Enzo + * @date : 2023/6/6 + */ + +@Slf4j +@Component +@RequiredArgsConstructor +public class IsBlackTask { + + +} 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 737f1d48..28033d57 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 @@ -112,12 +112,19 @@ public class MailSourceTask { // 解析文件 CsvData data = reader.read(parseFile); // csv通配 - data.getRows().forEach(clue -> { - phoneList.add(clue.size() == DefaultNumberConstants.THREE_NUMBER - ? clue.get(DefaultNumberConstants.TWO_NUMBER) : clue.get(DefaultNumberConstants.THREE_NUMBER)); - tagList.add(clue.size() == DefaultNumberConstants.THREE_NUMBER - ? clue.get(DefaultNumberConstants.ZERO_NUMBER) : clue.get(DefaultNumberConstants.ONE_NUMBER)); - }); + for (CsvRow row : data.getRows()) { + if (byTaskName.getType() == DefaultNumberConstants.ONE_NUMBER + && row.size() == DefaultNumberConstants.FOUR_NUMBER) { + Integer number = Integer.valueOf(row.get(DefaultNumberConstants.THREE_NUMBER)); + if (DisplayNumberUtil.getDefaultSkipNumber().contains(number)) { + continue; + } + } + phoneList.add(row.size() == DefaultNumberConstants.THREE_NUMBER + ? row.get(DefaultNumberConstants.ONE_NUMBER) : row.get(DefaultNumberConstants.TWO_NUMBER)); + tagList.add(row.size() == DefaultNumberConstants.THREE_NUMBER + ? row.get(DefaultNumberConstants.ZERO_NUMBER) : row.get(DefaultNumberConstants.ONE_NUMBER)); + } // 去除重复 List phoneSets = Lists.newArrayList(Sets.newHashSet(phoneList)); log.info("=============== the phone list as {} ==================", phoneList.size()); diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/util/DisplayNumberUtil.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/util/DisplayNumberUtil.java new file mode 100644 index 00000000..9aee126d --- /dev/null +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/util/DisplayNumberUtil.java @@ -0,0 +1,25 @@ +package com.baiye.util; + +import com.google.common.collect.Lists; + +import java.util.List; + +/** + * 鉴权配置 + * + * @author Enzo + * @date 2023-6-6 + */ +public class DisplayNumberUtil { + + private static final List DELETE_SIGN = Lists.newArrayList(10, 891, 892, 893, 894, 895, 896, 897, 901, 902, 903, 906, 908, 909, 990, 991, 992, 993, 994, 995, 996, 997, 998, 999); + + + /** + * 默认无需鉴权的API + */ + public static List getDefaultSkipNumber() { + return DELETE_SIGN; + } + +}