From 8bece56908df5823c87ad011b891e11dcba5ab5b Mon Sep 17 00:00:00 2001 From: czhqwer Date: Sat, 29 Mar 2025 16:56:19 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=85=B1?= =?UTF-8?q?=E4=BA=AB=E6=96=87=E4=BB=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/czh/controller/ConfigController.java | 9 ++ .../cn/czh/controller/FileController.java | 105 +++++++++++++++++- .../cn/czh/controller/UploadController.java | 10 +- .../main/java/cn/czh/entity/SharedFile.java | 15 +++ .../main/java/cn/czh/entity/UserConfig.java | 17 +++ .../java/cn/czh/mapper/ShareFileMapper.java | 9 ++ .../java/cn/czh/mapper/UserConfigMapper.java | 9 ++ .../java/cn/czh/service/IAuthService.java | 10 ++ .../java/cn/czh/service/IFileService.java | 8 ++ .../java/cn/czh/service/IStorageService.java | 4 +- .../cn/czh/service/impl/AuthServiceImpl.java | 57 ++++++++++ .../cn/czh/service/impl/FileServiceImpl.java | 48 ++++++++ .../czh/service/impl/LocalStorageService.java | 15 ++- .../czh/service/impl/MinioStorageService.java | 15 ++- .../czh/service/impl/OssStorageService.java | 15 ++- upload-file-frontend/src/utils/api.js | 54 +++++++++ upload-file-frontend/src/utils/http.js | 20 ++++ upload-file-frontend/src/views/MainPage.vue | 9 +- 18 files changed, 411 insertions(+), 18 deletions(-) create mode 100644 upload-file-backend/src/main/java/cn/czh/entity/SharedFile.java create mode 100644 upload-file-backend/src/main/java/cn/czh/entity/UserConfig.java create mode 100644 upload-file-backend/src/main/java/cn/czh/mapper/ShareFileMapper.java create mode 100644 upload-file-backend/src/main/java/cn/czh/mapper/UserConfigMapper.java create mode 100644 upload-file-backend/src/main/java/cn/czh/service/IAuthService.java create mode 100644 upload-file-backend/src/main/java/cn/czh/service/impl/AuthServiceImpl.java diff --git a/upload-file-backend/src/main/java/cn/czh/controller/ConfigController.java b/upload-file-backend/src/main/java/cn/czh/controller/ConfigController.java index e3391e2..f9a7bba 100644 --- a/upload-file-backend/src/main/java/cn/czh/controller/ConfigController.java +++ b/upload-file-backend/src/main/java/cn/czh/controller/ConfigController.java @@ -2,6 +2,7 @@ package cn.czh.controller; import cn.czh.base.Result; import cn.czh.entity.StorageConfig; +import cn.czh.service.IAuthService; import cn.czh.service.IStorageConfigService; import org.springframework.web.bind.annotation.*; @@ -14,6 +15,8 @@ public class ConfigController { @Resource private IStorageConfigService storageConfigService; + @Resource + private IAuthService authService; @GetMapping public Result getConfig(String type) { @@ -31,4 +34,10 @@ public class ConfigController { storageConfigService.testStorageConfig(config); return Result.success(); } + + @PostMapping("/set-password") + public Result setPassword(@RequestBody String password) { + authService.setMainUserPassword(password); + return Result.success(); + } } diff --git a/upload-file-backend/src/main/java/cn/czh/controller/FileController.java b/upload-file-backend/src/main/java/cn/czh/controller/FileController.java index 7692c42..095996a 100644 --- a/upload-file-backend/src/main/java/cn/czh/controller/FileController.java +++ b/upload-file-backend/src/main/java/cn/czh/controller/FileController.java @@ -2,25 +2,30 @@ package cn.czh.controller; import cn.czh.base.Result; import cn.czh.entity.StorageConfig; +import cn.czh.service.IAuthService; import cn.czh.service.IFileService; import cn.czh.service.IStorageConfigService; import cn.czh.utils.FileTypeUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.ByteArrayResource; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.IOException; +import java.net.Inet4Address; +import java.net.InetAddress; +import java.net.NetworkInterface; import java.nio.file.Files; import java.nio.file.Paths; +import java.util.Enumeration; +@Slf4j @RestController @RequestMapping("/file") public class FileController { @@ -29,6 +34,13 @@ public class FileController { private IStorageConfigService storageConfigService; @Resource private IFileService fileService; + @Resource + private IAuthService authService; + + @Value("${server.port}") + private String serverPort; + + private static boolean enableShare = false; @GetMapping("/preview/{storageType}/**") public ResponseEntity previewFile( @@ -76,7 +88,11 @@ public class FileController { } @GetMapping("/page") - public Result pageFiles(Integer page, Integer pageSize, String storageType, String fileName) { + public Result pageFiles(HttpServletRequest request, Integer page, Integer pageSize, String storageType, String fileName) { + if (!authService.isMainUser(request.getRemoteAddr())) { + return Result.error("权限不足"); + } + if (page == null) { page = 1; } @@ -85,4 +101,83 @@ public class FileController { } return Result.success(fileService.pageFiles(page, pageSize, storageType, fileName)); } + + @PostMapping("/sharedFile") + public Result listSharedFiles(@RequestParam String fileIdentifier) { + fileService.addSharedFile(fileIdentifier); + return Result.success(); + } + + @PostMapping("/unShareFile") + public Result unShareFile(HttpServletRequest request, @RequestParam String fileIdentifier) { + if (!authService.isMainUser(request.getRemoteAddr())) { + return Result.error("非主用户不能取消分享"); + } + fileService.removeSharedFile(fileIdentifier); + return Result.success(); + } + + @GetMapping("/sharedFiles") + public Result getSharedFiles(HttpServletRequest request, @RequestHeader("Authorization") String password) { + boolean isMainUser = authService.isMainUser(request.getRemoteAddr()); + String mainUserPassword = authService.getMainUserPassword(); + + if (!isMainUser && !mainUserPassword.equals(password)) { + return Result.error("密码错误"); + } + if (!isMainUser && !enableShare) { + return Result.error("分享功能未开启"); + } + + return Result.success(fileService.listSharedFiles()); + } + + @PostMapping("/enableShare") + public Result enableShare(HttpServletRequest request, @RequestParam Boolean enable) { + if (!authService.isMainUser(request.getRemoteAddr())) { + return Result.error("非主用户不能修改分享状态"); + } + enableShare = enable; + return Result.success(); + } + + @GetMapping("/getShareStatus") + public Result getShareStatus() { + return Result.success(enableShare); + } + + @GetMapping("/shareAddress") + public Result getShareAddress() { + String ip; + try { + ip = getLocalIpAddress(); + } catch (Exception e) { + log.error("获取本地IP地址失败：{}", e.getMessage(), e); + ip = "localhost"; + } + return Result.success("http://" + ip + ":" + serverPort); + } + + private String getLocalIpAddress() throws Exception { + Enumeration interfaces = NetworkInterface.getNetworkInterfaces(); + while (interfaces.hasMoreElements()) { + NetworkInterface networkInterface = interfaces.nextElement(); + // 跳过回环接口和未启用的接口 + if (networkInterface.isLoopback() || !networkInterface.isUp()) { + continue; + } + Enumeration addresses = networkInterface.getInetAddresses(); + while (addresses.hasMoreElements()) { + InetAddress addr = addresses.nextElement(); + if (addr instanceof Inet4Address && !addr.isLoopbackAddress()) { + String ip = addr.getHostAddress(); + if (ip.startsWith("192.168.") || ip.startsWith("10.") || + (ip.startsWith("172.") && Integer.parseInt(ip.split("\\.")[1]) >= 16 && Integer.parseInt(ip.split("\\.")[1]) <= 31)) { + return ip; + } + } + } + } + return null; + } } \ No newline at end of file diff --git a/upload-file-backend/src/main/java/cn/czh/controller/UploadController.java b/upload-file-backend/src/main/java/cn/czh/controller/UploadController.java index 5c481a9..26d2f20 100644 --- a/upload-file-backend/src/main/java/cn/czh/controller/UploadController.java +++ b/upload-file-backend/src/main/java/cn/czh/controller/UploadController.java @@ -4,6 +4,7 @@ import cn.czh.base.Result; import cn.czh.dto.req.CreateMultipartUpload; import cn.czh.entity.StorageConfig; import cn.czh.entity.UploadFile; +import cn.czh.service.IAuthService; import cn.czh.service.IStorageService; import cn.czh.service.StorageServiceFactory; import cn.czh.utils.FileTypeUtil; @@ -27,6 +28,8 @@ public class UploadController { @Resource private StorageServiceFactory storageServiceFactory; + @Resource + private IAuthService authService; /** * 从请求中获取存储类型（示例：从请求头获取） @@ -83,9 +86,10 @@ public class UploadController { @PostMapping("/merge") public Result merge(HttpServletRequest request, String identifier) { + boolean mainUser = authService.isMainUser(request.getRemoteAddr()); String storageType = getStorageTypeFromRequest(request); IStorageService storageService = storageServiceFactory.getStorageService(storageType); - return Result.success(storageService.merge(identifier)); + return Result.success(storageService.merge(identifier, mainUser)); } @PostMapping @@ -101,6 +105,8 @@ public class UploadController { } } + boolean mainUser = authService.isMainUser(request.getRemoteAddr()); + String md5 = SecureUtil.md5(file.getInputStream()); synchronized (md5.intern()) { String dateFormat = DateUtil.format(new Date(), DatePattern.PURE_DATE_PATTERN); @@ -109,7 +115,7 @@ public class UploadController { dateFormat + "/" + md5 + "." + FileTypeUtil.getFileSuffix(filename); String storageType = getStorageTypeFromRequest(request); IStorageService storageService = storageServiceFactory.getStorageService(storageType); - return Result.success(storageService.uploadFile(file, md5, objectName)); + return Result.success(storageService.uploadFile(file, md5, objectName, mainUser)); } } } \ No newline at end of file diff --git a/upload-file-backend/src/main/java/cn/czh/entity/SharedFile.java b/upload-file-backend/src/main/java/cn/czh/entity/SharedFile.java new file mode 100644 index 0000000..00c6fae --- /dev/null +++ b/upload-file-backend/src/main/java/cn/czh/entity/SharedFile.java @@ -0,0 +1,15 @@ +package cn.czh.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName("shared_file") +public class SharedFile { + @TableId(type = IdType.AUTO) + private Long id; + private String fileIdentifier; + private String createTime; +} \ No newline at end of file diff --git a/upload-file-backend/src/main/java/cn/czh/entity/UserConfig.java b/upload-file-backend/src/main/java/cn/czh/entity/UserConfig.java new file mode 100644 index 0000000..0bf25a1 --- /dev/null +++ b/upload-file-backend/src/main/java/cn/czh/entity/UserConfig.java @@ -0,0 +1,17 @@ +package cn.czh.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName("user_config") +public class UserConfig { + @TableId(type = IdType.AUTO) + private Long id; + private String username; + private String password; + private Integer isMainUser; // 0 or 1 + private String createTime; +} \ No newline at end of file diff --git a/upload-file-backend/src/main/java/cn/czh/mapper/ShareFileMapper.java b/upload-file-backend/src/main/java/cn/czh/mapper/ShareFileMapper.java new file mode 100644 index 0000000..fd63031 --- /dev/null +++ b/upload-file-backend/src/main/java/cn/czh/mapper/ShareFileMapper.java @@ -0,0 +1,9 @@ +package cn.czh.mapper; + +import cn.czh.entity.SharedFile; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ShareFileMapper extends BaseMapper { +} diff --git a/upload-file-backend/src/main/java/cn/czh/mapper/UserConfigMapper.java b/upload-file-backend/src/main/java/cn/czh/mapper/UserConfigMapper.java new file mode 100644 index 0000000..ecbc127 --- /dev/null +++ b/upload-file-backend/src/main/java/cn/czh/mapper/UserConfigMapper.java @@ -0,0 +1,9 @@ +package cn.czh.mapper; + +import cn.czh.entity.UserConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface UserConfigMapper extends BaseMapper { +} diff --git a/upload-file-backend/src/main/java/cn/czh/service/IAuthService.java b/upload-file-backend/src/main/java/cn/czh/service/IAuthService.java new file mode 100644 index 0000000..fa5c572 --- /dev/null +++ b/upload-file-backend/src/main/java/cn/czh/service/IAuthService.java @@ -0,0 +1,10 @@ +package cn.czh.service; + +public interface IAuthService { + + String getMainUserPassword(); + + void setMainUserPassword(String password); + + boolean isMainUser(String remoteAddress); +} diff --git a/upload-file-backend/src/main/java/cn/czh/service/IFileService.java b/upload-file-backend/src/main/java/cn/czh/service/IFileService.java index d161f2d..13580b5 100644 --- a/upload-file-backend/src/main/java/cn/czh/service/IFileService.java +++ b/upload-file-backend/src/main/java/cn/czh/service/IFileService.java @@ -3,8 +3,16 @@ package cn.czh.service; import cn.czh.entity.UploadFile; import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.List; + public interface IFileService { IPage pageFiles(Integer page, Integer pageSize, String storageType, String fileName); + List listSharedFiles(); + + void addSharedFile(String identifier); + + void removeSharedFile(String fileIdentifier); + } diff --git a/upload-file-backend/src/main/java/cn/czh/service/IStorageService.java b/upload-file-backend/src/main/java/cn/czh/service/IStorageService.java index 366990c..c0d0a15 100644 --- a/upload-file-backend/src/main/java/cn/czh/service/IStorageService.java +++ b/upload-file-backend/src/main/java/cn/czh/service/IStorageService.java @@ -14,7 +14,7 @@ public interface IStorageService { /** * 普通文件上传 */ - FileRecordDTO uploadFile(MultipartFile file, String md5, String objectName); + FileRecordDTO uploadFile(MultipartFile file, String md5, String objectName, Boolean admin); /** * 获取文件上传进度 @@ -29,7 +29,7 @@ public interface IStorageService { /** * 合并分片文件 */ - UploadFile merge(String identifier); + UploadFile merge(String identifier, Boolean admin); /** * 根据md5标识获取分片上传任务 diff --git a/upload-file-backend/src/main/java/cn/czh/service/impl/AuthServiceImpl.java b/upload-file-backend/src/main/java/cn/czh/service/impl/AuthServiceImpl.java new file mode 100644 index 0000000..8e8c3b4 --- /dev/null +++ b/upload-file-backend/src/main/java/cn/czh/service/impl/AuthServiceImpl.java @@ -0,0 +1,57 @@ +package cn.czh.service.impl; + +import cn.czh.entity.UserConfig; +import cn.czh.mapper.UserConfigMapper; +import cn.czh.service.IAuthService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + +@Service +public class AuthServiceImpl implements IAuthService { + + @Resource + private UserConfigMapper userConfigMapper; + + @Override + public String getMainUserPassword() { + UserConfig user = userConfigMapper.selectOne( + new LambdaQueryWrapper() + .eq(UserConfig::getIsMainUser, 1) + ); + if (user == null) { + return ""; + } + return user.getPassword() == null || user.getPassword().trim().isEmpty() ? "" : user.getPassword(); + } + + @Override + public void setMainUserPassword(String password) { + UserConfig user = userConfigMapper.selectOne( + new LambdaQueryWrapper() + .eq(UserConfig::getIsMainUser, 1) + ); + + if (user == null) { + user = new UserConfig(); + user.setUsername("admin"); + user.setIsMainUser(1); + user.setCreateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + + } + user.setPassword(password != null && password.trim().isEmpty() ? null : password); + if (user.getId() == null) { + userConfigMapper.insert(user); + } else { + userConfigMapper.updateById(user); + } + } + + @Override + public boolean isMainUser(String remoteAddress) { + return "127.0.0.1".equals(remoteAddress) || "0:0:0:0:0:0:0:1".equals(remoteAddress); + } +} diff --git a/upload-file-backend/src/main/java/cn/czh/service/impl/FileServiceImpl.java b/upload-file-backend/src/main/java/cn/czh/service/impl/FileServiceImpl.java index 7d84883..ca2e1a9 100644 --- a/upload-file-backend/src/main/java/cn/czh/service/impl/FileServiceImpl.java +++ b/upload-file-backend/src/main/java/cn/czh/service/impl/FileServiceImpl.java @@ -1,22 +1,70 @@ package cn.czh.service.impl; +import cn.czh.entity.SharedFile; import cn.czh.entity.UploadFile; +import cn.czh.mapper.ShareFileMapper; import cn.czh.mapper.UploadFileMapper; import cn.czh.service.IFileService; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; @Service public class FileServiceImpl implements IFileService { @Resource private UploadFileMapper uploadFileMapper; + @Resource + private ShareFileMapper shareFileMapper; @Override public IPage pageFiles(Integer page, Integer pageSize, String storageType, String fileName) { return uploadFileMapper.pageFiles(new Page<>(page, pageSize), storageType, fileName); } + + @Override + public List listSharedFiles() { + + List sharedFiles = shareFileMapper.selectList(null); + Set files = sharedFiles.stream() + .map(SharedFile::getFileIdentifier) + .collect(Collectors.toSet()); + + List uploadFiles = uploadFileMapper.selectList(null); + if (uploadFiles != null) { + return uploadFiles.stream() + .filter(uploadFile -> files.contains(uploadFile.getFileIdentifier())) + .collect(Collectors.toList()); + } + + return Collections.emptyList(); + } + + @Override + public void addSharedFile(String identifier) { + SharedFile sharedFile = shareFileMapper.selectOne( + Wrappers.lambdaQuery(SharedFile.class).eq(SharedFile::getFileIdentifier, identifier) + ); + + if (sharedFile == null) { + sharedFile = new SharedFile(); + sharedFile.setFileIdentifier(identifier); + sharedFile.setCreateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + shareFileMapper.insert(sharedFile); + } + } + + @Override + public void removeSharedFile(String fileIdentifier) { + shareFileMapper.delete(Wrappers.lambdaQuery(SharedFile.class).eq(SharedFile::getFileIdentifier, fileIdentifier)); + } } diff --git a/upload-file-backend/src/main/java/cn/czh/service/impl/LocalStorageService.java b/upload-file-backend/src/main/java/cn/czh/service/impl/LocalStorageService.java index a8dc625..3ba5953 100644 --- a/upload-file-backend/src/main/java/cn/czh/service/impl/LocalStorageService.java +++ b/upload-file-backend/src/main/java/cn/czh/service/impl/LocalStorageService.java @@ -11,6 +11,7 @@ import cn.czh.dto.req.CreateMultipartUpload; import cn.czh.entity.StorageConfig; import cn.czh.entity.UploadFile; import cn.czh.mapper.UploadFileMapper; +import cn.czh.service.IFileService; import cn.czh.service.IStorageConfigService; import cn.czh.service.IStorageService; import cn.hutool.core.date.DatePattern; @@ -47,6 +48,8 @@ public class LocalStorageService implements IStorageService { private UploadFileMapper uploadFileMapper; @Resource private IStorageConfigService storageConfigService; + @Resource + private IFileService fileService; private StorageConfig storageConfig; @@ -75,7 +78,7 @@ public class LocalStorageService implements IStorageService { @Transactional @Override - public FileRecordDTO uploadFile(MultipartFile file, String md5, String objectName) { + public FileRecordDTO uploadFile(MultipartFile file, String md5, String objectName, Boolean admin) { UploadFile uploadFile = getByIdentifier(md5); if (uploadFile != null) { FileRecordDTO fileRecord = new FileRecordDTO(); @@ -117,6 +120,10 @@ public class LocalStorageService implements IStorageService { BeanUtils.copyProperties(uploadFile, fileRecord); fileRecord.setFileId(uploadFile.getId()); fileRecord.setOriginalName(file.getOriginalFilename()); + + if (!admin) { + fileService.addSharedFile(md5); + } return fileRecord; } catch (IOException e) { throw new BusinessException("文件上传失败", e); @@ -178,7 +185,7 @@ public class LocalStorageService implements IStorageService { @Transactional @Override - public UploadFile merge(String identifier) { + public UploadFile merge(String identifier, Boolean admin) { UploadFile uploadFile = getByIdentifier(identifier); if (uploadFile == null) { throw new BusinessException("上传任务不存在"); @@ -223,6 +230,10 @@ public class LocalStorageService implements IStorageService { uploadFile.setDownloadUrl(generateWebUrl(uploadFile.getObjectKey())); uploadFile.setIsFinish(1); uploadFileMapper.updateById(uploadFile); + + if (!admin) { + fileService.addSharedFile(uploadFile.getFileIdentifier()); + } return uploadFile; } diff --git a/upload-file-backend/src/main/java/cn/czh/service/impl/MinioStorageService.java b/upload-file-backend/src/main/java/cn/czh/service/impl/MinioStorageService.java index 51e64a8..43349dc 100644 --- a/upload-file-backend/src/main/java/cn/czh/service/impl/MinioStorageService.java +++ b/upload-file-backend/src/main/java/cn/czh/service/impl/MinioStorageService.java @@ -11,6 +11,7 @@ import cn.czh.dto.req.CreateMultipartUpload; import cn.czh.entity.StorageConfig; import cn.czh.entity.UploadFile; import cn.czh.mapper.UploadFileMapper; +import cn.czh.service.IFileService; import cn.czh.service.IStorageConfigService; import cn.czh.service.IStorageService; import cn.czh.utils.ImgUtils; @@ -61,6 +62,8 @@ public class MinioStorageService implements IStorageService { private UploadFileMapper uploadFileMapper; @Resource private IStorageConfigService storageConfigService; + @Resource + private IFileService fileService; /** * 预签名url过期时间: 10分钟 @@ -122,7 +125,7 @@ public class MinioStorageService implements IStorageService { @Transactional @Override - public FileRecordDTO uploadFile(MultipartFile file, String md5, String objectName) { + public FileRecordDTO uploadFile(MultipartFile file, String md5, String objectName, Boolean admin) { UploadFile uploadFile = getByIdentifier(md5); if (ObjectUtil.isNotNull(uploadFile)) { @@ -164,6 +167,10 @@ public class MinioStorageService implements IStorageService { BeanUtils.copyProperties(uploadFile, fileRecord); fileRecord.setFileId(uploadFile.getId()); fileRecord.setOriginalName(filename); + + if (!admin) { + fileService.addSharedFile(md5); + } return fileRecord; } catch (Exception e) { throw new BusinessException("文件上上传失败", e); @@ -219,7 +226,7 @@ public class MinioStorageService implements IStorageService { @Transactional @Override - public UploadFile merge(String identifier) { + public UploadFile merge(String identifier, Boolean admin) { UploadFile uploadFile = getByIdentifier(identifier); if (uploadFile == null) { throw new BusinessException("上传任务不存在"); @@ -244,6 +251,10 @@ public class MinioStorageService implements IStorageService { uploadFile.setDownloadUrl(getFileDownloadUrl(uploadFile.getObjectKey())); uploadFile.setIsFinish(1); uploadFileMapper.updateById(uploadFile); + + if (!admin) { + fileService.addSharedFile(uploadFile.getFileIdentifier()); + } return uploadFile; } diff --git a/upload-file-backend/src/main/java/cn/czh/service/impl/OssStorageService.java b/upload-file-backend/src/main/java/cn/czh/service/impl/OssStorageService.java index acf7a5e..d8c8e8b 100644 --- a/upload-file-backend/src/main/java/cn/czh/service/impl/OssStorageService.java +++ b/upload-file-backend/src/main/java/cn/czh/service/impl/OssStorageService.java @@ -11,6 +11,7 @@ import cn.czh.dto.req.CreateMultipartUpload; import cn.czh.entity.StorageConfig; import cn.czh.entity.UploadFile; import cn.czh.mapper.UploadFileMapper; +import cn.czh.service.IFileService; import cn.czh.service.IStorageConfigService; import cn.czh.service.IStorageService; import cn.hutool.core.date.DatePattern; @@ -49,6 +50,8 @@ public class OssStorageService implements IStorageService { private UploadFileMapper uploadFileMapper; @Resource private IStorageConfigService storageConfigService; + @Resource + private IFileService fileService; private StorageConfig storageConfig; private OSS ossClient; @@ -83,7 +86,7 @@ public class OssStorageService implements IStorageService { */ @Transactional @Override - public FileRecordDTO uploadFile(MultipartFile file, String md5, String objectName) { + public FileRecordDTO uploadFile(MultipartFile file, String md5, String objectName, Boolean admin) { UploadFile uploadFile = getByIdentifier(md5); if (uploadFile != null) { FileRecordDTO fileRecord = new FileRecordDTO(); @@ -129,6 +132,10 @@ public class OssStorageService implements IStorageService { BeanUtils.copyProperties(uploadFile, fileRecord); fileRecord.setFileId(uploadFile.getId()); fileRecord.setOriginalName(file.getOriginalFilename()); + + if (!admin) { + fileService.addSharedFile(md5); + } return fileRecord; } catch (IOException e) { throw new BusinessException("文件上传失败", e); @@ -211,7 +218,7 @@ public class OssStorageService implements IStorageService { */ @Transactional @Override - public UploadFile merge(String identifier) { + public UploadFile merge(String identifier, Boolean admin) { UploadFile uploadFile = getByIdentifier(identifier); if (uploadFile == null) { throw new BusinessException("上传任务不存在"); @@ -243,6 +250,10 @@ public class OssStorageService implements IStorageService { uploadFile.setDownloadUrl(getFileDownloadUrl(uploadFile.getObjectKey())); uploadFile.setIsFinish(1); uploadFileMapper.updateById(uploadFile); + + if (!admin) { + fileService.addSharedFile(identifier); + } return uploadFile; } diff --git a/upload-file-frontend/src/utils/api.js b/upload-file-frontend/src/utils/api.js index 2406145..824a039 100644 --- a/upload-file-frontend/src/utils/api.js +++ b/upload-file-frontend/src/utils/api.js @@ -180,6 +180,55 @@ const testStorageConfig = ({ type, endpoint, accessKey, secretKey, bucket }) => }); } +/** + * 获取共享文件列表 + * @param {Object} params 参数对象 + * @param {string} params.password 密码 + * @returns + */ +const getSharedFiles = () => { + return http.get('/file/sharedFiles'); +}; + +/** + * 启用或禁用共享 + * @param {Object} params 参数对象 + * @param {boolean} params.enable 是否启用 + * @returns + */ +const enableShare = ({ enable }) => { + const formData = new FormData(); + formData.append('enable', enable); + return http.post("/file/enableShare", formData); +}; + +/** + * 获取分享状态 + * @returns + */ +const getShareStatus = () => { + return http.get("/file/getShareStatus"); +} + +/** + * 获取分享地址 + * @returns + */ +const shareAddress = () => { + return http.get("/file/shareAddress"); +} + +/** + * 移除共享文件 + * @param {string} fileIdentifier + * @returns + */ +const unShareFile = (fileIdentifier) => { + const formData = new FormData(); + formData.append('fileIdentifier', fileIdentifier); + return http.post("/file/unShareFile", formData); +} + export { getUploadProgress, createMultipartUpload, @@ -191,5 +240,10 @@ export { getStorageConfig, setStorageConfig, testStorageConfig, + getSharedFiles, + enableShare, + getShareStatus, + shareAddress, + unShareFile, httpExtra }; diff --git a/upload-file-frontend/src/utils/http.js b/upload-file-frontend/src/utils/http.js index e0489ad..332deed 100644 --- a/upload-file-frontend/src/utils/http.js +++ b/upload-file-frontend/src/utils/http.js @@ -8,6 +8,16 @@ const http = axios.create({ baseURL: baseUrl }); +// 请求拦截器 - 自动添加 Authorization +http.interceptors.request.use(config => { + // 从 localStorage 获取 password + const password = localStorage.getItem('password'); + config.headers['Authorization'] = password ? password : ''; + return config; +}, error => { + return Promise.reject(error); +}); + // 配置拦截器，返回 response.data http.interceptors.response.use(response => { return response.data; @@ -22,4 +32,14 @@ const httpExtra = axiosExtra.create({ } }); +httpExtra.interceptors.request.use(config => { + const password = localStorage.getItem('password'); + if (password) { + config.headers['Authorization'] = password; + } + return config; +}, error => { + return Promise.reject(error); +}); + export { http, baseUrl, httpExtra }; \ No newline at end of file diff --git a/upload-file-frontend/src/views/MainPage.vue b/upload-file-frontend/src/views/MainPage.vue index 5d9c95a..5603330 100644 --- a/upload-file-frontend/src/views/MainPage.vue +++ b/upload-file-frontend/src/views/MainPage.vue @@ -22,7 +22,7 @@
-
+
@@ -34,6 +34,7 @@

七牛云功能正在被疯狂调教，马上就能和大家见面啦！

+ @@ -49,10 +50,11 @@ import FileGallery from '@/components/FileGallery/FileGallery.vue'; import SettingsModal from '@/components/SettingsModal/SettingsModal.vue'; import StorageConfigModal from '@/components/StorageConfigModal/StorageConfigModal.vue'; import AboutModal from '@/components/AboutModal/AboutModal.vue'; +import ShareFile from '@/components/ShareFile/ShareFile.vue'; export default { name: 'MainPage', - components: { UploadFile, FileGallery, SettingsModal, StorageConfigModal, AboutModal }, + components: { UploadFile, FileGallery, SettingsModal, StorageConfigModal, AboutModal, ShareFile }, data() { return { fileList: [], @@ -63,7 +65,8 @@ export default { { label: 'OSS', value: 'oss' }, { label: 'OBS', value: 'obs' }, { label: 'QiNiu', value: 'qiniu' }, - { label: '已上传文件', value: 'gallery' } + { label: '已上传文件', value: 'gallery' }, + { label: '共享文件', value: 'shared' }, ], showMenu: false, showSettings: false,