From bc9ed880ff995a9607f47b1f5d722583d86d1c50 Mon Sep 17 00:00:00 2001 From: Kris <2893855659@qq.com> Date: Tue, 24 Jun 2025 10:52:55 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90feat=E3=80=91=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=9C=B0=E5=9D=80=E9=85=8D=E7=BD=AE=E5=A4=B1?= =?UTF-8?q?=E6=95=88=E6=8F=90=E7=A4=BA=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FileManagerServiceImpl.java | 14 ++++++----- .../service/impl/FileServiceImpl.java | 23 ++++++++++--------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/celnet/datadump/service/impl/FileManagerServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/FileManagerServiceImpl.java index 36550eb..b3454b0 100644 --- a/src/main/java/com/celnet/datadump/service/impl/FileManagerServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/FileManagerServiceImpl.java @@ -169,11 +169,12 @@ public class FileManagerServiceImpl implements FileManagerService { for (Map map1 : poll) { if ("FILE_DOWNLOAD_URL".equals(map1.get("code"))) { downloadUrl = (String) map1.get("value"); - }else { - EmailUtil.send("DumpFile ERROR", "文件下载失败！下载地址未配置"); - return; } } + if (StringUtils.isNotBlank(downloadUrl)) { + EmailUtil.send("DumpFile ERROR", "文件下载失败！下载地址未配置"); + return; + } String url = downloadUrl + String.format(Const.SF_RICH_TEXT_FILE_URL, objectApi, recordId, fieldApi, fieldId); try { @@ -307,11 +308,12 @@ public class FileManagerServiceImpl implements FileManagerService { for (Map map1 : poll) { if ("FILE_UPLOAD_URL".equals(map1.get("code"))) { uploadUrl = (String) map1.get("value"); - }else { - EmailUtil.send("UploadFile ERROR", "文件上传失败！上传地址未配置"); - return; } } + if (StringUtils.isBlank(uploadUrl)) { + EmailUtil.send("UploadFile ERROR", "文件上传失败！上传地址未配置"); + return; + } // 拼接url String url = uploadUrl + String.format(Const.SF_UPLOAD_RICH_TEXT_FILE_URL, objectApi, recordId); diff --git a/src/main/java/com/celnet/datadump/service/impl/FileServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/FileServiceImpl.java index 2e1e477..f68a66f 100644 --- a/src/main/java/com/celnet/datadump/service/impl/FileServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/FileServiceImpl.java @@ -139,11 +139,12 @@ public class FileServiceImpl implements FileService { for (Map map1 : poll) { if ("FILE_DOWNLOAD_URL".equals(map1.get("code"))) { downloadUrl = (String) map1.get("value"); - }else { - EmailUtil.send("DumpFile ERROR", "文件下载失败！下载地址未配置"); - return; } } + if (StringUtils.isNotBlank(downloadUrl)) { + EmailUtil.send("DumpFile ERROR", "文件下载失败！下载地址未配置"); + return; + } log.info("dump file api:{}, field:{}", api, field); PartnerConnection connect = salesforceConnect.createConnect(); String token = connect.getSessionHeader().getSessionId(); @@ -431,17 +432,17 @@ public class FileServiceImpl implements FileService { @Override public void uploadFile(String api, String field, Boolean singleThread) { - String uploadUrl = null; List> poll = customMapper.list("code,value","org_config",null); for (Map map1 : poll) { if ("FILE_UPLOAD_URL".equals(map1.get("code"))) { uploadUrl = (String) map1.get("value"); - }else { - EmailUtil.send("UploadFile ERROR", "文件上传失败！上传地址未配置"); - return; } } + if (StringUtils.isBlank(uploadUrl)) { + EmailUtil.send("UploadFile ERROR", "文件上传失败！上传地址未配置"); + return; + } log.info("upload file api:{}, field:{}", api, field); PartnerConnection connect = salesforceTargetConnect.createConnect(); @@ -618,12 +619,12 @@ public class FileServiceImpl implements FileService { for (Map map1 : poll) { if ("FILE_UPLOAD_URL".equals(map1.get("code"))) { uploadUrl = (String) map1.get("value"); - }else { - EmailUtil.send("UploadFile ERROR", "文件上传失败！上传地址未配置"); - return; } } - + if (StringUtils.isBlank(uploadUrl)) { + EmailUtil.send("UploadFile ERROR", "文件上传失败！上传地址未配置"); + return; + } log.info("upload file api:{}, field:{}", api, field); PartnerConnection connect = salesforceTargetConnect.createConnect(); String token = connect.getSessionHeader().getSessionId();