From 1c055793876fd0e23f5d5b38247b2a39a322f753 Mon Sep 17 00:00:00 2001 From: MAC <1162714483@qq.com> Date: Tue, 5 Apr 2022 12:43:28 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=A3=E5=8E=8B=E7=BC=A9):=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9ERAR5=E6=A0=BC=E5=BC=8F=E6=96=87=E4=BB=B6=E8=A7=A3?= =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E5=8F=8A=E5=85=B6=E4=BB=96=E5=A4=9A=E7=A7=8D?= =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E6=A0=BC=E5=BC=8F=E8=A7=A3=E5=8E=8B=E7=BC=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qiwenshare/file/api/IFileService.java | 2 +- .../qiwenshare/file/config/FdfsConfig.java | 14 -------- .../file/constant/FilePermissionEnum.java | 27 -------------- .../qiwenshare/file/service/FileService.java | 35 ++++++++++++------- src/main/resources/build/settings.xml | 8 ++--- 5 files changed, 28 insertions(+), 58 deletions(-) delete mode 100644 src/main/java/com/qiwenshare/file/config/FdfsConfig.java delete mode 100644 src/main/java/com/qiwenshare/file/constant/FilePermissionEnum.java diff --git a/src/main/java/com/qiwenshare/file/api/IFileService.java b/src/main/java/com/qiwenshare/file/api/IFileService.java index 099842a..6ffb4b4 100644 --- a/src/main/java/com/qiwenshare/file/api/IFileService.java +++ b/src/main/java/com/qiwenshare/file/api/IFileService.java @@ -8,7 +8,7 @@ public interface IFileService extends IService { Long getFilePointCount(Long fileId); void unzipFile(long userFileId, int unzipMode, String filePath); - + public void updateFileDetail(long userFileId, String identifier, long fileSize, long modifyUserId); diff --git a/src/main/java/com/qiwenshare/file/config/FdfsConfig.java b/src/main/java/com/qiwenshare/file/config/FdfsConfig.java deleted file mode 100644 index 754eb5f..0000000 --- a/src/main/java/com/qiwenshare/file/config/FdfsConfig.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.qiwenshare.file.config; - -import com.github.tobato.fastdfs.FdfsClientConfig; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.EnableMBeanExport; -import org.springframework.context.annotation.Import; -import org.springframework.jmx.support.RegistrationPolicy; - -@Configuration -@Import(FdfsClientConfig.class) -@EnableMBeanExport(registration = RegistrationPolicy.IGNORE_EXISTING) -public class FdfsConfig { - -} \ No newline at end of file diff --git a/src/main/java/com/qiwenshare/file/constant/FilePermissionEnum.java b/src/main/java/com/qiwenshare/file/constant/FilePermissionEnum.java deleted file mode 100644 index ecdf53e..0000000 --- a/src/main/java/com/qiwenshare/file/constant/FilePermissionEnum.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.qiwenshare.file.constant; - -/** - * @author MAC - * @version 1.0 - * @description: TODO - * @date 2022/1/12 15:44 - */ -public enum FilePermissionEnum { - READ(1, "读取"), - READ_WRITE(2, "读取/写入"); - - private int type; - private String desc; - FilePermissionEnum(int type, String desc) { - this.type = type; - this.desc = desc; - } - - public int getType() { - return type; - } - - public String getDesc() { - return desc; - } -} diff --git a/src/main/java/com/qiwenshare/file/service/FileService.java b/src/main/java/com/qiwenshare/file/service/FileService.java index b73f593..c16f680 100644 --- a/src/main/java/com/qiwenshare/file/service/FileService.java +++ b/src/main/java/com/qiwenshare/file/service/FileService.java @@ -1,9 +1,12 @@ package com.qiwenshare.file.service; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qiwenshare.common.exception.QiwenException; import com.qiwenshare.common.operation.FileOperation; +import com.qiwenshare.common.util.DateUtil; import com.qiwenshare.file.api.IFileService; import com.qiwenshare.file.component.AsyncTaskComp; import com.qiwenshare.file.domain.FileBean; @@ -81,19 +84,15 @@ public class FileService extends ServiceImpl implements IF String unzipUrl = UFOPUtils.getTempFile(fileBean.getFileUrl()).getAbsolutePath().replace("." + extendName, ""); List fileEntryNameList = new ArrayList<>(); - if ("zip".equals(extendName)) { - fileEntryNameList = FileOperation.unzip(destFile, unzipUrl); - } else if ("rar".equals(extendName)) { - try { - fileEntryNameList = FileOperation.unrar(destFile, unzipUrl); - } catch (Exception e) { - e.printStackTrace(); - log.error("rar解压失败" + e); - throw new QiwenException(500001, "rar解压异常：" + e.getMessage()); - } - } else { - throw new QiwenException(500002, "不支持的文件格式！"); + + try { + fileEntryNameList = FileOperation.unrar(destFile, unzipUrl); + } catch (Exception e) { + e.printStackTrace(); + log.error("解压失败" + e); + throw new QiwenException(500001, "解压异常：" + e.getMessage()); } + if (destFile.exists()) { destFile.delete(); } @@ -110,4 +109,16 @@ public class FileService extends ServiceImpl implements IF } + public void updateFileDetail(long userFileId, String identifier, long fileSize, long modifyUserId) { + UserFile userFile = userFileMapper.selectById(userFileId); + + FileBean fileBean = new FileBean(); + fileBean.setIdentifier(identifier); + fileBean.setFileSize(fileSize); + fileBean.setModifyTime(DateUtil.getCurrentTime()); + fileBean.setModifyUserId(modifyUserId); + fileBean.setFileId(userFile.getFileId()); + fileMapper.updateById(fileBean); + } + } diff --git a/src/main/resources/build/settings.xml b/src/main/resources/build/settings.xml index 54f1fc4..2c2b6a0 100644 --- a/src/main/resources/build/settings.xml +++ b/src/main/resources/build/settings.xml @@ -158,10 +158,10 @@ under the License. --> - alimaven - central - aliyun maven. - http://maven.aliyun.com/nexus/content/groups/public/ + aliyunmaven + * + 阿里云公共仓库 + https://maven.aliyun.com/repository/public