|
@@ -14,6 +14,7 @@ import com.zhongshu.card.server.core.domain.org.UserAccount;
|
|
|
import com.zhongshu.card.server.core.model.upLoadFile.*;
|
|
import com.zhongshu.card.server.core.model.upLoadFile.*;
|
|
|
import com.zhongshu.card.server.core.model.upLoadFile.oss.ALiObjectStorage;
|
|
import com.zhongshu.card.server.core.model.upLoadFile.oss.ALiObjectStorage;
|
|
|
import com.zhongshu.card.server.core.service.base.SuperService;
|
|
import com.zhongshu.card.server.core.service.base.SuperService;
|
|
|
|
|
+import com.zhongshu.card.server.core.util.CommonUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -126,11 +127,12 @@ public class NetDiskOssBusService extends SuperService {
|
|
|
if (ObjectUtils.isNotEmpty(account)) {
|
|
if (ObjectUtils.isNotEmpty(account)) {
|
|
|
countId = account.getId();
|
|
countId = account.getId();
|
|
|
}
|
|
}
|
|
|
- return PlatformFileItem.builder().accountId(countId) //账户
|
|
|
|
|
- .versionNumber(fileVersionNumber)//版本
|
|
|
|
|
- .platformStoreType(PlatformStoreType.Store) //类型
|
|
|
|
|
- .sourcePath(sourcePath)//原路径
|
|
|
|
|
- .isReserveName(isReserveName).orgiFileName(fileName).build().toPath(PlatformFileItem.PathType.OSS);
|
|
|
|
|
|
|
+ return new String[]{CommonUtil.UUID(), String.format("%s", fileName)};
|
|
|
|
|
+// return PlatformFileItem.builder().accountId(countId) //账户
|
|
|
|
|
+// .versionNumber(fileVersionNumber)//版本
|
|
|
|
|
+// .platformStoreType(PlatformStoreType.Store) //类型
|
|
|
|
|
+// .sourcePath(sourcePath)//原路径
|
|
|
|
|
+// .isReserveName(isReserveName).orgiFileName(fileName).build().toPath(PlatformFileItem.PathType.OSS);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public List<String[]> buildPathByUser(RemoteBusFile param, UserAccount user) {
|
|
public List<String[]> buildPathByUser(RemoteBusFile param, UserAccount user) {
|