diff --git a/oss-client/src/main/java/cn/axzo/oss/client/controller/WebFileController.java b/oss-client/src/main/java/cn/axzo/oss/client/controller/WebFileController.java index a905a4b..b5df96f 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/controller/WebFileController.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/controller/WebFileController.java @@ -101,10 +101,8 @@ public class WebFileController { @SneakyThrows @PostMapping("/v1/file/getUrl") @CrossOrigin - public CommonResponse> getUrl(@Valid @RequestParam String appCode, - @Valid @RequestParam List fileKey) { + public CommonResponse> getUrl(@Valid @RequestParam List fileKey) { FindFileUrlDto dto = FindFileUrlDto.builder() - .appCode(appCode) .fileKey(fileKey) .build(); List response = fileService.findFileUrl(dto); @@ -114,11 +112,8 @@ public class WebFileController { @SneakyThrows @GetMapping("/v1/file/download") @CrossOrigin - public void download(@Valid @RequestParam String appCode, - @Valid @RequestParam String fileKey, - HttpServletResponse response) { + public void download(@Valid @RequestParam String fileKey, HttpServletResponse response) { ServerFileDownloadDto dto = ServerFileDownloadDto.builder() - .appCode(appCode) .fileKey(fileKey) .build(); ServerFileDownloadResponse result = fileService.download(dto); diff --git a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/FileDao.java b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/FileDao.java index c191678..badfa26 100644 --- a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/FileDao.java +++ b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/FileDao.java @@ -23,9 +23,9 @@ public interface FileDao extends IService { */ File getByAppCodeAndUrlMd5(String appCode, String urlMd5); - File getByAppCodeAndFileUuid(String appCode, String fileKey); + File getByFileUuid(String fileKey); - List getByAppCodeAndFileUuids(String appCode, List fileKey); + List getByFileUuids(List fileKey); - List getByAppCodeAndUrlMd5s(String appCode, List urlMd5List); + List getByUrlMd5s(List urlMd5List); } diff --git a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/FileDaoImpl.java b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/FileDaoImpl.java index 8c85f47..2612cc8 100644 --- a/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/FileDaoImpl.java +++ b/oss-dal/src/main/java/cn/axzo/oss/dal/repository/impl/FileDaoImpl.java @@ -29,25 +29,25 @@ public class FileDaoImpl extends ServiceImpl implements FileDa } @Override - public File getByAppCodeAndFileUuid(String appCode, String fileKey) { - return lambdaQuery().eq(File::getAppCode, appCode).eq(File::getFileUuid, fileKey) - .eq(File::getStatus, FileStatus.SUCCESS).eq(File::getIsDelete, TableDelete.UN_DELETED) - .last("limit 1").one(); + public File getByFileUuid(String fileKey) { + return lambdaQuery().eq(File::getFileUuid, fileKey) + .eq(File::getStatus, FileStatus.SUCCESS) + .eq(File::getIsDelete, TableDelete.UN_DELETED) + .last("limit 1") + .one(); } @Override - public List getByAppCodeAndFileUuids(String appCode, List fileKey) { - return lambdaQuery().eq(File::getAppCode, appCode) - .in(File::getFileUuid, fileKey) + public List getByFileUuids(List fileKey) { + return lambdaQuery().in(File::getFileUuid, fileKey) .eq(File::getStatus, FileStatus.SUCCESS) .eq(File::getIsDelete, TableDelete.UN_DELETED) .list(); } @Override - public List getByAppCodeAndUrlMd5s(String appCode, List urlMd5List) { - return lambdaQuery().eq(File::getAppCode, appCode) - .in(File::getUrlMd5, urlMd5List) + public List getByUrlMd5s(List urlMd5List) { + return lambdaQuery().in(File::getUrlMd5, urlMd5List) .eq(File::getStatus, FileStatus.SUCCESS) .eq(File::getIsDelete, TableDelete.UN_DELETED) .list(); diff --git a/oss-http-api/src/main/java/cn/axzo/oss/http/model/FindFileKeyRequest.java b/oss-http-api/src/main/java/cn/axzo/oss/http/model/FindFileKeyRequest.java index 60bdfd3..30e484f 100644 --- a/oss-http-api/src/main/java/cn/axzo/oss/http/model/FindFileKeyRequest.java +++ b/oss-http-api/src/main/java/cn/axzo/oss/http/model/FindFileKeyRequest.java @@ -14,9 +14,6 @@ import java.util.List; @Data public class FindFileKeyRequest { - @NotBlank(message = "appCode must not be null") - private String appCode; - @NotNull(message = "url must not be null") private List url; } diff --git a/oss-http-api/src/main/java/cn/axzo/oss/http/model/FindFileUrlRequest.java b/oss-http-api/src/main/java/cn/axzo/oss/http/model/FindFileUrlRequest.java index 7165a4d..8ed03e1 100644 --- a/oss-http-api/src/main/java/cn/axzo/oss/http/model/FindFileUrlRequest.java +++ b/oss-http-api/src/main/java/cn/axzo/oss/http/model/FindFileUrlRequest.java @@ -14,9 +14,6 @@ import java.util.List; @Data public class FindFileUrlRequest { - @NotBlank(message = "appCode must not be null") - private String appCode; - @NotNull(message = "fileKey must not be null") private List fileKey; } \ No newline at end of file diff --git a/oss-manager-api/src/main/java/cn/axzo/oss/manager/api/dto/request/FindFileKeyDto.java b/oss-manager-api/src/main/java/cn/axzo/oss/manager/api/dto/request/FindFileKeyDto.java index a227165..55efcaa 100644 --- a/oss-manager-api/src/main/java/cn/axzo/oss/manager/api/dto/request/FindFileKeyDto.java +++ b/oss-manager-api/src/main/java/cn/axzo/oss/manager/api/dto/request/FindFileKeyDto.java @@ -18,11 +18,6 @@ import java.util.List; @AllArgsConstructor public class FindFileKeyDto { - /** - * 应用码 - */ - private String appCode; - /** * 文件url */ diff --git a/oss-manager-api/src/main/java/cn/axzo/oss/manager/api/dto/request/FindFileUrlDto.java b/oss-manager-api/src/main/java/cn/axzo/oss/manager/api/dto/request/FindFileUrlDto.java index 2b968eb..5a19c9c 100644 --- a/oss-manager-api/src/main/java/cn/axzo/oss/manager/api/dto/request/FindFileUrlDto.java +++ b/oss-manager-api/src/main/java/cn/axzo/oss/manager/api/dto/request/FindFileUrlDto.java @@ -18,11 +18,6 @@ import java.util.List; @AllArgsConstructor public class FindFileUrlDto { - /** - * 应用码 - */ - private String appCode; - /** * 文件uuid */ diff --git a/oss-manager-api/src/main/java/cn/axzo/oss/manager/api/dto/request/ServerFileDownloadDto.java b/oss-manager-api/src/main/java/cn/axzo/oss/manager/api/dto/request/ServerFileDownloadDto.java index 902f5c8..810dba4 100644 --- a/oss-manager-api/src/main/java/cn/axzo/oss/manager/api/dto/request/ServerFileDownloadDto.java +++ b/oss-manager-api/src/main/java/cn/axzo/oss/manager/api/dto/request/ServerFileDownloadDto.java @@ -16,11 +16,6 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class ServerFileDownloadDto { - /** - * 应用码 - */ - private String appCode; - /** * 文件uuid */ diff --git a/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java b/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java index 553b66e..21a4349 100644 --- a/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java +++ b/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java @@ -23,7 +23,6 @@ import cn.axzo.oss.manager.api.dto.request.*; import cn.axzo.oss.manager.api.dto.response.*; import cn.axzo.oss.service.api.FileService; import cn.hutool.core.collection.CollectionUtil; -import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -141,10 +140,8 @@ public class FileServiceImpl implements FileService { @Override public ServerFileDownloadResponse download(ServerFileDownloadDto dto) { log.info("file download dto = {}", JsonUtil.obj2Str(dto)); - // 检查app code - checkAppCode(dto.getAppCode()); - File file = fileDao.getByAppCodeAndFileUuid(dto.getAppCode(), dto.getFileKey()); + File file = fileDao.getByFileUuid(dto.getFileKey()); if (Utility.objIsNull(file)) { log.warn("file download is null, fileKey = {}", dto.getFileKey()); return null; @@ -217,8 +214,6 @@ public class FileServiceImpl implements FileService { @Override public List findFileUrl(FindFileUrlDto dto) { log.info("find file url dto = {}", JsonUtil.obj2Str(dto)); - // 检查app code - checkAppCode(dto.getAppCode()); // 做兼容处理,如果List fileKey如果存在url取出url,不做查询处理 List urlList = new ArrayList<>(); @@ -231,7 +226,7 @@ public class FileServiceImpl implements FileService { } } - List fileList = fileDao.getByAppCodeAndFileUuids(dto.getAppCode(), fileKeyList); + List fileList = fileDao.getByFileUuids(fileKeyList); if (CollectionUtil.isEmpty(fileList)) { log.warn("find file url is null,key = {}", Arrays.toString(dto.getFileKey().toArray())); return new ArrayList<>(); @@ -242,14 +237,12 @@ public class FileServiceImpl implements FileService { @Override public List findFileKey(FindFileKeyDto dto) { log.info("find file key dto = {}", JsonUtil.obj2Str(dto)); - // 检查app code - checkAppCode(dto.getAppCode()); List urlMd5List = dto.getUrl().stream() .map(url -> Utility.getMd5(url)) .collect(Collectors.toList()); - List fileList = fileDao.getByAppCodeAndUrlMd5s(dto.getAppCode(), urlMd5List); + List fileList = fileDao.getByUrlMd5s(urlMd5List); if (CollectionUtil.isEmpty(fileList)) { log.warn("find file key is null,url = {}", Arrays.toString(dto.getUrl().toArray())); return new ArrayList<>();