From 817bb83d5ec3e5ad379f10844362c74d8f836395 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 29 May 2020 16:15:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git
---
src/main/java/com/xcong/excoin/common/system/controller/CommonController.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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 8ba477e..f34d016 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,9 +1,13 @@
package com.xcong.excoin.common.system.controller;
+import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.xcong.excoin.common.contants.AppContants;
import com.xcong.excoin.common.response.Result;
+import com.xcong.excoin.common.system.dto.Base64UploadDto;
import com.xcong.excoin.common.system.service.CommonService;
+import com.xcong.excoin.configurations.properties.AliOssProperties;
+import com.xcong.excoin.utils.OssUtils;
import com.xcong.excoin.utils.RedisUtils;
import com.xcong.excoin.utils.SmsUtils;
import com.xcong.excoin.utils.mail.SubMailSend;
@@ -11,10 +15,8 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.HashMap;
@@ -39,6 +41,9 @@
@Resource
private CommonService commonservice;
+
+ @Resource
+ private AliOssProperties aliOssProperties;
@ApiOperation(value = "获取验证码接口", notes = "获取验证码通用接口")
@GetMapping(value = "/verifyCode")
@@ -89,7 +94,14 @@
@ApiOperation(value = "文件上次接口", notes = "文件上传")
@GetMapping(value = "/uploadFile")
- public Result uploadFile() {
- return null;
+ 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);
+ if (flag) {
+ String url = aliOssProperties.getBucketName() + "/" + imageName;
+ return Result.ok("success", url);
+ }
+ return Result.fail("上传失败");
}
}
--
Gitblit v1.9.1