From d65675232238852047ffcea0a0a2230104c7a4e5 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 02 Mar 2022 22:50:00 +0800
Subject: [PATCH] Merge branch '配置文件改造' into developer
---
zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
index fed9f78..64ae132 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
@@ -7,7 +7,6 @@
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.PropertiesUtil;
import com.matrix.core.tools.WebUtil;
import com.matrix.core.tools.excl.ExcelSheetPO;
import com.matrix.core.tools.excl.ExcelUtil;
@@ -31,6 +30,7 @@
import com.matrix.system.hive.service.*;
import com.matrix.system.score.dao.ScoreVipDetailDao;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -56,6 +56,11 @@
@Controller
@RequestMapping(value = "admin/vipInfo")
public class VipInfoController extends BaseController {
+
+
+ @Value("${file_storage_path}")
+ private String fileStoragePath;
+
@Resource
private SysVipInfoService vipInfoService;
@@ -605,12 +610,14 @@
return showList(vipInfoService, info, null);
}
+
+
@RequestMapping(value = "/importVipInfo")
@ResponseBody
public AjaxResult importVipInfo(HttpServletResponse response, HttpServletRequest request, @RequestParam(value = "file", required = false) MultipartFile file) throws IOException {
String fileName = file.getOriginalFilename();
- String dirPath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
+ String dirPath = fileStoragePath;
// String dirPath = "C:/Users/wzy19/Desktop/zq";
File fileDir = new File(dirPath);
LogUtil.info("#----->{}#", fileDir.exists());
--
Gitblit v1.9.1