From ceea128c48d5b21ebd1bb46943d656446aa974ec Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 24 Feb 2022 23:22:03 +0800
Subject: [PATCH] Merge branch '配置文件改造' into developer

---
 zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
index ed9b2c4..1e8fb3b 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
@@ -59,6 +59,9 @@
 @RestController
 @RequestMapping(value = "/api/common")
 public class ApiCommonAction {
+    @Autowired
+    UploadUtil uploadUtil;
+
 
     @Autowired
     private SysUsersService sysUsersService;
@@ -169,11 +172,12 @@
         EXT_LIST.add(FileType.PNG);
     }
 
+
     @ApiOperation(value = "表单图片上传接口", notes = "表单图片上传接口")
     @PostMapping(value = "/uploadImg")
     public AjaxResult uploadImg(HttpServletResponse response, MultipartHttpServletRequest request)
             throws IOException, FileUploadException, NoSuchAlgorithmException {
-        Map<String, String> fileMap = UploadUtil.doUpload(request, EXT_LIST, folderType, 1L);
+        Map<String, String> fileMap = uploadUtil.doUpload(request, EXT_LIST, folderType, 1L);
         AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("上传成功");
         ajaxResult.putInMap("file", fileMap.get("visitPath"));
         return ajaxResult;

--
Gitblit v1.9.1