diff --git a/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/MailUtil.java b/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/MailUtil.java index 17c9d3cb..d140a1d6 100644 --- a/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/MailUtil.java +++ b/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/MailUtil.java @@ -127,7 +127,7 @@ public class MailUtil { return message; } - public static void sendMail(String username, String password, String toUsername, String fileName, String taskName) { + public static Boolean sendMail(String username, String password, String toUsername, String fileName, String taskName) { try { // 1. 创建参数配置, 用于连接邮件服务器的参数配置 @@ -176,8 +176,10 @@ public class MailUtil { // 7. 关闭连接 transport.close(); + return Boolean.TRUE; } catch (Exception ex) { log.error("===================== send message error {} ==========================", ex.getMessage()); + return Boolean.FALSE; } } 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 82862b06..9edb40e3 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 @@ -153,8 +153,12 @@ public class TaskImeiServiceImpl implements TaskImeiService { CompressUtil.decryptionCompression (zipPath, csvPath, deliveryProperties.getZipPassword()); // 发送邮件 - MailUtil.sendMail(deliveryProperties.getEmailAddress(), + Boolean aBoolean = MailUtil.sendMail(deliveryProperties.getEmailAddress(), deliveryProperties.getEmailPassword(), deliveryProperties.getToEmailAddress(), zipPath, taskImeiDTO.getBatchNo()); + if (Boolean.FALSE.equals(aBoolean)) { + return CommonResponse.createByErrorCodeMessage + (DefaultNumberConstants.ZERO_NUMBER, ResponseCode.DATA_CONVERSION_FAILURE.getDesc()); + } Long recordId = deliveryRecordService.saveDeliveryRecord(zipPath, taskImeiDTO.getBatchNo(), dtoList.size(), null, (long) DefaultNumberConstants.ONE_NUMBER, DefaultNumberConstants.THREE_NUMBER); // 缓存三天 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 55abb94d..8c005921 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 @@ -62,7 +62,7 @@ login: # 登录缓存 cache-enable: false # 是否限制单用户登录 - single-login: false + single-login: true # 验证码 login-code: # 验证码类型配置 查看 LoginProperties 类 diff --git a/ad-platform-pojo/src/main/java/com/baiye/model/enums/ResponseCode.java b/ad-platform-pojo/src/main/java/com/baiye/model/enums/ResponseCode.java index d0547194..48d3885f 100644 --- a/ad-platform-pojo/src/main/java/com/baiye/model/enums/ResponseCode.java +++ b/ad-platform-pojo/src/main/java/com/baiye/model/enums/ResponseCode.java @@ -191,6 +191,11 @@ public enum ResponseCode { */ UPDATE_USER_ERROR("11012", "修改用户信息失败"), + /** + * 兑换数据失败 + */ + DATA_CONVERSION_FAILURE("11013", "兑换数据失败,请再次重试"), + /** * 发送邮件失败 */