From 8d7a120f118bce0325b7a2b375475345b9d8ccb4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 24 二月 2026 18:10:42 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

---
 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/OssController.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 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 b89ce69..9296ad2 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
@@ -1,14 +1,13 @@
 package com.xiaopeng.operation.controller;
 
 
+import cn.hutool.core.lang.UUID;
 import com.xiaopeng.common.core.domain.R;
+import com.xiaopeng.operation.vo.FileUploadVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestPart;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -26,16 +25,20 @@
 @RequestMapping("/base/v1/oss")
 public class OssController {
 
-    @PostMapping("/upload")
+    @PostMapping(value = "/upload",headers = "content-type=multipart/form-data")
     @ApiOperation(value = "文件上传",tags = "文件上传")
-    public R<String> uploadOSS(@RequestPart("file") MultipartFile file) {
+    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);
-            return R.ok("https://we-park-life.oss-cn-beijing.aliyuncs.com/img/K4vqtLmVc6.png");
+            FileUploadVO fileUploadVO = new FileUploadVO();
+            fileUploadVO.setId(UUID.randomUUID().toString());
+            fileUploadVO.setName("测试.jpg");
+            fileUploadVO.setUrl("https://we-park-life.oss-cn-beijing.aliyuncs.com/img/K4vqtLmVc6.png");
+            return R.ok(fileUploadVO);
         } catch (Exception e) {
             System.err.println("上传文件失败"+e);
             return R.fail(e.getMessage());

--
Gitblit v1.7.1