From a672e4e8c05be9c763943a06cfe5220ef217934c Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 23 Jan 2021 20:07:44 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 6 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 e353f19..dfd5149 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,9 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.matrix.component.redis.RedisClient;
import com.matrix.core.pojo.AjaxResult;
-import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.StringUtils;
-import com.matrix.core.tools.UUIDUtil;
+import com.matrix.core.tools.*;
import com.matrix.system.app.authority.AppAuthorityManager;
import com.matrix.system.app.dto.LoginDto;
import com.matrix.system.app.dto.PwdResetDto;
@@ -18,6 +16,8 @@
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.tools.PasswordUtil;
+import com.matrix.system.common.tools.UploadUtil;
+import com.matrix.system.hive.bean.AppVersion;
import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.plugin.util.ImageUtil;
@@ -26,20 +26,28 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
+import org.apache.commons.fileupload.FileUploadException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.File;
+import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @author wzy
* @date 2020-12-21
**/
+@CrossOrigin(origins = "*")
@Api(value = "CommonAction", tags = "手机端公共请求类(含登陆)")
@RestController
@RequestMapping(value = "/api/common")
@@ -104,9 +112,16 @@
public AjaxResult uploadPhotoBase64(@RequestBody @Validated UploadPhotoDto uploadPhotoDto) {
// 文件保存目录路径
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";
+
+
// 文件保存目录URL
String saveUrl = nginxUrl;
-
+ LogUtil.debug("图片保存目录路径={}",fileStoragePath);
+ LogUtil.debug("图片保存目录URL={}",nginxUrl);
// 保存和访问路径检查
if (StringUtils.isBlank(saveUrl) || StringUtils.isBlank(savePath)) {
return AjaxResult.buildFailInstance("文件上传失败错误代码：001");
@@ -118,13 +133,32 @@
uploadDir.mkdir();
}
- String fileName = ImageUtil.base64ToFile(uploadPhotoDto.getBase64(), savePath, UUIDUtil.getRandomID() + ".png");
+ ImageUtil.base64ToFile(uploadPhotoDto.getBase64(),savePath , fileName);
LogUtil.info("fileName : {}", fileName);
AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("上传成功");
- ajaxResult.putInMap("file", saveUrl + fileName);
+ ajaxResult.putInMap("file", nginxUrl + abstractPath+"/"+fileName);
return ajaxResult;
}
+
+
+ String folderType = "image";
+ public final static List<FileType> EXT_LIST = new ArrayList<FileType>();
+ static {
+ EXT_LIST.add(FileType.JPEG);
+ EXT_LIST.add(FileType.PNG);
+ }
+
+ @ApiOperation(value = "表单图片上传接口", notes = "表单图片上传接口")
+ @PostMapping(value = "/uploadImg")
+ public AjaxResult uploadImg(HttpServletResponse response, MultipartHttpServletRequest request)
+ throws IOException, FileUploadException, NoSuchAlgorithmException {
+ Map<String, String> fileMap = UploadUtil.doUpload(request, EXT_LIST, folderType, 1L);
+ AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("上传成功");
+ ajaxResult.putInMap("file", fileMap.get("visitPath"));
+ return ajaxResult;
+ }
+
@ApiOperation(value = "短信验证码发送", notes = "短信验证码发送")
@PostMapping(value = "/sendSmsCode")
@@ -174,4 +208,13 @@
}
return AjaxResult.buildFailInstance("修改失败");
}
+
+ @ApiOperation(value = "获取app版本", notes = "获取app版本")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "ok", response = AppVersion.class)
+ })
+ @GetMapping(value = "/findAppVersion")
+ public AjaxResult findAppVersion() {
+ return AjaxResult.buildSuccessInstance(sysUsersService.findAppVersion());
+ }
}
--
Gitblit v1.9.1