From 05a82deffa89a22fa35abaa9196053f43cbc1103 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 27 May 2022 19:51:07 +0800 Subject: [PATCH] fix --- zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 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..81defe9 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()); @@ -279,7 +281,7 @@ res.setContentType("application/octet-stream;charset=UTF-8"); Date date = new Date(); - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日HH时mm分ss"); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); res.setHeader("Content-Disposition", "attachment;filename=" + java.net.URLEncoder.encode("订单列表" + dateFormat.format(date) + ".xlsx".trim(), "UTF-8")); -- Gitblit v1.9.1