Merge remote-tracking branch 'origin/dev' into dev

dev_0531
郑皇 6 years ago
commit 7035cd4d70

@ -0,0 +1,49 @@
package com.kiisoo.ic.activity.controller;
import com.kiisoo.ic.common.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.FileOutputStream;
import java.util.Map;
import java.util.UUID;
@RestController
@Api(value = "后台-上传文件", tags = {"后台-上传文件"})
@Slf4j
public class FileController extends BaseController {
@ApiOperation(value = "上传文件")
@PostMapping(value = "/upload")
public Map<String, Object> upload(@RequestParam(value = "file", required = false) MultipartFile file) {
if (file == null) return fail();
String fileName = file.getOriginalFilename();
if (fileName == null) return fail();
fileName = renameToUUID(fileName);
try {
File targetPath = new File("upload");
if (!targetPath.exists()) {
boolean state = targetPath.mkdirs();
}
FileOutputStream out = new FileOutputStream("upload" + fileName);
out.write(file.getBytes());
out.flush();
out.close();
} catch (Exception e) {
log.error("上传出错", e);
return fail();
}
return data("/upload" + fileName);
}
private String renameToUUID(String filename) {
return UUID.randomUUID() + "." + filename.substring(filename.lastIndexOf(".") + 1);
}
}

@ -10,5 +10,6 @@ public class WebConfig implements WebMvcConfigurer {
public void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
registry.addResourceHandler("/upload/**").addResourceLocations("file:/usr/local/share/applications/bsdgy/upload");
}
}

@ -22,6 +22,8 @@ server:
servlet:
context-path: /kiisoo-ic
upload:
path: /usr/local/share/applications/bsdgy/upload
bsd:
vip: http://vtest.bsd.cn/BSD_WXAPP/miniProgram/getMemberDtlByUnionId

Loading…
Cancel
Save