From d1212e402bdc6b3c50a615723cb0c6d6b9959f04 Mon Sep 17 00:00:00 2001
From: xudawei <xudawei@axzo.cn>
Date: Fri, 26 Apr 2024 16:30:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E9=80=9A=E8=BF=87url?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6-channelType=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2channelCode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/axzo/oss/manager/api/FileManager.java    | 2 +-
 .../java/cn/axzo/oss/manager/impl/FileManagerImpl.java    | 8 ++++----
 .../cn/axzo/oss/service/impl/FileByUrlServiceImpl.java    | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/oss-manager-api/src/main/java/cn/axzo/oss/manager/api/FileManager.java b/oss-manager-api/src/main/java/cn/axzo/oss/manager/api/FileManager.java
index 0c43d3a..95b1d5b 100644
--- a/oss-manager-api/src/main/java/cn/axzo/oss/manager/api/FileManager.java
+++ b/oss-manager-api/src/main/java/cn/axzo/oss/manager/api/FileManager.java
@@ -80,5 +80,5 @@ public interface FileManager {
      * 通过url上传至云
      */
     String uploadByUrl(String bulkName, String keyPath, String fileName, String url,
-                              Integer channelType);
+                              String channelCode);
 }
diff --git a/oss-manager/src/main/java/cn/axzo/oss/manager/impl/FileManagerImpl.java b/oss-manager/src/main/java/cn/axzo/oss/manager/impl/FileManagerImpl.java
index c997925..60b05cd 100644
--- a/oss-manager/src/main/java/cn/axzo/oss/manager/impl/FileManagerImpl.java
+++ b/oss-manager/src/main/java/cn/axzo/oss/manager/impl/FileManagerImpl.java
@@ -257,9 +257,9 @@ public class FileManagerImpl implements FileManager {
      * 通过url上传至云
      */
     public String uploadByUrl(String bulkName, String keyPath, String fileName, String url,
-                              Integer channelType) {
+                              String channelCode) {
         try {
-            switch (ChannelTypeEnum.getChannelTypeByCode(channelType)) {
+            switch (ChannelTypeEnum.getChannelTypeByChannelCode(channelCode)) {
                 case OSS:
                     return aliOssService.uploadByUrl(bulkName,keyPath, fileName, url);
                 case OBS:
@@ -268,8 +268,8 @@ public class FileManagerImpl implements FileManager {
                     BizException.error(CodeEnum.CHANNEL_TYPE_NOT_EXIST);
             }
         } catch (Exception e) {
-            log.error("通过url上传至云 exception,bulkName:{}, key:{}, fileName:{}, url:{},channelType:{}"
-                    , bulkName, keyPath, fileName, url, channelType, e);
+            log.error("通过url上传至云 exception,bulkName:{}, key:{}, fileName:{}, url:{},channelCode:{}"
+                    , bulkName, keyPath, fileName, url, channelCode, e);
         }
         return StringUtils.EMPTY;
     }
diff --git a/oss-service/src/main/java/cn/axzo/oss/service/impl/FileByUrlServiceImpl.java b/oss-service/src/main/java/cn/axzo/oss/service/impl/FileByUrlServiceImpl.java
index 14d08c0..90759a2 100644
--- a/oss-service/src/main/java/cn/axzo/oss/service/impl/FileByUrlServiceImpl.java
+++ b/oss-service/src/main/java/cn/axzo/oss/service/impl/FileByUrlServiceImpl.java
@@ -191,7 +191,7 @@ public class FileByUrlServiceImpl implements FileByUrlService {
         FileUploadConfig fileUploadConfig = getFileUploadConfig(appCode, bizScene, channelType);
 
         // 上传文件并生成file对象
-        return generateFile(fileUploadConfig, appCode, fileName,url, channelType);
+        return generateFile(fileUploadConfig, fileName,url, fileUploadConfig.getChannelCode());
     }
 
     /**
@@ -228,7 +228,7 @@ public class FileByUrlServiceImpl implements FileByUrlService {
     /**
      * 生产File对象
      */
-    private File generateFile(FileUploadConfig fileUploadConfig, String appCode, String fileName, String url, Integer channelType) {
+    private File generateFile(FileUploadConfig fileUploadConfig, String fileName, String url, String channelCode) {
 
         // 判断容量
         String fileConform = isFileConform(fileUploadConfig, fileName);
@@ -236,7 +236,7 @@ public class FileByUrlServiceImpl implements FileByUrlService {
         // 生成上传文件的唯一key
         String tgtFileKey = Utility.generateFileKey(fileUploadConfig.getDirectory(), uuid, fileConform);
         // 上传文件
-        String fileUrl = fileManager.uploadByUrl(fileUploadConfig.getBucketName(), tgtFileKey, fileName, url, channelType);
+        String fileUrl = fileManager.uploadByUrl(fileUploadConfig.getBucketName(), tgtFileKey, fileName, url, channelCode);
 
         // 保存失败
         if (Utility.isBlank(fileUrl)) {