From 21173f7ae60b1c598720c87ab966ea42b3d72c6a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 二月 2022 13:12:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/sc/manager/controller/param/MobileIssueParam.java | 1 +
src/main/java/com/zy/sc/common/service/OssService.java | 36 ++++--------------------------------
src/main/java/com/zy/sc/common/web/UploadController.java | 6 ++----
src/main/java/com/zy/sc/manager/controller/AppController.java | 4 ++--
4 files changed, 9 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/sc/common/service/OssService.java b/src/main/java/com/zy/sc/common/service/OssService.java
index ebda706..cb573e7 100644
--- a/src/main/java/com/zy/sc/common/service/OssService.java
+++ b/src/main/java/com/zy/sc/common/service/OssService.java
@@ -12,14 +12,12 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.InputStream;
import java.net.URL;
import java.security.SecureRandom;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Objects;
/**
* 闃块噷浜慜SS鏈嶅姟绫�
@@ -55,21 +53,16 @@
* 涓婁紶OSS鏂囦欢
* @return the url
*/
- public String upload(InputStream inputStream, String suffix){
- if(suffix.trim().equals("file")){
- suffix="jpg";
- }
+ public String upload(InputStream inputStream, String fileName){
OSSClient ossClient = new OSSClient(OSS_ENDPOINT, accessKeyId, accessKeySecret);
- String name = "";
try {
if (!ossClient.doesBucketExist(bucket)) {
ossClient.createBucket(bucket);
log.info("鎮ㄧ殑Bucket涓嶅瓨鍦紝鍒涘缓Bucket锛歿}",bucket);
}
- name = String.valueOf(snowflakeIdWorker.nextId()).concat(".").concat(suffix);
- // 娣诲姞 ContentType
+ String suffix = Objects.requireNonNull(fileName).substring(fileName.lastIndexOf(".") + 1);
+ String name = String.valueOf(snowflakeIdWorker.nextId()).concat(".").concat(suffix);
ObjectMetadata objectMetadata = new ObjectMetadata();
- objectMetadata.setContentType("image/jpg");
ossClient.putObject(bucket, name, inputStream, objectMetadata);
Date expiration = new Date(new Date().getTime() + 3600L * 1000 * 24 * 365 * 100);
URL url = ossClient.generatePresignedUrl(bucket, name, expiration);
@@ -82,10 +75,6 @@
ossClient.shutdown();
}
throw new CoolException("500-涓婁紶澶辫触");
- }
-
- public String upload(InputStream inputStream) {
- return upload(inputStream, ".jpg");
}
/**
@@ -120,23 +109,6 @@
ossClient.shutdown();
}
return true;
- }
-
- public static void main(String[] args) {
- File file = new File("E:\\tmp\\v2-fbbb97b977b5cebc66dc3cefab0ac981_r.jpg");
- try {
- InputStream in = new FileInputStream(file);
- OssService ossService = new OssService();
- ossService.setAccessKeyId("LTAI4GDzr6ioSHuRw2mk22ug");
- ossService.setAccessKeySecret("84CHL7tF21LbU1qpaP0jn9mIAZP9bv");
- ossService.setBucket("tjdt");
- ossService.setEndpoint("http://oss-cn-hangzhou.aliyuncs.com");
- ossService.setSnowflakeIdWorker(new SnowflakeIdWorker());
- System.out.println(ossService.upload(in));
-
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- }
}
public String uploadFile(InputStream inputStream, String fileName, Long len, String suffix){
diff --git a/src/main/java/com/zy/sc/common/web/UploadController.java b/src/main/java/com/zy/sc/common/web/UploadController.java
index 0165414..5417ed8 100644
--- a/src/main/java/com/zy/sc/common/web/UploadController.java
+++ b/src/main/java/com/zy/sc/common/web/UploadController.java
@@ -31,14 +31,13 @@
@PostMapping("/upload.action")
public R upload(MultipartFile file) {
- String suffix = file.getName().substring(file.getName().lastIndexOf(".") + 1);
InputStream inputStream = null;
try {
inputStream = file.getInputStream();
} catch (IOException e) {
e.printStackTrace();
}
- String upload=ossService.upload(inputStream,suffix);
+ String upload = ossService.upload(inputStream,file.getOriginalFilename());
return R.ok(Cools.add("url", upload));
}
@@ -58,14 +57,13 @@
return R.error("鍥剧墖涓婁紶鏁伴噺宸插埌涓婇檺");
}
// oss
- String suffix = file.getName().substring(file.getName().lastIndexOf(".") + 1);
InputStream inputStream = null;
try {
inputStream = file.getInputStream();
} catch (IOException e) {
e.printStackTrace();
}
- String upload = ossService.upload(inputStream,suffix);
+ String upload = ossService.upload(inputStream,file.getOriginalFilename());
if (Cools.isEmpty(upload)) {
return R.error("涓婁紶OSS鏈嶅姟澶辫触");
}
diff --git a/src/main/java/com/zy/sc/manager/controller/AppController.java b/src/main/java/com/zy/sc/manager/controller/AppController.java
index d893968..c8fd7a6 100644
--- a/src/main/java/com/zy/sc/manager/controller/AppController.java
+++ b/src/main/java/com/zy/sc/manager/controller/AppController.java
@@ -97,7 +97,7 @@
param.getTitle(), // 闂姒傝堪
null, // 鏁呴殰鍘熷洜
null, // 瑙ｅ喅鍔炴硶
- null, // 鏂囦欢鍒楄〃
+ JSONArray.toJSONString(param.getVideoSrc()), // 鏂囦欢鍒楄〃
JSONArray.toJSONString(param.getImgArr()), // 鍥剧墖
startTime, // 鍙戠敓鏃ユ湡
null, // 澶勭悊鏃ユ湡
@@ -136,7 +136,7 @@
AppIssueVo vo = new AppIssueVo();
vo.setIssueId(issue.getId());
vo.setTitle(issue.getTitle().length()>12?issue.getTitle().substring(0, 12):issue.getTitle());
- vo.setStartTime(issue.getStartTime$().substring(0, 11));
+ vo.setStartTime(issue.getStartTime$().length()>11?issue.getStartTime$().substring(0, 11):issue.getStartTime$());
vo.setSettle(issue.getSettle$());
if (!hostSet.contains(issue.getHostId())) {
diff --git a/src/main/java/com/zy/sc/manager/controller/param/MobileIssueParam.java b/src/main/java/com/zy/sc/manager/controller/param/MobileIssueParam.java
index 80558e0..ac3820a 100644
--- a/src/main/java/com/zy/sc/manager/controller/param/MobileIssueParam.java
+++ b/src/main/java/com/zy/sc/manager/controller/param/MobileIssueParam.java
@@ -26,5 +26,6 @@
private List<String> imgArr;
+ private List<String> videoSrc;
}
--
Gitblit v1.9.1