Merge branch 'dev'

This commit is contained in:
wangliwen 2022-11-09 16:16:42 +08:00
commit 3ae9d2a51c
1 changed files with 2 additions and 4 deletions

View File

@ -1,11 +1,9 @@
package io.renren.common.controller; package io.renren.common.controller;
import io.renren.common.annotation.LogOperation;
import io.renren.common.utils.Result; import io.renren.common.utils.Result;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@ -36,8 +34,8 @@ public class FileUploadController {
private static final SimpleDateFormat SIMPLE_DATE_FORMAT = new SimpleDateFormat("yyyy/MM/dd/"); private static final SimpleDateFormat SIMPLE_DATE_FORMAT = new SimpleDateFormat("yyyy/MM/dd/");
@PostMapping("/upload") @PostMapping("/upload")
@ApiOperation("文件上传") // @ApiOperation("文件上传")
@LogOperation("文件上传") // @LogOperation("文件上传")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "file", value = "文件", paramType = "file", dataType = "file", required = true) @ApiImplicitParam(name = "file", value = "文件", paramType = "file", dataType = "file", required = true)
}) })