From ef32f6913325bb593d537b4ff433545f73ecb79a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 11 三月 2026 10:00:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/OssController.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/OssController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/OssController.java
index c004ab3..771f9e9 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/OssController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/OssController.java
@@ -40,17 +40,17 @@
long fileSize = file.getSize();
String fileId = UUID.randomUUID().toString();
//上传文件
- aliOssService.uploadFile(file.getBytes(), fileId);
- String downloadUrl = aliOssService.getDownloadUrl(fileId, fileName,true);
- FileUploadVO fileUploadVO = new FileUploadVO();
- fileUploadVO.setId(fileId);
- fileUploadVO.setName(fileName);
- fileUploadVO.setUrl(downloadUrl);
-
+// aliOssService.uploadFile(file.getBytes(), fileId);
+// String downloadUrl = aliOssService.getDownloadUrl(fileId, fileName,true);
// FileUploadVO fileUploadVO = new FileUploadVO();
-// fileUploadVO.setId(UUID.randomUUID().toString());
-// fileUploadVO.setName("测试.jpg");
-// fileUploadVO.setUrl("https://huishou-1323682843.cos.ap-nanjing.myqcloud.com/images/552a3a31-e4dd-4a28-8748-fd8b87dd3055.png");
+// fileUploadVO.setId(fileId);
+// fileUploadVO.setName(fileName);
+// fileUploadVO.setUrl(downloadUrl);
+
+ FileUploadVO fileUploadVO = new FileUploadVO();
+ fileUploadVO.setId(UUID.randomUUID().toString());
+ fileUploadVO.setName("测试.jpg");
+ fileUploadVO.setUrl("https://huishou-1323682843.cos.ap-nanjing.myqcloud.com/images/552a3a31-e4dd-4a28-8748-fd8b87dd3055.png");
return R.ok(fileUploadVO);
} catch (Exception e) {
System.err.println("上传文件失败"+e);
--
Gitblit v1.7.1