From 3ff73fa4cabb850c4bd8e934715ffadc36f7bf13 Mon Sep 17 00:00:00 2001 From: bynt Date: Thu, 30 Mar 2023 18:41:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/properties/AliPayProperties.java | 3 +++ .../service/impl/TaskImeiServiceImpl.java | 4 ++-- .../platform/service/impl/TaskServiceImpl.java | 6 ++++-- .../main/java/com/baiye/util/CSVFileUtil.java | 18 +++++++++++------- .../main/resources/config/application-dev.yml | 2 ++ .../main/resources/config/application-prod.yml | 3 +++ .../java/com/baiye/feign/OrganizeClient.java | 1 - .../WeChatAddFriendClientFallback.java | 3 --- .../java/com/baiye/task/MailSourceTask.java | 16 ++++++++++++---- 9 files changed, 37 insertions(+), 19 deletions(-) diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/config/properties/AliPayProperties.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/config/properties/AliPayProperties.java index 3ac81b3e..6a18e0c4 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/config/properties/AliPayProperties.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/config/properties/AliPayProperties.java @@ -26,4 +26,7 @@ public class AliPayProperties { private String notifyUrl; @ApiModelProperty("AES密钥") private String encryptKey; + @ApiModelProperty("支付成功跳转地址") + private String returnUrl; + } diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskImeiServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskImeiServiceImpl.java index cdfc3ec0..82862b06 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskImeiServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskImeiServiceImpl.java @@ -73,8 +73,8 @@ public class TaskImeiServiceImpl implements TaskImeiService { List imeiList = Lists.newArrayList(); for (RepeatFormDTO plateForm : transmitDTO.getList()) { TaskImei taskImei = new TaskImei(); - taskImei.setTag(plateForm.getTag()); - taskImei.setImei(plateForm.getImei()); + taskImei.setTag(plateForm.getTag().trim()); + taskImei.setImei(plateForm.getImei().trim()); taskImei.setCreateTime(DateUtil.date()); taskImei.setUserId(transmitDTO.getUserId()); taskImei.setTaskId(transmitDTO.getTaskId()); diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskServiceImpl.java index 563f9a5b..f870af94 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskServiceImpl.java @@ -93,7 +93,8 @@ public class TaskServiceImpl implements TaskService { createTask(taskId, taskTagDto.getUserId(), taskTagDto.getTaskName(), DefaultNumberConstants.FOUR_NUMBER, taskTagDto.getLabelOrganizeId(), taskTagDto .getRemark()); // 推送到adbask - adBackRequestApi.sendTag(taskId, taskTagDto.getUserId(), taskTagDto.getTagStr()); + List collect = taskTagDto.getTagStr().stream().map(String::trim).collect(Collectors.toList()); + adBackRequestApi.sendTag(taskId, taskTagDto.getUserId(), collect); return CommonResponse.createBySuccess(); } @@ -119,7 +120,8 @@ public class TaskServiceImpl implements TaskService { if (CollUtil.isNotEmpty(tag)) { return CommonResponse.createBySuccess(tag); } - adBackRequestApi.sendTag(taskTagDto.getTaskId(), taskTagDto.getUserId(), taskTagDto.getTagStr()); + List collect = taskTagDto.getTagStr().stream().map(String::trim).collect(Collectors.toList()); + adBackRequestApi.sendTag(taskTagDto.getTaskId(), taskTagDto.getUserId(), collect); return CommonResponse.createBySuccess(); } 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 cfc55218..906294af 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 @@ -1,9 +1,6 @@ package com.baiye.util; -import cn.hutool.core.text.csv.CsvData; -import cn.hutool.core.text.csv.CsvReader; -import cn.hutool.core.text.csv.CsvUtil; -import cn.hutool.core.text.csv.CsvWriter; +import cn.hutool.core.text.csv.*; import cn.hutool.core.util.CharsetUtil; import com.baiye.constant.AdPlatFormConstants; import com.baiye.constant.DefaultNumberConstants; @@ -47,16 +44,23 @@ public class CSVFileUtil { } public static void main(String[] args) { - File file = new File("C:\\Users\\a\\Desktop\\1.csv"); + File file = new File("C:\\Users\\a\\Desktop\\BY_20230326_1_dest.csv"); List phoneList = Lists.newArrayList(); + List tagStr = Lists.newArrayList(); CsvReader reader = CsvUtil.getReader(); // 解析文件 CsvData data = reader.read(file); - data.getRows().forEach(clue -> phoneList.add - (clue.get(DefaultNumberConstants.TWO_NUMBER))); + CsvRow strings = data.getRows().get(DefaultNumberConstants.ZERO_NUMBER); + String tag = 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)); + tagStr.add(tag); + }); // 去除重复 List phoneSets = Lists.newArrayList(Sets.newHashSet(phoneList)); diff --git a/ad-platform-manage/ad-platform-management/src/main/resources/config/application-dev.yml b/ad-platform-manage/ad-platform-management/src/main/resources/config/application-dev.yml index 9a453249..f070bde9 100644 --- a/ad-platform-manage/ad-platform-management/src/main/resources/config/application-dev.yml +++ b/ad-platform-manage/ad-platform-management/src/main/resources/config/application-dev.yml @@ -157,6 +157,8 @@ alipay: aliPayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyvegkGCrz1i5/K7VzQxvoZm4G73pSPNu9R5ET8YonIuDVoHkHaYvQQizLdRkTyBsYIik8FXsSDmVsw5MLMQ7OAlZ97nQBkz5TxOX6Px766nUpSVoWXoAz6cpIlWnwgir4t1ph88Ph56l+qmqW3gUj/U6MIuzjxBJlijTMHl96its95Nd4cEFx4j+sFuRYob6D0kcemC7xEFuty7bdupda51Z56GYI1YjuUTryTlFOHZbOSThc2ZMzNC1gPG25bn2Lx6sDuPByk4KW4rQ2v7mSfeUuZZRdjtVSC0WV2M2Cv5L8eLFvZRgNYnXrUJYhnRpT+OBAvJZXaWU2nv/bNe/UQIDAQAB # 回调地址 notifyUrl: http://8.130.96.163:8866/pay/aliPay/pay-notify + # 支付宝成功支付跳转页面 + returnUrl: http://8.130.96.163:8001/dashboard # 可设置AES密钥，调用AES加解密相关接口时需要（可选） encryptKey: diff --git a/ad-platform-manage/ad-platform-management/src/main/resources/config/application-prod.yml b/ad-platform-manage/ad-platform-management/src/main/resources/config/application-prod.yml index 06c780b7..55abb94d 100644 --- a/ad-platform-manage/ad-platform-management/src/main/resources/config/application-prod.yml +++ b/ad-platform-manage/ad-platform-management/src/main/resources/config/application-prod.yml @@ -161,9 +161,12 @@ alipay: aliPayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyvegkGCrz1i5/K7VzQxvoZm4G73pSPNu9R5ET8YonIuDVoHkHaYvQQizLdRkTyBsYIik8FXsSDmVsw5MLMQ7OAlZ97nQBkz5TxOX6Px766nUpSVoWXoAz6cpIlWnwgir4t1ph88Ph56l+qmqW3gUj/U6MIuzjxBJlijTMHl96its95Nd4cEFx4j+sFuRYob6D0kcemC7xEFuty7bdupda51Z56GYI1YjuUTryTlFOHZbOSThc2ZMzNC1gPG25bn2Lx6sDuPByk4KW4rQ2v7mSfeUuZZRdjtVSC0WV2M2Cv5L8eLFvZRgNYnXrUJYhnRpT+OBAvJZXaWU2nv/bNe/UQIDAQAB # 回调地址 notifyUrl: https://baiyee.vip/pay/aliPay/pay-notify + # 支付宝成功支付跳转页面 + returnUrl: https://baiyee.vip/dashboard # 可设置AES密钥，调用AES加解密相关接口时需要（可选） encryptKey: + template: download-personnel-list: https://baiyee.vip/file/example.xlsx diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/feign/OrganizeClient.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/feign/OrganizeClient.java index c86d43f3..aabe47a8 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/feign/OrganizeClient.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/feign/OrganizeClient.java @@ -1,7 +1,6 @@ package com.baiye.feign; import com.baiye.feign.fallback.OrganizeClientFallback; -import com.baiye.model.dto.ClueDto; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.ResponseEntity; diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/feign/fallback/WeChatAddFriendClientFallback.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/feign/fallback/WeChatAddFriendClientFallback.java index ad1ce66c..25b2c8e9 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/feign/fallback/WeChatAddFriendClientFallback.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/feign/fallback/WeChatAddFriendClientFallback.java @@ -5,9 +5,6 @@ import com.baiye.model.dto.AddWeChatFriendRecordDTO; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; -import java.util.List; -import java.util.Map; - /** * @author Enzo * @date 2022-7-1 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 7dc2be2f..7472f092 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 @@ -9,10 +9,12 @@ import cn.hutool.core.io.FileUtil; import cn.hutool.core.text.StrPool; import cn.hutool.core.text.csv.CsvData; import cn.hutool.core.text.csv.CsvReader; +import cn.hutool.core.text.csv.CsvRow; import cn.hutool.core.text.csv.CsvUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; +import com.alibaba.druid.sql.visitor.functions.If; import com.baiye.config.properties.DeliveryProperties; import com.baiye.constant.DefaultNumberConstants; import com.baiye.constant.SecurityConstants; @@ -119,11 +121,17 @@ public class MailSourceTask { (file.listFiles())[DefaultNumberConstants.ZERO_NUMBER]; // 解析文件 CsvData data = reader.read(parseFile); - data.getRows().forEach(clue -> tagList.add - (clue.get(DefaultNumberConstants.ONE_NUMBER))); + /* data.getRows().forEach(clue -> tagList.add + (clue.get(DefaultNumberConstants.ONE_NUMBER)));*/ - data.getRows().forEach(clue -> phoneList.add - (clue.get(DefaultNumberConstants.THREE_NUMBER))); + 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); + }); // 去除重复 List phoneSets = Lists.newArrayList(Sets.newHashSet(phoneList)); log.info("=============== the phone list as {} ==================", phoneList.size());