From f4ba01314a5e2780d5108d4bf59a23cbbeb4d5c8 Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期一, 04 十二月 2023 13:45:25 +0800
Subject: [PATCH] 合并
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java
index 2dfe01f..d6f0935 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java
@@ -1,7 +1,9 @@
package org.dromara.system.service;
+import org.dromara.common.core.domain.R;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.oss.entity.SynchronousRequest;
import org.dromara.system.domain.bo.SysOssBo;
import org.dromara.system.domain.vo.SysOssVo;
import jakarta.servlet.http.HttpServletResponse;
@@ -9,6 +11,7 @@
import java.io.File;
import java.io.IOException;
+import java.text.ParseException;
import java.util.Collection;
import java.util.List;
@@ -25,12 +28,16 @@
SysOssVo getById(Long ossId);
- SysOssVo upload(MultipartFile file);
+ SysOssVo upload(MultipartFile file) throws IOException;
- SysOssVo upload(File file);
+ SysOssVo upload2(SynchronousRequest request) throws ParseException;
+
+// SysOssVo upload(File file);
void download(Long ossId, HttpServletResponse response) throws IOException;
- Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+ Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid, String password) throws Exception;
+
+ R viewPasswordById(Long ossId);
}
--
Gitblit v1.8.0