From 993a6e6ea8ae047b9e5fffd249ae7adfcd650d3a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 17 五月 2026 11:35:44 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/OssController.java | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 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 0d14245..c2e7fa4 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
@@ -35,22 +35,22 @@
public R<FileUploadVO> uploadOSS(@RequestParam("file") MultipartFile file) {
try {
// 上传并返回访问地址
-// String fileName = file.getOriginalFilename();
-// String prefix = fileName.substring(fileName.lastIndexOf("."));
-// 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);
-
+ String fileName = file.getOriginalFilename();
+ String prefix = fileName.substring(fileName.lastIndexOf("."));
+ 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(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);
@@ -66,22 +66,22 @@
public R<FileUploadVO> uploadOSS1(@RequestParam("file") MultipartFile file) {
try {
// 上传并返回访问地址
-// String fileName = file.getOriginalFilename();
-// String prefix = fileName.substring(fileName.lastIndexOf("."));
-// 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);
-
+ String fileName = file.getOriginalFilename();
+ String prefix = fileName.substring(fileName.lastIndexOf("."));
+ 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(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