qirong
2023-12-08 fb766b5ff9f913561f76aa747c76eae5c3678589
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
@@ -80,55 +80,55 @@
        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);
//        SynchronousRequest request = new SynchronousRequest();
//        request.setFile(file);
//
//
//
//        //添加队列数据
//        QueueUtils.addDelayedQueueObject("OSS", oss.getOssId().toString(), 1, TimeUnit.DAYS);
//        log.info("通道: {} , 发送数据: {}", "OSS", oss.getOssId());
//        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 {
    public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) throws IOException {
        if (ObjectUtil.isNull(file)) {
            return R.fail("上传文件不能为空");
        }
        VideoRequest request = new VideoRequest();
        SysOssVo oss = ossService.upload(file);
        SynchronousRequest request = new SynchronousRequest();
        request.setFile(file);
        request.setFileName(file.getOriginalFilename());
        String post = post(request);
        String password = post.substring(post.indexOf("password\":\"") + 9, post.indexOf("\"}"));
        return R.ok(password);
        //添加队列数据
        QueueUtils.addDelayedQueueObject("OSS", oss.getOssId().toString(), 1, TimeUnit.DAYS);
        log.info("通道: {} , 发送数据: {}", "OSS", oss.getOssId());
        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 {
//        if (ObjectUtil.isNull(file)) {
//            return R.fail("上传文件不能为空");
//        }
//        VideoRequest request = new VideoRequest();
//        request.setFile(file);
//        request.setFileName(file.getOriginalFilename());
//        String post = post(request);
//        String password = post.substring(post.indexOf("password\":\"") + 9, post.indexOf("\"}"));
//        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";