From 4bd80985d1bbb835a6f992f533e24551d769aba0 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Sat, 16 Jan 2021 16:12:12 +0800
Subject: [PATCH] 图片配置修改

---
 zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 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 745d102..b4d1a24 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
@@ -3,6 +3,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.matrix.component.redis.RedisClient;
 import com.matrix.core.pojo.AjaxResult;
+import com.matrix.core.tools.DateUtil;
 import com.matrix.core.tools.LogUtil;
 import com.matrix.core.tools.StringUtils;
 import com.matrix.core.tools.UUIDUtil;
@@ -35,6 +36,7 @@
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.security.NoSuchAlgorithmException;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -105,9 +107,14 @@
     public AjaxResult uploadPhotoBase64(@RequestBody @Validated UploadPhotoDto uploadPhotoDto) {
         // 文件保存目录路径
         String savePath = fileStoragePath;
+        String abstractPath= DateUtil.dateFormatStr(new Date(),DateUtil.DATE_FORMAT_NO_SPLITE_DD);
+        String fileName =UUIDUtil.getRandomID() + ".png";
+
+
         // 文件保存目录URL
         String saveUrl = nginxUrl;
-
+        LogUtil.debug("图片保存目录路径={}",fileStoragePath);
+        LogUtil.debug("图片保存目录URL={}",nginxUrl);
         // 保存和访问路径检查
         if (StringUtils.isBlank(saveUrl) || StringUtils.isBlank(savePath)) {
             return AjaxResult.buildFailInstance("文件上传失败错误代码:001");
@@ -119,14 +126,18 @@
             uploadDir.mkdir();
         }
 
-        String fileName = ImageUtil.base64ToFile(uploadPhotoDto.getBase64(), savePath, UUIDUtil.getRandomID() + ".png");
+        ImageUtil.base64ToFile(uploadPhotoDto.getBase64(), savePath+File.separator+abstractPath, fileName);
         LogUtil.info("fileName : {}", fileName);
 
         AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("上传成功");
-        ajaxResult.putInMap("file", saveUrl + fileName);
+        ajaxResult.putInMap("file", nginxUrl +"/"+ abstractPath+fileName);
         return ajaxResult;
     }
 
+
+
+
+
     @ApiOperation(value = "短信验证码发送", notes = "短信验证码发送")
     @PostMapping(value = "/sendSmsCode")
     public AjaxResult sendSmsCode(@RequestBody @Validated SmsCodeDto smsCodeDto) {

--
Gitblit v1.9.1