Merge remote-tracking branch 'origin/master'

无关风月

2026-02-24 32063e565deaf03a0cc8abf1fafd146cc4e4d421

 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;
@@ -23,19 +22,23 @@
 */
@Api(tags = "阿里云文件上传")
@RestController
@RequestMapping("/oss")
@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());