Merge pull request #296 from JiazhenBao/main

downloadFile为空情况异常处理

Author: JiazhenBao

httpclient/pom.xml

@@ -16,7 +16,7 @@
     <artifactId>httpclient</artifactId>
     <name>httpclient</name>
     <description>httpclient</description>
-    <version>0.18.0</version>
+    <version>0.18.1</version>
 
     <dependencies>
         <dependency>

httpclient/src/main/java/com/netease/http/httpclient/HttpClientService.java

@@ -63,6 +63,10 @@ public File downloadFile(RequestParamAllBodyTypeInner requestParam, RestTemplate
         ResponseEntity<byte[]> response = exchangeInner(requestParam, restTemplateFinal, byte[].class);
         if (response.getStatusCode() == HttpStatus.OK) {
             byte[] fileData = response.getBody();
+            if (fileData == null) {
+                logger.error(requestParam.getUrl()+"请求返回文件为空");
+                return null;
+            }
             List<String> resHeaders = response.getHeaders().get("Content-Disposition");
             if (StringUtils.isEmpty(fileName)) {
                 fileName = System.currentTimeMillis() + ".xlsx";
@@ -90,7 +94,6 @@ public File downloadFile(RequestParamAllBodyTypeInner requestParam, RestTemplate
                 }
                 file = File.createTempFile(fileName, fileExt);
                 try (FileOutputStream outputStream = new FileOutputStream(file)) {
-                    assert fileData != null;
                     outputStream.write(fileData);
                 }
             } catch (IOException e) {

httpclient/src/main/java/com/netease/http/httpclient/LCAPHttpClient.java

@@ -167,6 +167,9 @@ public String downloadFileUploadNos(String fileUrl, String fileName, Map<String,
             requestParam.setHeader(header);
             requestParam.setHttpMethod(HttpMethod.GET.name());
             file = httpClientService.downloadFile(requestParam, restTemplate, fileName);
+            if (file == null) {
+                return null;
+            }
             UploadResponseDTO uploadResponseDTO = httpClientFileUtils.uploadStream(Files.newInputStream(file.toPath()), file.getName());
             return uploadResponseDTO.result;
         } catch (HttpClientErrorException e) {
@@ -204,6 +207,9 @@ public String downloadFileUploadNosExtendHttpMethod(@Required String fileUrl, St
             requestParam.setHttpMethod(httpMethod);
             requestParam.setBody(JSONObject.parseObject(body));
             file = httpClientService.downloadFile(requestParam, restTemplate, fileName);
+            if (file == null) {
+                return null;
+            }
             UploadResponseDTO uploadResponseDTO = httpClientFileUtils.uploadStream(httpClientFileUtils.repeatReadInputStream(file), file.getName());
             return uploadResponseDTO.result;
         } catch (HttpClientErrorException e) {
@@ -265,6 +271,9 @@ public String uploadNosExchangeCommonFileType(String fileUrl, String fileName, R
             //文件下载一般是get，默认get
             requestParamGetFile.setHttpMethod(HttpMethod.GET.name());
             file = httpClientService.downloadFile(requestParamGetFile, restTemplate, fileName);
+            if (file == null) {
+                return null;
+            }
             RequestParamAllBodyTypeInner requestParamInner = new RequestParamAllBodyTypeInner();
             MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
             requestParam.getBody().forEach(body::add);