From 1d6e7763f4a30272cc0818ea12f83697b7375c45 Mon Sep 17 00:00:00 2001
From: shikeying <shikeying@163.com>
Date: 星期五, 23 二月 2024 15:17:19 +0800
Subject: [PATCH] 测试了aws oss，另外 mybatis模块还未完成
---
iplatform-base/src/main/java/com/iplatform/base/AbstractFileOperateSpiController.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/iplatform-base/src/main/java/com/iplatform/base/AbstractFileOperateSpiController.java b/iplatform-base/src/main/java/com/iplatform/base/AbstractFileOperateSpiController.java
index c9cb3b6..d4ea391 100644
--- a/iplatform-base/src/main/java/com/iplatform/base/AbstractFileOperateSpiController.java
+++ b/iplatform-base/src/main/java/com/iplatform/base/AbstractFileOperateSpiController.java
@@ -1,5 +1,6 @@
package com.iplatform.base;
+import com.iplatform.base.config.FileProperties;
import com.iplatform.core.BeanContextAware;
import com.walker.file.FileInfo;
import com.walker.file.FileStoreType;
@@ -144,34 +145,47 @@
protected FileInfo uploadFileToRemote(InputStream inputStream
, String fileName, String groupId, long fileSize, Integer businessType, String owner) throws Exception{
- String remoteFileStoreType = this.getArgumentVariable(ArgumentsConstants.CONFIG_UPLOAD_TYPE).getStringValue();
- if(StringUtils.isEmpty(remoteFileStoreType)){
- throw new PlatformRuntimeException("骞冲彴鏈厤缃换浣曡繙绋嬪瓨鍌ㄧ被鍒細" + ArgumentsConstants.CONFIG_UPLOAD_TYPE);
- }
// 2023-07-03锛屽鏋滈厤缃繙绋嬩笂浼犱负鏈湴
if(this.acquireFileOperateSpi().isRemoteAsLocal()){
return this.acquireFileOperateSpi().uploadFileToLocal(inputStream, fileName, groupId, fileSize, businessType, owner);
}
- FileStoreType fileStoreType = FileStoreType.getType(remoteFileStoreType);
+// String remoteFileStoreType = this.getArgumentVariable(ArgumentsConstants.CONFIG_UPLOAD_TYPE).getStringValue();
+// if(StringUtils.isEmpty(remoteFileStoreType)){
+// throw new PlatformRuntimeException("骞冲彴鏈厤缃换浣曡繙绋嬪瓨鍌ㄧ被鍒細" + ArgumentsConstants.CONFIG_UPLOAD_TYPE);
+// }
+// FileStoreType fileStoreType = FileStoreType.getType(remoteFileStoreType);
+ String ossType = BeanContextAware.getBeanByType(FileProperties.class).getOssType();
+ if(StringUtils.isEmpty(ossType)){
+ throw new PlatformRuntimeException("骞冲彴鏈厤缃换浣昽ssType");
+ }
+
+ FileStoreType fileStoreType = FileStoreType.getType(ossType);
if(fileStoreType == FileStoreType.Ftp){
return this.acquireFileOperateSpi().uploadFileToFtp(inputStream, fileName, groupId, fileSize, businessType, owner);
} else {
return this.acquireFileOperateSpi().uploadFileToOss(inputStream, fileName, groupId, fileSize, businessType, owner, fileStoreType);
}
}
+
protected FileInfo[] uploadFileToRemote(InputStream[] inputStream
, String[] fileName, String groupId, long[] fileSize, Integer businessType, String owner) throws Exception{
- String remoteFileStoreType = this.getArgumentVariable(ArgumentsConstants.CONFIG_UPLOAD_TYPE).getStringValue();
- if(StringUtils.isEmpty(remoteFileStoreType)){
- throw new PlatformRuntimeException("骞冲彴鏈厤缃换浣曡繙绋嬪瓨鍌ㄧ被鍒細" + ArgumentsConstants.CONFIG_UPLOAD_TYPE);
- }
+// String remoteFileStoreType = this.getArgumentVariable(ArgumentsConstants.CONFIG_UPLOAD_TYPE).getStringValue();
+// if(StringUtils.isEmpty(remoteFileStoreType)){
+// throw new PlatformRuntimeException("骞冲彴鏈厤缃换浣曡繙绋嬪瓨鍌ㄧ被鍒細" + ArgumentsConstants.CONFIG_UPLOAD_TYPE);
+// }
+// FileStoreType fileStoreType = FileStoreType.getType(remoteFileStoreType);
// 2023-07-03锛屽鏋滈厤缃繙绋嬩笂浼犱负鏈湴
if(this.acquireFileOperateSpi().isRemoteAsLocal()){
return this.acquireFileOperateSpi().uploadFileToLocal(inputStream, fileName, groupId, fileSize, businessType, owner);
}
- FileStoreType fileStoreType = FileStoreType.getType(remoteFileStoreType);
+ String ossType = BeanContextAware.getBeanByType(FileProperties.class).getOssType();
+ if(StringUtils.isEmpty(ossType)){
+ throw new PlatformRuntimeException("骞冲彴鏈厤缃换浣昽ssType");
+ }
+
+ FileStoreType fileStoreType = FileStoreType.getType(ossType);
if(fileStoreType == FileStoreType.Ftp){
return this.acquireFileOperateSpi().uploadFileToFtp(inputStream, fileName, groupId, fileSize, businessType, owner);
} else {
--
Gitblit v1.9.1