From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonApi.java | 79 ++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 38 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonApi.java
index cdb8fff..51bd3a3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonApi.java
@@ -1,24 +1,29 @@
package com.panzhihua.grid_app.api;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
import com.panzhihua.common.constants.FtpConstants;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.SFTPUtil;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -32,6 +37,14 @@
@Api(tags = {"公共接口"})
public class CommonApi {
+ /**
+ * 允许的图片文件后缀
+ */
+ private static List<String> fileExtensionAllow = Arrays.asList("gif", "jpg", "png", "jpeg");
+ /**
+ * 允许的视频文件后缀
+ */
+ private static List<String> videoExtensionAllow = Arrays.asList("mp4", "mov");
// FTP 登录用户名
@Value("${ftp.username}")
private String userName;
@@ -46,41 +59,31 @@
private int port;
@Value("${ftp.url}")
private String url;
-
@Resource
private CommunityService communityService;
-
- /**
- * 允许的图片文件后缀
- */
- private static List<String> fileExtensionAllow = Arrays.asList("gif", "jpg", "png", "jpeg");
- /**
- * 允许的视频文件后缀
- */
- private static List<String> videoExtensionAllow = Arrays.asList("mp4", "mov");
@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();
+ // 微信图片内容校验
+ // WxMaSecCheckService wxMaSecCheckService = wxMaConfiguration.getMaService().getSecCheckService();
String property = System.getProperty("user.dir");
String fileExtension = ".jpg";
String originName = file.getOriginalFilename();
AtomicBoolean isVideo = new AtomicBoolean(false);
- videoExtensionAllow.forEach(ext ->{
+ videoExtensionAllow.forEach(ext -> {
String originNameLowerCase = originName.toLowerCase();
- if(originNameLowerCase.endsWith("." +ext)){
+ if (originNameLowerCase.endsWith("." + ext)) {
isVideo.set(true);
}
});
- if(isVideo.get()){
+ if (isVideo.get()) {
fileExtension = ".mp4";
}
- if(originName.toLowerCase().endsWith(".mp3")){
+ if (originName.toLowerCase().endsWith(".mp3")) {
fileExtension = ".mp3";
}
@@ -106,12 +109,11 @@
}
-
@ApiOperation(value = "批量上传照片/视频 (jpg/jpeg/png/mp4/mov)")
@PostMapping(value = "uploads", consumes = "multipart/*", headers = "content-type=multipart/form-date")
public R uploadImages(@RequestParam MultipartFile[] files, HttpServletRequest request) throws IOException {
-// 微信图片内容校验
-// WxMaSecCheckService wxMaSecCheckService = wxMaConfiguration.getMaService().getSecCheckService();
+ // 微信图片内容校验
+ // WxMaSecCheckService wxMaSecCheckService = wxMaConfiguration.getMaService().getSecCheckService();
String property = System.getProperty("user.dir");
String fileExtension = ".jpg";
@@ -119,27 +121,28 @@
SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
sftp.login();
- for (MultipartFile file:files) {
+ for (MultipartFile file : files) {
String originName = file.getOriginalFilename();
AtomicBoolean isVideo = new AtomicBoolean(false);
- videoExtensionAllow.forEach(ext ->{
+ videoExtensionAllow.forEach(ext -> {
String originNameLowerCase = originName.toLowerCase();
- if(originNameLowerCase.endsWith("." +ext)){
+ if (originNameLowerCase.endsWith("." + ext)) {
isVideo.set(true);
}
});
- if(isVideo.get()){
+ if (isVideo.get()) {
fileExtension = ".mp4";
}
- if(originName.toLowerCase().endsWith(".mp3")){
+ if (originName.toLowerCase().endsWith(".mp3")) {
fileExtension = ".mp3";
}
String name = UUID.randomUUID().toString().replaceAll("-", "") + fileExtension;
try {
InputStream is = file.getInputStream();
- String fileName = property + File.separator + UUID.randomUUID().toString().replace("-", "") + fileExtension;
+ String fileName =
+ property + File.separator + UUID.randomUUID().toString().replace("-", "") + fileExtension;
File file1 = new File(fileName);
file.transferTo(file1);
boolean delete = file1.delete();
@@ -157,7 +160,7 @@
@GetMapping("/getConf/noToken")
@ApiOperation(value = "根据code查询系统配置")
- public R getConf(@RequestParam("code") String code){
+ public R getConf(@RequestParam("code") String code) {
return communityService.getConf(code);
}
}
--
Gitblit v1.7.1