yexuejc007/PlayEdu
1
0
Fork 0
mirror of https://github.com/PlayEdu/PlayEdu synced 2025-06-07 17:55:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

minio配置增加env的读取

Browse Source
This commit is contained in:
xxx 2024-06-06 10:04:55 +08:00
parent fe47657213
commit b5fe6ecd4d
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
playedu-api/playedu-common/src/main/java/xyz/playedu/common/service/impl/AppConfigServiceImpl.java
View File

@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import xyz.playedu.common.constant.ConfigConstant; import xyz.playedu.common.constant.ConfigConstant;
@ -41,6 +42,8 @@ import java.util.stream.Collectors;
public class AppConfigServiceImpl extends ServiceImpl<AppConfigMapper, AppConfig> public class AppConfigServiceImpl extends ServiceImpl<AppConfigMapper, AppConfig>
implements AppConfigService { implements AppConfigService {
private Environment environment;
@Override @Override
public Map<String, Long> allKeys() { public Map<String, Long> allKeys() {
return list().stream().collect(Collectors.toMap(AppConfig::getKeyName, AppConfig::getId)); return list().stream().collect(Collectors.toMap(AppConfig::getKeyName, AppConfig::getId));
@ -95,26 +98,45 @@ public class AppConfigServiceImpl extends ServiceImpl<AppConfigMapper, AppConfig
@Override @Override
public S3Config getS3Config() { public S3Config getS3Config() {
S3Config s3Config = new S3Config(); // 全部的系统配置
Map<String, String> config = keyValues(); Map<String, String> config = keyValues();
S3Config s3Config = new S3Config();
s3Config.setAccessKey(config.get(ConfigConstant.MINIO_ACCESS_KEY)); s3Config.setAccessKey(config.get(ConfigConstant.MINIO_ACCESS_KEY));
s3Config.setSecretKey(config.get(ConfigConstant.MINIO_SECRET_KEY)); s3Config.setSecretKey(config.get(ConfigConstant.MINIO_SECRET_KEY));
s3Config.setBucket(config.get(ConfigConstant.MINIO_BUCKET)); s3Config.setBucket(config.get(ConfigConstant.MINIO_BUCKET));
s3Config.setEndpoint(config.get(ConfigConstant.MINIO_ENDPOINT)); s3Config.setEndpoint(config.get(ConfigConstant.MINIO_ENDPOINT));
s3Config.setDomain(config.get(ConfigConstant.MINIO_DOMAIN));
s3Config.setRegion(null); s3Config.setRegion(null);
s3Config.setService("minio"); s3Config.setService("minio");
String domain = config.get(ConfigConstant.MINIO_DOMAIN); if (StringUtil.isEmpty(s3Config.getAccessKey())) {
if (s3Config.getService().equals("minio") && StringUtil.isNotEmpty(domain)) { s3Config.setAccessKey(environment.getProperty("MINIO_USERNAME"));
}
if (StringUtil.isEmpty(s3Config.getSecretKey())) {
s3Config.setSecretKey(environment.getProperty("MINIO_PASSWORD"));
}
if (StringUtil.isEmpty(s3Config.getBucket())) {
s3Config.setBucket(environment.getProperty("MINIO_BUCKET"));
}
if (StringUtil.isEmpty(s3Config.getEndpoint())) {
s3Config.setEndpoint(environment.getProperty("MINIO_ENDPOINT"));
}
if (StringUtil.isEmpty(s3Config.getDomain())) {
s3Config.setDomain(environment.getProperty("MINIO_DOMAIN"));
}
if (s3Config.getService().equals("minio") && StringUtil.isNotEmpty(s3Config.getDomain())) {
String _domain = s3Config.getDomain();
// 移除 / 后缀 // 移除 / 后缀
if (StringUtil.endsWith(domain, "/")) { if (StringUtil.endsWith(_domain, "/")) {
domain = domain.substring(0, domain.length() - 1); _domain = _domain.substring(0, _domain.length() - 1);
} }
// 判断是否携带了bucket // 判断是否携带了bucket
if (!StringUtil.endsWith(domain, s3Config.getBucket())) { if (!StringUtil.endsWith(_domain, s3Config.getBucket())) {
domain += "/" + s3Config.getBucket(); _domain += "/" + s3Config.getBucket();
} }
s3Config.setDomain(domain); s3Config.setDomain(_domain);
} }
return s3Config; return s3Config;