From 4edaaf570a2cd8af8a9c35694a46289cdf9278b3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 17 四月 2026 11:58:16 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/OssController.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 49 insertions(+), 3 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 f7e49bb..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
@@ -24,13 +24,13 @@
*/
@Api(tags = "阿里云文件上传")
@RestController
-@RequestMapping("/base/v1/oss")
+@RequestMapping("")
public class OssController {
@Resource
private AliOssService aliOssService;
- @PostMapping(value = "/upload",headers = "content-type=multipart/form-data")
+ @PostMapping(value = "/base/v1/oss/upload",headers = "content-type=multipart/form-data")
@ApiOperation(value = "文件上传",tags = "文件上传")
public R<FileUploadVO> uploadOSS(@RequestParam("file") MultipartFile file) {
try {
@@ -60,7 +60,38 @@
- @PostMapping(value = "/getUploadOSSUrl")
+
+ @PostMapping(value = "/maintenance-app/base/v1/oss/upload",headers = "content-type=multipart/form-data")
+ @ApiOperation(value = "文件上传",tags = "文件上传")
+ 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);
+
+// 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 = "/maintenance-app/base/v1/oss/getUploadOSSUrl")
@ApiOperation(value = "获取文件上传地址",tags = "文件上传")
public R<String> getUploadOSSUrl(@RequestParam("fileId") String fileId) {
try {
@@ -73,5 +104,20 @@
}
}
+
+
+ @PostMapping(value = "/base/v1/oss/getUploadOSSUrl")
+ @ApiOperation(value = "获取文件上传地址",tags = "文件上传")
+ public R<String> getUploadOSSUrl1(@RequestParam("fileId") String fileId) {
+ try {
+ // 上传并返回访问地址
+ String uploadUrl = aliOssService.getUploadUrl(fileId, true);
+ return R.ok(uploadUrl);
+ } catch (Exception e) {
+ System.err.println("上传文件失败"+e);
+ return R.fail(e.getMessage());
+ }
+ }
+
}
--
Gitblit v1.7.1