From f8b1073fbb28d37e08016eed32c682f8c5eae391 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 02 二月 2024 17:26:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/platform/src/main/java/com/doumee/api/common/PublicController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/common/PublicController.java b/server/platform/src/main/java/com/doumee/api/common/PublicController.java
index 24111aa..5aa2019 100644
--- a/server/platform/src/main/java/com/doumee/api/common/PublicController.java
+++ b/server/platform/src/main/java/com/doumee/api/common/PublicController.java
@@ -171,6 +171,17 @@
String tempFileName = nowDate + "/" + fileName;
String key = folder + tempFileName;// 鏂囦欢鍚�
ALiYunUtil obs = new ALiYunUtil(endpoint,access_id, access_key);
+ int type = 2;
+ if(StringUtils.endsWith(key,".mp4")){
+ type =1;
+ }else if(StringUtils.endsWith(key,".jpg")
+ || StringUtils.endsWith(key,".JPG")
+ || StringUtils.endsWith(key,".png")
+ || StringUtils.endsWith(key,".PNG")
+ || StringUtils.endsWith(key,".jpeg")
+ || StringUtils.endsWith(key,".JPEG")){
+ type =0;
+ }
if (obs.uploadOnlineObject(file.getInputStream(),bucketName, key,null)) {
// 绉诲姩鎴愬姛,杩斿洖鏂囦欢鍚�
// sendSuccessMessage(response, resourcePath+key);
@@ -180,6 +191,7 @@
JSONObject fileJSON = new JSONObject();
fileJSON.put("url", resourcePath + key);
fileJSON.put("imgaddr", tempFileName);
+ fileJSON.put("type", type);
fileJSON.put("imgname", fileName);
fileJSON.put("originname", originname);
context.put("data",fileJSON);
--
Gitblit v1.9.3