添加小蓝本兑换代码 修改配置参数

ad-platform-auth/src/main/resources/config/application-prod.yml

@@ -7,7 +7,7 @@ spring:
       auto-commit: true
       #注意的是这个地方的定义需要用在DataSourceConfig.java里面使用，是因为在定义JobEventConfig.java的时候需要引入自定义dataSource
       password: baiye@RDS2022
-      jdbc-url: jdbc:mysql://172.16.190.245:3306/ad_platform?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull
+      jdbc-url: jdbc:mysql://127.0.0.1:3306/ad_platform?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull
       username: root
   redis:
     #数据库索引

ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/constant/DefaultNumberConstants.java

@@ -218,11 +218,4 @@ public class DefaultNumberConstants {
      * %
      */
     public static final String DOLLAR_DELIM = "${";
-
-    /**
-     * 七彩之谜
-     */
-    public static final Long COLORFUL_PUZZLE_NUMBER = 12576L;
-
-
 }

ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/http/CommonResponse.java

@@ -118,4 +118,13 @@ public class CommonResponse<T> implements Serializable {
     public static <T> CommonResponse<T> createByErrorCodeMessage(int errorCode,String errorMessage){
         return new CommonResponse<>(errorCode,errorMessage);
     }
+
+    /**
+     * 返回错误码(传入)和错误信息(传入)
+     */
+    public static <T> CommonResponse<T> createBySuccess(int successCode){
+        return new CommonResponse<>(successCode, ResponseCode.SUCCESS.getDesc());
+    }
+
+
 }

ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/http/DmpDataDTO.java

@@ -0,0 +1,19 @@
+package com.baiye.http;
+
+import lombok.Data;
+
+/**
+ * @author Enzo
+ * @date : 2023/1/3
+ */
+@Data
+public class DmpDataDTO {
+
+    private String decryptInfo;
+
+    private String tag;
+
+
+
+
+}

ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/http/DmpResponse.java

@@ -0,0 +1,16 @@
+package com.baiye.http;
+
+import com.baiye.http.DmpDataDTO;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Enzo
+ * @date : 2023/1/3
+ */
+@Data
+public class DmpResponse {
+    private String batchNo;
+    private List<DmpDataDTO> decryptList;
+}

ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/AESUtils.java

@@ -1,5 +1,6 @@
 package com.baiye.util;
 
+import com.baiye.constant.AdPlatFormConstants;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.crypto.Cipher;
@@ -15,13 +16,19 @@ import java.util.Base64;
 @Slf4j
 public class AESUtils {
 
-    /** 密钥长度: 128, 192 or 256 */
+    /**
+     * 密钥长度: 128, 192 or 256
+     */
     private static final int KEY_SIZE = 128;
 
-    /** 加密/解密算法名称 */
+    /**
+     * 加密/解密算法名称
+     */
     private static final String ALGORITHM = "AES";
 
-    /** 随机数生成器（RNG）算法名称 */
+    /**
+     * 随机数生成器（RNG）算法名称
+     */
     private static final String RNG_ALGORITHM = "SHA1PRNG";
 
     /**
@@ -63,8 +70,8 @@ public class AESUtils {
             //base64加密
             String str = Base64.getEncoder().encodeToString(cipherBytes);
             return str;
-        }catch (Exception e){
-            log.info("加密失败"+e.fillInStackTrace());
+        } catch (Exception e) {
+            log.error("加密失败" + e.fillInStackTrace());
             return null;
         }
 
@@ -73,7 +80,7 @@ public class AESUtils {
     /**
      * 数据解密: 密文 -> 明文
      */
-    public static String decrypt(String cipherBytes, String key){
+    public static String decrypt(String cipherBytes, String key) {
         try {
             // 生成密钥对象
             SecretKey secKey = generateKey(key.getBytes(StandardCharsets.UTF_8));
@@ -90,12 +97,15 @@ public class AESUtils {
             byte[] plainBytes = cipher.doFinal(bytes);
 
             //反转解密的结果返回
-            String str = new StringBuilder(new String(plainBytes, "utf-8")).reverse().toString();
-            return str;
-        }catch (Exception e){
-            log.info("解密失败"+e.fillInStackTrace());
+            return new StringBuilder(new String(plainBytes, StandardCharsets.UTF_8)).reverse().toString();
+        } catch (Exception e) {
+            log.error("解密失败" + e.fillInStackTrace());
             return null;
         }
+    }
 
+    public static void main(String[] args) {
+        System.out.println(AESUtils.encrypt("216f7a59d24498e204ef5efd6b383b39", "DA2023xlb213v1."));
+        System.out.println(AESUtils.decrypt("Lw1oRu+9EoCb++Fj6OrnyoUbr7QPTkCpe+OwvA9ZdH6DLJMxem509vAHRBtb5Kp1", "DB2023xlb213v1."));
     }
 }

ad-platform-gateway/src/main/resources/config/application-prod.yml

@@ -3,7 +3,7 @@ spring:
   redis:
     #数据库索引
     database: 9
-    host: 172.16.190.245
+    host: 127.0.0.1
     port: 6379
     password:
   datasource:

ad-platform-gateway/src/main/resources/config/application.yml

@@ -1,7 +1,7 @@
 
 spring:
   profiles:
-    active: dev
+    active: prod
   cloud:
     gateway:
       discovery:

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/config/properties/DeliveryProperties.java

@@ -20,6 +20,9 @@ public class DeliveryProperties {
     @ApiModelProperty("压缩密码")
     private String zipPassword;
 
+    @ApiModelProperty("兑换密码")
+    private String exchangePassword;
+
     @ApiModelProperty("customerId")
     private String customerId;
 

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/repository/DeliveryRecordRepository.java

@@ -10,4 +10,12 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
  */
 public interface DeliveryRecordRepository extends
         JpaRepository<DeliveryRecord, Long>, JpaSpecificationExecutor<DeliveryRecord> {
+
+    /**
+     * 根据任务名称查询
+     * @param taskName
+     * @return
+     */
+    DeliveryRecord findByTaskName(String taskName);
+
 }

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/rest/TaskImeiController.java

@@ -3,11 +3,13 @@ package com.baiye.modules.platform.rest;
 import com.baiye.http.CommonResponse;
 import com.baiye.modules.platform.service.TaskImeiService;
 import com.baiye.modules.platform.service.dto.PlatformTransmitDTO;
+import com.baiye.modules.platform.service.dto.TaskImeiDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -35,4 +37,11 @@ public class TaskImeiController {
         return Boolean.TRUE.equals(taskImeiService.acceptAdBackSource(transmitDTO)) ?
                 CommonResponse.createBySuccess() : CommonResponse.createByError();
     }
+
+    @ApiOperation("兑换条数")
+    @PostMapping("/exchange")
+    public CommonResponse<Object> acceptAdBackSource(@Validated @RequestBody TaskImeiDTO taskImeiDTO) {
+        return taskImeiService.processingData(taskImeiDTO);
+    }
+
 }

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/DeliveryRecordService.java

@@ -1,5 +1,7 @@
 package com.baiye.modules.platform.service;
 
+import com.baiye.modules.platform.domain.DeliveryRecord;
+
 /**
  * @author Enzo
  * @date : 2022/10/18
@@ -17,4 +19,11 @@ public interface DeliveryRecordService {
      * @return
      */
     Long saveDeliveryRecord(String filePath, String taskName, Integer num, Long taskId, Long userId, Integer type);
+
+    /**
+     * 根据批次号查询记录
+     * @param taskName
+     * @return 记录
+     */
+    DeliveryRecord findByBatchNo(String taskName);
 }

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/TaskImeiService.java

@@ -1,7 +1,9 @@
 package com.baiye.modules.platform.service;
 
+import com.baiye.http.CommonResponse;
 import com.baiye.modules.platform.domain.TaskImei;
 import com.baiye.modules.platform.service.dto.PlatformTransmitDTO;
+import com.baiye.modules.platform.service.dto.TaskImeiDTO;
 
 import java.util.List;
 import java.util.Set;
@@ -67,4 +69,11 @@ public interface TaskImeiService {
      * @param taskIds
      */
     void deleteTaskImei(Set<Long> taskIds);
+
+    /**
+     * 上传并发送兑换邮件
+     * @param taskImeiDTO
+     * @return
+     */
+    CommonResponse<Object> processingData(TaskImeiDTO taskImeiDTO);
 }

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/dto/TaskImeiDTO.java

@@ -0,0 +1,26 @@
+package com.baiye.modules.platform.service.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * @author Enzo
+ * @date : 2023/1/13
+ */
+@Data
+public class TaskImeiDTO {
+
+    @NotBlank
+    @ApiModelProperty(value = "批次号")
+    private String batchNo;
+
+    @NotEmpty
+    @ApiModelProperty(value = "兑换数量")
+    private List<ImeiDTO> imeiList;
+
+
+}

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/DeliveryRecordServiceImpl.java

@@ -29,4 +29,9 @@ public class DeliveryRecordServiceImpl implements DeliveryRecordService {
         return deliveryRecordRepository.save(deliveryRecord).getId();
     }
 
+
+    @Override
+    public DeliveryRecord findByBatchNo(String taskName) {
+        return deliveryRecordRepository.findByTaskName(taskName);
+    }
 }

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskImeiServiceImpl.java

@@ -1,13 +1,27 @@
 package com.baiye.modules.platform.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.text.StrPool;
+import cn.hutool.core.util.ObjectUtil;
+import com.baiye.config.properties.DeliveryProperties;
 import com.baiye.constant.DefaultNumberConstants;
+import com.baiye.constant.FileConstant;
+import com.baiye.http.CommonResponse;
+import com.baiye.model.enums.ResponseCode;
+
+import com.baiye.modules.platform.domain.DeliveryRecord;
 import com.baiye.modules.platform.domain.TaskImei;
 import com.baiye.modules.platform.repository.TaskImeiRepository;
+import com.baiye.modules.platform.service.DeliveryRecordService;
 import com.baiye.modules.platform.service.TaskImeiService;
-import com.baiye.modules.platform.service.dto.RepeatFormDTO;
+import com.baiye.modules.platform.service.dto.ImeiDTO;
 import com.baiye.modules.platform.service.dto.PlatformTransmitDTO;
+import com.baiye.modules.platform.service.dto.RepeatFormDTO;
+import com.baiye.modules.platform.service.dto.TaskImeiDTO;
+import com.baiye.util.*;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -15,8 +29,11 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * @author Enzo
@@ -30,8 +47,14 @@ public class TaskImeiServiceImpl implements TaskImeiService {
     @Value("${platform.authToken}")
     private String authToken;
 
+    private final RedisUtils redisUtils;
+
+    private final DeliveryProperties deliveryProperties;
+
     private final TaskImeiRepository taskImeiRepository;
 
+    private final DeliveryRecordService deliveryRecordService;
+
 
     @Override
     public List<TaskImei> findByStatus(Integer num) {
@@ -84,7 +107,7 @@ public class TaskImeiServiceImpl implements TaskImeiService {
     }
 
     @Override
-    public Integer countByUserIdAndDate( Long userId, Integer num) {
+    public Integer countByUserIdAndDate(Long userId, Integer num) {
         return taskImeiRepository.countByUserId(userId, num);
     }
 
@@ -93,5 +116,51 @@ public class TaskImeiServiceImpl implements TaskImeiService {
         taskImeiRepository.deleteByTaskIds(taskIds);
     }
 
+    @Override
+    public CommonResponse<Object> processingData(TaskImeiDTO taskImeiDTO) {
+        List<ImeiDTO> dtoList = Lists.newArrayList(Sets.newHashSet(taskImeiDTO.getImeiList()));
+        if (dtoList.size() < DefaultNumberConstants.ONE_HUNDRED) {
+            return CommonResponse.createByErrorCodeMessage
+                    (DefaultNumberConstants.ZERO_NUMBER, ResponseCode.SEND_MAIL_NUM_FRIEND.getDesc());
+        }
+
+        if (dtoList.size() >= DefaultNumberConstants.ONE_HUNDRED_THOUSAND) {
+            return CommonResponse.createByErrorCodeMessage
+                    (DefaultNumberConstants.ZERO_NUMBER, ResponseCode.SEND_MAIL_MAX_NUM_FRIEND.getDesc());
+        }
+
+        if (redisUtils.get(taskImeiDTO.getBatchNo()) != null) {
+            DeliveryRecord byBatchNo = deliveryRecordService.findByBatchNo(taskImeiDTO.getBatchNo());
+            if (ObjectUtil.isNotNull(byBatchNo) && ObjectUtil.isNotNull(byBatchNo.getId())) {
+                return CommonResponse.createByErrorCodeMessage
+                        (DefaultNumberConstants.ZERO_NUMBER, ResponseCode.BATCH_NUMBER_ALREADY_EXISTS.getDesc());
+            }
+        }
+
+        dtoList.forEach(o -> o.setImei(AESUtils.decrypt(o.getImei(), deliveryProperties.getExchangePassword())));
+        // 过滤未解密完成的
+        List<ImeiDTO> filterList = dtoList.stream().filter
+                (o -> ObjectUtil.isNotNull(o.getImei())).collect(Collectors.toList());
+        if (CollUtil.isNotEmpty(filterList)) {
+            String file = deliveryProperties.getFileUrl().concat(StrPool.SLASH).concat(taskImeiDTO.getBatchNo());
+            // 保存文件
+            String csvPath = file.concat(StrPool.DOT).concat(FileConstant.CSV_FILE_SUB_NAME);
+            CSVFileUtil.createCsvFile(filterList, csvPath);
+            String zipPath = file.concat(FileConstant.ZIP_FILE_SUB_NAME);
+            // 设置压缩文件
+            CompressUtil.decryptionCompression
+                    (zipPath, csvPath, deliveryProperties.getZipPassword());
+            // 发送邮件
+            MailUtil.sendMail(deliveryProperties.getEmailAddress(),
+                    deliveryProperties.getEmailPassword(), deliveryProperties.getToEmailAddress(), zipPath, taskImeiDTO.getBatchNo());
+            Long recordId = deliveryRecordService.saveDeliveryRecord(zipPath, taskImeiDTO.getBatchNo(), dtoList.size(),
+                    null, (long) DefaultNumberConstants.ONE_NUMBER, DefaultNumberConstants.THREE_NUMBER);
+            // 缓存三天
+            redisUtils.set(taskImeiDTO.getBatchNo(), recordId, DefaultNumberConstants.ONE_NUMBER, TimeUnit.DAYS);
+        }
+        return CommonResponse.createBySuccess(DefaultNumberConstants.TWO_HUNDRED);
+    }
+
 }
 
+

ad-platform-manage/ad-platform-management/src/main/resources/config/application-dev.yml

@@ -178,6 +178,7 @@ debt:
 platform:
   authToken: JI8AeA7POKsdGcBC
   zipPassword: DB2022hjk213v1...
+  exchangePassword: DA2023xlb213v1.
   fileUrl: /home/eladmin/mail
   emailAddress: ensoze@outlook.com
   emailPassword: baiye2022

ad-platform-manage/ad-platform-management/src/main/resources/config/application-prod.yml

@@ -3,7 +3,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_HOST:172.16.190.245}:${NACOS_PORT:8848}
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
   redis:
     database: 2
     host: 127.0.0.1
@@ -177,6 +177,7 @@ debt:
 platform:
   authToken: nqJpVSf3UcrEcVIH
   zipPassword: DB2022hjk213v1...
+  exchangePassword: DA2023xlb213v1.
   fileUrl: /home/eladmin/mail
   emailAddress: ensoze@outlook.com
   emailPassword: baiye2022

ad-platform-pojo/src/main/java/com/baiye/model/entity/BaseDeliveryRecord.java

@@ -45,6 +45,10 @@ public class BaseDeliveryRecord {
     @Column(name = "num")
     private Integer num;
 
+    @ApiModelProperty("任务数量")
+    @Column(name = "decrypt_num")
+    private Integer decryptNum;
+
     @ApiModelProperty("任务类型 1:定时发送 2:手动上传")
     @Column(name = "type")
     private Integer type;

ad-platform-pojo/src/main/java/com/baiye/model/enums/ResponseCode.java

@@ -21,27 +21,27 @@ public enum ResponseCode {
     /**
      * 充值成功
      */
-    RECHARGE_SUCCESS("1020","充值成功"),
+    RECHARGE_SUCCESS("1020", "充值成功"),
 
     /**
      * 手机号码不正确
      */
-    PHONE_NUMBER_IS_INCORRECT("1022","手机号码不正确"),
+    PHONE_NUMBER_IS_INCORRECT("1022", "手机号码不正确"),
 
     /**
      * 验证码错误
      */
-    VERIFICATION_CODE_PARAMETER_ERROR("1023","验证码错误"),
+    VERIFICATION_CODE_PARAMETER_ERROR("1023", "验证码错误"),
 
     /**
      * 验证码不存在或已过期
      */
-    VERIFICATION_NOT_EXIST_HAS_EXPIRED("1024","验证码不存在或已过期"),
+    VERIFICATION_NOT_EXIST_HAS_EXPIRED("1024", "验证码不存在或已过期"),
 
     /**
      * 读取文件失败
      */
-    READ_FILE_ERROR("1021","读取文件失败"),
+    READ_FILE_ERROR("1021", "读取文件失败"),
     /**
      * 参数错误
      */
@@ -65,17 +65,17 @@ public enum ResponseCode {
     /**
      * 支付宝支付失败
      */
-    ALI_PAY_ERROR("1016","支付宝支付失败"),
+    ALI_PAY_ERROR("1016", "支付宝支付失败"),
 
     /**
      * 支付宝支付回调失败
      */
-    CALLBACK_FAILED("1017","支付宝支付回调失败"),
+    CALLBACK_FAILED("1017", "支付宝支付回调失败"),
 
     /**
      * 账号已过期
      */
-    ACCOUNT_EXPIRED("1020","账号已过期,无法激活"),
+    ACCOUNT_EXPIRED("1020", "账号已过期,无法激活"),
     /**
      * 呼叫失败
      */
@@ -104,31 +104,26 @@ public enum ResponseCode {
     WRONG_USER_NAME_PASSWORD("1016", "用户名或密码不正确"),
 
     /**
-     *
      * 账户余额不足
      */
     INSUFFICIENT_ACCOUNT_BALANCE("1019", "账户余额不足"),
 
     /**
-     *
      * 连接成功
      */
     CONNECTION_SUCCEEDED("1027", "连接成功"),
 
     /**
-     *
      * 获取二维码失败
      */
     FAILED_GET_QR_CODE("1028", "获取二维码失败"),
 
     /**
-     *
      * 获取模板失败
      */
     FAILED_GET_TEMPLATE("1029", "获取模板失败,请先配置发送模板"),
 
     /**
-     *
      * 发送消息至少配置一条
      */
     TEMPLATE_CHANGE_ERROR("1031", "发送消息至少配置一条!"),
@@ -136,7 +131,7 @@ public enum ResponseCode {
     /**
      * 添加好友失败
      */
-    FAILED_ADD_FRIEND("1032","添加好友失败!"),
+    FAILED_ADD_FRIEND("1032", "添加好友失败!"),
 
     /**
      * 当前账户未登录或不在线
@@ -146,17 +141,17 @@ public enum ResponseCode {
     /**
      * 修改套餐失败
      */
-    UPDATE_COMBO_FRIEND("1033","修改套餐失败!"),
+    UPDATE_COMBO_FRIEND("1033", "修改套餐失败!"),
 
     /**
      * 发送邮件失败
      */
-    SEND_MAIL_FRIEND("1034","发送邮件失败!"),
+    SEND_MAIL_FRIEND("1034", "发送邮件失败!"),
 
     /**
      * 发送邮件失败
      */
-    SEND_MAIL_NUM_FRIEND("1035","发送数量不足100!"),
+    SEND_MAIL_NUM_FRIEND("1035", "发送数量不足100!"),
 
     /**
      * 用户被禁11005用
@@ -197,7 +192,16 @@ public enum ResponseCode {
     UPDATE_USER_ERROR("11012", "修改用户信息失败"),
 
     /**
-     *
+     * 发送邮件失败
+     */
+    SEND_MAIL_MAX_NUM_FRIEND("1036", "发送数量超出最大范围!"),
+
+    /**
+     * 该批次号已经存在
+     */
+    BATCH_NUMBER_ALREADY_EXISTS("1037", "该批次号已经存在!"),
+
+    /**
      * 非超级管理员不能修改数据
      */
     NON_SUPER_ADMINISTRATORS_CANNOT_MODIFY_DATA("1018", "非管理员不能修改数据");

ad-platform-services/ad-platform-service/src/main/resources/application-prod.yml

@@ -3,5 +3,5 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_HOST:172.16.190.245}:${NACOS_PORT:8848}
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
 

ad-platform-services/ad-platform-source/src/main/java/com/baiye/config/properties/DeliveryProperties.java

@@ -26,6 +26,9 @@ public class DeliveryProperties {
     @ApiModelProperty("emailAddress")
     private String emailAddress;
 
+    @ApiModelProperty("兑换密码")
+    private String exchangePassword;
+
     @ApiModelProperty("emailPassword")
     private String emailPassword;
 

ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/dao/DeliveryRecordRepository.java

@@ -24,11 +24,13 @@ public interface DeliveryRecordRepository extends JpaRepository<DeliveryRecord,
 
     /**
      * 修改状态
+     *
      * @param num
+     * @param decryptNum
      * @param taskName
      * @return
      */
     @Modifying
-    @Query("UPDATE DeliveryRecord d set d.status = ?1 where d.taskName = ?2")
-    int updateStatus(Integer num, String taskName);
+    @Query("UPDATE DeliveryRecord d set d.status = ?1 ,d.decryptNum = ?2  where d.taskName = ?3")
+    int updateStatusAndDecryptNum(Integer num, Integer decryptNum, String taskName);
 }

ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/DeliveryRecordService.java

@@ -18,8 +18,9 @@ public interface DeliveryRecordService {
     /**
      * 修改状态
      * @param num num
+     * @param decryptSize
      * @param taskName
      * @return
      */
-    Boolean updateStatusByTaskName(Integer num, String taskName);
+    Boolean updateStatusByTaskName(Integer num, Integer decryptSize, String taskName);
 }

ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/DeliveryRecordServiceImpl.java

@@ -34,8 +34,9 @@ public class DeliveryRecordServiceImpl implements DeliveryRecordService {
     }
 
     @Override
-    public Boolean updateStatusByTaskName(Integer num, String taskName) {
-        return deliveryRecordRepository.updateStatus(num, taskName) > DefaultNumberConstants.ZERO_NUMBER;
+    public Boolean updateStatusByTaskName(Integer num, Integer decryptSize, String taskName) {
+        return deliveryRecordRepository.updateStatusAndDecryptNum
+                (num, decryptSize, taskName) > DefaultNumberConstants.ZERO_NUMBER;
     }
 
 }

ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/MailSourceTask.java

@@ -11,24 +11,26 @@ 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.util.ObjectUtil;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONUtil;
 import com.baiye.config.properties.DeliveryProperties;
 import com.baiye.constant.DefaultNumberConstants;
-import com.baiye.constant.SecurityConstants;
 import com.baiye.exception.BadRequestException;
 import com.baiye.feign.DownRecordClient;
 import com.baiye.feign.TaskClient;
+import com.baiye.http.DmpResponse;
+import com.baiye.http.ResponseCode;
+import com.baiye.http.DmpDataDTO;
 import com.baiye.module.dao.ClueTalkRepository;
 import com.baiye.module.entity.DeliveryRecord;
 import com.baiye.module.entity.Task;
 import com.baiye.module.service.ClueService;
 import com.baiye.module.service.DeliveryRecordService;
 import com.baiye.module.service.dto.SecretResponseBean;
-import com.baiye.util.CompressUtil;
-import com.baiye.util.DecryptPnoUtil;
-import com.baiye.util.MailUtil;
-import com.baiye.util.RedisUtils;
+import com.baiye.util.*;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
@@ -40,13 +42,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.mail.Flags;
 import javax.mail.Message;
-import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
 import java.io.File;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -114,7 +112,8 @@ public class MailSourceTask {
                                     CompressUtil.unzipFiles(deliveryProperties.getFileUrl(),
                                             path, deliveryProperties.getZipPassword());
                             if (ObjectUtil.isNotNull(byTaskName.getType())) {
-                                if (byTaskName.getType() == DefaultNumberConstants.ONE_NUMBER) {
+                                if (byTaskName.getType() == DefaultNumberConstants.ONE_NUMBER
+                                        || byTaskName.getType() == DefaultNumberConstants.THREE_NUMBER) {
                                     File file = new File(unzipPath);
                                     File parseFile = Objects.requireNonNull
                                             (file.listFiles())[DefaultNumberConstants.ZERO_NUMBER];
@@ -143,9 +142,9 @@ public class MailSourceTask {
                                             }
                                         }
                                     }
-                                    // 修改为接收参数
                                     if (CollUtil.isNotEmpty(decryptList)) {
                                         log.info("=================== the decryptList size as {} =====================", decryptList.size());
+                                        if (byTaskName.getType() == DefaultNumberConstants.ONE_NUMBER) {
                                             // 将imei转为线索
                                             clueService.saveClue(tagList, decryptList, byTaskName.getTaskId(),
                                                     byTaskName.getUserId(), DefaultNumberConstants.FOUR_NUMBER);
@@ -158,16 +157,38 @@ public class MailSourceTask {
                                             FileUtil.del(path);
                                             FileUtil.del(unzipPath);
                                             taskClient.updateTask(task);
-                                        deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, taskName);
+                                            deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER,decryptList.size(), taskName);
+                                        }
                                         log.info("============== message parsing succeeded file path as {} unzip path as {} ===============", path, unzipPath);
+                                        if (byTaskName.getType() == DefaultNumberConstants.THREE_NUMBER) {
+                                            Map<String, Object> map = Maps.newHashMap();
+                                            List<DmpDataDTO> arrayList = Lists.newArrayList();
+                                            DmpResponse dmpResponse = new DmpResponse();
+                                            for (int i = 0; i < decryptList.size(); i++) {
+                                                DmpDataDTO dto = new DmpDataDTO();
+                                                String encrypt = AESUtils.encrypt
+                                                        (decryptList.get(i), deliveryProperties.getExchangePassword());
+                                                dto.setTag(tagList.get(i));
+                                                dto.setDecryptInfo(encrypt);
+                                                arrayList.add(dto);
+                                            }
+                                            dmpResponse.setBatchNo(taskName);
+                                            dmpResponse.setDecryptList(arrayList);
+                                            map.put("status",DefaultNumberConstants.TWO_HUNDRED);
+                                            map.put("msg", ResponseCode.SUCCESS.getDesc());
+                                            map.put("data",dmpResponse);
+                                            HttpUtil.post("", JSONUtil.toJsonStr(map));
+                                            deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, decryptList.size(), taskName);
+                                        }
                                     }
                                 }
                                 if (byTaskName.getType() == DefaultNumberConstants.TWO_NUMBER) {
                                     log.info("========================= the path as {} =========================", path);
                                     String filePath = path.substring(path.lastIndexOf(StrPool.SLASH) + DefaultNumberConstants.ONE_NUMBER);
-                                    deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, taskName);
+                                    deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, decryptList.size(), taskName);
                                     downRecordClient.updatePath(deliveryProperties.getDmpDownPath().concat(filePath), byTaskName.getId());
                                 }
+
                             }
                         }
                     }

ad-platform-services/ad-platform-source/src/main/resources/application-prod.yml

@@ -3,7 +3,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_HOST:172.16.190.245}:${NACOS_PORT:8848}
+        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
 
   redis:
     database: 2
@@ -14,7 +14,7 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driver-class-name: com.mysql.jdbc.Driver
-      url: jdbc:mysql://172.16.190.245:3306/ad_platform?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull
+      url: jdbc:mysql://127.0.0.1:3306/ad_platform?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull
       username: root
       password: baiye@RDS2022
       # 初始连接数
@@ -81,6 +81,7 @@ save:
 
 platform:
   zipPassword: DB2022hjk213v1...
+  exchangePassword: DA2023xlb213v1.
   fileUrl: /home/eladmin/mail
   emailAddress: ensoze@outlook.com
   emailPassword: baiye2022

ad-platform-services/ad-platform-source/src/main/resources/application-test.yml

@@ -81,6 +81,7 @@ save:
 
 platform:
   zipPassword: DB2022hjk213v1...
+  exchangePassword: DA2023xlb213v1.
   fileUrl: /home/eladmin/mail
   emailAddress: lambda0821@outlook.com
   emailPassword: baiye123456789