优化 文件上传工鞥呢

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

@@ -91,8 +91,9 @@ public class OssUploadTemplate {
         try {
             ossClient = OSSUtil.getOSSClient();
             fileName = UUID.randomUUID().toString() + "." + uploadFile.getOriginalFilename().substring(uploadFile.getOriginalFilename().lastIndexOf(".") + 1);
+            fileName = IMAGE_DEFAULT_PATH + DateUtil.getNowII() + "/" + fileName;
             is = uploadFile.getInputStream();
-            OSSUtil.uploadByInputStream(ossClient, is, ftpPath);
+            OSSUtil.uploadByInputStream(ossClient, is, ftpPath + fileName);
         } catch (Exception e) {
             // logger.error("上传文件失败", e);
             throw new IllegalArgumentException("上传文件失败");
@@ -185,7 +186,7 @@ public class OssUploadTemplate {
         ByteArrayInputStream fis = null;
         try {
             ossClient = OSSUtil.getOSSClient();
-            is = OSSUtil.getInputStreamByOSS(ossClient,  remotePath + fileName);
+            is = OSSUtil.getInputStreamByOSS(ossClient, remotePath + fileName);
             if (null == is) {
                 throw new FileNotFoundException(remotePath);
             }

service-store/src/main/java/com/java110/store/bmo/contractFile/impl/GetContractFileBMOImpl.java

@@ -3,6 +3,7 @@ package com.java110.store.bmo.contractFile.impl;
 import com.java110.dto.contractFile.ContractFileDto;
 import com.java110.intf.store.IContractFileInnerServiceSMO;
 import com.java110.store.bmo.contractFile.IGetContractFileBMO;
+import com.java110.utils.cache.MappingCache;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -32,6 +33,7 @@ public class GetContractFileBMOImpl implements IGetContractFileBMO {
         List<ContractFileDto> contractFileDtos = null;
         if (count > 0) {
             contractFileDtos = contractFileInnerServiceSMOImpl.queryContractFiles(contractFileDto);
+            freshUrl(contractFileDtos);
         } else {
             contractFileDtos = new ArrayList<>();
         }
@@ -43,4 +45,11 @@ public class GetContractFileBMOImpl implements IGetContractFileBMO {
         return responseEntity;
     }
 
+    private void freshUrl(List<ContractFileDto> contractFileDtos) {
+        String imgPath = MappingCache.getValue("IMG_PATH");
+        for(ContractFileDto contractFileDto : contractFileDtos){
+            contractFileDto.setFileSaveName(imgPath+contractFileDto.getFileSaveName());
+        }
+    }
+
 }