From 1ef5cb1cd1799b65116ebc236313429431b79c0c Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 13 五月 2021 13:16:12 +0800
Subject: [PATCH] add:小程序添加视频上传
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
index e1cb5bb..158d294 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
@@ -1,15 +1,12 @@
package com.panzhihua.applets.api;
import cn.binarywang.wx.miniapp.api.WxMaSecCheckService;
-import com.netflix.discovery.converters.Auto;
import com.panzhihua.applets.config.WxMaConfiguration;
import com.panzhihua.common.constants.FtpConstants;
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.area.AreaInfoVo;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.common.service.community.CommunityService;
-import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.SFTPUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -28,10 +25,12 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Arrays;
import java.util.Base64;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -61,22 +60,46 @@
@Value("${ftp.url}")
private String url;
+ /**
+ * 允许的图片文件后缀
+ */
+ private static List<String> fileExtensionAllow = Arrays.asList("gif", "jpg", "png", "jpeg");
+ /**
+ * 允许的视频文件后缀
+ */
+ private static List<String> videoExtensionAllow = Arrays.asList("mp4", "mov");
+
@Resource
private WxMaConfiguration wxMaConfiguration;
@Resource
private CommunityService communityService;
- @ApiOperation(value = "上传照片")
+ @ApiOperation(value = "上传照片/视频 (jpg/jpeg/png/mp4/mov)")
@PostMapping(value = "uploadimage", consumes = "multipart/*", headers = "content-type=multipart/form-date")
public R uploadImage(@RequestParam MultipartFile file, HttpServletRequest request) throws IOException {
// 微信图片内容校验
WxMaSecCheckService wxMaSecCheckService = wxMaConfiguration.getMaService().getSecCheckService();
String property = System.getProperty("user.dir");
- String fileName = property + File.separator + UUID.randomUUID().toString().replace("-", "") + ".jpg";
+
+ String fileExtension = ".jpg";
+
+ String originName = file.getOriginalFilename();
+ AtomicBoolean isVideo = new AtomicBoolean(false);
+ videoExtensionAllow.forEach(ext ->{
+ if(ext.equalsIgnoreCase(originName)){
+ isVideo.set(true);
+ }
+ });
+ if(isVideo.get()){
+ fileExtension = ".mp4";
+ }
+
+
+ String fileName = property + File.separator + UUID.randomUUID().toString().replace("-", "") + fileExtension;
File file1 = new File(fileName);
String name = file.getOriginalFilename();
- name = UUID.randomUUID().toString().replaceAll("-", "") + ".jpg";
+ name = UUID.randomUUID().toString().replaceAll("-", "") + fileExtension;
try {
SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
sftp.login();
--
Gitblit v1.7.1