diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/cloud/FastDFSCloudStorageService.java b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/cloud/FastDFSCloudStorageService.java index c65b2467c..7e16afe67 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/cloud/FastDFSCloudStorageService.java +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/cloud/FastDFSCloudStorageService.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - * + *
* https://www.renren.io - * + *
* 版权所有,侵权必究!
*/
@@ -13,9 +13,6 @@ import com.elink.esua.epdc.commons.tools.utils.SpringContextUtils;
import com.elink.esua.epdc.exception.ModuleErrorCode;
import com.github.tobato.fastdfs.domain.StorePath;
import com.github.tobato.fastdfs.service.DefaultGenerateStorageClient;
-import com.elink.esua.epdc.commons.tools.exception.RenException;
-import com.elink.esua.epdc.commons.tools.utils.SpringContextUtils;
-import com.elink.esua.epdc.exception.ModuleErrorCode;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -32,7 +29,7 @@ public class FastDFSCloudStorageService extends AbstractCloudStorageService {
defaultGenerateStorageClient = (DefaultGenerateStorageClient) SpringContextUtils.getBean("defaultGenerateStorageClient");
}
- public FastDFSCloudStorageService(CloudStorageConfig config){
+ public FastDFSCloudStorageService(CloudStorageConfig config) {
this.config = config;
}
@@ -45,8 +42,8 @@ public class FastDFSCloudStorageService extends AbstractCloudStorageService {
public String upload(InputStream inputStream, String suffix) {
StorePath storePath;
try {
- storePath = defaultGenerateStorageClient.uploadFile("group1", inputStream, inputStream.available(), suffix);
- }catch (Exception ex){
+ storePath = defaultGenerateStorageClient.uploadFile("epdc-pic", inputStream, inputStream.available(), suffix);
+ } catch (Exception ex) {
throw new RenException(ModuleErrorCode.OSS_UPLOAD_FILE_ERROR, ex, ex.getMessage());
}
diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java
index b06953395..02912121c 100644
--- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java
+++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java
@@ -129,6 +129,8 @@ public class OssController {
if (build instanceof AliyunCloudStorageService) {
AliyunCloudStorageService aliyunCloudStorageService = (AliyunCloudStorageService) build;
aliyunCloudStorageService.download(fileUrl, response);
+ } else {
+ ossService.download(fileUrl, response);
}
}
diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/service/OssService.java b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/service/OssService.java
index 6f958d6f0..e7fe79341 100644
--- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/service/OssService.java
+++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/service/OssService.java
@@ -16,6 +16,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.UploadDTO;
import com.elink.esua.epdc.entity.OssEntity;
+import javax.servlet.http.HttpServletResponse;
import java.util.Map;
/**
@@ -37,4 +38,15 @@ public interface OssService extends BaseService