财务导出

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/storage/provider/AliyunOssStoragePlugin.java

@@ -75,7 +75,7 @@ public class AliyunOssStoragePlugin implements StoragePlugin, InitializingBean,
 		if (folderName.endsWith("/")) {
 			folderName = folderName.substring(0, folderName.length() - 1);
 		}
-		String bucketName = BucketContextHolder.getBucket().getCode();
+//		String bucketName = BucketContextHolder.getBucket().getCode();
 		ossClient.putObject(bucketName, folderName + "/" + file.getName(), file);
 
 		return "https://" + bucketName + "." + endpoint + "/" + folderName + "/" + file.getName();

mec-web/src/main/java/com/ym/mec/web/controller/UploadFileController.java

@@ -40,10 +40,9 @@ public class UploadFileController extends BaseController {
 	private SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
 
 	@PostMapping(value = "uploadFile")
-	public Object uploadFile(@ApiParam(value = "上传的文件", required = true) @RequestParam("file") MultipartFile file,
-							 @RequestParam("bucket") BucketEnum bucket){
+	public Object uploadFile(@ApiParam(value = "上传的文件", required = true) @RequestParam("file") MultipartFile file){
 		try {
-			BucketContextHolder.setBucket(bucket);
+//			BucketContextHolder.setBucket(bucket);
 			if (file != null && StringUtils.isNotBlank(file.getOriginalFilename())) {
 				UploadReturnBean bean = uploadFileService.uploadFile(file.getInputStream(), UploadUtil.getExtension(file.getOriginalFilename()));
 				bean.setSize(file.getSize());
@@ -55,9 +54,10 @@ public class UploadFileController extends BaseController {
 			}
 		} catch (Exception e) {
 			LOGGER.error("上传失败", e);
-		}finally {
-			BucketContextHolder.clearBucket();
 		}
+//		finally {
+//			BucketContextHolder.clearBucket();
+//		}
 		return failed("上传失败");
 	}