From 1722fe54570bfecdd3e76f2a244d3fd4329482ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=AE=87=E5=A5=87?= <liangyuqi@bdfint.com>
Date: Mon, 12 May 2025 23:11:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0oss=E5=85=AC=E5=85=B1?=
 =?UTF-8?q?=E8=AF=BB=E6=A1=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/web/controller/common/CommonController.java    | 1 +
 .../com/ruoyi/web/controller/common/vo/STSCredentialsVO.java | 5 +++++
 ruoyi-admin/src/main/resources/application.yml               | 1 +
 .../com/ruoyi/framework/config/properties/OSSProperties.java | 2 ++
 4 files changed, 9 insertions(+)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index 8f79a9210..97598e0ae 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -56,6 +56,7 @@ public class CommonController {
         vo.setAccessKeySecret(credentials.getSecretAccessKey());
         vo.setSecurityToken(credentials.getSecurityToken());
         vo.setBucketName(ossProperties.getBucketName());
+        vo.setPublicBucketName(ossProperties.getPublicBucketName());
         vo.setRegionId(ossProperties.getRegionId());
         vo.setEndPoint(ossProperties.getEndPoint());
         vo.setExpiredDuration(ossProperties.getExpiredDuration() - ossProperties.getStsCacheDuration());
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/vo/STSCredentialsVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/vo/STSCredentialsVO.java
index 9973db697..52281f346 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/vo/STSCredentialsVO.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/vo/STSCredentialsVO.java
@@ -50,6 +50,11 @@ public class STSCredentialsVO {
      */
     @ApiModelProperty("bucketName")
     private String bucketName;
+    /**
+     * 公共读桶
+     */
+    @ApiModelProperty("publicBucketName")
+    private String publicBucketName;
     /**
      * https标记
      */
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 94242e844..65aa93619 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -17,6 +17,7 @@ oss:
   accessKeyId: LTAI5tFXTfY5Rsiwvrg9gUuk
   accessKeySecret: Ebbj7anXSdbJwfm5zbTfHkJ5QWDbTP
   bucketName: lyq-private
+  publicBucketName: lyq-public
   https: true
   regionId: cn-beijing
   roleArn: acs:ram::1919425406190533:role/sts-role
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/OSSProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/OSSProperties.java
index a07d84a12..604647204 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/OSSProperties.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/OSSProperties.java
@@ -19,6 +19,8 @@ public class OSSProperties {
 
     private String bucketName;
 
+    private String publicBucketName;
+
     private boolean https;
 
     private String regionId;