From ecb361733a4f90ad1672c422577292a18c0fd2bb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 一月 2020 09:46:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java
index 9c12447..a1e168b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java
@@ -27,6 +27,7 @@
import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.FilePathEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
@@ -73,7 +74,7 @@
String contentType = file.getContentType();
String type = contentType.substring(contentType.indexOf("/") + 1);
String uploadFilePath = COSManager.getInstance()
- .uploadFile(inputStream, UUID.randomUUID().toString().replace("-", "") + "." + type).getUrl();
+ .uploadFile(inputStream, FilePathEnum.section.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type).getUrl();
out.print(JsonUtil.loadTrueResult(uploadFilePath));
} catch (IOException e) {
e.printStackTrace();
@@ -96,7 +97,7 @@
String contentType = file.getContentType();
String type = contentType.substring(contentType.indexOf("/") + 1);
String uploadFilePath = COSManager.getInstance()
- .uploadFile(inputStream, UUID.randomUUID().toString().replace("-", "") + "." + type + ".apk")
+ .uploadFile(inputStream, FilePathEnum.apk.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type + ".apk")
.getUrl();
out.print(JsonUtil.loadTrueResult(uploadFilePath));
} catch (Exception e) {
@@ -114,7 +115,7 @@
String contentType = file.getContentType();
String type = contentType.substring(contentType.indexOf("/") + 1);
String uploadFilePath = COSManager.getInstance()
- .uploadFile(inputStream, "section/" + date + "/" + timeMillis + "." + type).getUrl();
+ .uploadFile(inputStream, FilePathEnum.section.getPath() + timeMillis + "." + type).getUrl();
JSONObject data = new JSONObject();
data.put("original", file.getOriginalFilename());
data.put("name", file.getOriginalFilename());
@@ -274,7 +275,7 @@
String contentType = file.getContentType();
String type = contentType.substring(contentType.indexOf("/") + 1);
// 涓婁紶鏂囦欢鐩稿浣嶇疆
- String fileUrl="/img/admin/" + UUID.randomUUID().toString().replace("-", "") + "." + type;
+ String fileUrl=FilePathEnum.section.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type;
String uploadPath = COSManager.getInstance().uploadFile(inputStream, fileUrl).getUrl();
@@ -313,7 +314,7 @@
String type = contentType.substring(contentType.indexOf("/") + 1);
// 涓婁紶鏂囦欢鐩稿浣嶇疆
- String fileUrl="/apk/admin/" + UUID.randomUUID().toString().replace("-", "") + "." + type + ".apk";
+ String fileUrl= FilePathEnum.apk.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type + ".apk";
String uploadFilePath = COSManager.getInstance().uploadFile(inputStream, fileUrl).getUrl();
--
Gitblit v1.8.0