Merge remote-tracking branch 'origin/master'

EricsHu

2022-12-08 6ca7ca9feb1cc4a35cab3a3af8dddfae2580bddc

 src/main/java/com/qxueyou/scc/controller/HweiYunOBSController.java

@@ -1,5 +1,5 @@
package com.qxueyou.scc.controller;
 

import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.ArrayUtil;
@@ -7,12 +7,14 @@

//import cn.hutool.core.io.FileUtil;
import com.obs.services.exception.ObsException;
import com.obs.services.model.PutObjectResult;
import com.qxueyou.scc.base.model.FileMeta;
import com.qxueyou.scc.base.model.Result;
import com.qxueyou.scc.teach.res.service.HweiYunOBSService;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
 

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -21,7 +23,7 @@
import java.io.InputStream;
import java.net.URLEncoder;
import java.util.List;
 

/**
 * @ClassName: ObsController
 * @Description: OBS服务器Controller
@@ -30,12 +32,12 @@
 * @Version: 1.0
 */
@RestController
@RequestMapping({ "file" })// @RequestMapping("/file")
@RequestMapping("/file")// @RequestMapping("/file")
public class HweiYunOBSController {
 

    @Resource
    private HweiYunOBSService hweiYunOBSService;
 

    @RequestMapping(value = "upload", method = RequestMethod.POST)
    public Result save(@RequestParam(value = "file", required = false) MultipartFile file) {

@@ -45,11 +47,11 @@
//        if (FileUtil.isEmpty(file)) {
//            return new Result(false,"文件为空");
//        }
        final String test = hweiYunOBSService.fileUpload(file, file.getOriginalFilename());
        final List<FileMeta> test = hweiYunOBSService.fileUpload(file, file.getOriginalFilename());
//        return ResponseVO.ok("执行成功",test);
        return new Result(true,"success",test);
    }
 

    @RequestMapping(value = "delete", method = RequestMethod.POST)
    public Result delete(@RequestParam(value = "fileName", required = false)  String fileName) {
        if (StrUtil.isEmpty(fileName)) {
@@ -58,7 +60,7 @@
        final boolean delete = hweiYunOBSService.delete(fileName);
        return delete?new Result(true,"success"):new Result(false,"删除失败");
    }
 

    @RequestMapping(value = "deletes", method = RequestMethod.POST)
    //@RequestParam 获取List，数组则不需要
    public Result delete(@RequestParam("fileNames") List<String> fileNames) {
@@ -68,8 +70,8 @@
        final boolean delete = hweiYunOBSService.delete(fileNames);
        return delete?new Result(true,"success"):new Result(false,"删除失败");
    }
 
 


    @RequestMapping(value = "download", method = RequestMethod.POST)
    public Result download(HttpServletRequest request, HttpServletResponse response, @RequestParam(value = "fileName", required = false) String fileName) {
        if (StrUtil.isEmpty(fileName)) {
@@ -104,4 +106,4 @@
            return new Result(false);
        }
    }
}
}