重构底层上传组件,支持表格动态渲染

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/FileController.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
 
 /**
  *<p>
@@ -52,7 +53,7 @@ public class FileController {
 	}
 
 	@PostMapping("/upload")
-	public R upload(@RequestPart("file") MultipartFile file) {
+	public Map upload(@RequestPart("file") MultipartFile file) {
 		return fileService.uploadFile(file);
 	}
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java

@@ -32,6 +32,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -162,7 +163,7 @@ public class UserController {
     @SysLog("用户头像修改")
     @PutMapping("/updateAvatar")
     @PreAuthorize("@pms.hasPermission('user_edit')")
-    public R updateAvatar(@RequestParam("avatarFile") MultipartFile file) {
+    public Map updateAvatar(@RequestParam("avatarFile") MultipartFile file) {
         return fileService.uploadFile(file);
     }
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/FileService.java

@@ -6,6 +6,7 @@ import com.cloud.kicc.common.core.api.R;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
 
 /**
  *<p>
@@ -22,7 +23,7 @@ public interface FileService extends IService<File> {
 	 * @param file
 	 * @return
 	 */
-	R uploadFile(MultipartFile file);
+	Map uploadFile(MultipartFile file);
 
 	/**
 	 * 读取文件

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/FileServiceImpl.java

@@ -7,6 +7,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.amazonaws.services.s3.model.S3Object;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cloud.kicc.common.core.exception.CheckedException;
 import com.cloud.kicc.system.api.entity.File;
 import com.cloud.kicc.system.mapper.FileMapper;
 import com.cloud.kicc.system.service.FileService;
@@ -40,21 +41,20 @@ public class FileServiceImpl extends ServiceImpl<FileMapper, File> implements Fi
 	private final OssTemplate ossTemplate;
 
 	@Override
-	public R uploadFile(MultipartFile file) {
+	public Map uploadFile(MultipartFile file) {
 		String fileName = IdUtil.simpleUUID() + StrUtil.DOT + FileUtil.extName(file.getOriginalFilename());
 		Map<String, String> resultMap = new HashMap<>(4);
 		resultMap.put("bucketName", ossProperties.getBucketName());
 		resultMap.put("fileName", fileName);
-		resultMap.put("url", String.format("/system_proxy/system/file/%s/%s", ossProperties.getBucketName(), fileName));
+		resultMap.put("url", String.format("/system_proxy/system/file/getFile/%s/%s", ossProperties.getBucketName(), fileName));
 		try {
 			ossTemplate.putObject(ossProperties.getBucketName(), fileName, file.getContentType(), file.getInputStream());
 			// 文件管理数据记录,收集管理追踪文件
 			fileLog(file, fileName);
 		} catch (Exception e) {
-			log.error("上传失败", e);
+			throw new CheckedException("上传失败");
-			return R.error(e.getLocalizedMessage());
 		}
-		return R.ok(resultMap);
+		return resultMap;
 	}
 
 	@Override

kicc-ui

@@ -1 +1 @@
-Subproject commit cc89475ce363a510dc74affbf0fc5f46c5867f5d
+Subproject commit 2b1a47a0969ca012fa2f3cce0fd3e90212e6e28e