From 4a413fff65ae8a87fe10778bf7162392409c75b0 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 18 二月 2026 20:50:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/OssController.java | 10 ++++++++--
1 files changed, 8 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 b89ce69..9e28a9d 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,7 +1,9 @@
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;
@@ -28,14 +30,18 @@
@PostMapping("/upload")
@ApiOperation(value = "文件上传",tags = "文件上传")
- public R<String> uploadOSS(@RequestPart("file") MultipartFile file) {
+ public R<FileUploadVO> uploadOSS(@RequestPart("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