文件下载调整

api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java

@@ -245,8 +245,7 @@ public class IdcServiceImpl implements IdcService {
 
     /*上传失败重新上传*/
     private void asyncFailTask(String host) {
-        try 
+        try {
-        {
             String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : "/";
             String sql = "select * from basic_export_status where status='1' and receiveStatus='0' where updateTime<date_sub(now(),interval 6 minute) order by updateTime";
             Map<String, Object> map = new HashMap<String, Object>();
@@ -630,7 +629,8 @@ public class IdcServiceImpl implements IdcService {
     public void downloadFile(String fileName, HttpServletResponse response) {
         OutputStream os;
         String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : fileName.substring(0, 1).equals("/") ? "" : "/";
-        String sourceFileName = filePath + filePathSlash + imagePath + fileName;
+//        String sourceFileName = filePath + filePathSlash + imagePath + fileName;
+        String sourceFileName = fileName;
         try {
             if (FileUtils.isFileExist(sourceFileName)) {
                 byte[] bytes = FileUtils.readFileByBytes(sourceFileName);
@@ -1187,7 +1187,7 @@ public class IdcServiceImpl implements IdcService {
 
             if (result != null && result.isSuccessful() && MediaType.parse("application/force-download").equals(result.body().contentType())) {
                 try (InputStream inputStream = result.body().byteStream()) {
-
+                    fileName = fileName.substring(fileName.lastIndexOf('/') + 1);
 
                     FileOutputStream outputStream = new FileOutputStream(filePath + filePathSlash + imagePath + fileName);
 
@@ -1208,8 +1208,8 @@ public class IdcServiceImpl implements IdcService {
                     }
 
                 } catch (Exception e) {
-
+                    e.printStackTrace();
-
+                    log.error("", e);
                 }
             }
             if (!(total > 0)) {