|
|
@@ -10,8 +10,11 @@ import com.mokamrp.privates.utils.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
+import java.io.IOException;
|
|
|
|
|
|
import java.io.ByteArrayInputStream;
|
|
|
+import java.io.FileInputStream;
|
|
|
+import java.io.InputStream;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
@@ -33,16 +36,21 @@ public class FileServiceImpl implements FileService {
|
|
|
@Autowired
|
|
|
public OSS oss;
|
|
|
|
|
|
- public String uploadToOss(MultipartFile zipFile){
|
|
|
- String originalFileName = zipFile.getOriginalFilename();
|
|
|
- String exland = originalFileName.substring(originalFileName.lastIndexOf("."));
|
|
|
- SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
- Date currentTime = new Date();
|
|
|
- String dateStr = formatter.format(currentTime);
|
|
|
- String randStr = StringUtils.getRandomString(10);
|
|
|
- String filePath = ossConfiguration.UPLOAD_DIR + dateStr+"/"+randStr+"."+exland;
|
|
|
- PutObjectResult res = oss.putObject(ossConfiguration.getBucketName(),filePath,new ByteArrayInputStream(zipFile.toString().getBytes()));
|
|
|
- String url = ossConfiguration.getHost() + filePath;
|
|
|
- return url;
|
|
|
+ public String uploadToOss(MultipartFile zipFile) {
|
|
|
+ try{
|
|
|
+ InputStream inputStream = zipFile.getInputStream();
|
|
|
+ String originalFileName = zipFile.getOriginalFilename();
|
|
|
+ String exland = originalFileName.substring(originalFileName.lastIndexOf("."));
|
|
|
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmm");
|
|
|
+ Date currentTime = new Date();
|
|
|
+ String dateStr = formatter.format(currentTime);
|
|
|
+ String randStr = StringUtils.getRandomString(10);
|
|
|
+ String filePath = ossConfiguration.UPLOAD_DIR + dateStr+"/"+randStr+exland;
|
|
|
+ PutObjectResult res = oss.putObject(ossConfiguration.getBucketName(),filePath,inputStream);
|
|
|
+ String url = ossConfiguration.getHost() + filePath;
|
|
|
+ return url;
|
|
|
+ }catch (Exception e){
|
|
|
+ return "";
|
|
|
+ }
|
|
|
}
|
|
|
}
|