优化代码

java110-core/src/main/java/com/java110/core/client/FileUploadTemplate.java

@@ -52,23 +52,21 @@ public class FileUploadTemplate {
 
     public InputStream downloadFile(String fileName){
 
-        String newfileName = ROOT_PATH+ fileName;
-
         InputStream inputStream = null;
 
         String ossSwitch = MappingCache.getValue(OSSUtil.DOMAIN, OSSUtil.OSS_SWITCH);
 
         if (OSSUtil.OSS_SWITCH_OSS.equals(ossSwitch)) {
-            inputStream = ossUploadTemplate.download(newfileName);
+            inputStream = ossUploadTemplate.download(fileName);
         } else if (COSUtil.COS_SWITCH_COS.equals(ossSwitch)) {
-            inputStream = cosUploadTemplate.download(newfileName);
+            inputStream = cosUploadTemplate.download(fileName);
         } else {
             String ftpServer = MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_SERVER);
             int ftpPort = Integer.parseInt(MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_PORT));
             String ftpUserName = MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_USERNAME);
             String ftpUserPassword = MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_USERPASSWORD);
 
-            inputStream = ftpUploadTemplate.download(newfileName, ftpServer,
+            inputStream = ftpUploadTemplate.download(fileName, ftpServer,
                     ftpPort, ftpUserName,
                     ftpUserPassword);
         }

service-api/src/main/java/com/java110/api/controller/app/file/UserDownloadFileController.java

@@ -47,8 +47,11 @@ public class UserDownloadFileController {
         userDownloadFileDto.setDownloadUserId(userId);
         List<UserDownloadFileDto> userDownloadFileDtos = userDownloadFileV1InnerServiceSMOImpl.queryUserDownloadFiles(userDownloadFileDto);
         Assert.listOnlyOne(userDownloadFileDtos, "文件不存在");
+        String tempUrl = userDownloadFileDtos.get(0).getTempUrl();
+        String fileName = tempUrl.substring(tempUrl.lastIndexOf("/"));
 
         response.setHeader("content-type", "application/octet-stream");
+        response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
         response.setContentType("application/octet-stream");
 
         InputStream is = null;

service-job/src/main/java/com/java110/job/cmd/export/ExportDataCmd.java

@@ -58,7 +58,7 @@ public class ExportDataCmd extends Cmd {
         ExportDataDto exportDataDto = new ExportDataDto();
         exportDataDto.setBusinessAdapt(reqJson.getString("pagePath"));
         exportDataDto.setReqJson(reqJson);
-        String fileName = DateUtil.getyyyyMMddhhmmssDateString()
+        String fileName = GenerateCodeFactory.getUUID()
                 + ".xlsx";
         exportDataDto.setFileName(EXPORT_DATA_PRE
                 + reqJson.getString("pagePath")

springboot/src/main/java/com/java110/boot/controller/app/file/UserDownloadFileController.java

@@ -46,8 +46,11 @@ public class UserDownloadFileController {
         userDownloadFileDto.setDownloadUserId(userId);
         List<UserDownloadFileDto> userDownloadFileDtos = userDownloadFileV1InnerServiceSMOImpl.queryUserDownloadFiles(userDownloadFileDto);
         Assert.listOnlyOne(userDownloadFileDtos, "文件不存在");
+        String tempUrl = userDownloadFileDtos.get(0).getTempUrl();
+        String fileName = tempUrl.substring(tempUrl.lastIndexOf("/"));
 
         response.setHeader("content-type", "application/octet-stream");
+        response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
         response.setContentType("application/octet-stream");
 
         InputStream is = null;