From 911b70631c22cfaf55aec64a4d1cbabb936a2cf6 Mon Sep 17 00:00:00 2001
From: xudawei <xudawei@axzo.cn>
Date: Thu, 20 Mar 2025 18:48:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:(REQ-3540)=20=E6=96=87=E4=BB=B6=E5=85=8B?=
 =?UTF-8?q?=E9=9A=86-=E5=8A=A0=E4=B8=8AbizScene,=E4=B8=8D=E4=BC=A0?=
 =?UTF-8?q?=E7=9B=AE=E6=A0=87=E6=A1=B6=E4=B8=8Ekey=EF=BC=8C=E5=88=99?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7appCode=E4=B8=8EbizScene=E7=9A=84=E4=B8=BA?=
 =?UTF-8?q?=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oss/manager/api/dto/request/CopyObjectCloudDto.java    | 6 ++++++
 .../java/cn/axzo/oss/service/impl/FileServiceImpl.java     | 7 +++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/oss-manager-api/src/main/java/cn/axzo/oss/manager/api/dto/request/CopyObjectCloudDto.java b/oss-manager-api/src/main/java/cn/axzo/oss/manager/api/dto/request/CopyObjectCloudDto.java
index ccbc884..ee04c0d 100644
--- a/oss-manager-api/src/main/java/cn/axzo/oss/manager/api/dto/request/CopyObjectCloudDto.java
+++ b/oss-manager-api/src/main/java/cn/axzo/oss/manager/api/dto/request/CopyObjectCloudDto.java
@@ -65,6 +65,10 @@ public class CopyObjectCloudDto {
     private File file;
     private String fileUuid;
 
+    private String appChannelBucketNo;
+
+    private String appCode;
+
     public static CopyObjectCloudDto create(FileCopyObjectDto fileCopyObjectRequest, File file, FileBusinessScene fileBusinessScene) {
         // 入参中有通道，则优先取入参；否则取源通道
         String targetChannelCode = StringUtils.isBlank(fileCopyObjectRequest.getTargetChannelCode()) ? fileBusinessScene.getChannelCode() : fileCopyObjectRequest.getTargetChannelCode();
@@ -86,6 +90,8 @@ public class CopyObjectCloudDto {
                 .targetFileName(fileName)
                 .file(file)
                 .fileUuid(fileCopyObjectRequest.getFileUuid())
+                .appChannelBucketNo(fileBusinessScene.getAppChannelBucketNo())
+                .appCode(fileBusinessScene.getAppCode())
                 .build();
     }
 
diff --git a/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java b/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java
index 6153818..e70c1b9 100644
--- a/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java
+++ b/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java
@@ -27,6 +27,7 @@ import cn.axzo.oss.dal.entity.FileUploadConfig;
 import cn.axzo.oss.dal.repository.FileAppDao;
 import cn.axzo.oss.dal.repository.FileDao;
 import cn.axzo.oss.dal.vo.FileBusinessSceneVo;
+import cn.axzo.oss.integration.s3.config.CadThirdProperty;
 import cn.axzo.oss.integration.s3.config.HuaWeiCloudObsConfig;
 import cn.axzo.oss.manager.api.AppChannelBucketManager;
 import cn.axzo.oss.manager.api.FileBusinessSceneManager;
@@ -47,6 +48,7 @@ import cn.axzo.oss.manager.api.dto.request.MultipartUploadInitDto;
 import cn.axzo.oss.manager.api.dto.request.ServerFileDeleteDto;
 import cn.axzo.oss.manager.api.dto.request.ServerFileDownloadDto;
 import cn.axzo.oss.manager.api.dto.request.ServerFileUploadDto;
+import cn.axzo.oss.manager.api.dto.request.SignUploadTokenDto;
 import cn.axzo.oss.manager.api.dto.request.SignUrlDownloadDto;
 import cn.axzo.oss.manager.api.dto.request.SignUrlUploadDto;
 import cn.axzo.oss.manager.api.dto.request.file.DeleteObjectsFileDto;
@@ -62,6 +64,7 @@ import cn.axzo.oss.manager.api.dto.response.ServerFileDownloadResponse;
 import cn.axzo.oss.manager.api.dto.response.ServerFileUploadResponse;
 import cn.axzo.oss.manager.api.dto.response.SignUrlDownloadResponse;
 import cn.axzo.oss.manager.api.dto.response.SignUrlUploadResponse;
+import cn.axzo.oss.manager.api.dto.response.UploadTokenResponse;
 import cn.axzo.oss.service.api.FileService;
 import cn.axzo.oss.service.metafile.WithFileFactory;
 import cn.axzo.oss.service.metafile.WithFileService;
@@ -1306,8 +1309,8 @@ public class FileServiceImpl implements FileService {
      */
     private File buildFileWhenCopyObject(CopyObjectCloudDto item) {
         File ossFile = new File();
-        ossFile.setAppChannelBucketNo(item.getFile().getAppChannelBucketNo());
-        ossFile.setAppCode(item.getFile().getAppCode());
+        ossFile.setAppChannelBucketNo(item.getAppChannelBucketNo());
+        ossFile.setAppCode(item.getAppCode());
         ossFile.setChannelCode(item.getTargetChannelCode());
         ossFile.setBucketName(item.getTargetBucketName());
         ossFile.setDirectory(item.getTargetBucketDict());