From 0149008eb077bdfbdf86759f5aa870a7cced0d53 Mon Sep 17 00:00:00 2001
From: KilLze <kirito24177@163.com>
Date: Sat, 20 Dec 2025 17:13:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{util => common/aliyun}/AliOssUtil.java   |  7 +++--
 .../{ => common/aliyun}/util/FileUtil.java    |  2 +-
 .../bao/dating/config/OssConfiguration.java   | 26 -------------------
 .../dating/properties/AliOssProperties.java   | 15 -----------
 .../dating/service/impl/PostServiceImpl.java  |  4 +--
 5 files changed, 8 insertions(+), 46 deletions(-)
 rename src/main/java/com/bao/dating/{util => common/aliyun}/AliOssUtil.java (89%)
 rename src/main/java/com/bao/dating/{ => common/aliyun}/util/FileUtil.java (95%)
 delete mode 100644 src/main/java/com/bao/dating/config/OssConfiguration.java
 delete mode 100644 src/main/java/com/bao/dating/properties/AliOssProperties.java

diff --git a/src/main/java/com/bao/dating/util/AliOssUtil.java b/src/main/java/com/bao/dating/common/aliyun/AliOssUtil.java
similarity index 89%
rename from src/main/java/com/bao/dating/util/AliOssUtil.java
rename to src/main/java/com/bao/dating/common/aliyun/AliOssUtil.java
index f4035b3..f0f49fb 100644
--- a/src/main/java/com/bao/dating/util/AliOssUtil.java
+++ b/src/main/java/com/bao/dating/common/aliyun/AliOssUtil.java
@@ -1,4 +1,4 @@
-package com.bao.dating.util;
+package com.bao.dating.common.aliyun;
 
 import com.aliyun.oss.ClientException;
 import com.aliyun.oss.OSS;
@@ -7,12 +7,15 @@ import com.aliyun.oss.OSSException;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
 
 import java.io.ByteArrayInputStream;
 
 @Data
-@AllArgsConstructor
 @Slf4j
+@Component
+@ConfigurationProperties(prefix = "aliyun.oss")
 public class AliOssUtil {
 
     private String endpoint;
diff --git a/src/main/java/com/bao/dating/util/FileUtil.java b/src/main/java/com/bao/dating/common/aliyun/util/FileUtil.java
similarity index 95%
rename from src/main/java/com/bao/dating/util/FileUtil.java
rename to src/main/java/com/bao/dating/common/aliyun/util/FileUtil.java
index 5543dcd..d481ca1 100644
--- a/src/main/java/com/bao/dating/util/FileUtil.java
+++ b/src/main/java/com/bao/dating/common/aliyun/util/FileUtil.java
@@ -1,4 +1,4 @@
-package com.bao.dating.util;
+package com.bao.dating.common.aliyun.util;
 
 /**
  * 文件工具类
diff --git a/src/main/java/com/bao/dating/config/OssConfiguration.java b/src/main/java/com/bao/dating/config/OssConfiguration.java
deleted file mode 100644
index 01189d1..0000000
--- a/src/main/java/com/bao/dating/config/OssConfiguration.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.bao.dating.config;
-
-
-import com.bao.dating.properties.AliOssProperties;
-import com.bao.dating.util.AliOssUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 配置类，用于创建AliOssUtil对象
- */
-@Configuration
-@Slf4j
-public class OssConfiguration {
-    @Bean
-    @ConditionalOnMissingBean
-    public AliOssUtil aliOssUtil(AliOssProperties aliOssProperties){
-        log.info("开始创建阿里云文件上传工具类对象：{}",aliOssProperties);
-        return new AliOssUtil(aliOssProperties.getEndpoint(),
-                aliOssProperties.getAccessKeyId(),
-                aliOssProperties.getAccessKeySecret(),
-                aliOssProperties.getBucketName());
-    }
-}
diff --git a/src/main/java/com/bao/dating/properties/AliOssProperties.java b/src/main/java/com/bao/dating/properties/AliOssProperties.java
deleted file mode 100644
index 7756754..0000000
--- a/src/main/java/com/bao/dating/properties/AliOssProperties.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.bao.dating.properties;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-@Component
-@ConfigurationProperties(prefix = "aliyun.oss")
-@Data
-public class AliOssProperties {
-    private String endpoint;
-    private String accessKeyId;
-    private String accessKeySecret;
-    private String bucketName;
-}
diff --git a/src/main/java/com/bao/dating/service/impl/PostServiceImpl.java b/src/main/java/com/bao/dating/service/impl/PostServiceImpl.java
index 76abdff..cc46f93 100644
--- a/src/main/java/com/bao/dating/service/impl/PostServiceImpl.java
+++ b/src/main/java/com/bao/dating/service/impl/PostServiceImpl.java
@@ -7,8 +7,8 @@ import com.bao.dating.pojo.dto.PostRequestDTO;
 import com.bao.dating.pojo.entity.Post;
 import com.bao.dating.pojo.vo.PostEditVO;
 import com.bao.dating.service.PostService;
-import com.bao.dating.util.AliOssUtil;
-import com.bao.dating.util.FileUtil;
+import com.bao.dating.common.aliyun.AliOssUtil;
+import com.bao.dating.common.aliyun.util.FileUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;