From a04db90747862157fc81b6a17f473c7131ac54a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E8=B6=85?= Date: Mon, 1 Mar 2021 20:13:51 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=85=B1=E4=BA=AB?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/api/IShareFileService.java | 9 ++ .../qiwenshare/file/api/IShareService.java | 12 +++ .../file/controller/ShareController.java | 87 +++++++++++++++++++ .../file/controller/UserController.java | 2 +- .../com/qiwenshare/file/domain/Share.java | 26 ++++++ .../com/qiwenshare/file/domain/ShareFile.java | 22 +++++ .../dto/sharefile/CheckExtractionCodeDTO.java | 17 ++++ .../sharefile/ShareFileListBySecretDTO.java | 17 ++++ .../file/dto/sharefile/ShareSecretDTO.java | 23 +++++ .../file/mapper/ShareFileMapper.java | 8 ++ .../qiwenshare/file/mapper/ShareMapper.java | 12 +++ .../file/service/ShareFileService.java | 17 ++++ .../qiwenshare/file/service/ShareService.java | 25 ++++++ .../resources/mybatis/mapper/ShareMapper.xml | 54 ++++++++++++ 14 files changed, 330 insertions(+), 1 deletion(-) create mode 100644 file-web/src/main/java/com/qiwenshare/file/api/IShareFileService.java create mode 100644 file-web/src/main/java/com/qiwenshare/file/api/IShareService.java create mode 100644 file-web/src/main/java/com/qiwenshare/file/controller/ShareController.java create mode 100644 file-web/src/main/java/com/qiwenshare/file/domain/Share.java create mode 100644 file-web/src/main/java/com/qiwenshare/file/domain/ShareFile.java create mode 100644 file-web/src/main/java/com/qiwenshare/file/dto/sharefile/CheckExtractionCodeDTO.java create mode 100644 file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareFileListBySecretDTO.java create mode 100644 file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareSecretDTO.java create mode 100644 file-web/src/main/java/com/qiwenshare/file/mapper/ShareFileMapper.java create mode 100644 file-web/src/main/java/com/qiwenshare/file/mapper/ShareMapper.java create mode 100644 file-web/src/main/java/com/qiwenshare/file/service/ShareFileService.java create mode 100644 file-web/src/main/java/com/qiwenshare/file/service/ShareService.java create mode 100644 file-web/src/main/resources/mybatis/mapper/ShareMapper.xml diff --git a/file-web/src/main/java/com/qiwenshare/file/api/IShareFileService.java b/file-web/src/main/java/com/qiwenshare/file/api/IShareFileService.java new file mode 100644 index 0000000..25b58b0 --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/api/IShareFileService.java @@ -0,0 +1,9 @@ +package com.qiwenshare.file.api; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.qiwenshare.file.domain.Share; +import com.qiwenshare.file.domain.ShareFile; + +public interface IShareFileService extends IService { + +} diff --git a/file-web/src/main/java/com/qiwenshare/file/api/IShareService.java b/file-web/src/main/java/com/qiwenshare/file/api/IShareService.java new file mode 100644 index 0000000..3131663 --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/api/IShareService.java @@ -0,0 +1,12 @@ +package com.qiwenshare.file.api; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.qiwenshare.file.domain.RecoveryFile; +import com.qiwenshare.file.domain.Share; +import com.qiwenshare.file.domain.ShareFile; + +import java.util.List; + +public interface IShareService extends IService { + void batchInsertShareFile(List shareFiles); +} 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 new file mode 100644 index 0000000..0f87d42 --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/controller/ShareController.java @@ -0,0 +1,87 @@ +package com.qiwenshare.file.controller; + +import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.qiwenshare.common.cbb.DateUtil; +import com.qiwenshare.common.cbb.RestResult; +import com.qiwenshare.file.anno.MyLog; +import com.qiwenshare.file.api.IShareService; +import com.qiwenshare.file.api.IUserService; +import com.qiwenshare.file.domain.Share; +import com.qiwenshare.file.domain.ShareFile; +import com.qiwenshare.file.domain.UserBean; +import com.qiwenshare.file.domain.UserFile; +import com.qiwenshare.file.dto.sharefile.CheckExtractionCodeDTO; +import com.qiwenshare.file.dto.sharefile.ShareFileListBySecretDTO; +import com.qiwenshare.file.dto.sharefile.ShareSecretDTO; +import com.qiwenshare.file.service.ShareService; +import com.qiwenshare.file.service.UserService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; +import java.util.UUID; + +@Tag(name = "share", description = "该接口为文件分享接口") +@RestController +@Slf4j +@RequestMapping("/share") +public class ShareController { + + public static final String CURRENT_MODULE = "文件分享"; + @Resource + IUserService userService; + @Resource + IShareService shareService; + + @Operation(summary = "私密分享", description = "私密分享", tags = {"share"}) + @PostMapping(value = "/sharesecret") + @MyLog(operation = "私密分享", module = CURRENT_MODULE) + @ResponseBody + public RestResult shareSecret(ShareSecretDTO shareSecretDTO, @RequestHeader("token") String token) { + UserBean sessionUserBean = userService.getUserBeanByToken(token); + Share share = new Share(); + BeanUtil.copyProperties(sessionUserBean, share); + share.setShareTime(DateUtil.getCurrentTime()); + share.setUserId(sessionUserBean.getUserId()); + share.setShareStatus(0); + shareService.save(share); + String uuid = UUID.randomUUID().toString(); + List fileList = JSON.parseArray(shareSecretDTO.getFiles(), ShareFile.class); + fileList.forEach(p->p.setShareBatchNum("S@#" + uuid.replace("-", ""))); + shareService.batchInsertShareFile(fileList); + return RestResult.success(); + } + + @Operation(summary = "分享列表", description = "分享列表", tags = {"share"}) + @GetMapping(value = "/sharefileList") + @ResponseBody + 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)); + } + + @Operation(summary = "校验提取码", description = "校验提取码", tags = {"share"}) + @GetMapping(value = "/checkextractioncode") + @ResponseBody + public RestResult checkExtractionCode(CheckExtractionCodeDTO checkExtractionCodeDTO) { +// log.info(JSON.toJSONString(shareFileListBySecretDTO)); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(Share::getShareBatchNum, checkExtractionCodeDTO.getShareBatchNum()) + .eq(Share::getExtractionCode, checkExtractionCodeDTO.getExtractionCode()); + List list = shareService.list(lambdaQueryWrapper); + if (list.isEmpty()) { + return RestResult.fail().message("校验失败"); + } else { + return RestResult.success(); + } + } +} diff --git a/file-web/src/main/java/com/qiwenshare/file/controller/UserController.java b/file-web/src/main/java/com/qiwenshare/file/controller/UserController.java index f101fab..85ad31c 100644 --- a/file-web/src/main/java/com/qiwenshare/file/controller/UserController.java +++ b/file-web/src/main/java/com/qiwenshare/file/controller/UserController.java @@ -69,7 +69,7 @@ public class UserController { @MyLog(operation = "用户登录", module = CURRENT_MODULE) @ResponseBody public RestResult userLogin( - @Parameter(description = "登录用户名") String username, + @Parameter(description = "登录手机号") String username, @Parameter(description = "登录密码") String password) { RestResult restResult = new RestResult(); UserBean saveUserBean = userService.findUserInfoByTelephone(username); diff --git a/file-web/src/main/java/com/qiwenshare/file/domain/Share.java b/file-web/src/main/java/com/qiwenshare/file/domain/Share.java new file mode 100644 index 0000000..7d86066 --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/domain/Share.java @@ -0,0 +1,26 @@ +package com.qiwenshare.file.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import javax.persistence.*; + +@Data +@Table(name = "share") +@Entity +@TableName("share") +public class Share { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @TableId(type = IdType.AUTO) + private Long shareId; + private Long userId; + private String shareTime; + private String endTime; + private String extractionCode; + private String shareBatchNum; + private Integer isNeedExtractionCode;//0不需要，1需要 + private Integer shareStatus;//0正常，1已失效，2已撤销 +} diff --git a/file-web/src/main/java/com/qiwenshare/file/domain/ShareFile.java b/file-web/src/main/java/com/qiwenshare/file/domain/ShareFile.java new file mode 100644 index 0000000..79a151a --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/domain/ShareFile.java @@ -0,0 +1,22 @@ +package com.qiwenshare.file.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import javax.persistence.*; + +@Data +@Table(name = "sharefile") +@Entity +@TableName("sharefile") +public class ShareFile { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @TableId(type = IdType.AUTO) + private Long shareFileId; + private String shareBatchNum; + private Long userFileId; + +} diff --git a/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/CheckExtractionCodeDTO.java b/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/CheckExtractionCodeDTO.java new file mode 100644 index 0000000..323a160 --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/CheckExtractionCodeDTO.java @@ -0,0 +1,17 @@ +package com.qiwenshare.file.dto.sharefile; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(name = "校验提取码DTO",required = true) +public class CheckExtractionCodeDTO { + @Schema(description="批次号") + private String shareBatchNum; + @Schema(description="提取码") + private String extractionCode; + + + + +} \ No newline at end of file diff --git a/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareFileListBySecretDTO.java b/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareFileListBySecretDTO.java new file mode 100644 index 0000000..7bf4b1f --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareFileListBySecretDTO.java @@ -0,0 +1,17 @@ +package com.qiwenshare.file.dto.sharefile; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(name = "分享列表DTO",required = true) +public class ShareFileListBySecretDTO { + + @Schema(description="批次号") + private String shareBatchNum; + @Schema(description="提取码") + private String extractionCode; + + + +} \ No newline at end of file diff --git a/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareSecretDTO.java b/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareSecretDTO.java new file mode 100644 index 0000000..b0f4a32 --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareSecretDTO.java @@ -0,0 +1,23 @@ +package com.qiwenshare.file.dto.sharefile; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(name = "私密分享DTO",required = true) +public class ShareSecretDTO { + @Schema(description="文件集合") + private String files; + @Schema(description = "过期日期", example="2020-05-23 22:10:33") + private String endTime; + @Schema(description = "是否需要提取码", example="1-需要/0-不需要") + private Integer isNeedExtractionCode; + @Schema(description = "提取码", example="asFwe3") + private Integer extractionCode; + @Schema(description = "备注", example="") + private String remarks; + + + + +} \ No newline at end of file diff --git a/file-web/src/main/java/com/qiwenshare/file/mapper/ShareFileMapper.java b/file-web/src/main/java/com/qiwenshare/file/mapper/ShareFileMapper.java new file mode 100644 index 0000000..7c931a4 --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/mapper/ShareFileMapper.java @@ -0,0 +1,8 @@ +package com.qiwenshare.file.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qiwenshare.file.domain.Share; +import com.qiwenshare.file.domain.ShareFile; + +public interface ShareFileMapper extends BaseMapper { +} diff --git a/file-web/src/main/java/com/qiwenshare/file/mapper/ShareMapper.java b/file-web/src/main/java/com/qiwenshare/file/mapper/ShareMapper.java new file mode 100644 index 0000000..ac4f1a8 --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/mapper/ShareMapper.java @@ -0,0 +1,12 @@ +package com.qiwenshare.file.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qiwenshare.file.domain.FileBean; +import com.qiwenshare.file.domain.Share; +import com.qiwenshare.file.domain.ShareFile; + +import java.util.List; + +public interface ShareMapper extends BaseMapper { + void batchInsertShareFile(List shareFiles); +} diff --git a/file-web/src/main/java/com/qiwenshare/file/service/ShareFileService.java b/file-web/src/main/java/com/qiwenshare/file/service/ShareFileService.java new file mode 100644 index 0000000..0d71e08 --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/service/ShareFileService.java @@ -0,0 +1,17 @@ +package com.qiwenshare.file.service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qiwenshare.file.api.IShareFileService; +import com.qiwenshare.file.api.IShareService; +import com.qiwenshare.file.domain.Share; +import com.qiwenshare.file.domain.ShareFile; +import com.qiwenshare.file.mapper.ShareFileMapper; +import com.qiwenshare.file.mapper.ShareMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +public class ShareFileService extends ServiceImpl implements IShareFileService { + +} diff --git a/file-web/src/main/java/com/qiwenshare/file/service/ShareService.java b/file-web/src/main/java/com/qiwenshare/file/service/ShareService.java new file mode 100644 index 0000000..18857ce --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/service/ShareService.java @@ -0,0 +1,25 @@ +package com.qiwenshare.file.service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qiwenshare.file.api.IShareService; +import com.qiwenshare.file.domain.RecoveryFile; +import com.qiwenshare.file.domain.Share; +import com.qiwenshare.file.domain.ShareFile; +import com.qiwenshare.file.mapper.RecoveryFileMapper; +import com.qiwenshare.file.mapper.ShareMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +@Slf4j +@Service +public class ShareService extends ServiceImpl implements IShareService { + + @Resource + ShareMapper shareMapper; + @Override + public void batchInsertShareFile(List shareFiles) { + shareMapper.batchInsertShareFile(shareFiles); + } +} diff --git a/file-web/src/main/resources/mybatis/mapper/ShareMapper.xml b/file-web/src/main/resources/mybatis/mapper/ShareMapper.xml new file mode 100644 index 0000000..fbe4f16 --- /dev/null +++ b/file-web/src/main/resources/mybatis/mapper/ShareMapper.xml @@ -0,0 +1,54 @@ + + + + + + + + + INSERT ignore INTO sharefile (shareBatchNum, userFileId) + VALUES + + (#{file.shareBatchNum}, #{file.userFileId}) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 796ce6a59ada62a1d5f4e0c44706b0181c2a0018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E8=B6=85?= Date: Wed, 3 Mar 2021 20:22:49 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=E5=90=8C=E8=B7=AF=E5=BE=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E9=87=8D=E5=90=8D=E4=B8=8A=E4=BC=A0=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qiwenshare/file/controller/ShareController.java | 7 +++++-- .../java/com/qiwenshare/file/domain/UserFile.java | 2 +- .../qiwenshare/file/dto/sharefile/ShareSecretDTO.java | 2 -- .../com/qiwenshare/file/vo/share/ShareSecretVO.java | 11 +++++++++++ 4 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 file-web/src/main/java/com/qiwenshare/file/vo/share/ShareSecretVO.java 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 0f87d42..a98f394 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 @@ -18,6 +18,7 @@ import com.qiwenshare.file.dto.sharefile.ShareFileListBySecretDTO; import com.qiwenshare.file.dto.sharefile.ShareSecretDTO; import com.qiwenshare.file.service.ShareService; import com.qiwenshare.file.service.UserService; +import com.qiwenshare.file.vo.share.ShareSecretVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; @@ -43,7 +44,8 @@ public class ShareController { @PostMapping(value = "/sharesecret") @MyLog(operation = "私密分享", module = CURRENT_MODULE) @ResponseBody - public RestResult shareSecret(ShareSecretDTO shareSecretDTO, @RequestHeader("token") String token) { + public RestResult shareSecret(ShareSecretDTO shareSecretDTO, @RequestHeader("token") String token) { + ShareSecretVO shareSecretVO = new ShareSecretVO(); UserBean sessionUserBean = userService.getUserBeanByToken(token); Share share = new Share(); BeanUtil.copyProperties(sessionUserBean, share); @@ -55,7 +57,8 @@ public class ShareController { List fileList = JSON.parseArray(shareSecretDTO.getFiles(), ShareFile.class); fileList.forEach(p->p.setShareBatchNum("S@#" + uuid.replace("-", ""))); shareService.batchInsertShareFile(fileList); - return RestResult.success(); + shareSecretVO.setShareBatchNum("S@#" + uuid.replace("-", "")); + return RestResult.success().data(shareSecretVO); } @Operation(summary = "分享列表", description = "分享列表", tags = {"share"}) diff --git a/file-web/src/main/java/com/qiwenshare/file/domain/UserFile.java b/file-web/src/main/java/com/qiwenshare/file/domain/UserFile.java index c4d897d..7d47b41 100644 --- a/file-web/src/main/java/com/qiwenshare/file/domain/UserFile.java +++ b/file-web/src/main/java/com/qiwenshare/file/domain/UserFile.java @@ -9,7 +9,7 @@ import javax.persistence.*; @Data @Table(name = "userfile", uniqueConstraints = { - @UniqueConstraint(name = "fileindex", columnNames = {"fileName", "filePath", "extendName"})}) + @UniqueConstraint(name = "fileindex", columnNames = {"fileName", "filePath", "extendName", "deleteFlag"})}) @Entity @TableName("userfile") public class UserFile { diff --git a/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareSecretDTO.java b/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareSecretDTO.java index b0f4a32..bfcf152 100644 --- a/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareSecretDTO.java +++ b/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareSecretDTO.java @@ -12,8 +12,6 @@ public class ShareSecretDTO { private String endTime; @Schema(description = "是否需要提取码", example="1-需要/0-不需要") private Integer isNeedExtractionCode; - @Schema(description = "提取码", example="asFwe3") - private Integer extractionCode; @Schema(description = "备注", example="") private String remarks; diff --git a/file-web/src/main/java/com/qiwenshare/file/vo/share/ShareSecretVO.java b/file-web/src/main/java/com/qiwenshare/file/vo/share/ShareSecretVO.java new file mode 100644 index 0000000..f245239 --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/vo/share/ShareSecretVO.java @@ -0,0 +1,11 @@ +package com.qiwenshare.file.vo.share; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description="私密分享VO") +public class ShareSecretVO { + @Schema(description="批次号") + private String shareBatchNum; +} From 5538d677faf1817c01b624f5e9c43e90bbc6bd0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E8=B6=85?= Date: Fri, 5 Mar 2021 17:49:22 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=88=86=E4=BA=AB=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../qiwenshare/common/util/RandomUtil.java | 24 ++++++++++ .../file/controller/ShareController.java | 45 +++++++++++++------ .../com/qiwenshare/file/domain/Share.java | 2 +- ...{ShareSecretDTO.java => ShareFileDTO.java} | 8 ++-- .../file/dto/sharefile/ShareTypeDTO.java | 14 ++++++ .../{ShareSecretVO.java => ShareFileVO.java} | 6 ++- .../qiwenshare/file/vo/share/ShareTypeVO.java | 11 +++++ 8 files changed, 90 insertions(+), 22 deletions(-) create mode 100644 file-common/src/main/java/com/qiwenshare/common/util/RandomUtil.java rename file-web/src/main/java/com/qiwenshare/file/dto/sharefile/{ShareSecretDTO.java => ShareFileDTO.java} (63%) create mode 100644 file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareTypeDTO.java rename file-web/src/main/java/com/qiwenshare/file/vo/share/{ShareSecretVO.java => ShareFileVO.java} (57%) create mode 100644 file-web/src/main/java/com/qiwenshare/file/vo/share/ShareTypeVO.java diff --git a/README.md b/README.md index 3f2f513..3105661 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@

- 在线演示环境  | + 在线演示环境  | 安装指导 | 更新日志

diff --git a/file-common/src/main/java/com/qiwenshare/common/util/RandomUtil.java b/file-common/src/main/java/com/qiwenshare/common/util/RandomUtil.java new file mode 100644 index 0000000..c31dd19 --- /dev/null +++ b/file-common/src/main/java/com/qiwenshare/common/util/RandomUtil.java @@ -0,0 +1,24 @@ +package com.qiwenshare.common.util; + +import java.util.Random; + +public class RandomUtil { + public static String getStringRandom(int length) { + + String val = ""; + Random random = new Random(); + //参数length，表示生成几位随机数 + for(int i = 0; i < length; i++) { + String charOrNum = random.nextInt(2) % 2 == 0 ? "char" : "num"; + //输出字母还是数字 + if("char".equalsIgnoreCase(charOrNum)){ + //输出是大写字母还是小写字母 + int temp = random.nextInt(2) % 2 == 0 ? 65 : 97; + val += (char)(random.nextInt(26) + temp); + }else if("num".equalsIgnoreCase(charOrNum)) { + val += String.valueOf(random.nextInt(10)); + } + } + return val; + } +} 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 a98f394..fbe7d8f 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 @@ -3,22 +3,21 @@ package com.qiwenshare.file.controller; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.qiwenshare.common.cbb.DateUtil; import com.qiwenshare.common.cbb.RestResult; +import com.qiwenshare.common.util.RandomUtil; import com.qiwenshare.file.anno.MyLog; import com.qiwenshare.file.api.IShareService; import com.qiwenshare.file.api.IUserService; import com.qiwenshare.file.domain.Share; import com.qiwenshare.file.domain.ShareFile; import com.qiwenshare.file.domain.UserBean; -import com.qiwenshare.file.domain.UserFile; import com.qiwenshare.file.dto.sharefile.CheckExtractionCodeDTO; import com.qiwenshare.file.dto.sharefile.ShareFileListBySecretDTO; -import com.qiwenshare.file.dto.sharefile.ShareSecretDTO; -import com.qiwenshare.file.service.ShareService; -import com.qiwenshare.file.service.UserService; -import com.qiwenshare.file.vo.share.ShareSecretVO; +import com.qiwenshare.file.dto.sharefile.ShareFileDTO; +import com.qiwenshare.file.dto.sharefile.ShareTypeDTO; +import com.qiwenshare.file.vo.share.ShareFileVO; +import com.qiwenshare.file.vo.share.ShareTypeVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; @@ -40,24 +39,29 @@ public class ShareController { @Resource IShareService shareService; - @Operation(summary = "私密分享", description = "私密分享", tags = {"share"}) - @PostMapping(value = "/sharesecret") - @MyLog(operation = "私密分享", module = CURRENT_MODULE) + @Operation(summary = "分享文件", description = "分享文件统一接口", tags = {"share"}) + @PostMapping(value = "/sharefile") + @MyLog(operation = "分享文件", module = CURRENT_MODULE) @ResponseBody - public RestResult shareSecret(ShareSecretDTO shareSecretDTO, @RequestHeader("token") String token) { - ShareSecretVO shareSecretVO = new ShareSecretVO(); + public RestResult shareFile(ShareFileDTO shareSecretDTO, @RequestHeader("token") String token) { + ShareFileVO shareSecretVO = new ShareFileVO(); UserBean sessionUserBean = userService.getUserBeanByToken(token); + String extractionCode = RandomUtil.getStringRandom(6); + String uuid = UUID.randomUUID().toString(); Share share = new Share(); BeanUtil.copyProperties(sessionUserBean, share); share.setShareTime(DateUtil.getCurrentTime()); share.setUserId(sessionUserBean.getUserId()); share.setShareStatus(0); + share.setExtractionCode(extractionCode); + share.setShareBatchNum(uuid); + shareService.save(share); - String uuid = UUID.randomUUID().toString(); + List fileList = JSON.parseArray(shareSecretDTO.getFiles(), ShareFile.class); - fileList.forEach(p->p.setShareBatchNum("S@#" + uuid.replace("-", ""))); + fileList.forEach(p->p.setShareBatchNum(uuid.replace("-", ""))); shareService.batchInsertShareFile(fileList); - shareSecretVO.setShareBatchNum("S@#" + uuid.replace("-", "")); + shareSecretVO.setShareBatchNum(uuid.replace("-", "")); return RestResult.success().data(shareSecretVO); } @@ -72,6 +76,19 @@ public class ShareController { return RestResult.success().data(list.get(0)); } + @Operation(summary = "分享类型", description = "可用此接口判断是否需要提取码", tags = {"share"}) + @GetMapping(value = "/sharetype") + @ResponseBody + public RestResult shareType(ShareTypeDTO shareTypeDTO) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(Share::getShareBatchNum, shareTypeDTO.getShareBatchNum()); + Share share = shareService.getOne(lambdaQueryWrapper); + ShareTypeVO shareTypeVO = new ShareTypeVO(); + shareTypeVO.setShareType(share.getShareType()); + return RestResult.success().data(shareTypeVO); + + } + @Operation(summary = "校验提取码", description = "校验提取码", tags = {"share"}) @GetMapping(value = "/checkextractioncode") @ResponseBody diff --git a/file-web/src/main/java/com/qiwenshare/file/domain/Share.java b/file-web/src/main/java/com/qiwenshare/file/domain/Share.java index 7d86066..781ae8f 100644 --- a/file-web/src/main/java/com/qiwenshare/file/domain/Share.java +++ b/file-web/src/main/java/com/qiwenshare/file/domain/Share.java @@ -21,6 +21,6 @@ public class Share { private String endTime; private String extractionCode; private String shareBatchNum; - private Integer isNeedExtractionCode;//0不需要，1需要 + private Integer shareType;//0公共，1私密，2好友 private Integer shareStatus;//0正常，1已失效，2已撤销 } diff --git a/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareSecretDTO.java b/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareFileDTO.java similarity index 63% rename from file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareSecretDTO.java rename to file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareFileDTO.java index bfcf152..087d175 100644 --- a/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareSecretDTO.java +++ b/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareFileDTO.java @@ -4,14 +4,14 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -@Schema(name = "私密分享DTO",required = true) -public class ShareSecretDTO { +@Schema(name = "分享文件DTO",required = true) +public class ShareFileDTO { @Schema(description="文件集合") private String files; @Schema(description = "过期日期", example="2020-05-23 22:10:33") private String endTime; - @Schema(description = "是否需要提取码", example="1-需要/0-不需要") - private Integer isNeedExtractionCode; + @Schema(description = "分享类型", example="0公共分享，1私密分享，2好友分享") + private Integer shareType; @Schema(description = "备注", example="") private String remarks; diff --git a/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareTypeDTO.java b/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareTypeDTO.java new file mode 100644 index 0000000..5ea2fe9 --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/ShareTypeDTO.java @@ -0,0 +1,14 @@ +package com.qiwenshare.file.dto.sharefile; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(name = "分享类型DTO",required = true) +public class ShareTypeDTO { + + @Schema(description="批次号") + private String shareBatchNum; + + +} \ No newline at end of file diff --git a/file-web/src/main/java/com/qiwenshare/file/vo/share/ShareSecretVO.java b/file-web/src/main/java/com/qiwenshare/file/vo/share/ShareFileVO.java similarity index 57% rename from file-web/src/main/java/com/qiwenshare/file/vo/share/ShareSecretVO.java rename to file-web/src/main/java/com/qiwenshare/file/vo/share/ShareFileVO.java index f245239..68cf80a 100644 --- a/file-web/src/main/java/com/qiwenshare/file/vo/share/ShareSecretVO.java +++ b/file-web/src/main/java/com/qiwenshare/file/vo/share/ShareFileVO.java @@ -4,8 +4,10 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -@Schema(description="私密分享VO") -public class ShareSecretVO { +@Schema(description="分享文件VO") +public class ShareFileVO { @Schema(description="批次号") private String shareBatchNum; + @Schema(description = "提取编码") + private String extractionCode; } diff --git a/file-web/src/main/java/com/qiwenshare/file/vo/share/ShareTypeVO.java b/file-web/src/main/java/com/qiwenshare/file/vo/share/ShareTypeVO.java new file mode 100644 index 0000000..ce19721 --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/vo/share/ShareTypeVO.java @@ -0,0 +1,11 @@ +package com.qiwenshare.file.vo.share; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description="分享类型VO") +public class ShareTypeVO { + @Schema(description="0公共，1私密，2好友") + private Integer shareType; +} 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 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E6=8E=A5=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 From 7e6876a295c08456d783d19de12b2b0804d9d18b 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:58:33 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qiwenshare/file/api/IShareService.java | 2 + .../file/controller/ShareController.java | 40 +++++++++++++---- .../file/dto/sharefile/CheckEndTimeDTO.java | 12 ++++++ .../qiwenshare/file/mapper/ShareMapper.java | 2 + .../qiwenshare/file/service/ShareService.java | 6 +++ .../file/vo/share/ShareFileListVO.java | 43 +++++++++++++++++++ .../resources/mybatis/mapper/ShareMapper.xml | 7 +++ 7 files changed, 104 insertions(+), 8 deletions(-) create mode 100644 file-web/src/main/java/com/qiwenshare/file/dto/sharefile/CheckEndTimeDTO.java create mode 100644 file-web/src/main/java/com/qiwenshare/file/vo/share/ShareFileListVO.java diff --git a/file-web/src/main/java/com/qiwenshare/file/api/IShareService.java b/file-web/src/main/java/com/qiwenshare/file/api/IShareService.java index 3131663..6071f84 100644 --- a/file-web/src/main/java/com/qiwenshare/file/api/IShareService.java +++ b/file-web/src/main/java/com/qiwenshare/file/api/IShareService.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.qiwenshare.file.domain.RecoveryFile; import com.qiwenshare.file.domain.Share; import com.qiwenshare.file.domain.ShareFile; +import com.qiwenshare.file.vo.share.ShareFileListVO; import java.util.List; public interface IShareService extends IService { void batchInsertShareFile(List shareFiles); + List selectShareFileListByBatchNum(Share share); } 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 eb0a739..24746ef 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 @@ -12,10 +12,8 @@ import com.qiwenshare.file.api.IUserService; import com.qiwenshare.file.domain.Share; import com.qiwenshare.file.domain.ShareFile; import com.qiwenshare.file.domain.UserBean; -import com.qiwenshare.file.dto.sharefile.CheckExtractionCodeDTO; -import com.qiwenshare.file.dto.sharefile.ShareFileListBySecretDTO; -import com.qiwenshare.file.dto.sharefile.ShareFileDTO; -import com.qiwenshare.file.dto.sharefile.ShareTypeDTO; +import com.qiwenshare.file.dto.sharefile.*; +import com.qiwenshare.file.vo.share.ShareFileListVO; import com.qiwenshare.file.vo.share.ShareFileVO; import com.qiwenshare.file.vo.share.ShareTypeVO; import io.swagger.v3.oas.annotations.Operation; @@ -24,6 +22,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.text.ParseException; +import java.util.Date; import java.util.List; import java.util.UUID; @@ -68,11 +68,13 @@ 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); + + Share share = new Share(); + share.setShareBatchNum(shareFileListBySecretDTO.getShareBatchNum()); + + List list = shareService.selectShareFileListByBatchNum(share); return RestResult.success().data(list); } @@ -104,4 +106,26 @@ public class ShareController { return RestResult.success(); } } + + @Operation(summary = "校验过期时间", description = "校验过期时间", tags = {"share"}) + @GetMapping(value = "/checkendtime") + @ResponseBody + public RestResult checkEndTime(CheckEndTimeDTO checkEndTimeDTO) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(Share::getShareBatchNum, checkEndTimeDTO.getShareBatchNum()); + Share share = shareService.getOne(lambdaQueryWrapper); + String endTime = share.getEndTime(); + Date endTimeDate = null; + try { + endTimeDate = DateUtil.getDateByFormatString(endTime, "yyyy-MM-dd HH:mm:ss"); + } catch (ParseException e) { + log.error("日期解析失败：{}" , e); + } + if (new Date().after(endTimeDate)) { + return RestResult.fail().message("分享已过期"); + } else { + return RestResult.success(); + } + + } } diff --git a/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/CheckEndTimeDTO.java b/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/CheckEndTimeDTO.java new file mode 100644 index 0000000..0c4ba90 --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/dto/sharefile/CheckEndTimeDTO.java @@ -0,0 +1,12 @@ +package com.qiwenshare.file.dto.sharefile; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(name = "校验过期时间DTO",required = true) +public class CheckEndTimeDTO { + @Schema(description="批次号") + private String shareBatchNum; + +} \ No newline at end of file diff --git a/file-web/src/main/java/com/qiwenshare/file/mapper/ShareMapper.java b/file-web/src/main/java/com/qiwenshare/file/mapper/ShareMapper.java index ac4f1a8..3243321 100644 --- a/file-web/src/main/java/com/qiwenshare/file/mapper/ShareMapper.java +++ b/file-web/src/main/java/com/qiwenshare/file/mapper/ShareMapper.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qiwenshare.file.domain.FileBean; import com.qiwenshare.file.domain.Share; import com.qiwenshare.file.domain.ShareFile; +import com.qiwenshare.file.vo.share.ShareFileListVO; import java.util.List; public interface ShareMapper extends BaseMapper { void batchInsertShareFile(List shareFiles); + List selectShareFileListByBatchNum(Share share); } diff --git a/file-web/src/main/java/com/qiwenshare/file/service/ShareService.java b/file-web/src/main/java/com/qiwenshare/file/service/ShareService.java index 18857ce..48d94a1 100644 --- a/file-web/src/main/java/com/qiwenshare/file/service/ShareService.java +++ b/file-web/src/main/java/com/qiwenshare/file/service/ShareService.java @@ -7,6 +7,7 @@ import com.qiwenshare.file.domain.Share; import com.qiwenshare.file.domain.ShareFile; import com.qiwenshare.file.mapper.RecoveryFileMapper; import com.qiwenshare.file.mapper.ShareMapper; +import com.qiwenshare.file.vo.share.ShareFileListVO; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -22,4 +23,9 @@ public class ShareService extends ServiceImpl implements ISh public void batchInsertShareFile(List shareFiles) { shareMapper.batchInsertShareFile(shareFiles); } + + @Override + public List selectShareFileListByBatchNum(Share share) { + return shareMapper.selectShareFileListByBatchNum(share); + } } diff --git a/file-web/src/main/java/com/qiwenshare/file/vo/share/ShareFileListVO.java b/file-web/src/main/java/com/qiwenshare/file/vo/share/ShareFileListVO.java new file mode 100644 index 0000000..b7133aa --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/vo/share/ShareFileListVO.java @@ -0,0 +1,43 @@ +package com.qiwenshare.file.vo.share; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description="分享文件列表VO") +@Data +public class ShareFileListVO { + @Schema(description="文件id") + private Long fileId; + @Schema(description="文件时间戳姓名") + private String timeStampName; + @Schema(description="文件url") + private String fileUrl; + @Schema(description="文件大小") + private Long fileSize; + @Schema(description="是否sso存储") + private Integer isOSS; +// +// private Long userFileId; +// +// private Long userId; + + @Schema(description="文件名") + private String fileName; + @Schema(description="文件路径") + private String filePath; + @Schema(description="文件扩展名") + private String extendName; + @Schema(description="是否是目录 0-否， 1-是") + private Integer isDir; + @Schema(description="上传时间") + private String uploadTime; +// +// private Long shareId; +// +// private String shareTime; +// private String endTime; +// private String extractionCode; +// private String shareBatchNum; +// private Integer shareType;//0公共，1私密，2好友 +// private Integer shareStatus;//0正常，1已失效，2已撤销 +} diff --git a/file-web/src/main/resources/mybatis/mapper/ShareMapper.xml b/file-web/src/main/resources/mybatis/mapper/ShareMapper.xml index fbe4f16..f6d837a 100644 --- a/file-web/src/main/resources/mybatis/mapper/ShareMapper.xml +++ b/file-web/src/main/resources/mybatis/mapper/ShareMapper.xml @@ -14,6 +14,13 @@ (#{file.shareBatchNum}, #{file.userFileId}) + + From e096999a48868df7ff3912da8722995612d927a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E8=B6=85?= <1162714483@qq.com> Date: Sun, 7 Mar 2021 14:24:40 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97sql=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qiwenshare/file/mapper/OperationLogMapper.java | 2 -- .../com/qiwenshare/file/service/OperationLogService.java | 4 ++-- .../main/resources/mybatis/mapper/OperationLogMapper.xml | 9 --------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/file-web/src/main/java/com/qiwenshare/file/mapper/OperationLogMapper.java b/file-web/src/main/java/com/qiwenshare/file/mapper/OperationLogMapper.java index adc2fdb..2b0f39c 100644 --- a/file-web/src/main/java/com/qiwenshare/file/mapper/OperationLogMapper.java +++ b/file-web/src/main/java/com/qiwenshare/file/mapper/OperationLogMapper.java @@ -8,7 +8,5 @@ import com.qiwenshare.file.domain.OperationLogBean; import java.util.List; public interface OperationLogMapper extends BaseMapper { - List selectOperationLog(); - void insertOperationLog(OperationLogBean operationlogBean); } diff --git a/file-web/src/main/java/com/qiwenshare/file/service/OperationLogService.java b/file-web/src/main/java/com/qiwenshare/file/service/OperationLogService.java index b35a082..5f4c5dd 100644 --- a/file-web/src/main/java/com/qiwenshare/file/service/OperationLogService.java +++ b/file-web/src/main/java/com/qiwenshare/file/service/OperationLogService.java @@ -28,13 +28,13 @@ public class OperationLogService extends ServiceImpl selectOperationLog() { - List result = operationLogMapper.selectOperationLog(); + List result = operationLogMapper.selectList(null); return result; } @Override public void insertOperationLog(OperationLogBean operationlogBean) { - operationLogMapper.insertOperationLog(operationlogBean); + operationLogMapper.insert(operationlogBean); } diff --git a/file-web/src/main/resources/mybatis/mapper/OperationLogMapper.xml b/file-web/src/main/resources/mybatis/mapper/OperationLogMapper.xml index b55c7eb..24e6197 100644 --- a/file-web/src/main/resources/mybatis/mapper/OperationLogMapper.xml +++ b/file-web/src/main/resources/mybatis/mapper/OperationLogMapper.xml @@ -6,14 +6,5 @@ - - - - INSERT INTO operationLog (operation, userId, terminal, result, detail, source, time, logLevel) - VALUES (#{operation}, #{userId}, #{terminal}, #{result}, #{detail}, #{source}, #{time}, #{logLevel}); - \ No newline at end of file