From dfccc03f488a9685f2dfb70e680ae256275c7e7b Mon Sep 17 00:00:00 2001 From: ray <1490493387@qq.com> Date: Mon, 19 Aug 2024 00:50:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/oss/AliyunOssService.java | 3 +- .../service/impl/oss/MinioOssService.java | 10 +++--- ...itional-spring-configuration-metadata.json | 5 --- src/main/resources/application-dev.yml | 35 ++++++++++++++++++- src/main/resources/application-prod.yml | 20 ++++++++++- src/main/resources/application.yml | 1 - 6 files changed, 60 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/youlai/system/service/impl/oss/AliyunOssService.java b/src/main/java/com/youlai/system/service/impl/oss/AliyunOssService.java index 6cb63cfb..5062713f 100644 --- a/src/main/java/com/youlai/system/service/impl/oss/AliyunOssService.java +++ b/src/main/java/com/youlai/system/service/impl/oss/AliyunOssService.java @@ -14,7 +14,6 @@ import jakarta.annotation.PostConstruct; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; -import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -30,7 +29,7 @@ import java.time.LocalDateTime; * @since 2.3.0 */ @Component -@ConditionalOnExpression("'${oss.enabled}' == 'true' and '${oss.type}' == 'aliyun'") +@ConditionalOnProperty(value = "oss.type", havingValue = "aliyun") @ConfigurationProperties(prefix = "oss.aliyun") @RequiredArgsConstructor @Data diff --git a/src/main/java/com/youlai/system/service/impl/oss/MinioOssService.java b/src/main/java/com/youlai/system/service/impl/oss/MinioOssService.java index dcb77295..868382fb 100644 --- a/src/main/java/com/youlai/system/service/impl/oss/MinioOssService.java +++ b/src/main/java/com/youlai/system/service/impl/oss/MinioOssService.java @@ -14,7 +14,6 @@ import jakarta.annotation.PostConstruct; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; -import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -33,7 +32,7 @@ import java.time.LocalDateTime; * @since 2023/6/2 */ @Component -@ConditionalOnExpression("'${oss.enabled}' == 'true' and '${oss.type}' == 'minio'") +@ConditionalOnProperty(value = "oss.enabled", havingValue = "true" ) @ConfigurationProperties(prefix = "oss.minio") @RequiredArgsConstructor @Data @@ -69,8 +68,8 @@ public class MinioOssService implements OssService { .endpoint(endpoint) .credentials(accessKey, secretKey) .build(); - // 创建存储桶 - createBucketIfAbsent(bucketName); + // 创建存储桶(存储桶不存在) + // createBucketIfAbsent(bucketName); } @@ -83,6 +82,9 @@ public class MinioOssService implements OssService { @Override public FileInfo uploadFile(MultipartFile file) { + // 创建存储桶(存储桶不存在)，如果有搭建好的minio服务，建议放在init方法中 + createBucketIfAbsent(bucketName); + // 生成文件名(日期文件夹) String suffix = FileUtil.getSuffix(file.getOriginalFilename()); String uuid = IdUtil.simpleUUID(); diff --git a/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/src/main/resources/META-INF/additional-spring-configuration-metadata.json index ae09672b..434a19c2 100644 --- a/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -1,10 +1,5 @@ { "properties": [ - { - "name": "oss.enabled", - "type": "java.lang.Boolean", - "description": "OSS 开关" - }, { "name": "oss.type", "type": "java.lang.String", diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index da3e480d..3eed7c30 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -41,6 +41,21 @@ spring: time-to-live: 3600000 # 缓存null值，防止缓存穿透 cache-null-values: true + # 邮件配置 + mail: + host: smtp.youlai.tech + port: 587 + username: your-email@example.com + password: 123456 + properties: + mail: + smtp: + auth: true + starttls: + enable: true + # 邮件发送者 + from: youlaitech@163.com + mybatis-plus: global-config: db-config: @@ -78,9 +93,10 @@ security: - /ws/** - /ws-app/** +# 文件存储配置 oss: # OSS 类型 (目前支持aliyun、minio) - type: minio + type: aliyun # MinIO 对象存储服务 minio: # 服务Endpoint @@ -104,6 +120,23 @@ oss: # 存储桶名称 bucket-name: default +# 短信配置 +sms: + # 阿里云短信 + aliyun: + accessKeyId: LTAI5tSMgfxxxxxxdiBJLyR + accessKeySecret: SoOWRqpjtS7xxxxxxZ2PZiMTJOVC + domain: dysmsapi.aliyuncs.com + regionId: cn-shanghai + signName: 有来技术 + templateCodes: + # 注册（预留） + register: SMS_22xxx771 + # 登录（预留） + login: SMS_22xxx772 + # 修改密码 + changePassword: SMS_22xxx773 + # springdoc配置： https://springdoc.org/properties.html springdoc: swagger-ui: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 2822ed7f..541cd2a0 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -75,7 +75,8 @@ security: - /api/v1/auth/captcha - /ws/** - /ws-app/** -# 文件上传配置 + +# 文件存储配置 oss: # OSS 类型 (目前支持aliyun、minio) type: minio @@ -102,6 +103,23 @@ oss: # 存储桶名称 bucket-name: default +# 短信配置 +sms: + # 阿里云短信 + aliyun: + accessKeyId: LTAI5tSMgfxxxxxxdiBJLyR + accessKeySecret: SoOWRqpjtS7xxxxxxZ2PZiMTJOVC + domain: dysmsapi.aliyuncs.com + regionId: cn-shanghai + signName: 有来技术 + templateCodes: + # 注册（预留） + register: SMS_22xxx771 + # 登录（预留） + login: SMS_22xxx772 + # 修改密码 + changePassword: SMS_22xxx773 + # springdoc配置： https://springdoc.org/properties.html springdoc: swagger-ui: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 2dbb4a61..b34a2dcd 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -60,4 +60,3 @@ generator: extension: .vue -