diff --git a/uploads/drawing.png b/uploads/drawing.png index 968ebe02414e26540d03294c5d56aefaaa2af03d..1aa04198a273988af30f22a053fdf43fb85c758c 100644 Binary files a/uploads/drawing.png and b/uploads/drawing.png differ diff --git a/zhentao-minan-auth/src/main/java/com/zhentao/controller/FilesController.java b/zhentao-minan-auth/src/main/java/com/zhentao/controller/FilesController.java index 1230b6bf023f20787f8ff7c9131fe06e38d2e23e..d997cf17e5ee0b989dc3132fa4d3662b84b7a00b 100644 --- a/zhentao-minan-auth/src/main/java/com/zhentao/controller/FilesController.java +++ b/zhentao-minan-auth/src/main/java/com/zhentao/controller/FilesController.java @@ -112,4 +112,9 @@ public class FilesController { public ResponseResult danganan(@RequestBody FilesDto fileDto){ return tbFilesService.gongkai(fileDto); } +//详情页面 + @PostMapping("/details") + public ResponseResult details(@Param("id") Long id){ + return tbFilesService.details(id); + } } diff --git a/zhentao-minan-auth/target/classes/com/zhentao/controller/ChannelController.class b/zhentao-minan-auth/target/classes/com/zhentao/controller/ChannelController.class new file mode 100644 index 0000000000000000000000000000000000000000..d29a810f8e8002fc872ba00d1b1d7b03a8b457e9 Binary files /dev/null and b/zhentao-minan-auth/target/classes/com/zhentao/controller/ChannelController.class differ diff --git a/zhentao-minan-auth/target/classes/com/zhentao/controller/FilesController.class b/zhentao-minan-auth/target/classes/com/zhentao/controller/FilesController.class index b6af6d76278a0426fb9f356955246d6a7e42334b..f4b26a3fb209e4f21d5ca6638012cf2485700806 100644 Binary files a/zhentao-minan-auth/target/classes/com/zhentao/controller/FilesController.class and b/zhentao-minan-auth/target/classes/com/zhentao/controller/FilesController.class differ diff --git a/zhentao-minan-auth/target/classes/com/zhentao/controller/SpeechController.class b/zhentao-minan-auth/target/classes/com/zhentao/controller/SpeechController.class index 5ccc0bed78ae5e463f11e18f77fee86429415a8a..1aad3c261c6f610fed510048cd0bbd6eea8493cc 100644 Binary files a/zhentao-minan-auth/target/classes/com/zhentao/controller/SpeechController.class and b/zhentao-minan-auth/target/classes/com/zhentao/controller/SpeechController.class differ diff --git a/zhentao-minan-auth/target/classes/com/zhentao/controller/UserController.class b/zhentao-minan-auth/target/classes/com/zhentao/controller/UserController.class index a1a35675fa28a59d0077a7cd6b42ee2ded821b2b..b3a1760b4217a8a1bf27b7230bb547e2c3c64461 100644 Binary files a/zhentao-minan-auth/target/classes/com/zhentao/controller/UserController.class and b/zhentao-minan-auth/target/classes/com/zhentao/controller/UserController.class differ diff --git a/zhentao-minan-auth/target/classes/com/zhentao/controller/VideoUploadController.class b/zhentao-minan-auth/target/classes/com/zhentao/controller/VideoUploadController.class new file mode 100644 index 0000000000000000000000000000000000000000..edaf5905af43fe087ea807b328b34a55f642c614 Binary files /dev/null and b/zhentao-minan-auth/target/classes/com/zhentao/controller/VideoUploadController.class differ diff --git a/zhentao-minan-common/target/classes/com/zhentao/common/Constans.class b/zhentao-minan-common/target/classes/com/zhentao/common/Constans.class index 15734de74f58bd55c9d87f4cc4a16808d1141850..0f877b4ffef066da9099bdbc92b2ea3adf876bac 100644 Binary files a/zhentao-minan-common/target/classes/com/zhentao/common/Constans.class and b/zhentao-minan-common/target/classes/com/zhentao/common/Constans.class differ diff --git a/zhentao-minan-pojo/src/main/java/com/zhentao/vo/FilesVo.java b/zhentao-minan-pojo/src/main/java/com/zhentao/vo/FilesVo.java index 6987c8010de065a876d59e6821e642a3df0342ef..329ff6d0b7654af3f1f882a7cc9fe382c9dd9c59 100644 --- a/zhentao-minan-pojo/src/main/java/com/zhentao/vo/FilesVo.java +++ b/zhentao-minan-pojo/src/main/java/com/zhentao/vo/FilesVo.java @@ -35,7 +35,6 @@ public class FilesVo extends TbFiles { */ private List typeIds; - /** * 图片 */ diff --git a/zhentao-minan-pojo/target/classes/com/zhentao/channel/TbChanFiles.class b/zhentao-minan-pojo/target/classes/com/zhentao/channel/TbChanFiles.class new file mode 100644 index 0000000000000000000000000000000000000000..c2f89316192ce1c5ec6f4e9560bd9adb5f3c31b3 Binary files /dev/null and b/zhentao-minan-pojo/target/classes/com/zhentao/channel/TbChanFiles.class differ diff --git a/zhentao-minan-pojo/target/classes/com/zhentao/channel/TbChannel.class b/zhentao-minan-pojo/target/classes/com/zhentao/channel/TbChannel.class new file mode 100644 index 0000000000000000000000000000000000000000..c4656a78d9362f656f8ce3ca25851fa55f2757fb Binary files /dev/null and b/zhentao-minan-pojo/target/classes/com/zhentao/channel/TbChannel.class differ diff --git a/zhentao-minan-pojo/target/classes/com/zhentao/dto/FilesDto.class b/zhentao-minan-pojo/target/classes/com/zhentao/dto/FilesDto.class index cd81d675f2d2093735df2942be94d2eeb7aa49f1..b3569f5785740aaa903fd3d560e70b1b490f1cdf 100644 Binary files a/zhentao-minan-pojo/target/classes/com/zhentao/dto/FilesDto.class and b/zhentao-minan-pojo/target/classes/com/zhentao/dto/FilesDto.class differ diff --git a/zhentao-minan-pojo/target/classes/com/zhentao/dto/ForgetPasswordDto.class b/zhentao-minan-pojo/target/classes/com/zhentao/dto/ForgetPasswordDto.class index 208263dda1d7395af13ce8745e22cf05bd6a5c12..2378371a85735d0d73cc6b626133461bf733b8cf 100644 Binary files a/zhentao-minan-pojo/target/classes/com/zhentao/dto/ForgetPasswordDto.class and b/zhentao-minan-pojo/target/classes/com/zhentao/dto/ForgetPasswordDto.class differ diff --git a/zhentao-minan-pojo/target/classes/com/zhentao/dto/LoginFormDTO.class b/zhentao-minan-pojo/target/classes/com/zhentao/dto/LoginFormDTO.class index b18ce36b40ece621af0c296a66aeda18d4471b7f..754c6226a7c341a8594a880ef2d3762cff84405c 100644 Binary files a/zhentao-minan-pojo/target/classes/com/zhentao/dto/LoginFormDTO.class and b/zhentao-minan-pojo/target/classes/com/zhentao/dto/LoginFormDTO.class differ diff --git a/zhentao-minan-pojo/target/classes/com/zhentao/dto/UpdatePwdDto.class b/zhentao-minan-pojo/target/classes/com/zhentao/dto/UpdatePwdDto.class index 885b29302a0172afb267f6d952fd1dbe9fff7f4c..322f64294dc38eb85511923aab1cc7398b454283 100644 Binary files a/zhentao-minan-pojo/target/classes/com/zhentao/dto/UpdatePwdDto.class and b/zhentao-minan-pojo/target/classes/com/zhentao/dto/UpdatePwdDto.class differ diff --git a/zhentao-minan-pojo/target/classes/com/zhentao/dto/UserDto.class b/zhentao-minan-pojo/target/classes/com/zhentao/dto/UserDto.class index d01c81b8bdece51b918632cc44f833a235761fae..80ddac417f05eb78df3341d7f19c613edc743ff7 100644 Binary files a/zhentao-minan-pojo/target/classes/com/zhentao/dto/UserDto.class and b/zhentao-minan-pojo/target/classes/com/zhentao/dto/UserDto.class differ diff --git a/zhentao-minan-pojo/target/classes/com/zhentao/files/TbFiles.class b/zhentao-minan-pojo/target/classes/com/zhentao/files/TbFiles.class new file mode 100644 index 0000000000000000000000000000000000000000..a23f440475464e8425f2a9d14692abbb435fbc86 Binary files /dev/null and b/zhentao-minan-pojo/target/classes/com/zhentao/files/TbFiles.class differ diff --git a/zhentao-minan-pojo/target/classes/com/zhentao/files/TbWarehouse.class b/zhentao-minan-pojo/target/classes/com/zhentao/files/TbWarehouse.class new file mode 100644 index 0000000000000000000000000000000000000000..c6b9d5d9935e9710ec26323b3704c668e2b366b9 Binary files /dev/null and b/zhentao-minan-pojo/target/classes/com/zhentao/files/TbWarehouse.class differ diff --git a/zhentao-minan-pojo/target/classes/com/zhentao/files/param/FilesParam.class b/zhentao-minan-pojo/target/classes/com/zhentao/files/param/FilesParam.class new file mode 100644 index 0000000000000000000000000000000000000000..dfdaf6500ebdee9adacd4ab19733cea2943ea9ed Binary files /dev/null and b/zhentao-minan-pojo/target/classes/com/zhentao/files/param/FilesParam.class differ diff --git a/zhentao-minan-pojo/target/classes/com/zhentao/image/ImageUploadRequest.class b/zhentao-minan-pojo/target/classes/com/zhentao/image/ImageUploadRequest.class index 77733723b01b2dd35f8da0d9356edab027eabd8f..11e490c9e1989564d7bfd2084d83bd6333aeee70 100644 Binary files a/zhentao-minan-pojo/target/classes/com/zhentao/image/ImageUploadRequest.class and b/zhentao-minan-pojo/target/classes/com/zhentao/image/ImageUploadRequest.class differ diff --git a/zhentao-minan-pojo/target/classes/com/zhentao/image/UploadResponse.class b/zhentao-minan-pojo/target/classes/com/zhentao/image/UploadResponse.class index 7edc665fcd26fd8a4d9007051d801f87c9ec86c8..3cf978ff0c69682b15da555aeea9d63b16aa9562 100644 Binary files a/zhentao-minan-pojo/target/classes/com/zhentao/image/UploadResponse.class and b/zhentao-minan-pojo/target/classes/com/zhentao/image/UploadResponse.class differ diff --git a/zhentao-minan-pojo/target/classes/com/zhentao/user/Role.class b/zhentao-minan-pojo/target/classes/com/zhentao/user/Role.class index 290551ffa5d032589db0a8a6bf822882e699a4b4..af24adda9e54e9d5bc3854001fc81947b3a07d43 100644 Binary files a/zhentao-minan-pojo/target/classes/com/zhentao/user/Role.class and b/zhentao-minan-pojo/target/classes/com/zhentao/user/Role.class differ diff --git a/zhentao-minan-pojo/target/classes/com/zhentao/user/TbChanFiles.class b/zhentao-minan-pojo/target/classes/com/zhentao/user/TbChanFiles.class deleted file mode 100644 index 2371aaa5f20e6b9846a41baad23d22c88873f12b..0000000000000000000000000000000000000000 Binary files a/zhentao-minan-pojo/target/classes/com/zhentao/user/TbChanFiles.class and /dev/null differ diff --git a/zhentao-minan-pojo/target/classes/com/zhentao/user/TbChannel.class b/zhentao-minan-pojo/target/classes/com/zhentao/user/TbChannel.class deleted file mode 100644 index 593a5346e16216b4501f5ffb9073e38afc870cfa..0000000000000000000000000000000000000000 Binary files a/zhentao-minan-pojo/target/classes/com/zhentao/user/TbChannel.class and /dev/null differ diff --git a/zhentao-minan-pojo/target/classes/com/zhentao/user/TbFiles.class b/zhentao-minan-pojo/target/classes/com/zhentao/user/TbFiles.class deleted file mode 100644 index e0ae25551f807935512c9181a9df0850160132f8..0000000000000000000000000000000000000000 Binary files a/zhentao-minan-pojo/target/classes/com/zhentao/user/TbFiles.class and /dev/null differ diff --git a/zhentao-minan-pojo/target/classes/com/zhentao/user/User.class b/zhentao-minan-pojo/target/classes/com/zhentao/user/User.class index fee7ec9196b754cf8d774084ddc372eaee2deec5..c759db98676dc873b28c5c4c920629a6bf8f88bd 100644 Binary files a/zhentao-minan-pojo/target/classes/com/zhentao/user/User.class and b/zhentao-minan-pojo/target/classes/com/zhentao/user/User.class differ diff --git a/zhentao-minan-pojo/target/classes/com/zhentao/vo/FilesVo.class b/zhentao-minan-pojo/target/classes/com/zhentao/vo/FilesVo.class index 1d49aaaaef8f8faba48b4a42b37140aca09f6a2e..75b7eaa6204a3fd5851a539522f370f4ac92c6f9 100644 Binary files a/zhentao-minan-pojo/target/classes/com/zhentao/vo/FilesVo.class and b/zhentao-minan-pojo/target/classes/com/zhentao/vo/FilesVo.class differ diff --git a/zhentao-minan-service/src/main/java/com/zhentao/mapper/TbFilesMapper.java b/zhentao-minan-service/src/main/java/com/zhentao/mapper/TbFilesMapper.java index d6488d206b155e558966e7924bd022fe1ff00035..19381af30ba8745546afc8933d975ec6cf4021da 100644 --- a/zhentao-minan-service/src/main/java/com/zhentao/mapper/TbFilesMapper.java +++ b/zhentao-minan-service/src/main/java/com/zhentao/mapper/TbFilesMapper.java @@ -1,10 +1,8 @@ package com.zhentao.mapper; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhentao.dto.FilesDto; + import com.zhentao.files.TbFiles; import com.zhentao.vo.FilesVo; import org.apache.ibatis.annotations.Param; @@ -19,6 +17,5 @@ import java.util.List; */ public interface TbFilesMapper extends BaseMapper { -// Page selectChannelFiles(@Param("page") Page page,@Param("dto") FilesDto fileDto); } diff --git a/zhentao-minan-service/src/main/java/com/zhentao/service/TbFilesService.java b/zhentao-minan-service/src/main/java/com/zhentao/service/TbFilesService.java index a43a6cf3e3d6bd0708ae688a32841a986c28f684..9b4affc285faa3bd2b9839ca9668e2378e4e6dc3 100644 --- a/zhentao-minan-service/src/main/java/com/zhentao/service/TbFilesService.java +++ b/zhentao-minan-service/src/main/java/com/zhentao/service/TbFilesService.java @@ -30,5 +30,7 @@ public interface TbFilesService extends IService { ResponseResult uploadFiles(FilesParam param); ResponseResult uploadImage(MultipartFile file); + + ResponseResult details(Long id); } diff --git a/zhentao-minan-service/src/main/java/com/zhentao/service/impl/TbFilesServiceImpl.java b/zhentao-minan-service/src/main/java/com/zhentao/service/impl/TbFilesServiceImpl.java index bb5ea446a478ed80d45abe60ec63731a76e9339b..b8d261e82681e6e45489796a6494cc0586e36f87 100644 --- a/zhentao-minan-service/src/main/java/com/zhentao/service/impl/TbFilesServiceImpl.java +++ b/zhentao-minan-service/src/main/java/com/zhentao/service/impl/TbFilesServiceImpl.java @@ -57,6 +57,7 @@ public class TbFilesServiceImpl extends ServiceImpl @Autowired private TbChannelMapper channelMapper; + @Autowired private MinioFileStorageServiceImpl minioFileStorageService; // 定义一个线程池，调整线程数量 @@ -175,6 +176,51 @@ public class TbFilesServiceImpl extends ServiceImpl return ResponseResult.okResult("上传成功"); } + @Override + public ResponseResult details(Long id) { + // 根据ID查询文件信息 + TbFiles files = tbFilesMapper.selectById(id); + + if (files == null) { + return ResponseResult.errorResult(404, "未找到对应的数据"); + } + + // 创建FilesVo对象并复制属性 + FilesVo vo = new FilesVo(); + BeanUtils.copyProperties(files, vo); + + // 如果存在仓库ID，查询仓库信息并填充到vo中 + if (files.getWId() != null) { + TbWarehouse warehouse = tbWarehouseMapper.selectById(files.getWId()); + if (warehouse != null) { + if (warehouse.getImage() != null) vo.setImage(warehouse.getImage()); + if (warehouse.getContent() != null) vo.setContent(warehouse.getContent()); + if (warehouse.getVideoContent() != null) vo.setVideoContent(warehouse.getVideoContent()); + if (warehouse.getPlanContent() != null) vo.setPlanContent(warehouse.getPlanContent()); + } + } + // 查询关联的频道信息并填充到vo中 + if (files.getId() != null) { + // 获取关联的类型集合 + List chanFiles = tbChanFilesMapper.selectList(Wrappers.lambdaQuery() + .eq(TbChanFiles::getFilesId, files.getId())); + + if (chanFiles != null && !chanFiles.isEmpty()) { + List channelNames = new ArrayList<>(); + for (TbChanFiles chanFile : chanFiles) { + TbChannel tbChannel = channelMapper.selectById(chanFile.getTypeId()); + if (tbChannel != null) { + channelNames.add(tbChannel); + } + } + vo.setChannelNames(channelNames); + } + } + + // 返回成功结果 + return ResponseResult.okResult(vo); + } + //分页展示 下拉查（频道查） 模糊查（标题） @Override @@ -263,7 +309,43 @@ public class TbFilesServiceImpl extends ServiceImpl @Override public ResponseResult gongkai(FilesDto fileDto) { - return null; + // 获取当前登录用户id + String userId = UserHolder.getUser().getId(); + Page page = new Page<>(fileDto.getPageNum(), fileDto.getPageSize()); + this.page(page, Wrappers.lambdaQuery() + .eq(com.baomidou.mybatisplus.core.toolkit.StringUtils.checkValNotNull(userId), + TbFiles::getUId,Integer.valueOf(userId)) + .eq(TbFiles::getStatus,1) + .like(com.baomidou.mybatisplus.core.toolkit.StringUtils.checkValNotNull(fileDto.getTitle()), + TbFiles::getTitle,fileDto.getTitle())); + List records = page.getRecords(); + for (int i = 0; i < records.size(); i++) { + TbFiles files = records.get(i); + FilesVo vo = new FilesVo(); + BeanUtils.copyProperties(files, vo); + if(files.getWId() != null){ + TbWarehouse warehouse = tbWarehouseMapper.selectById(files.getWId()); + if(warehouse.getImage() != null) vo.setImage(warehouse.getImage()); + if(warehouse.getContent() != null) vo.setContent(warehouse.getContent()); + if(warehouse.getVideoContent() != null) vo.setVideoContent(warehouse.getVideoContent()); + if(warehouse.getPlanContent() != null) vo.setPlanContent(warehouse.getPlanContent()); + } + if(files.getId() != null){ + // 对应的类型id + List chanFiles = tbChanFilesMapper.selectList(Wrappers.lambdaQuery() + .eq(TbChanFiles::getFilesId, files.getId())); + // 获取类型集合 + List channelNames = vo.getChannelNames(); + if(chanFiles != null && chanFiles.size() > 0){ + for (TbChanFiles chanFile : chanFiles) { + TbChannel tbChannel = channelMapper.selectById(chanFile.getTypeId()); + channelNames.add(tbChannel); + } + } + } + records.set(i,vo); + } + return ResponseResult.okResult(page); } } diff --git a/zhentao-minan-service/src/main/resources/mapper/TbFilesMapper.xml b/zhentao-minan-service/src/main/resources/mapper/TbFilesMapper.xml index 6395687d0da1794b0fd273b436fcd94faf90038b..642005483a6a68159bb8d72c8192a80c0b6bc059 100644 --- a/zhentao-minan-service/src/main/resources/mapper/TbFilesMapper.xml +++ b/zhentao-minan-service/src/main/resources/mapper/TbFilesMapper.xml @@ -39,20 +39,11 @@ FROM tb_files a INNER JOIN tb_user b ON a.u_id = b.id + + + + + + - - diff --git a/zhentao-minan-service/target/classes/com/zhentao/config/MvcConfig.class b/zhentao-minan-service/target/classes/com/zhentao/config/MvcConfig.class index 147e53ec8dbedef19e243f391938ae3310b97041..9ec7efbd3c8d2fef10e90b4a30e4281b90675050 100644 Binary files a/zhentao-minan-service/target/classes/com/zhentao/config/MvcConfig.class and b/zhentao-minan-service/target/classes/com/zhentao/config/MvcConfig.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/interceptor/LoginInterceptor.class b/zhentao-minan-service/target/classes/com/zhentao/interceptor/LoginInterceptor.class index 3b75f74e379ed60e86bea7492e77ed1c4e00e76a..4583635ec8f09c06e0a4ceb15d42071ad589ea71 100644 Binary files a/zhentao-minan-service/target/classes/com/zhentao/interceptor/LoginInterceptor.class and b/zhentao-minan-service/target/classes/com/zhentao/interceptor/LoginInterceptor.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/interceptor/RefreshTokenInterceptor.class b/zhentao-minan-service/target/classes/com/zhentao/interceptor/RefreshTokenInterceptor.class index 92e091403ff762a296877d2e816908886934017c..c4649dc686f57f173912c401bd62f4a9785b8651 100644 Binary files a/zhentao-minan-service/target/classes/com/zhentao/interceptor/RefreshTokenInterceptor.class and b/zhentao-minan-service/target/classes/com/zhentao/interceptor/RefreshTokenInterceptor.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/mapper/RoleMapper.class b/zhentao-minan-service/target/classes/com/zhentao/mapper/RoleMapper.class index 3c5993dbbb0de2ab10e16c23b84cc92125015679..943acc2038e6158ff69aab321f5c40dc681e5ae4 100644 Binary files a/zhentao-minan-service/target/classes/com/zhentao/mapper/RoleMapper.class and b/zhentao-minan-service/target/classes/com/zhentao/mapper/RoleMapper.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/mapper/TbChanFilesMapper.class b/zhentao-minan-service/target/classes/com/zhentao/mapper/TbChanFilesMapper.class index 01e046cd19593d87ef02b5ccc94a9e7e331f5a42..75912843605025e937b17143936470a223a58d1e 100644 Binary files a/zhentao-minan-service/target/classes/com/zhentao/mapper/TbChanFilesMapper.class and b/zhentao-minan-service/target/classes/com/zhentao/mapper/TbChanFilesMapper.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/mapper/TbChannelMapper.class b/zhentao-minan-service/target/classes/com/zhentao/mapper/TbChannelMapper.class index 15c4ee5692cf3f2c557b06782f7bf3651d88036e..f98cf2d1412580a8049b0cc69c22e8bafb0163b8 100644 Binary files a/zhentao-minan-service/target/classes/com/zhentao/mapper/TbChannelMapper.class and b/zhentao-minan-service/target/classes/com/zhentao/mapper/TbChannelMapper.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/mapper/TbFilesMapper.class b/zhentao-minan-service/target/classes/com/zhentao/mapper/TbFilesMapper.class index 376874f9a9a81bd52fbdf1de70ec6a4eda14f35f..0587ef5742d8763d1604986d76471df0662bdb19 100644 Binary files a/zhentao-minan-service/target/classes/com/zhentao/mapper/TbFilesMapper.class and b/zhentao-minan-service/target/classes/com/zhentao/mapper/TbFilesMapper.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/mapper/TbWarehouseMapper.class b/zhentao-minan-service/target/classes/com/zhentao/mapper/TbWarehouseMapper.class new file mode 100644 index 0000000000000000000000000000000000000000..d80710dedde51e8b5d0d24c46d13b64e2f91eeb3 Binary files /dev/null and b/zhentao-minan-service/target/classes/com/zhentao/mapper/TbWarehouseMapper.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/mapper/UserMapper.class b/zhentao-minan-service/target/classes/com/zhentao/mapper/UserMapper.class index 852636985d775a2aa33673ce8048f04fa6b4c26a..ed19157a9a98e9120395fef2198f13c49e691acc 100644 Binary files a/zhentao-minan-service/target/classes/com/zhentao/mapper/UserMapper.class and b/zhentao-minan-service/target/classes/com/zhentao/mapper/UserMapper.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/service/FileUploadService.class b/zhentao-minan-service/target/classes/com/zhentao/service/FileUploadService.class new file mode 100644 index 0000000000000000000000000000000000000000..523c3789544eef917ea401b84998bad94b1558a0 Binary files /dev/null and b/zhentao-minan-service/target/classes/com/zhentao/service/FileUploadService.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/service/FilesAutoScanService.class b/zhentao-minan-service/target/classes/com/zhentao/service/FilesAutoScanService.class new file mode 100644 index 0000000000000000000000000000000000000000..bda0b49fa6b7991d50303de25787a5cacca71406 Binary files /dev/null and b/zhentao-minan-service/target/classes/com/zhentao/service/FilesAutoScanService.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/service/RoleService.class b/zhentao-minan-service/target/classes/com/zhentao/service/RoleService.class index 1b07a6f6cff15f4bd83ba90073c4669e56c6e53f..1dd41fe16241ed384f54f7310ab27ed46bafe4d5 100644 Binary files a/zhentao-minan-service/target/classes/com/zhentao/service/RoleService.class and b/zhentao-minan-service/target/classes/com/zhentao/service/RoleService.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/service/SpeechService.class b/zhentao-minan-service/target/classes/com/zhentao/service/SpeechService.class index 161afe4aacada8247a219851c4318483b718b378..1a2193370e2696e618d61952373b652f3208f8c5 100644 Binary files a/zhentao-minan-service/target/classes/com/zhentao/service/SpeechService.class and b/zhentao-minan-service/target/classes/com/zhentao/service/SpeechService.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/service/TbChanFilesService.class b/zhentao-minan-service/target/classes/com/zhentao/service/TbChanFilesService.class index 0b6e65b74cf492859943cda87161ac6b757dbeb4..d1c65f2ff300af81fd42a5bf5691b90577fa9898 100644 Binary files a/zhentao-minan-service/target/classes/com/zhentao/service/TbChanFilesService.class and b/zhentao-minan-service/target/classes/com/zhentao/service/TbChanFilesService.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/service/TbChannelService.class b/zhentao-minan-service/target/classes/com/zhentao/service/TbChannelService.class index 8aabd69847e488eaf6cbdf398c9e0ff320eca703..940c4124626c511a40e221e5f7fb06b1bbf5bf92 100644 Binary files a/zhentao-minan-service/target/classes/com/zhentao/service/TbChannelService.class and b/zhentao-minan-service/target/classes/com/zhentao/service/TbChannelService.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/service/TbFilesService.class b/zhentao-minan-service/target/classes/com/zhentao/service/TbFilesService.class index d9ede2e651ff6036b5a68d5c9bf647c68814831c..5a3ff784724ac07d9be15b0a19af965fc643eb73 100644 Binary files a/zhentao-minan-service/target/classes/com/zhentao/service/TbFilesService.class and b/zhentao-minan-service/target/classes/com/zhentao/service/TbFilesService.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/service/TbWarehouseService.class b/zhentao-minan-service/target/classes/com/zhentao/service/TbWarehouseService.class new file mode 100644 index 0000000000000000000000000000000000000000..87379803aed863c0ad3dee19b6b5d56ecb60481e Binary files /dev/null and b/zhentao-minan-service/target/classes/com/zhentao/service/TbWarehouseService.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/service/UserService.class b/zhentao-minan-service/target/classes/com/zhentao/service/UserService.class index 4c5d474eeb7baa9defc574d61fb4593b7bc9507b..87bc0256ff8d95d091cf2e7118f3a769f96be42a 100644 Binary files a/zhentao-minan-service/target/classes/com/zhentao/service/UserService.class and b/zhentao-minan-service/target/classes/com/zhentao/service/UserService.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/service/impl/FileUploadServiceImpl.class b/zhentao-minan-service/target/classes/com/zhentao/service/impl/FileUploadServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..db1da2be4f16cd3b2ff8bcf1bd0fa692a9db196b Binary files /dev/null and b/zhentao-minan-service/target/classes/com/zhentao/service/impl/FileUploadServiceImpl.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/service/impl/FilesAutoScanServiceImpl.class b/zhentao-minan-service/target/classes/com/zhentao/service/impl/FilesAutoScanServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..e07d8730b077689f4aef57755ab69330e2c54e62 Binary files /dev/null and b/zhentao-minan-service/target/classes/com/zhentao/service/impl/FilesAutoScanServiceImpl.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/service/impl/RoleServiceImpl.class b/zhentao-minan-service/target/classes/com/zhentao/service/impl/RoleServiceImpl.class index 19283cd4453a5e0475ceb6de27f2d82a23dd3e51..08b433c8556d648d0d3126f190449fcab58362be 100644 Binary files a/zhentao-minan-service/target/classes/com/zhentao/service/impl/RoleServiceImpl.class and b/zhentao-minan-service/target/classes/com/zhentao/service/impl/RoleServiceImpl.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/service/impl/SpeechServiceImpl.class b/zhentao-minan-service/target/classes/com/zhentao/service/impl/SpeechServiceImpl.class index 2605cd34f35381b3a12cb0212bbd9c6ba195b16e..51d6cd8baa31f09dd80dbc1632b64122697236f2 100644 Binary files a/zhentao-minan-service/target/classes/com/zhentao/service/impl/SpeechServiceImpl.class and b/zhentao-minan-service/target/classes/com/zhentao/service/impl/SpeechServiceImpl.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/service/impl/TbChanFilesServiceImpl.class b/zhentao-minan-service/target/classes/com/zhentao/service/impl/TbChanFilesServiceImpl.class index dcfef3ff19fbbec18efb9a1eeda0db15e56e96b7..6bea2bb656f8a7a3ce4d1007878181d21ce1c8d6 100644 Binary files a/zhentao-minan-service/target/classes/com/zhentao/service/impl/TbChanFilesServiceImpl.class and b/zhentao-minan-service/target/classes/com/zhentao/service/impl/TbChanFilesServiceImpl.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/service/impl/TbChannelServiceImpl.class b/zhentao-minan-service/target/classes/com/zhentao/service/impl/TbChannelServiceImpl.class index 05a2693f20f8f5c7fbc6311954746af5e2b91a73..89b76af782bffae387abba14d630209810993d19 100644 Binary files a/zhentao-minan-service/target/classes/com/zhentao/service/impl/TbChannelServiceImpl.class and b/zhentao-minan-service/target/classes/com/zhentao/service/impl/TbChannelServiceImpl.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/service/impl/TbFilesServiceImpl.class b/zhentao-minan-service/target/classes/com/zhentao/service/impl/TbFilesServiceImpl.class index c180233f0ab9850275d8a9071f28ed1251eb1a1d..eef29ce6dae6a8b51a99d8acab5e8c5d7c057496 100644 Binary files a/zhentao-minan-service/target/classes/com/zhentao/service/impl/TbFilesServiceImpl.class and b/zhentao-minan-service/target/classes/com/zhentao/service/impl/TbFilesServiceImpl.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/service/impl/TbWarehouseServiceImpl.class b/zhentao-minan-service/target/classes/com/zhentao/service/impl/TbWarehouseServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..c6fb8d55d1f4045d6d6b6890f45bd99667b82180 Binary files /dev/null and b/zhentao-minan-service/target/classes/com/zhentao/service/impl/TbWarehouseServiceImpl.class differ diff --git a/zhentao-minan-service/target/classes/com/zhentao/service/impl/UserServiceImpl.class b/zhentao-minan-service/target/classes/com/zhentao/service/impl/UserServiceImpl.class index 70ff54b4780821759e30b9ea340877fd12d0c1e0..052b4e265d13dc60c102f38409f604ba6db36d0d 100644 Binary files a/zhentao-minan-service/target/classes/com/zhentao/service/impl/UserServiceImpl.class and b/zhentao-minan-service/target/classes/com/zhentao/service/impl/UserServiceImpl.class differ diff --git a/zhentao-minan-service/target/classes/mapper/TbFilesMapper.xml b/zhentao-minan-service/target/classes/mapper/TbFilesMapper.xml index 6395687d0da1794b0fd273b436fcd94faf90038b..642005483a6a68159bb8d72c8192a80c0b6bc059 100644 --- a/zhentao-minan-service/target/classes/mapper/TbFilesMapper.xml +++ b/zhentao-minan-service/target/classes/mapper/TbFilesMapper.xml @@ -39,20 +39,11 @@ FROM tb_files a INNER JOIN tb_user b ON a.u_id = b.id + + + + + + - - diff --git a/zhentao-minan-starter/target/classes/com/zhentao/MinAnApplication$1.class b/zhentao-minan-starter/target/classes/com/zhentao/MinAnApplication$1.class new file mode 100644 index 0000000000000000000000000000000000000000..dccd1025be93639c530f3e6d14c1c949b111da1c Binary files /dev/null and b/zhentao-minan-starter/target/classes/com/zhentao/MinAnApplication$1.class differ diff --git a/zhentao-minan-starter/target/classes/com/zhentao/MinAnApplication.class b/zhentao-minan-starter/target/classes/com/zhentao/MinAnApplication.class index e57da7a1934cfec9bba1cab4234f86c0a5ff81d6..5151893f96609c6bde4dc3ad51d7cee27da532fd 100644 Binary files a/zhentao-minan-starter/target/classes/com/zhentao/MinAnApplication.class and b/zhentao-minan-starter/target/classes/com/zhentao/MinAnApplication.class differ diff --git a/zhentao-minan-starter/target/classes/com/zhentao/uuu/song.class b/zhentao-minan-starter/target/classes/com/zhentao/uuu/song.class new file mode 100644 index 0000000000000000000000000000000000000000..e793d9448d2cb520fe888c832c87f696ecadfe65 Binary files /dev/null and b/zhentao-minan-starter/target/classes/com/zhentao/uuu/song.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/aliyun/AliyunConstans.class b/zhentao-minan-utils/target/classes/com/zhentao/aliyun/AliyunConstans.class index ba5588d1d445fadf1e27d67f6fb5245dde0798b0..b3c8878c62cef912c17323ec791e163206a47c6e 100644 Binary files a/zhentao-minan-utils/target/classes/com/zhentao/aliyun/AliyunConstans.class and b/zhentao-minan-utils/target/classes/com/zhentao/aliyun/AliyunConstans.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/aliyun/SpeechTranscriberWithMicrophoneDemo$1.class b/zhentao-minan-utils/target/classes/com/zhentao/aliyun/SpeechTranscriberWithMicrophoneDemo$1.class index eac328ed122c50bbd6b5959ebcf4971921ed0bf4..f3cd6f330601dbc5f4b4942ae9e0da9d1331588e 100644 Binary files a/zhentao-minan-utils/target/classes/com/zhentao/aliyun/SpeechTranscriberWithMicrophoneDemo$1.class and b/zhentao-minan-utils/target/classes/com/zhentao/aliyun/SpeechTranscriberWithMicrophoneDemo$1.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/aliyun/SpeechTranscriberWithMicrophoneDemo.class b/zhentao-minan-utils/target/classes/com/zhentao/aliyun/SpeechTranscriberWithMicrophoneDemo.class index 06756f35262172c49f38ddd8eef9b162cc3d8fb2..1a38d6df3bb371ac7475cb2a20d6447e918f242b 100644 Binary files a/zhentao-minan-utils/target/classes/com/zhentao/aliyun/SpeechTranscriberWithMicrophoneDemo.class and b/zhentao-minan-utils/target/classes/com/zhentao/aliyun/SpeechTranscriberWithMicrophoneDemo.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/aliyun/WebSocketHandlerTest.class b/zhentao-minan-utils/target/classes/com/zhentao/aliyun/WebSocketHandlerTest.class index 3c00e2b70dfbbc41e6b01bd9c0ea05d7ef5c9e91..ed6af216dc098e0531f2328e0c057d10a7837466 100644 Binary files a/zhentao-minan-utils/target/classes/com/zhentao/aliyun/WebSocketHandlerTest.class and b/zhentao-minan-utils/target/classes/com/zhentao/aliyun/WebSocketHandlerTest.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/config/WebSocketConfig.class b/zhentao-minan-utils/target/classes/com/zhentao/config/WebSocketConfig.class index 6271895394c04fe71a1e44dedc434d946a9b1663..20bf9388be5451f30f3ad0f2f39f0688a6ad005e 100644 Binary files a/zhentao-minan-utils/target/classes/com/zhentao/config/WebSocketConfig.class and b/zhentao-minan-utils/target/classes/com/zhentao/config/WebSocketConfig.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/minio/config/MinioConfig.class b/zhentao-minan-utils/target/classes/com/zhentao/minio/config/MinioConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..4b900c63d645dfb0046071d474b987a2a212fcc4 Binary files /dev/null and b/zhentao-minan-utils/target/classes/com/zhentao/minio/config/MinioConfig.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/minio/config/MinioConfigProerties.class b/zhentao-minan-utils/target/classes/com/zhentao/minio/config/MinioConfigProerties.class new file mode 100644 index 0000000000000000000000000000000000000000..8c0aebbaff2f21fc00d8dea0385ea082e28898a6 Binary files /dev/null and b/zhentao-minan-utils/target/classes/com/zhentao/minio/config/MinioConfigProerties.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/minio/service/FileStorageService.class b/zhentao-minan-utils/target/classes/com/zhentao/minio/service/FileStorageService.class new file mode 100644 index 0000000000000000000000000000000000000000..22aaf08bd23870890f2c4c9ea5ee625399ea8f65 Binary files /dev/null and b/zhentao-minan-utils/target/classes/com/zhentao/minio/service/FileStorageService.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/minio/service/impl/MinioFileStorageServiceImpl.class b/zhentao-minan-utils/target/classes/com/zhentao/minio/service/impl/MinioFileStorageServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..511bc494277b8ca245983a0069bb30b117589a61 Binary files /dev/null and b/zhentao-minan-utils/target/classes/com/zhentao/minio/service/impl/MinioFileStorageServiceImpl.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/redis/CacheService$1.class b/zhentao-minan-utils/target/classes/com/zhentao/redis/CacheService$1.class index 5a1b6a835bed693dab090430fc83e26481312017..a5ae16f036a157a74e01f17c5ded9b6401821877 100644 Binary files a/zhentao-minan-utils/target/classes/com/zhentao/redis/CacheService$1.class and b/zhentao-minan-utils/target/classes/com/zhentao/redis/CacheService$1.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/redis/CacheService$2.class b/zhentao-minan-utils/target/classes/com/zhentao/redis/CacheService$2.class index c073743d3471a315c1016c2b53a502b584bf67ee..78bd2a1a319717a8efa7a792482034200c4685a9 100644 Binary files a/zhentao-minan-utils/target/classes/com/zhentao/redis/CacheService$2.class and b/zhentao-minan-utils/target/classes/com/zhentao/redis/CacheService$2.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/redis/CacheService.class b/zhentao-minan-utils/target/classes/com/zhentao/redis/CacheService.class index 0e943f335518b6b37dc6d0841b1bb9cf4bbd45e2..4071f95e2f16901f035f3d411641d24c7c78d1a4 100644 Binary files a/zhentao-minan-utils/target/classes/com/zhentao/redis/CacheService.class and b/zhentao-minan-utils/target/classes/com/zhentao/redis/CacheService.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/redis/ScheduleComNumber.class b/zhentao-minan-utils/target/classes/com/zhentao/redis/ScheduleComNumber.class index 9a7dd7c03dcb905e9f45c40c58e782458185958e..2e8ee417e66eac743b5838df160cd87e69575efb 100644 Binary files a/zhentao-minan-utils/target/classes/com/zhentao/redis/ScheduleComNumber.class and b/zhentao-minan-utils/target/classes/com/zhentao/redis/ScheduleComNumber.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/sensitive/SensitiveWordUtil.class b/zhentao-minan-utils/target/classes/com/zhentao/sensitive/SensitiveWordUtil.class index 3988f2527cacc8858758a75a7cd8e88ee5f27284..cfdb4a32f4ac04806125e2c82e61097c312d1791 100644 Binary files a/zhentao-minan-utils/target/classes/com/zhentao/sensitive/SensitiveWordUtil.class and b/zhentao-minan-utils/target/classes/com/zhentao/sensitive/SensitiveWordUtil.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/user/UserHolder.class b/zhentao-minan-utils/target/classes/com/zhentao/user/UserHolder.class index 371de61eece28497135f38cb008b19f05d7cbf81..552ab02efe632c5ec84bf4d4f9d4b6ffe12a7f3b 100644 Binary files a/zhentao-minan-utils/target/classes/com/zhentao/user/UserHolder.class and b/zhentao-minan-utils/target/classes/com/zhentao/user/UserHolder.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/utils/AppHttpCodeEnum.class b/zhentao-minan-utils/target/classes/com/zhentao/utils/AppHttpCodeEnum.class index 1ba901d5fb6cd43a304eaccf1dce4500b421482b..a24494a4fb34be6f33574e8b19bd62440d279cf3 100644 Binary files a/zhentao-minan-utils/target/classes/com/zhentao/utils/AppHttpCodeEnum.class and b/zhentao-minan-utils/target/classes/com/zhentao/utils/AppHttpCodeEnum.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/utils/JwtService.class b/zhentao-minan-utils/target/classes/com/zhentao/utils/JwtService.class index e003a27d797dc2af12587c9a7088e2ce84866b03..c2e264a8dcad464626f30062745f388d9b998dc3 100644 Binary files a/zhentao-minan-utils/target/classes/com/zhentao/utils/JwtService.class and b/zhentao-minan-utils/target/classes/com/zhentao/utils/JwtService.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/utils/PasswordEncoder.class b/zhentao-minan-utils/target/classes/com/zhentao/utils/PasswordEncoder.class index b227fc059d8f78aba982c5bbb94b3e1d2f7f8854..c11e3ad656c643caea10d26c5546803e6345d421 100644 Binary files a/zhentao-minan-utils/target/classes/com/zhentao/utils/PasswordEncoder.class and b/zhentao-minan-utils/target/classes/com/zhentao/utils/PasswordEncoder.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/utils/RegexPatterns.class b/zhentao-minan-utils/target/classes/com/zhentao/utils/RegexPatterns.class index 6caba2a15e7bcf724b8f870e50e3ca6f73d5142d..9b560cf89f23fc84c90a46c6e5546dc4ed2c498c 100644 Binary files a/zhentao-minan-utils/target/classes/com/zhentao/utils/RegexPatterns.class and b/zhentao-minan-utils/target/classes/com/zhentao/utils/RegexPatterns.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/utils/RegexUtils.class b/zhentao-minan-utils/target/classes/com/zhentao/utils/RegexUtils.class index ae483b9c63dc19576200be08b780bcdce1c57d1f..5327b5b45b90ffe010170eccfd6f73df49ca90ec 100644 Binary files a/zhentao-minan-utils/target/classes/com/zhentao/utils/RegexUtils.class and b/zhentao-minan-utils/target/classes/com/zhentao/utils/RegexUtils.class differ diff --git a/zhentao-minan-utils/target/classes/com/zhentao/utils/ResponseResult.class b/zhentao-minan-utils/target/classes/com/zhentao/utils/ResponseResult.class index aba479348d645259b873fd048786daa5931f6bc2..e777ddcf39417d8315ab2bf6c77d1ca6d46fad68 100644 Binary files a/zhentao-minan-utils/target/classes/com/zhentao/utils/ResponseResult.class and b/zhentao-minan-utils/target/classes/com/zhentao/utils/ResponseResult.class differ