修改

qirong

2024-02-28 e71bd87b3f06a7357ee5142c8f538736e7ef1efa

 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,47 +89,47 @@
        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);
        String requestUrl = boundary.getChief() + "/resource/synchronization/uploadTwo";