Skip to content

Commit 90a2290

Browse files
committed
refactor: 抽取 file 上传目录相关配置
1 parent e8ad59b commit 90a2290

3 files changed

Lines changed: 44 additions & 23 deletions

File tree

framework/framework_api/src/main/java/com/github/cadecode/uniboot/framework/api/config/UniBootConfig.java

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
import org.springframework.boot.context.properties.ConfigurationProperties;
77
import org.springframework.context.annotation.Configuration;
88

9-
import java.util.List;
10-
119
/**
12-
* uni-boot-admin 主配置类,维护一些功能开关和全局变量
10+
* uni-boot-admin 通用配置类
11+
* 维护一些功能开关和全局变量
1312
*
1413
* @author Cade Li
1514
* @date 2022/5/21
@@ -24,7 +23,7 @@ public class UniBootConfig {
2423
/**
2524
* 应用名称
2625
*/
27-
private String name = "uni-boot-admin";
26+
private String name;
2827

2928
/**
3029
* 版本号
@@ -40,15 +39,4 @@ public class UniBootConfig {
4039
* 是否开启动态数据源配置
4140
*/
4241
private boolean dynamicDsOn;
43-
44-
/**
45-
* 文件基本路径,以/结尾
46-
*/
47-
private String fileBasePath;
48-
49-
/**
50-
* 可上传下载的扩展文件类型
51-
*/
52-
private List<String> allowedFileExtensions;
53-
5442
}
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.github.cadecode.uniboot.framework.svc.config;
2+
3+
import lombok.Data;
4+
import lombok.RequiredArgsConstructor;
5+
import lombok.extern.slf4j.Slf4j;
6+
import org.springframework.boot.context.properties.ConfigurationProperties;
7+
import org.springframework.context.annotation.Configuration;
8+
9+
import java.util.List;
10+
11+
/**
12+
* uni-boot-admin framework 服务配置
13+
*
14+
* @author Cade Li
15+
* @since 2023/7/28
16+
*/
17+
@Slf4j
18+
@Data
19+
@RequiredArgsConstructor
20+
@Configuration
21+
@ConfigurationProperties("uni-boot.framework")
22+
public class UniFrameworkConfig {
23+
24+
/**
25+
* 文件基本路径,以/结尾
26+
*/
27+
private String fileBasePath;
28+
29+
/**
30+
* 可上传下载的扩展文件类型
31+
*/
32+
private List<String> allowedFileExtensions;
33+
}

framework/framework_svc/src/main/java/com/github/cadecode/uniboot/framework/svc/util/FileUploadUtil.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import cn.hutool.core.io.file.FileNameUtil;
55
import cn.hutool.core.lang.UUID;
66
import cn.hutool.core.util.StrUtil;
7-
import com.github.cadecode.uniboot.framework.api.config.UniBootConfig;
7+
import com.github.cadecode.uniboot.framework.svc.config.UniFrameworkConfig;
88
import lombok.RequiredArgsConstructor;
99
import lombok.extern.slf4j.Slf4j;
1010
import org.springframework.beans.factory.InitializingBean;
@@ -23,7 +23,7 @@
2323
@Component
2424
public class FileUploadUtil implements InitializingBean {
2525

26-
private final UniBootConfig uniBootConfig;
26+
private final UniFrameworkConfig uniFrameworkConfig;
2727

2828
public static final String DEFAULT_FILE_BASE_PATH = "/uniboot/file/temp/";
2929
public static final String DEFAULT_DOWNLOAD_API = "/common/download";
@@ -74,15 +74,15 @@ public static String renameByTime(String fileName) {
7474

7575
@Override
7676
public void afterPropertiesSet() {
77-
if (StrUtil.isEmpty(uniBootConfig.getFileBasePath())) {
78-
uniBootConfig.setFileBasePath(DEFAULT_FILE_BASE_PATH);
77+
if (StrUtil.isEmpty(uniFrameworkConfig.getFileBasePath())) {
78+
uniFrameworkConfig.setFileBasePath(DEFAULT_FILE_BASE_PATH);
7979
log.info("Set uniboot config file base path to default {}", DEFAULT_FILE_BASE_PATH);
8080
}
81-
UPLOAD_PATH = uniBootConfig.getFileBasePath() + "upload/";
82-
DOWNLOAD_PATH = uniBootConfig.getFileBasePath() + "download/";
81+
UPLOAD_PATH = uniFrameworkConfig.getFileBasePath() + "upload/";
82+
DOWNLOAD_PATH = uniFrameworkConfig.getFileBasePath() + "download/";
8383
// 加入额外配置的后缀
84-
if (CollUtil.isNotEmpty(uniBootConfig.getAllowedFileExtensions())) {
85-
ALLOWED_EXTENSIONS.addAll(uniBootConfig.getAllowedFileExtensions());
84+
if (CollUtil.isNotEmpty(uniFrameworkConfig.getAllowedFileExtensions())) {
85+
ALLOWED_EXTENSIONS.addAll(uniFrameworkConfig.getAllowedFileExtensions());
8686
}
8787
}
8888
}

0 commit comments

Comments
 (0)