~nishiwei/ard-uav-server.git

			@@ -5,10 +5,7 @@
			import javax.servlet.http.HttpServletRequest;
			import javax.servlet.http.HttpServletResponse;

			import com.ard.common.core.domain.entity.MinioUploadResult;
			import com.ard.work.domain.entity.MinioSysFile;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiOperation;
			import org.slf4j.Logger;
			import org.slf4j.LoggerFactory;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -23,14 +20,11 @@
			import com.ard.common.utils.file.FileUtils;
			import com.ard.framework.config.ServerConfig;

			import static com.ard.common.utils.file.MinioUtil.uploadFile;

			/**
			* 通用请求处理
			*
			* @author ruoyi
			* @author ard
			*/
			@Api(tags = "通用请求处理")
			@RestController
			@RequestMapping("/common")
			public class CommonController
			@@ -166,48 +160,5 @@
			}
			}


			/**
			* minio上传文件
			*/
			@ApiOperation("minio文件上传")
			@PostMapping("/uploadMinio")
			public AjaxResult uploadFileMinio(@RequestPart MultipartFile file) {
			try
			{
			// 上传并返回新文件名称
			String url = FileUploadUtils.uploadMinio(file);
			MinioUploadResult minioUploadResult = MinioUploadResult.builder()
			.url(url)
			.newFileName(FileUtils.getName(url))
			.originalFilename(file.getOriginalFilename())
			.build();
			return AjaxResult.success(minioUploadResult);
			}
			catch (Exception e)
			{
			return AjaxResult.error(e.getMessage());
			}
			}
			/**
			* minio文件上传-指定桶
			*/
			@ApiOperation("minio文件上传-指定桶")
			@PostMapping("/uploadMinio/{bucketName}")
			public AjaxResult upload(@RequestPart("file")MultipartFile file,
			@PathVariable String bucketName) {
			try {
			// 上传并返回访问地址
			String url = FileUploadUtils.uploadMinio(file,bucketName);
			MinioUploadResult minioUploadResult = MinioUploadResult.builder()
			.url(url)
			.newFileName(FileUtils.getName(url))
			.originalFilename(file.getOriginalFilename())
			.build();
			return AjaxResult.success(minioUploadResult);
			} catch (Exception e) {
			return AjaxResult.error(e.getMessage());
			}
			}

			}