ak/file
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!14 代码合并

Browse Source 
Merge pull request !14 from MAC/develop
This commit is contained in:
MAC 2021-03-14 22:48:38 +08:00 committed by Gitee
commit ac7af1f519
9 changed files with 112 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
file-common/pom.xml
View File

@ -30,7 +30,7 @@
<dependency>
<groupId>net.coobird</groupId>
<artifactId>thumbnailator</artifactId>
<version>0.4.8</version>
<version>0.4.13</version>
</dependency>
<dependency>
@ -43,6 +43,17 @@
<artifactId>jjwt</artifactId>
<version>0.9.1</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.csource</groupId>-->
<!-- <artifactId>fastdfs-client-java</artifactId>-->
<!-- <version>1.27-SNAPSHOT</version>-->
<!-- </dependency>-->
<!-- https://mvnrepository.com/artifact/net.oschina.zcx7878/fastdfs-client-java -->
<dependency>
<groupId>net.oschina.zcx7878</groupId>
<artifactId>fastdfs-client-java</artifactId>
<version>1.27.0.0</version>
</dependency>
</dependencies>

17
file-common/src/main/java/com/qiwenshare/common/cbb/DateUtil.java
View File

@ -19,30 +19,17 @@ public class DateUtil {
}
/**
* @param formatString 格式，如"yyyy-MM-dd"
* @param stringDate 日期字符串，如"2000-03-19"
* @param formatString 格式，如"yyyy-MM-dd"
* @return 日期
* @throws ParseException 解析异常
*/
public static Date getDateByFormatString(String formatString, String stringDate) throws ParseException {
public static Date getDateByFormatString(String stringDate, String formatString) throws ParseException {
DateFormat dateFormat = new SimpleDateFormat(formatString);
Date date = dateFormat.parse(stringDate);
return date;
}
/**
* 格式化date
*
* @param formatString 格式，如"yyyy-MM-dd"
* @param stringDate 日期字符串，如"2000-03-19"
* @return SQL日期
* @throws ParseException 解析异常
*/
public static java.sql.Date getSqlDateByFormatString(String formatString, String stringDate) throws ParseException {
long longtime = DateUtil.getDateByFormatString("yyyyMMdd", stringDate).getTime();
return new java.sql.Date(longtime);
}
/**
* 两个日期相差天数
*

2
file-web/src/main/java/com/qiwenshare/file/api/IUserFileService.java
View File

@ -19,7 +19,7 @@ public interface IUserFileService extends IService<UserFile> {
Long selectCountByExtendName(List<String> fileNameList, Long beginCount, Long pageCount, long userId);
List<FileListVo> selectFileNotInExtendNames(List<String> fileNameList, Long beginCount, Long pageCount, long userId);
Long selectCountNotInExtendNames(List<String> fileNameList, Long beginCount, Long pageCount, long userId);
List<UserFile> selectFileTreeListLikeFilePath(String filePath);
List<UserFile> selectFileTreeListLikeFilePath(String filePath, long userId);
List<UserFile> selectFilePathTreeByUserId(Long userId);
void deleteUserFile(UserFile userFile, UserBean sessionUserBean);

58
file-web/src/main/java/com/qiwenshare/file/config/openapi/OpenAPIConfig.java
View File

@ -6,8 +6,10 @@ import io.swagger.v3.oas.models.info.Info;
import io.swagger.v3.oas.models.info.License;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
@ -15,24 +17,48 @@ import springfox.documentation.spring.web.plugins.Docket;
@Configuration
public class OpenAPIConfig {
@Bean
public OpenAPI qiwenFileOpenAPI() {
return new OpenAPI()
.info(new Info().title("奇文网盘 API")
.description("基于springboot + vue 框架开发的Web文件系统，旨在为用户提供一个简单、方便的文件存储方案，能够以完善的目录结构体系，对文件进行管理 。")
.version("v0.0.1")
.license(new License().name("MIT").url("http://springdoc.org")))
.externalDocs(new ExternalDocumentation()
.description("奇文网盘gitee地址")
.url("https://www.gitee.com/qiwen-cloud/qiwen-file"));
}
@Bean
public Docket demoApi() {
// @Bean
// public OpenAPI qiwenFileOpenAPI() {
// return new OpenAPI()
// .info(new Info().title("奇文网盘 API")
// .description("基于springboot + vue 框架开发的Web文件系统，旨在为用户提供一个简单、方便的文件存储方案，能够以完善的目录结构体系，对文件进行管理 。")
// .version("v0.0.1")
// .license(new License().name("MIT").url("http://springdoc.org")))
// .externalDocs(new ExternalDocumentation()
// .description("奇文网盘gitee地址")
// .url("https://www.gitee.com/qiwen-cloud/qiwen-file"));
// }
//
// @Bean
// public Docket demoApi() {
// return new Docket(DocumentationType.OAS_30)
// .select()
// .apis(RequestHandlerSelectors.any())
// .paths(PathSelectors.regex("(?!/error.*).*"))
// .build();
// }
/**
* 前台API分组
*
* @return
*/
@Bean(value = "indexApi")
public Docket indexApi() {
return new Docket(DocumentationType.OAS_30)
.groupName("网站前端接口分组")
.apiInfo(apiInfo())
.select()
.apis(RequestHandlerSelectors.any())
.paths(PathSelectors.regex("(?!/error.*).*"))
.apis(RequestHandlerSelectors.basePackage("com.qiwenshare.file.controller"))
.paths(PathSelectors.any())
.build();
}
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
.title("奇文网盘API")
.description("基于springboot + vue 框架开发的Web文件系统，旨在为用户提供一个简单、方便的文件存储方案，能够以完善的目录结构体系，对文件进行管理 。")
// .termsOfServiceUrl("http://www.qiwenshare.com:8762/")
// .contact("developer@mail.com")
.version("1.0.0")
.build();
}
}

38
file-web/src/main/java/com/qiwenshare/file/controller/FiletransferController.java
View File

@ -51,19 +51,16 @@ public class FiletransferController {
@RequestMapping(value = "/uploadfile", method = RequestMethod.GET)
@MyLog(operation = "极速上传", module = CURRENT_MODULE)
@ResponseBody
public RestResult<UploadFileVo> uploadFileSpeed(HttpServletRequest request, UploadFileDTO uploadFileDto, @RequestHeader("token") String token) {
RestResult<UploadFileVo> restResult = new RestResult<UploadFileVo>();
public RestResult<UploadFileVo> uploadFileSpeed(UploadFileDTO uploadFileDto, @RequestHeader("token") String token) {
UserBean sessionUserBean = userService.getUserBeanByToken(token);
if (sessionUserBean == null){
restResult.setSuccess(false);
restResult.setMessage("未登录");
return restResult;
return RestResult.fail().message("未登录");
}
RestResult<String> operationCheckResult = fileController.operationCheck(token);
if (!operationCheckResult.getSuccess()){
restResult.setSuccess(false);
restResult.setMessage("没权限，请联系管理员！");
return restResult;
return RestResult.fail().message("没权限，请联系管理员！");
}
UploadFileVo uploadFileVo = new UploadFileVo();
Map<String, Object> param = new HashMap<String, Object>();
@ -92,10 +89,8 @@ public class FiletransferController {
}
}
return RestResult.success().data(uploadFileVo);
restResult.setData(uploadFileVo);
restResult.setSuccess(true);
return restResult;
}
/**
@ -104,37 +99,31 @@ public class FiletransferController {
* @param request
* @return
*/
@Operation(summary = "上传文件", description = "真正的上次文件接口", tags = {"filetransfer"})
@Operation(summary = "上传文件", description = "真正的上传文件接口", tags = {"filetransfer"})
@RequestMapping(value = "/uploadfile", method = RequestMethod.POST)
@MyLog(operation = "上传文件", module = CURRENT_MODULE)
@ResponseBody
public RestResult<UploadFileVo> uploadFile(HttpServletRequest request, UploadFileDTO uploadFileDto, @RequestHeader("token") String token) {
RestResult<UploadFileVo> restResult = new RestResult<>();
UserBean sessionUserBean = userService.getUserBeanByToken(token);
if (sessionUserBean == null){
restResult.setSuccess(false);
restResult.setMessage("未登录");
return restResult;
return RestResult.fail().message("未登录");
}
RestResult<String> operationCheckResult = fileController.operationCheck(token);
if (!operationCheckResult.getSuccess()){
restResult.setSuccess(false);
restResult.setMessage("没权限，请联系管理员！");
return restResult;
return RestResult.fail().message("没权限，请联系管理员！");
}
filetransferService.uploadFile(request, uploadFileDto, sessionUserBean.getUserId());
UploadFileVo uploadFileVo = new UploadFileVo();
return RestResult.success().data(uploadFileVo);
restResult.setData(uploadFileVo);
return restResult;
}
@Operation(summary = "获取存储信息", description = "获取存储信息", tags = {"filetransfer"})
@RequestMapping(value = "/getstorage", method = RequestMethod.GET)
@ResponseBody
public RestResult<StorageBean> getStorage(@RequestHeader("token") String token) {
RestResult<StorageBean> restResult = new RestResult<StorageBean>();
UserBean sessionUserBean = userService.getUserBeanByToken(token);
StorageBean storageBean = new StorageBean();
@ -148,9 +137,8 @@ public class FiletransferController {
StorageBean storage = new StorageBean();
storage.setUserId(sessionUserBean.getUserId());
storage.setStorageSize(storageSize);
restResult.setData(storage);
restResult.setSuccess(true);
return restResult;
return RestResult.success().data(storage);
}

38
file-web/src/main/java/com/qiwenshare/file/controller/RecoveryFileController.java
View File

@ -43,8 +43,6 @@ public class RecoveryFileController {
@RequestMapping(value = "/deleterecoveryfile", method = RequestMethod.POST)
@ResponseBody
public RestResult<String> deleteRecoveryFile(@RequestBody DeleteRecoveryFileDTO deleteRecoveryFileDTO, @RequestHeader("token") String token) {
RestResult<String> restResult = new RestResult<String>();
RecoveryFile recoveryFile = recoveryFileService.getById(deleteRecoveryFileDTO.getRecoveryFileId());
UserFile userFile =userFileService.getById(recoveryFile.getUserFileId());
@ -60,7 +58,7 @@ public class RecoveryFileController {
@MyLog(operation = "批量删除回收文件", module = CURRENT_MODULE)
@ResponseBody
public RestResult<String> batchDeleteRecoveryFile(@RequestBody BatchDeleteRecoveryFileDTO batchDeleteRecoveryFileDTO, @RequestHeader("token") String token) {
RestResult<String> restResult = new RestResult<String>();
List<RecoveryFile> recoveryFileList = JSON.parseArray(batchDeleteRecoveryFileDTO.getRecoveryFileIds(), RecoveryFile.class);
@ -119,16 +117,34 @@ public class RecoveryFileController {
userFileService.save(userFile);
}
// else {
//
// LambdaUpdateWrapper<UserFile> updateUserfileWp = new LambdaUpdateWrapper<>();
// updateUserfileWp.set(UserFile::getDeleteBatchNum, "")
// .set(UserFile::getDeleteFlag, "0")
// .eq(UserFile::getFilePath, filePath).eq(UserFile::getUserId, sessionUserBean.getUserId());
// userFileService.update(updateUserfileWp);
// }
}
LambdaQueryWrapper<UserFile> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.select(UserFile::getFileName, UserFile::getFilePath)
.likeRight(UserFile::getFilePath, restoreFileDto.getFilePath())
.eq(UserFile::getIsDir, 1)
.eq(UserFile::getDeleteFlag, 0)
.groupBy(UserFile::getFilePath, UserFile::getFileName)
.having("count(fileName) >= 2");
List<UserFile> repeatList = userFileService.list(lambdaQueryWrapper);
for (UserFile userFile : repeatList) {
LambdaQueryWrapper<UserFile> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
lambdaQueryWrapper1.eq(UserFile::getFilePath, userFile.getFilePath())
.eq(UserFile::getFileName, userFile.getFileName())
.eq(UserFile::getDeleteFlag, "0");
List<UserFile> userFiles = userFileService.list(lambdaQueryWrapper1);
log.info("重复的文件:" + JSON.toJSONString(userFiles));
for (int i = 0; i < userFiles.size() - 1; i ++) {
log.info("删除文件：" + JSON.toJSONString(userFiles.get(i)));
userFileService.removeById(userFiles.get(i).getUserFileId());
}
}
log.info(JSON.toJSONString(repeatList));
LambdaQueryWrapper<RecoveryFile> recoveryFileServiceLambdaQueryWrapper = new LambdaQueryWrapper<>();
recoveryFileServiceLambdaQueryWrapper.eq(RecoveryFile::getDeleteBatchNum, restoreFileDto.getDeleteBatchNum());
recoveryFileService.remove(recoveryFileServiceLambdaQueryWrapper);

2
file-web/src/main/java/com/qiwenshare/file/service/RecoveryFileService.java
View File

@ -86,7 +86,7 @@ public class RecoveryFileService extends ServiceImpl<RecoveryFileMapper, Recove
}
}).start();
}
@Override
public List<RecoveryFileListVo> selectRecoveryFileList() {
return recoveryFileMapper.selectRecoveryFileList();
}

21
file-web/src/main/java/com/qiwenshare/file/service/UserFileService.java
View File

@ -39,7 +39,10 @@ public class UserFileService extends ServiceImpl<UserFileMapper, UserFile> impl
@Override
public List<UserFile> selectUserFileByNameAndPath(String fileName, String filePath, Long userId) {
LambdaQueryWrapper<UserFile> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(UserFile::getFileName, fileName).eq(UserFile::getFilePath, filePath).eq(UserFile::getUserId, userId);
lambdaQueryWrapper.eq(UserFile::getFileName, fileName)
.eq(UserFile::getFilePath, filePath)
.eq(UserFile::getUserId, userId)
.eq(UserFile::getDeleteFlag, "0");
return userFileMapper.selectList(lambdaQueryWrapper);
}
@ -100,20 +103,20 @@ public class UserFileService extends ServiceImpl<UserFileMapper, UserFile> impl
}
@Override
public List<UserFile> selectFileTreeListLikeFilePath(String filePath) {
UserFile userFile = new UserFile();
public List<UserFile> selectFileTreeListLikeFilePath(String filePath, long userId) {
//UserFile userFile = new UserFile();
filePath = filePath.replace("\\", "\\\\\\\\");
filePath = filePath.replace("'", "\\'");
filePath = filePath.replace("%", "\\%");
filePath = filePath.replace("_", "\\_");
userFile.setFilePath(filePath);
//userFile.setFilePath(filePath);
LambdaQueryWrapper<UserFile> lambdaQueryWrapper = new LambdaQueryWrapper<>();
log.info("删除文件路径：" + filePath);
log.info("查询文件路径：" + filePath);
lambdaQueryWrapper.likeRight(UserFile::getFilePath, filePath);
lambdaQueryWrapper.eq(UserFile::getUserId, userId).likeRight(UserFile::getFilePath, filePath);
return userFileMapper.selectList(lambdaQueryWrapper);
}
@ -139,7 +142,7 @@ public class UserFileService extends ServiceImpl<UserFileMapper, UserFile> impl
userFileMapper.update(null, userFileLambdaUpdateWrapper);
String filePath = userFile.getFilePath() + userFile.getFileName() + "/";
updateFileDeleteStateByFilePath(filePath, userFile.getDeleteBatchNum());
updateFileDeleteStateByFilePath(filePath, userFile.getDeleteBatchNum(), sessionUserBean.getUserId());
}else{
@ -161,9 +164,9 @@ public class UserFileService extends ServiceImpl<UserFileMapper, UserFile> impl
}
private void updateFileDeleteStateByFilePath(String filePath, String deleteBatchNum) {
private void updateFileDeleteStateByFilePath(String filePath, String deleteBatchNum, Long userId) {
new Thread(()->{
List<UserFile> fileList = selectFileTreeListLikeFilePath(filePath);
List<UserFile> fileList = selectFileTreeListLikeFilePath(filePath, userId);
for (int i = 0; i < fileList.size(); i++){
UserFile userFileTemp = fileList.get(i);
executor.execute(new Runnable() {

2
file-web/src/main/resources/config/application.properties
View File

@ -1,4 +1,6 @@
server.port=8080
#环境切换dev/prod
spring.profiles.active=dev
eureka.client.register-with-eureka=false
eureka.client.fetchRegistry=false