From 2ab85c2d24ee2c94cd9225334f0dda85c90011f6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 12 三月 2026 10:01:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/OssController.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 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 771f9e9..fe93410 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
@@ -30,16 +30,12 @@
@Resource
private AliOssService aliOssService;
- @PostMapping(value = "/upload",headers = "content-type=multipart/form-data")
+ @PostMapping(value = "/upload")
@ApiOperation(value = "文件上传",tags = "文件上传")
- public R<FileUploadVO> uploadOSS(@RequestParam(value = "file") MultipartFile file) {
+ public R<String> uploadOSS(@RequestParam("fileId") String fileId) {
try {
- // 上传并返回访问地址
- String fileName = file.getOriginalFilename();
- String prefix = fileName.substring(fileName.lastIndexOf("."));
- long fileSize = file.getSize();
- String fileId = UUID.randomUUID().toString();
- //上传文件
+ //获取上传地址
+ String uploadUrl = aliOssService.getUploadUrl(fileId, true);
// aliOssService.uploadFile(file.getBytes(), fileId);
// String downloadUrl = aliOssService.getDownloadUrl(fileId, fileName,true);
// FileUploadVO fileUploadVO = new FileUploadVO();
@@ -47,11 +43,11 @@
// 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);
+// 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(uploadUrl);
} catch (Exception e) {
System.err.println("上传文件失败"+e);
return R.fail(e.getMessage());
--
Gitblit v1.7.1