peihaoyu/forest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔍 代码格式优化

Browse Source
This commit is contained in:
ronger 2020-08-26 09:19:22 +08:00
parent 397e0e07a5
commit 9589d7010f
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/com/rymcu/vertical/web/api/common/UploadController.java
View File

@ -25,6 +25,7 @@ import java.util.Set;
/** /**
* 文件上传控制器 * 文件上传控制器
*
* @author ronger * @author ronger
*/ */
@RestController @RestController
@ -36,22 +37,22 @@ public class UploadController {
public static final String ctxHeadPicPath = "/usr/local/src/nebula/static"; public static final String ctxHeadPicPath = "/usr/local/src/nebula/static";
@PostMapping("/file") @PostMapping("/file")
public GlobalResult uploadPicture(@RequestParam(value = "file", required = false) MultipartFile multipartFile,@RequestParam(defaultValue = "1")Integer type, HttpServletRequest request){ public GlobalResult uploadPicture(@RequestParam(value = "file", required = false) MultipartFile multipartFile, @RequestParam(defaultValue = "1") Integer type, HttpServletRequest request) {
if (multipartFile == null) { if (multipartFile == null) {
return GlobalResultGenerator.genErrorResult("请选择要上传的文件"); return GlobalResultGenerator.genErrorResult("请选择要上传的文件");
} }
String typePath = getTypePath(type); String typePath = getTypePath(type);
//图片存储路径 //图片存储路径
String dir = ctxHeadPicPath+"/"+typePath; String dir = ctxHeadPicPath + "/" + typePath;
File file = new File(dir); File file = new File(dir);
if (!file.exists()) { if (!file.exists()) {
file.mkdirs();// 创建文件根目录 file.mkdirs();// 创建文件根目录
} }
String localPath = Utils.getProperty("resource.file-path")+"/"+typePath+"/"; String localPath = Utils.getProperty("resource.file-path") + "/" + typePath + "/";
String orgName = multipartFile.getOriginalFilename(); String orgName = multipartFile.getOriginalFilename();
String fileName = System.currentTimeMillis()+"."+ FileUtils.getExtend(orgName).toLowerCase(); String fileName = System.currentTimeMillis() + "." + FileUtils.getExtend(orgName).toLowerCase();
String savePath = file.getPath() + File.separator + fileName; String savePath = file.getPath() + File.separator + fileName;
@ -59,7 +60,7 @@ public class UploadController {
File saveFile = new File(savePath); File saveFile = new File(savePath);
try { try {
FileCopyUtils.copy(multipartFile.getBytes(), saveFile); FileCopyUtils.copy(multipartFile.getBytes(), saveFile);
data.put("url", localPath+fileName); data.put("url", localPath + fileName);
} catch (IOException e) { } catch (IOException e) {
data.put("message", "上传失败!"); data.put("message", "上传失败!");
} }
@ -68,43 +69,43 @@ public class UploadController {
} }
@PostMapping("/file/batch") @PostMapping("/file/batch")
public GlobalResult batchFileUpload(@RequestParam(value = "file[]", required = false)MultipartFile[] multipartFiles,@RequestParam(defaultValue = "1")Integer type,HttpServletRequest request){ public GlobalResult batchFileUpload(@RequestParam(value = "file[]", required = false) MultipartFile[] multipartFiles, @RequestParam(defaultValue = "1") Integer type, HttpServletRequest request) {
String typePath = getTypePath(type); String typePath = getTypePath(type);
//图片存储路径 //图片存储路径
String dir = ctxHeadPicPath+"/"+typePath; String dir = ctxHeadPicPath + "/" + typePath;
File file = new File(dir); File file = new File(dir);
if (!file.exists()) { if (!file.exists()) {
file.mkdirs();// 创建文件根目录 file.mkdirs();// 创建文件根目录
} }
String localPath = Utils.getProperty("resource.file-path")+"/"+typePath+"/"; String localPath = Utils.getProperty("resource.file-path") + "/" + typePath + "/";
Map succMap = new HashMap(10); Map succMap = new HashMap(10);
Set errFiles = new HashSet(); Set errFiles = new HashSet();
for(int i=0,len=multipartFiles.length;i<len;i++){ for (int i = 0, len = multipartFiles.length; i < len; i++) {
MultipartFile multipartFile = multipartFiles[i]; MultipartFile multipartFile = multipartFiles[i];
String orgName = multipartFile.getOriginalFilename(); String orgName = multipartFile.getOriginalFilename();
String fileName = System.currentTimeMillis()+"."+FileUtils.getExtend(orgName).toLowerCase(); String fileName = System.currentTimeMillis() + "." + FileUtils.getExtend(orgName).toLowerCase();
String savePath = file.getPath() + File.separator + fileName; String savePath = file.getPath() + File.separator + fileName;
File saveFile = new File(savePath); File saveFile = new File(savePath);
try { try {
FileCopyUtils.copy(multipartFile.getBytes(), saveFile); FileCopyUtils.copy(multipartFile.getBytes(), saveFile);
succMap.put(orgName,localPath+fileName); succMap.put(orgName, localPath + fileName);
} catch (IOException e) { } catch (IOException e) {
errFiles.add(orgName); errFiles.add(orgName);
} }
} }
Map data = new HashMap(2); Map data = new HashMap(2);
data.put("errFiles",errFiles); data.put("errFiles", errFiles);
data.put("succMap",succMap); data.put("succMap", succMap);
return GlobalResultGenerator.genSuccessResult(data); return GlobalResultGenerator.genSuccessResult(data);
} }
private static String getTypePath(Integer type) { private static String getTypePath(Integer type) {
String typePath; String typePath;
switch (type){ switch (type) {
case 0: case 0:
typePath = "avatar"; typePath = "avatar";
break; break;
@ -123,7 +124,7 @@ public class UploadController {
@GetMapping("/simple/token") @GetMapping("/simple/token")
public GlobalResult uploadSimpleToken(HttpServletRequest request) throws BaseApiException { public GlobalResult uploadSimpleToken(HttpServletRequest request) throws BaseApiException {
String authHeader = request.getHeader(JwtConstants.AUTHORIZATION); String authHeader = request.getHeader(JwtConstants.AUTHORIZATION);
if(StringUtils.isBlank(authHeader)){ if (StringUtils.isBlank(authHeader)) {
throw new BaseApiException(ErrorCode.UNAUTHORIZED); throw new BaseApiException(ErrorCode.UNAUTHORIZED);
} }
TokenUser tokenUser = UserUtils.getTokenUser(authHeader); TokenUser tokenUser = UserUtils.getTokenUser(authHeader);
@ -136,7 +137,7 @@ public class UploadController {
@GetMapping("/token") @GetMapping("/token")
public GlobalResult uploadToken(HttpServletRequest request) throws BaseApiException { public GlobalResult uploadToken(HttpServletRequest request) throws BaseApiException {
String authHeader = request.getHeader(JwtConstants.AUTHORIZATION); String authHeader = request.getHeader(JwtConstants.AUTHORIZATION);
if(StringUtils.isBlank(authHeader)){ if (StringUtils.isBlank(authHeader)) {
throw new BaseApiException(ErrorCode.UNAUTHORIZED); throw new BaseApiException(ErrorCode.UNAUTHORIZED);
} }
TokenUser tokenUser = UserUtils.getTokenUser(authHeader); TokenUser tokenUser = UserUtils.getTokenUser(authHeader);
@ -152,19 +153,19 @@ public class UploadController {
} }
String typePath = getTypePath(type); String typePath = getTypePath(type);
//图片存储路径 //图片存储路径
String dir = ctxHeadPicPath+"/"+typePath; String dir = ctxHeadPicPath + "/" + typePath;
File file = new File(dir); File file = new File(dir);
if (!file.exists()) { if (!file.exists()) {
file.mkdirs();// 创建文件根目录 file.mkdirs();// 创建文件根目录
} }
String localPath = Utils.getProperty("resource.file-path")+"/"+typePath+"/"; String localPath = Utils.getProperty("resource.file-path") + "/" + typePath + "/";
String fileName = System.currentTimeMillis()+".png"; String fileName = System.currentTimeMillis() + ".png";
String savePath = file.getPath() + File.separator + fileName; String savePath = file.getPath() + File.separator + fileName;
File saveFile = new File(savePath); File saveFile = new File(savePath);
try { try {
FileCopyUtils.copy(Base64.decodeBase64(fileStr.substring(fileStr.indexOf(",") + 1)), saveFile); FileCopyUtils.copy(Base64.decodeBase64(fileStr.substring(fileStr.indexOf(",") + 1)), saveFile);
fileStr = localPath+fileName; fileStr = localPath + fileName;
} catch (IOException e) { } catch (IOException e) {
fileStr = "上传失败!"; fileStr = "上传失败!";
} }