From 0a54c5df5c1a1f77570a07ff008ed90ff9d17da4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 27 Sep 2021 15:51:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/controller/CommonController.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java b/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
index 33804e3..357c82a 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
@@ -4,6 +4,9 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.*;
+import cc.mrbird.febs.mall.dto.Base64UploadDto;
+import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
+import cc.mrbird.febs.mall.service.ICommonService;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.Api;
@@ -18,6 +21,7 @@
import java.io.IOException;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -32,6 +36,7 @@
public class CommonController {
private final RedisUtils redisUtils;
+ private final ICommonService commonService;
@ApiOperation(value = "获取验证码接口", notes = "获取验证码通用接口")
@GetMapping(value = "/verifyCode")
@@ -76,8 +81,8 @@
@PostMapping(value = "/uploadFileBase64")
@ControllerEndpoint(operation = "图片上传", exceptionMessage = "上传失败")
public Map<String,Object> uploadFileBase64(@RequestBody @Validated MultipartFile file) {
- if (file.isEmpty()) {
- new FebsResponse().message("上传文件为空");
+ if (file == null || file.isEmpty()) {
+ return new FebsResponse().message("上传文件为空");
}
//文件加密
@@ -105,4 +110,35 @@
map2.put("title",imageNames);//图片名称，这个会显示在输入框里
return map;
}
+
+ @ApiOperation(value = "数据字典")
+ @GetMapping(value = "/findDataDic/{type}")
+ public FebsResponse findDataDic(@PathVariable("type") String type) {
+ List<DataDictionaryCustom> dic = commonService.findDataDicByType(type);
+ return new FebsResponse().success().data(dic);
+ }
+
+ @ApiOperation(value = "base64上传")
+ @PostMapping(value = "/base64Upload")
+ public FebsResponse base64Upload(@RequestBody @Validated Base64UploadDto base64UploadDto) {
+ String base64Str = base64UploadDto.getBase64Str();
+ if (base64Str.startsWith("data:image")) {
+ base64Str = base64Str.substring(base64Str.indexOf(",") + 1, base64Str.length() - 1);
+ }
+
+ String imageFuffix = ".jpg";
+ String imageNames = System.currentTimeMillis() + IdUtil.simpleUUID() + imageFuffix;
+ String imageName = "uploadeFile/" + imageNames;
+ OssUtils.uploadFileWithBase64(base64Str, imageName);
+ String bucket_name ="https://excoin.oss-cn-hangzhou.aliyuncs.com";
+ String url = bucket_name + "/" + imageName;
+
+ return new FebsResponse().message("上传成功").success().data(url);
+ }
+
+ @ApiOperation(value = "获取版本信息")
+ @GetMapping(value = "/appVersion")
+ public FebsResponse appVersion() {
+ return new FebsResponse().message("获取成功").success().data(commonService.findAppVersion());
+ }
}
--
Gitblit v1.9.1