diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java index e2587d558..446e9a026 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java @@ -32,6 +32,8 @@ public class OSSFileServiceImpl extends ServiceImpl impl @Value(value = "${jero.path.upload}") private String uploadpath; + @Value(value = "${jero.path.uploadCos}") + private String uploadCospath; /** * 文件后缀黑名单 @@ -188,7 +190,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl OSSFile oSSFile = new OSSFile(); try { - String ctxPath = uploadpath; + String ctxPath = uploadCospath; String fileName = null; String fileType = null; @@ -285,7 +287,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl OSSFile oSSFile = new OSSFile(); try { - String ctxPath = uploadpath; + String ctxPath = uploadCospath; String fileName = null; String fileType = null; File file = new File(ctxPath + File.separator + bizPath + File.separator); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java index 307364f65..9293b3018 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java @@ -167,8 +167,8 @@ public class CommonController { // bizPath = ""; // } } - OSSFile oSSFile = ossFileService.uploadLocal(file, bizPath,state,cut); -// OSSFile oSSFile = ossFileService.uploadLocalOfCos(file, bizPath,state,cut); // 切换cos +// OSSFile oSSFile = ossFileService.uploadLocal(file, bizPath,state,cut); + OSSFile oSSFile = ossFileService.uploadLocalOfCos(file, bizPath,state,cut); // 切换cos if (oConvertUtils.isNotEmpty(oSSFile)) { result.setResult(oSSFile); result.setSuccess(true); @@ -343,7 +343,7 @@ public class CommonController { * @param request * @param response */ -// @GetMapping(value = "/downLoadFile") + @GetMapping(value = "/downLoadFile") public void downLoadFromCos(String id,HttpServletRequest request, HttpServletResponse response) { if(StringUtils.isBlank(id)){ throw new JeroBootException("参数信息不全"); @@ -408,7 +408,7 @@ public class CommonController { * @param request * @param response */ - @GetMapping(value = "/downLoadFile") +// @GetMapping(value = "/downLoadFile") public void downLoadFile(String id,HttpServletRequest request, HttpServletResponse response) { // 查询数据表数据是否存在 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 9c8005283..c2d1b71bd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -23,6 +23,7 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryRuleEnum; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.DateUtils; +import com.jero.common.util.oss.CosBootUtil; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; import com.jero.modules.collection.entity.OnlCgformCollection; @@ -106,6 +107,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.text.DateFormat; import java.text.ParseException; @@ -3905,7 +3907,15 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl