【数据资产】

1、上传文件到obs

@@ -220,15 +220,6 @@ public class EnterpriseController {
         return CommonRes.success(vo);
         return CommonRes.success(vo);
     }
     }
 
 
-    @Autowired
-    private DataPortService dataPortService;
-
-    @PostMapping("/test")
-    public CommonRes test(@RequestBody EnterpriseRegisterRQVO enterpriseRegisterRQVO) {
-        dataPortService.test(enterpriseRegisterRQVO);
-        return CommonRes.success(true);
-    }
-
     //endregion
     //endregion
     
     
 }
 }

@@ -35,7 +35,7 @@ public interface DaopCommonFeign {
     ResponseEntity<ByteArrayResource> downloadFile(@RequestParam(value = "filePath", required = true) String filePath);
     ResponseEntity<ByteArrayResource> downloadFile(@RequestParam(value = "filePath", required = true) String filePath);
 
 
     /**
     /**
-     * 上传
+     * 上传(公有桶)
      * @param image
      * @param image
      * @return
      * @return
      */
      */
@@ -43,11 +43,11 @@ public interface DaopCommonFeign {
     CommonRes uploadImage(@RequestPart MultipartFile image);
     CommonRes uploadImage(@RequestPart MultipartFile image);
 
 
     /**
     /**
-     * 上传
+     * 上传(私有桶)
      * @param file
      * @param file
      * @return
      * @return
      */
      */
-    @RequestMapping(value = "/obs/upload-file-for-import",method = RequestMethod.POST, consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    CommonRes uploadFile(@RequestPart MultipartFile file);
+    @RequestMapping(value = "/obs/upload-file-for-import_base_name",method = RequestMethod.POST, consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    CommonRes uploadFile(@RequestPart MultipartFile file, @RequestPart String fileName);
 
 
 }
 }

@@ -122,7 +122,7 @@ public class DataPortServiceImpl implements DataPortService {
             } else {
             } else {
                 String fileName = "身份凭证.png";
                 String fileName = "身份凭证.png";
                 MultipartFile image = new MockMultipartFile(fileName, fileName, "application/octet-stream", resourceByteArray);
                 MultipartFile image = new MockMultipartFile(fileName, fileName, "application/octet-stream", resourceByteArray);
-                String url = (String) daopCommonFeign.uploadImage(image).getData();
+                String url = (String) daopCommonFeign.uploadFile(image, fileName).getData();
                 log.info("======url======, {}", url);
                 log.info("======url======, {}", url);
                 LambdaUpdateWrapper<MfEnterprise> updateWrapper = new LambdaUpdateWrapper<>();
                 LambdaUpdateWrapper<MfEnterprise> updateWrapper = new LambdaUpdateWrapper<>();
                 updateWrapper.set(MfEnterprise::getTrustedIdentityCredential, url);
                 updateWrapper.set(MfEnterprise::getTrustedIdentityCredential, url);
@@ -156,7 +156,7 @@ public class DataPortServiceImpl implements DataPortService {
                 }
                 }
             } else {
             } else {
                 MultipartFile image = new MockMultipartFile("测试.png", "测试,png", "application/octet-stream", resource.getByteArray());
                 MultipartFile image = new MockMultipartFile("测试.png", "测试,png", "application/octet-stream", resource.getByteArray());
-                String url = (String) ((CommonRes<?>) daopCommonFeign.uploadFile(image).getData()).getData();
+                String url = (String) daopCommonFeign.uploadFile(image, "测试.png").getData();
                 log.info("======url======, {}", url);
                 log.info("======url======, {}", url);
                 System.out.println(url);
                 System.out.println(url);
             }
             }
@@ -190,7 +190,7 @@ public class DataPortServiceImpl implements DataPortService {
             } else {
             } else {
                 String fileName = "身份凭证.png";
                 String fileName = "身份凭证.png";
                 MultipartFile image = new MockMultipartFile(fileName, fileName, "application/octet-stream", resourceByteArray);
                 MultipartFile image = new MockMultipartFile(fileName, fileName, "application/octet-stream", resourceByteArray);
-                String url = (String) daopCommonFeign.uploadImage(image).getData();
+                String url = (String) daopCommonFeign.uploadFile(image, fileName).getData();
                 log.info("======url======, {}", url);
                 log.info("======url======, {}", url);
                 LambdaUpdateWrapper<MfEnterprise> updateWrapper = new LambdaUpdateWrapper<>();
                 LambdaUpdateWrapper<MfEnterprise> updateWrapper = new LambdaUpdateWrapper<>();
                 updateWrapper.set(MfEnterprise::getTrustedIdentityCredential, url);
                 updateWrapper.set(MfEnterprise::getTrustedIdentityCredential, url);