|
@@ -2,10 +2,7 @@ package com.ruoyi.web.controller.system;
|
|
|
|
|
|
|
|
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
|
-import cn.hutool.core.convert.Convert;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
-import cn.hutool.http.HttpException;
|
|
|
-import cn.hutool.http.HttpUtil;
|
|
|
import com.ruoyi.common.annotation.Log;
|
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
|
import com.ruoyi.common.core.domain.PageQuery;
|
|
@@ -13,11 +10,6 @@ import com.ruoyi.common.core.domain.R;
|
|
|
import com.ruoyi.common.core.page.TableDataInfo;
|
|
|
import com.ruoyi.common.core.validate.QueryGroup;
|
|
|
import com.ruoyi.common.enums.BusinessType;
|
|
|
-import com.ruoyi.common.exception.ServiceException;
|
|
|
-import com.ruoyi.common.utils.file.FileUtils;
|
|
|
-import com.ruoyi.oss.core.OssClient;
|
|
|
-import com.ruoyi.oss.factory.OssFactory;
|
|
|
-import com.ruoyi.system.domain.SysOss;
|
|
|
import com.ruoyi.system.domain.bo.SysOssBo;
|
|
|
import com.ruoyi.system.domain.vo.SysOssVo;
|
|
|
import com.ruoyi.system.service.ISysOssService;
|
|
@@ -80,7 +72,7 @@ public class SysOssController extends BaseController {
|
|
|
@PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
|
|
|
public R<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
|
|
|
if (ObjectUtil.isNull(file)) {
|
|
|
- throw new ServiceException("上传文件不能为空");
|
|
|
+ return R.fail("上传文件不能为空");
|
|
|
}
|
|
|
SysOssVo oss = iSysOssService.upload(file);
|
|
|
Map<String, String> map = new HashMap<>(2);
|