|
@@ -34,7 +34,7 @@ public class BaseApiController extends BaseController {
|
|
|
private String uploadPrivatePath = null;
|
|
private String uploadPrivatePath = null;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- *
|
|
|
|
|
|
|
+ *
|
|
|
* @param request
|
|
* @param request
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
@@ -51,7 +51,7 @@ public class BaseApiController extends BaseController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- *
|
|
|
|
|
|
|
+ *
|
|
|
* @param res
|
|
* @param res
|
|
|
* @param path
|
|
* @param path
|
|
|
* @param isPrivate
|
|
* @param isPrivate
|
|
@@ -77,15 +77,13 @@ public class BaseApiController extends BaseController {
|
|
|
}
|
|
}
|
|
|
return fileName;
|
|
return fileName;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- *
|
|
|
|
|
|
|
+ *
|
|
|
* @param res
|
|
* @param res
|
|
|
- * @param path
|
|
|
|
|
* @param isPrivate
|
|
* @param isPrivate
|
|
|
* @param req
|
|
* @param req
|
|
|
- * @param sign
|
|
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
protected String handleFile(Result res, boolean isPrivate, HttpServletRequest req, String... fileName) {
|
|
protected String handleFile(Result res, boolean isPrivate, HttpServletRequest req, String... fileName) {
|
|
@@ -109,7 +107,7 @@ public class BaseApiController extends BaseController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- *
|
|
|
|
|
|
|
+ *
|
|
|
* @param res
|
|
* @param res
|
|
|
* @param fileName
|
|
* @param fileName
|
|
|
* @param filePath
|
|
* @param filePath
|
|
@@ -129,7 +127,7 @@ public class BaseApiController extends BaseController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- *
|
|
|
|
|
|
|
+ *
|
|
|
* @param fileName
|
|
* @param fileName
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
@@ -138,7 +136,7 @@ public class BaseApiController extends BaseController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- *
|
|
|
|
|
|
|
+ *
|
|
|
* @param fileName
|
|
* @param fileName
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
@@ -147,7 +145,7 @@ public class BaseApiController extends BaseController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- *
|
|
|
|
|
|
|
+ *
|
|
|
* @param fileName
|
|
* @param fileName
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
@@ -218,8 +216,8 @@ public class BaseApiController extends BaseController {
|
|
|
protected Result res() {
|
|
protected Result res() {
|
|
|
return new Result();
|
|
return new Result();
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
@SuppressWarnings("resource")
|
|
@SuppressWarnings("resource")
|
|
|
protected String handleBaseFiles(Result res, String path, boolean isPrivate, byte[] bs, String sign,
|
|
protected String handleBaseFiles(Result res, String path, boolean isPrivate, byte[] bs, String sign,
|
|
|
String uid,String fn) {
|
|
String uid,String fn) {
|
|
@@ -232,7 +230,7 @@ public class BaseApiController extends BaseController {
|
|
|
if(!filePath.exists()){
|
|
if(!filePath.exists()){
|
|
|
filePath.mkdirs();
|
|
filePath.mkdirs();
|
|
|
}
|
|
}
|
|
|
- fileName += "/"+ fn;
|
|
|
|
|
|
|
+ fileName += "/"+ fn;
|
|
|
System.out.println("------------"+ uploadPrivatePath + fileName);
|
|
System.out.println("------------"+ uploadPrivatePath + fileName);
|
|
|
fos = new FileOutputStream(new File(uploadPrivatePath + fileName));
|
|
fos = new FileOutputStream(new File(uploadPrivatePath + fileName));
|
|
|
} else {
|
|
} else {
|
|
@@ -240,7 +238,7 @@ public class BaseApiController extends BaseController {
|
|
|
if(!filePath.exists()){
|
|
if(!filePath.exists()){
|
|
|
filePath.mkdirs();
|
|
filePath.mkdirs();
|
|
|
}
|
|
}
|
|
|
- fileName += "/" + fn;
|
|
|
|
|
|
|
+ fileName += "/" + fn;
|
|
|
System.out.println("------------"+ uploadPath + fileName);
|
|
System.out.println("------------"+ uploadPath + fileName);
|
|
|
fos = new FileOutputStream(new File(uploadPath + fileName));
|
|
fos = new FileOutputStream(new File(uploadPath + fileName));
|
|
|
}
|
|
}
|
|
@@ -257,7 +255,7 @@ public class BaseApiController extends BaseController {
|
|
|
}
|
|
}
|
|
|
return fileName;
|
|
return fileName;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
protected String handleVideoFiles(Result res, HttpServletRequest req,String local) {
|
|
protected String handleVideoFiles(Result res, HttpServletRequest req,String local) {
|
|
|
List<MultipartFile> files = getFiles(req);
|
|
List<MultipartFile> files = getFiles(req);
|
|
|
MultipartFile mf = files.get(0);
|
|
MultipartFile mf = files.get(0);
|