push

yd-oss-feign/src/main/java/com/yd/oss/feign/client/ApiOssFeignClient.java

@@ -17,7 +17,7 @@ import java.util.List;
 /**
 /**
  * OSS服务信息Feign客户端
  * OSS服务信息Feign客户端
  */
  */
-@FeignClient(name = "yd-oss-api", fallbackFactory = ApiOssFeignFallbackFactory.class)
+@FeignClient(name = "yd-oss-api",path = "/oss/api/oss", fallbackFactory = ApiOssFeignFallbackFactory.class)
 public interface ApiOssFeignClient {
 public interface ApiOssFeignClient {
 
 
     /**
     /**

yd-oss-feign/src/main/java/com/yd/oss/feign/request/ApiUploadFileRequest.java

@@ -8,6 +8,11 @@ import javax.validation.constraints.NotBlank;
 public class ApiUploadFileRequest {
 public class ApiUploadFileRequest {
 
 
     /**
     /**
+     * 租户唯一标识(业务ID)
+     */
+    private String tenantBizId;
+
+    /**
      * 项目ID
      * 项目ID
      */
      */
     private String projectBizId;
     private String projectBizId;

yd-oss-service/src/main/java/com/yd/oss/service/dto/OssUploadFileReqDto.java

@@ -15,6 +15,11 @@ import lombok.NoArgsConstructor;
 public class OssUploadFileReqDto {
 public class OssUploadFileReqDto {
 
 
     /**
     /**
+     * 租户唯一标识(业务ID)
+     */
+    private String tenantBizId;
+
+    /**
      * 项目ID
      * 项目ID
      */
      */
     private String projectBizId;
     private String projectBizId;

yd-oss-service/src/main/java/com/yd/oss/service/service/impl/AliYunOssServiceImpl.java

@@ -83,7 +83,7 @@ public class AliYunOssServiceImpl implements OssService {
         OSS ossClient = null;
         OSS ossClient = null;
         try {
         try {
             ossClient = ossClientFactory.createOssClient(provider);
             ossClient = ossClientFactory.createOssClient(provider);
-            return doUploadFile(ossClient, provider, inputStream, fileName, bucketName, uploadUser, type, null, null, null, null, null, null);
+            return doUploadFile(ossClient, provider, inputStream, fileName, bucketName, uploadUser, type, null, null, null, null, null, null,null,null);
         } finally {
         } finally {
             if (ossClient != null) {
             if (ossClient != null) {
                 ossClient.shutdown();
                 ossClient.shutdown();
@@ -115,7 +115,8 @@ public class AliYunOssServiceImpl implements OssService {
                     FileUtil.getFileType(file.getOriginalFilename()),
                     FileUtil.getFileType(file.getOriginalFilename()),
                     reqDto.getObjectBizId(), reqDto.getObjectName(),
                     reqDto.getObjectBizId(), reqDto.getObjectName(),
                     reqDto.getObjectTableName(), reqDto.getObjectType(),
                     reqDto.getObjectTableName(), reqDto.getObjectType(),
-                    reqDto.getObjectBizId(), reqDto.getObjectName()); // 这里需要根据实际情况调整，原代码中存储了object信息
+                    reqDto.getObjectBizId(), reqDto.getObjectName(),
+                    reqDto.getTenantBizId(),reqDto.getProjectBizId()); // 这里需要根据实际情况调整，原代码中存储了object信息
         } catch (IOException e) {
         } catch (IOException e) {
             log.error("文件输入流解析异常", e);
             log.error("文件输入流解析异常", e);
             throw new BusinessException("文件输入流解析异常");
             throw new BusinessException("文件输入流解析异常");
@@ -142,7 +143,7 @@ public class AliYunOssServiceImpl implements OssService {
         try {
         try {
             ossClient = ossClientFactory.createOssClient(defaultProvider);
             ossClient = ossClientFactory.createOssClient(defaultProvider);
             OssUploadFileResDto result = doUploadFile(ossClient, defaultProvider, inputStream, fileName,
             OssUploadFileResDto result = doUploadFile(ossClient, defaultProvider, inputStream, fileName,
-                    defaultProvider.getBucketName(), uploadUser, null, null, null, null, null, null, null);
+                    defaultProvider.getBucketName(), uploadUser, null, null, null, null, null, null, null,null,null);
             return result.getUrl();
             return result.getUrl();
         } finally {
         } finally {
             if (ossClient != null) {
             if (ossClient != null) {
@@ -159,7 +160,8 @@ public class AliYunOssServiceImpl implements OssService {
                                              String bucketName, String uploadUser, String type,
                                              String bucketName, String uploadUser, String type,
                                              String objectBizId, String objectName,
                                              String objectBizId, String objectName,
                                              String objectTableName, String objectType,
                                              String objectTableName, String objectType,
-                                             String creatorId, String creatorName) {
+                                             String creatorId, String creatorName,
+                                             String tenantBizId,String projectBizId) {
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime now = LocalDateTime.now();
         long startTime = System.currentTimeMillis();
         long startTime = System.currentTimeMillis();
         String operationResult = "success";
         String operationResult = "success";
@@ -203,6 +205,8 @@ public class AliYunOssServiceImpl implements OssService {
             ossFile.setObjectName(objectName);
             ossFile.setObjectName(objectName);
             ossFile.setObjectTableName(objectTableName);
             ossFile.setObjectTableName(objectTableName);
             ossFile.setObjectType(objectType);
             ossFile.setObjectType(objectType);
+            ossFile.setTenantBizId(tenantBizId);
+            ossFile.setProjectBizId(projectBizId);
             // 获取当前登录用户信息（如果存在）
             // 获取当前登录用户信息（如果存在）
             AuthUserDto authUserDto = SecurityUtil.getCurrentLoginUser();
             AuthUserDto authUserDto = SecurityUtil.getCurrentLoginUser();
             if (authUserDto != null) {
             if (authUserDto != null) {