wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update 优化OSS异常判断

This commit is contained in:
疯狂的狮子li 2021-08-17 11:43:14 +08:00
parent 52d0d62c35
commit 5bfb2dae13
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.web.controller.system;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.annotation.Log;
@ -78,7 +79,7 @@ public class SysOssController extends BaseController {
@RepeatSubmit
@PostMapping("/upload")
public AjaxResult<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
if (file.isEmpty()) {
if (ObjectUtil.isNull(file)) {
throw new ServiceException("上传文件不能为空");
}
SysOss oss = iSysOssService.upload(file);
@ -93,7 +94,7 @@ public class SysOssController extends BaseController {
@GetMapping("/download/{ossId}")
public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
SysOss sysOss = iSysOssService.getById(ossId);
if (sysOss == null) {
if (ObjectUtil.isNull(sysOss)) {
throw new ServiceException("文件数据不存在!");
}
response.reset();

4
ruoyi-ui/src/utils/download.js
View File

@ -42,10 +42,12 @@ export function downLoadExcel(url, params) {
if (value !== null && typeof(value) !== "undefined") {
if (typeof value === 'object') {
for (const key of Object.keys(value)) {
if (value[key] !== null && typeof (value[key]) !== 'undefined') {
let params = propName + '[' + key + ']';
var subPart = encodeURIComponent(params) + "=";
let subPart = encodeURIComponent(params) + "="
urlparams += subPart + encodeURIComponent(value[key]) + "&";
}
}
} else {
urlparams += part + encodeURIComponent(value) + "&";
}