From af81682614da7eb136c2e6e2469e0d64870d52fd Mon Sep 17 00:00:00 2001
From: maojian <550076202@qq.com>
Date: Tue, 15 Apr 2025 16:11:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bw/fileDownload/entity/Constants.java |  1 +
 .../service/impl/FileDownloadServiceImpl.java      | 30 +++++++++++++++-------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/bw/fileDownload/entity/Constants.java b/src/main/java/com/bw/fileDownload/entity/Constants.java
index 1c51004..12a9325 100644
--- a/src/main/java/com/bw/fileDownload/entity/Constants.java
+++ b/src/main/java/com/bw/fileDownload/entity/Constants.java
@@ -32,6 +32,7 @@ public class Constants {
 	
 	public static final String CID = "cid";
 	public static final String URL = "url";
+	public static final String WGET = "wget";
 	
 	
 	public static String MSGQUEUENAME = "msgqueuename";
diff --git a/src/main/java/com/bw/fileDownload/service/impl/FileDownloadServiceImpl.java b/src/main/java/com/bw/fileDownload/service/impl/FileDownloadServiceImpl.java
index 1bd602a..1b399d6 100644
--- a/src/main/java/com/bw/fileDownload/service/impl/FileDownloadServiceImpl.java
+++ b/src/main/java/com/bw/fileDownload/service/impl/FileDownloadServiceImpl.java
@@ -102,25 +102,37 @@ public class FileDownloadServiceImpl implements FileDownloadService {
 		String cid = (String) data.get(Constants.CID);
 		String url = (String) data.get(Constants.URL);
         
-        
 		//判断文档和图片，包含进行下载操作
 		List<String> fileList = (List<String>) data.get(Constants.FILELIST);
 		if(fileList != null && fileList.size() > 0) {
 			//有文档
-			Map docRes = downloadExecService.DownloadAndUploadFile(fileList, data);
-            int downloadStatusCode = (int) docRes.get("downloadStatusCode");
-            if (downloadStatusCode == Constants.DOWNLOAD_SUCCESS) {
-                log.info("文档下载成功: url={},cid={}",url,cid);
-            } else {
-                log.warn("文档下载失败，尝试无ua请求下载----");
-                docRes = downloadExecService.DownloadAndUploadFileNoUa(fileList, data);
+			Map docRes = null;
+			int downloadStatusCode = 0;
+			if(data.containsKey(Constants.WGET)) {
+				log.info("指定wget方式下载--------{}",url);
+				docRes = downloadExecService.DownloadAndUploadFileNoUa(fileList, data);
                 downloadStatusCode = (int) docRes.get("downloadStatusCode");
                 if (downloadStatusCode == Constants.DOWNLOAD_SUCCESS) {
                     log.info("文档下载成功: url={},cid={}",url,cid);
                 } else {
                     log.error("文档下载失败: url={},cid={}",url,cid);
                 }
-            }
+			}else {
+				docRes = downloadExecService.DownloadAndUploadFile(fileList, data);
+				downloadStatusCode = (int) docRes.get("downloadStatusCode");
+				if (downloadStatusCode == Constants.DOWNLOAD_SUCCESS) {
+					log.info("文档下载成功: url={},cid={}",url,cid);
+				} else {
+					log.warn("文档下载失败，尝试无ua请求下载----");
+					docRes = downloadExecService.DownloadAndUploadFileNoUa(fileList, data);
+					downloadStatusCode = (int) docRes.get("downloadStatusCode");
+					if (downloadStatusCode == Constants.DOWNLOAD_SUCCESS) {
+						log.info("文档下载成功: url={},cid={}",url,cid);
+					} else {
+						log.error("文档下载失败: url={},cid={}",url,cid);
+					}
+				}
+			}
 		}
 		List<String> imgList = (List<String>) data.get(Constants.IMGLIST);
 		if(imgList != null && imgList.size() > 0) {