From 39dfa72369eca722241a49befd15aca386e88a34 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 16 Jan 2021 16:44:17 +0800
Subject: [PATCH] Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api
---
zq-erp/src/main/java/com/matrix/system/hive/plugin/util/ImageUtil.java | 6 +++---
zq-erp/src/main/resources/config/system.properties | 2 +-
zq-erp/src/main/resources/config/test/system.properties | 2 +-
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 6 ++++--
4 files changed, 9 insertions(+), 7 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 b4d1a24..7ade3bb 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
@@ -108,6 +108,8 @@
// 文件保存目录路径
String savePath = fileStoragePath;
String abstractPath= DateUtil.dateFormatStr(new Date(),DateUtil.DATE_FORMAT_NO_SPLITE_DD);
+ savePath=savePath+File.separator+abstractPath;
+
String fileName =UUIDUtil.getRandomID() + ".png";
@@ -126,11 +128,11 @@
uploadDir.mkdir();
}
- ImageUtil.base64ToFile(uploadPhotoDto.getBase64(), savePath+File.separator+abstractPath, fileName);
+ ImageUtil.base64ToFile(uploadPhotoDto.getBase64(),savePath , fileName);
LogUtil.info("fileName : {}", fileName);
AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("上传成功");
- ajaxResult.putInMap("file", nginxUrl +"/"+ abstractPath+fileName);
+ ajaxResult.putInMap("file", nginxUrl + abstractPath+"/"+fileName);
return ajaxResult;
}
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/plugin/util/ImageUtil.java b/zq-erp/src/main/java/com/matrix/system/hive/plugin/util/ImageUtil.java
index bca8330..9d72a61 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/plugin/util/ImageUtil.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/plugin/util/ImageUtil.java
@@ -64,9 +64,9 @@
public static String base64ToFile(String base64Str, String savePath, String fileName) {
- String fileDir = DateUtil.dateToString(new Date(), DateUtil.DATE_FORMAT_NO_SPLITE_DD);
- File dir = new File(savePath + fileDir);
+
+ File dir = new File(savePath);
if (!dir.isDirectory()) {
dir.mkdir();
}
@@ -74,7 +74,7 @@
BufferedOutputStream bos = null;
FileOutputStream fos = null;
File file = null;
- String filePathAndName = fileDir + File.separator + fileName;
+ String filePathAndName = dir + File.separator + fileName;
BASE64Decoder decoder = new BASE64Decoder();
byte[] bfile = new byte[0];
try {
diff --git a/zq-erp/src/main/resources/config/system.properties b/zq-erp/src/main/resources/config/system.properties
index 8a17d20..4b4664a 100644
--- a/zq-erp/src/main/resources/config/system.properties
+++ b/zq-erp/src/main/resources/config/system.properties
@@ -17,7 +17,7 @@
#文件保存地址
#file_storage_path=/mnt/hive/static/uploadeFile/
-file_storage_path=/Users/jiangyouyao/java/webresources/
+file_storage_path=E:\\20210116
#文件上传大小字节为单位 10MB
maxUploadSize=10485760
diff --git a/zq-erp/src/main/resources/config/test/system.properties b/zq-erp/src/main/resources/config/test/system.properties
index a7923b6..568731d 100644
--- a/zq-erp/src/main/resources/config/test/system.properties
+++ b/zq-erp/src/main/resources/config/test/system.properties
@@ -12,7 +12,7 @@
default_password=123
#nginx静态资源访问地址
-static_resource_url=https://testfile.hive.jyymatrix.cc/
+static_resource_url=http://testfile.hive.jyymatrix.cc/
#文件保存地址
file_storage_path=/mnt/upload/
#文件上传大小字节为单位 10MB
--
Gitblit v1.9.1