|
@@ -19,15 +19,18 @@ import java.util.Map;
|
|
|
@RequestMapping(value = "${adminPath}/bos/")
|
|
|
public class BosController {
|
|
|
private final static String uploadMode = Global.getConfig("remoteServer.uploadMode");
|
|
|
+ private final static String directory = Global.getConfig("remoteServer.directory");
|
|
|
@RequestMapping("upload")
|
|
|
@ResponseBody
|
|
|
public Map upload(HttpServletRequest request, MultipartFile file){
|
|
|
Map map = new HashMap();
|
|
|
- // 文件存储方式(0:本地服务器存储。1:云端存储)
|
|
|
+ String storeAs = request.getParameter("storeAs");
|
|
|
+ // 文件存储方式(0:本地服务器存储。1:云端存储)
|
|
|
if("1".equals(uploadMode)){
|
|
|
- String storeAs = request.getParameter("storeAs");
|
|
|
try {
|
|
|
- String path = "/"+storeAs;
|
|
|
+ //MultipartFile转File
|
|
|
+ File srcFile = transformMultipartFile(file);
|
|
|
+ String path = directory+"/"+storeAs+datePath()+"/"+srcFile.getName();
|
|
|
BOSClientUtil bosClientUtil = new BOSClientUtil();
|
|
|
InputStream inputStream = file.getInputStream();
|
|
|
String upload = bosClientUtil.upload(path, inputStream);
|
|
@@ -44,11 +47,7 @@ public class BosController {
|
|
|
//MultipartFile转File
|
|
|
File srcFile = transformMultipartFile(file);
|
|
|
SftpClientUtil fileUploadUtil = new SftpClientUtil();
|
|
|
- Calendar date = Calendar.getInstance();
|
|
|
- String year = String.valueOf(date.get(Calendar.YEAR));
|
|
|
- String month = String.valueOf(date.get(Calendar.MONTH)+1);
|
|
|
- String day = String.valueOf(date.get(Calendar.DAY_OF_MONTH));
|
|
|
- String uploadPath = "/"+year+"/"+month+"/"+day;
|
|
|
+ String uploadPath = "/" + storeAs + datePath();
|
|
|
String uploadFile = fileUploadUtil.uploadFile(uploadPath, srcFile, srcFile.getName());
|
|
|
map.put("msg","上传成功");
|
|
|
map.put("code","1");
|
|
@@ -215,4 +214,14 @@ public class BosController {
|
|
|
return srcFile;
|
|
|
}
|
|
|
|
|
|
+ public static String datePath(){
|
|
|
+
|
|
|
+ Calendar date = Calendar.getInstance();
|
|
|
+ String year = String.valueOf(date.get(Calendar.YEAR));
|
|
|
+ String month = String.valueOf(date.get(Calendar.MONTH)+1);
|
|
|
+ String day = String.valueOf(date.get(Calendar.DAY_OF_MONTH));
|
|
|
+ String path = "/"+year+"/"+month+"/"+day;
|
|
|
+ return path;
|
|
|
+ }
|
|
|
+
|
|
|
}
|