pom.xml
@@ -30,7 +30,7 @@ <hutool.version>5.8.22</hutool.version> <okhttp.version>4.10.0</okhttp.version> <spring-boot-admin.version>3.1.7</spring-boot-admin.version> <redisson.version>3.24.1</redisson.version> <redisson.version>3.24.2</redisson.version> <lock4j.version>2.2.5</lock4j.version> <dynamic-ds.version>4.2.0</dynamic-ds.version> <alibaba-ttl.version>2.14.2</alibaba-ttl.version> ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
@@ -78,7 +78,7 @@ SysUserVo sysUserVo = userMapper.selectUserByUserName(username); SysUserRole userRole = new SysUserRole(); userRole.setUserId(sysUserVo.getUserId()); userRole.setRoleId(Long.valueOf(RoleType.POLICE.getType())); userRole.setRoleId(Long.valueOf(RoleType.VIDEO.getType())); userRoleMapper.insert(userRole); recordLogininfor(tenantId, username, Constants.REGISTER, MessageUtils.message("user.register.success")); } ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
@@ -55,7 +55,7 @@ * @author Lion Li */ @Slf4j //@SaIgnore @SaIgnore @Validated @RequiredArgsConstructor @RestController @@ -89,46 +89,46 @@ return R.ok(list); } /** * 上传OSS对象存储 视频专网 * * @param file 文件 */ @SaCheckPermission("system:oss:upload") @Log(title = "OSS对象存储", businessType = BusinessType.INSERT) @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) throws IOException { if (ObjectUtil.isNull(file)) { return R.fail("上传文件不能为空"); } SysOssVo oss = ossService.upload(file); SysOssUploadVo uploadVo = new SysOssUploadVo(); uploadVo.setUrl(oss.getUrl()); uploadVo.setFileName(oss.getOriginalName()); uploadVo.setOssId(oss.getOssId().toString()); uploadVo.setPassword(oss.getPassword()); return R.ok(uploadVo); } // /** // * 上传OSS对象存储 互联网 // * 上传OSS对象存储 视频专网 // * // * @param file 文件 // */ // @SaCheckPermission("system:oss:upload") // @Log(title = "OSS对象存储", businessType = BusinessType.INSERT) // @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) // public R<String> upload(@RequestPart("file") MultipartFile file) throws IOException { // String originalfileName = file.getOriginalFilename(); // long l = System.currentTimeMillis(); // String password = PasswordUtil.randomPassword(6); // String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length()); // FtpApche.uploadFile(ftpConfig, file, password + String.valueOf(l) + suffix); // return R.ok(password); // public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) throws IOException { // // if (ObjectUtil.isNull(file)) { // return R.fail("上传文件不能为空"); // } // SysOssVo oss = ossService.upload(file); // // SysOssUploadVo uploadVo = new SysOssUploadVo(); // uploadVo.setUrl(oss.getUrl()); // uploadVo.setFileName(oss.getOriginalName()); // uploadVo.setOssId(oss.getOssId().toString()); // uploadVo.setPassword(oss.getPassword()); // // return R.ok(uploadVo); // } /** * 上传OSS对象存储 互联网 * * @param file 文件 */ @SaCheckPermission("system:oss:upload") @Log(title = "OSS对象存储", businessType = BusinessType.INSERT) @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R<String> upload(@RequestPart("file") MultipartFile file) throws IOException { String originalfileName = file.getOriginalFilename(); long l = System.currentTimeMillis(); String password = PasswordUtil.randomPassword(6); String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length()); FtpApche.uploadFile(ftpConfig, file, password + String.valueOf(l) + suffix); return R.ok(password); } private String post(VideoRequest request) throws IOException { HashMap<String, String> headers = new HashMap<>(3); ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/VideoPulSync.java
@@ -2,6 +2,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.DateUtils; import org.dromara.common.oss.core.OssClient; import org.dromara.common.oss.entity.SynchronousRequest; @@ -59,11 +60,16 @@ InputStream input = FtpApche.downloadFileFromDailyDir(str); byte[] fileBytesByName = FtpApche.getFileBytesByName(input); OssClient storage = OssFactory.instance(); UploadResult uploadResult = storage.upload(input,getPath(fileName),fileName.substring(14,fileName.length())); FtpApche.deleteFile(str); MultipartFile file = new MockMultipartFile(fileName,fileName, fileName.substring(14,fileName.length()), input); buildResultEntity(fileName, fileName.substring(14,fileName.length()), "minio", uploadResult, file, password, fileBytesByName); // UploadResult uploadResult = storage.upload(input,getPath(fileName),"multipart/form-data; charset=ISO-8859-1"); UploadResult uploadResult; // try { uploadResult = storage.uploadSuffix2(fileBytesByName, getPath(fileName), "multipart/form-data; charset=ISO-8859-1"); FtpApche.deleteFile(str); input.close(); // buildResultEntity(fileName, fileName.substring(14,fileName.length()), "minio", uploadResult, file, // password, fileBytesByName); }
@@ -25,7 +25,7 @@ } // @Scheduled(cron = "0 */10 * * * ?") @Scheduled(cron = "0 */10 * * * ?") public void remove() throws IOException { System.out.println("同步删除......"); List<SysOssVo> list = baseMapper.selectVoList(new LambdaQueryWrapper<SysOss>()
