wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-08-05 10:25:42 +08:00
parent d3f92adacc 0666081fdc
commit 45718e5a35
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renren-admin/src/main/java/io/renren/common/controller/FileUploadController.java
View File

@ -39,9 +39,9 @@ public class FileUploadController {
@ApiOperation("文件上传")
@LogOperation("文件上传")
@ApiImplicitParams({
@ApiImplicitParam(name = "config", value = "文件", paramType = "config", dataType = "config", required = true)
@ApiImplicitParam(name = "file", value = "文件", paramType = "config", dataType = "config", required = true)
})
public Result<String> upload(@RequestParam("config") MultipartFile uploadFile,
public Result<String> upload(@RequestParam("file") MultipartFile uploadFile,
HttpServletRequest request) {
logger.info("上传文件：{}", uploadFile.getOriginalFilename());
String format = SIMPLE_DATE_FORMAT.format(new Date());

3
renren-admin/src/main/java/io/renren/modules/resource/dataResource/domain/TsingtaoDataResourceService.java
View File

@ -78,8 +78,7 @@ public class TsingtaoDataResourceService extends AbstractDataResourceService {
return result;
} catch (Exception e) {
logger.error("资源数据调用失败", e);
e.printStackTrace();
logger.error("青岛市资源数据调用失败！！！");
return null;
}
}