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

xlsea

2024-12-16 4d566071db7853c66805a1ffac2fd9c93a6aac8a

 ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java

@@ -297,7 +297,7 @@
                            .build())
                    .build())
            .url();
        return url.toString().replace(url.getProtocol() + "://" + url.getHost(), getDomain());
        return url.toString();
    }

    /**