Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-10-13 44e2cc3deb22aa0b832a2bf4f738cd98d4e9255a

Merge remote-tracking branch 'origin/dev' into dev

 ard-admin/src/main/java/com/ard/web/controller/common/CommonController.java

@@ -25,7 +25,6 @@
 * 
 * @author ruoyi
 */
@Api(tags = "通用请求处理")
@RestController
@RequestMapping("/common")
public class CommonController

 ard-oss/src/main/java/com/ard/oss/service/impl/OssServiceContext.java

@@ -10,6 +10,7 @@
import com.ard.oss.model.enums.OssTypeEnum;
import com.ard.oss.service.IOssService;
import io.minio.PutObjectArgs;
import lombok.Cleanup;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@@ -130,8 +131,10 @@
                    ? extractFilename(file)
                    : object;

            @Cleanup
            InputStream inputStream = file.getInputStream();
            // 上传文件到 Minio
            this.ossService.putObject(bucket, objectName, file.getInputStream());
            this.ossService.putObject(bucket, objectName, inputStream);

            // ✅ 拼接永久 URL（不带 presigned 过期参数）
            String baseUrl = OssConfiguration.endpoint;

 ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdVtduServiceImpl.java

@@ -208,14 +208,4 @@
            mediaService.addPath(vtdu);
        });
    }

    //匹配rtsp地址
    private String matchRtsp(String value) {
        Matcher matcher = Pattern.compile("rtsp://[^\\s\"]+").matcher(value);
        if (matcher.find()) {
            return matcher.group();
        } else {
            return "";
        }
    }
}