From 801cc2268c5d0d34841020f464e67e16bc962351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E8=B6=85?= <1162714483@qq.com> Date: Sat, 6 Mar 2021 22:17:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E4=BA=AB=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qiwenshare/file/controller/FileController.java | 3 ++- .../com/qiwenshare/file/controller/ShareController.java | 8 ++++---- install.bat | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java b/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java index 04cf228..756400b 100644 --- a/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java +++ b/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java @@ -22,6 +22,7 @@ import com.qiwenshare.file.vo.file.FileListVo; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.codec.digest.DigestUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -203,7 +204,7 @@ public class FileController { } UserBean sessionUserBean = userService.getUserBeanByToken(token); List userFiles = JSON.parseArray(batchDeleteFileDto.getFiles(), UserFile.class); - + DigestUtils.md5Hex("data"); for (UserFile userFile : userFiles) { String uuid = UUID.randomUUID().toString(); userFile.setDeleteBatchNum(uuid); diff --git a/file-web/src/main/java/com/qiwenshare/file/controller/ShareController.java b/file-web/src/main/java/com/qiwenshare/file/controller/ShareController.java index fbe7d8f..eb0a739 100644 --- a/file-web/src/main/java/com/qiwenshare/file/controller/ShareController.java +++ b/file-web/src/main/java/com/qiwenshare/file/controller/ShareController.java @@ -68,18 +68,18 @@ public class ShareController { @Operation(summary = "分享列表", description = "分享列表", tags = {"share"}) @GetMapping(value = "/sharefileList") @ResponseBody - public RestResult shareFileListBySecret(ShareFileListBySecretDTO shareFileListBySecretDTO) { + public RestResult> shareFileListBySecret(ShareFileListBySecretDTO shareFileListBySecretDTO) { log.info(JSON.toJSONString(shareFileListBySecretDTO)); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(Share::getShareBatchNum, shareFileListBySecretDTO.getShareBatchNum()); List list = shareService.list(lambdaQueryWrapper); - return RestResult.success().data(list.get(0)); + return RestResult.success().data(list); } @Operation(summary = "分享类型", description = "可用此接口判断是否需要提取码", tags = {"share"}) @GetMapping(value = "/sharetype") @ResponseBody - public RestResult shareType(ShareTypeDTO shareTypeDTO) { + public RestResult shareType(ShareTypeDTO shareTypeDTO) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(Share::getShareBatchNum, shareTypeDTO.getShareBatchNum()); Share share = shareService.getOne(lambdaQueryWrapper); @@ -92,7 +92,7 @@ public class ShareController { @Operation(summary = "校验提取码", description = "校验提取码", tags = {"share"}) @GetMapping(value = "/checkextractioncode") @ResponseBody - public RestResult checkExtractionCode(CheckExtractionCodeDTO checkExtractionCodeDTO) { + public RestResult checkExtractionCode(CheckExtractionCodeDTO checkExtractionCodeDTO) { // log.info(JSON.toJSONString(shareFileListBySecretDTO)); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(Share::getShareBatchNum, checkExtractionCodeDTO.getShareBatchNum()) diff --git a/install.bat b/install.bat index 2338fc4..97c6f72 100644 --- a/install.bat +++ b/install.bat @@ -1,4 +1,4 @@ set settingDir=file-common/src/main/resources/conf/settings.xml -mvn install -s %settingDir% +mvn clean install -s %settingDir% pause \ No newline at end of file