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/shopXcx/action/ShopOrderAction.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java
index c318168..9180456 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java
@@ -34,6 +34,7 @@
import com.matrix.system.shopXcx.vo.LogisticsImportVo;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -82,7 +83,8 @@
@Autowired
private AsyncMessageManager asyncMessageManager;
-
+ @Value("${file_storage_path}")
+ private String fileStoragePath;
/**
* 导入快递单
*/
@@ -92,7 +94,7 @@
@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 = "E:/xcshop";
File fileDir = new File(dirPath);
LogUtil.info("#----->{}#", fileDir.exists());
--
Gitblit v1.9.1