|
|
@@ -8,6 +8,7 @@ import cn.hutool.core.util.IdUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.amazonaws.services.s3.model.S3Object;
|
|
|
import com.github.jfcloud.excel.editor.docdeal.bean.FileUpload;
|
|
|
+import com.github.jfcloud.excel.editor.docdeal.bean.PreviewVo;
|
|
|
import com.github.jfcloud.excel.editor.docdeal.oss.OssProperties;
|
|
|
import com.github.jfcloud.excel.editor.docdeal.oss.service.OssTemplate;
|
|
|
import com.github.jfcloud.excel.editor.docdeal.service.FileUploadService;
|
|
|
@@ -74,9 +75,9 @@ public class FileController {
|
|
|
@RequestParam(required = false) String url,
|
|
|
HttpServletResponse response) {
|
|
|
if (StrUtil.isNotBlank(url)) {
|
|
|
- name = url.substring(url.lastIndexOf('/') + 1);
|
|
|
- bucket = url.replace("/admin/sys-file/", "");
|
|
|
- bucket = bucket.substring(0, bucket.indexOf('/'));
|
|
|
+ PreviewVo vo = new PreviewVo(url);
|
|
|
+ name = vo.getName();
|
|
|
+ bucket = vo.getBucket();
|
|
|
}
|
|
|
if (StrUtil.isBlank(bucket)) {
|
|
|
bucket = ossProperties.getBucketName();
|