From 08ef63eb44102f05c21e5370fd096a7f0cfee20c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 二月 2026 10:05:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/OssController.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 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 9296ad2..0cc8db0 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
@@ -3,6 +3,7 @@
 
 import cn.hutool.core.lang.UUID;
 import com.xiaopeng.common.core.domain.R;
+import com.xiaopeng.evi.oss.service.AliOssService;
 import com.xiaopeng.operation.vo.FileUploadVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -10,6 +11,7 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 
 /**
@@ -25,15 +27,26 @@
 @RequestMapping("/base/v1/oss")
 public class OssController {
 
+    @Resource
+    private AliOssService aliOssService;
+
     @PostMapping(value = "/upload",headers = "content-type=multipart/form-data")
     @ApiOperation(value = "文件上传",tags = "文件上传")
     public R<FileUploadVO> uploadOSS(@RequestParam(value = "file") MultipartFile file) {
         try {
-//            // 上传并返回访问地址
+            // 上传并返回访问地址
 //            String fileName = file.getOriginalFilename();
 //            String prefix = fileName.substring(fileName.lastIndexOf("."));
 //            long fileSize = file.getSize();
-//            String url = OssUploadUtil.ossUpload(file);
+//            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");

--
Gitblit v1.7.1