From 6994cd823825e35994bc0331ba6f807bbd09ee36 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 12 三月 2026 10:44:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/OssController.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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 fe93410..eafffc7 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,12 +30,16 @@
@Resource
private AliOssService aliOssService;
- @PostMapping(value = "/upload")
+ @PostMapping(value = "/upload",headers = "content-type=multipart/form-data")
@ApiOperation(value = "文件上传",tags = "文件上传")
- public R<String> uploadOSS(@RequestParam("fileId") String fileId) {
+ public R<FileUploadVO> uploadOSS(@RequestParam(value = "file") MultipartFile file) {
try {
- //获取上传地址
- String uploadUrl = aliOssService.getUploadUrl(fileId, true);
+ // 上传并返回访问地址
+ 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();
@@ -43,10 +47,25 @@
// 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");
+ 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);
+ return R.fail(e.getMessage());
+ }
+ }
+
+
+
+ @PostMapping(value = "/getUploadOSSUrl")
+ @ApiOperation(value = "获取文件上传地址",tags = "文件上传")
+ public R<String> getUploadOSSUrl(@RequestParam("fileId") String fileId) {
+ try {
+ // 上传并返回访问地址
+ String uploadUrl = aliOssService.getUploadUrl(fileId, true);
return R.ok(uploadUrl);
} catch (Exception e) {
System.err.println("上传文件失败"+e);
--
Gitblit v1.7.1