From 40233f2db14728cbfaaeba1dc180270daa40dbd8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 21 Jun 2021 11:36:01 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/common/system/controller/CommonController.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/common/system/controller/CommonController.java b/src/main/java/com/xcong/excoin/common/system/controller/CommonController.java
index bca5a3c..73a13af 100644
--- a/src/main/java/com/xcong/excoin/common/system/controller/CommonController.java
+++ b/src/main/java/com/xcong/excoin/common/system/controller/CommonController.java
@@ -1,6 +1,7 @@
package com.xcong.excoin.common.system.controller;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.xcong.excoin.common.contants.AppContants;
@@ -13,10 +14,7 @@
import com.xcong.excoin.configurations.properties.AliOssProperties;
import com.xcong.excoin.modules.blackchain.service.TrxUsdtUpdateService;
import com.xcong.excoin.modules.platform.dao.SysExceptionDetailDao;
-import com.xcong.excoin.utils.MessageSourceUtils;
-import com.xcong.excoin.utils.OssUtils;
-import com.xcong.excoin.utils.RedisUtils;
-import com.xcong.excoin.utils.SmsUtils;
+import com.xcong.excoin.utils.*;
import com.xcong.excoin.utils.mail.Sms106Send;
import com.xcong.excoin.utils.mail.SmsSend;
import com.xcong.excoin.utils.mail.SubMailSend;
@@ -27,14 +25,18 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.io.File;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.text.DateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -60,6 +62,12 @@
@Resource
private AliOssProperties aliOssProperties;
+
+ @Value("${file.storage.path}")
+ private String filePath;
+
+ @Value("${file.storage.url}")
+ private String fileUrl;
@ApiOperation(value = "获取验证码接口", notes = "获取验证码通用接口")
@GetMapping(value = "/verifyCode")
@@ -111,10 +119,21 @@
@ApiOperation(value = "文件上次接口", notes = "文件上传")
@PostMapping(value = "/uploadFileBase64")
public Result uploadFileBase64(@RequestBody @Validated Base64UploadDto uploadDto) {
- String imageName = "uploadeFile/image/" + System.currentTimeMillis() + IdUtil.simpleUUID() + AppContants.UPLOAD_IMAGE_SUFFIX;
- boolean flag = OssUtils.uploadFileWithBase64(uploadDto.base64Str, imageName);
+// String imageName = "uploadeFile/image/" + System.currentTimeMillis() + IdUtil.simpleUUID() + AppContants.UPLOAD_IMAGE_SUFFIX;
+// boolean flag = OssUtils.uploadFileWithBase64(uploadDto.base64Str, imageName);
+
+ String imagesPath = filePath + "/" + DateUtil.format(new Date(), "yyyyMMdd");
+ File pathFile = new File(imagesPath);
+ if (pathFile.isDirectory()) {
+ pathFile.mkdirs();
+ }
+
+ String imageName = System.currentTimeMillis() + IdUtil.simpleUUID() + AppContants.UPLOAD_IMAGE_SUFFIX;
+
+ boolean flag = ImageUtils.base64ToImg(uploadDto.base64Str, imagesPath + "/" + imageName);
if (flag) {
- String url = aliOssProperties.getBucketName() + "/" + imageName;
+// String url = aliOssProperties.getBucketName() + "/" + imageName;
+ String url = fileUrl + imageName;
return Result.ok(MessageSourceUtils.getString("result_success_msg"), url);
}
return Result.fail(MessageSourceUtils.getString("uploadFile_controller_0001"));
--
Gitblit v1.9.1