ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-10-05 02:57:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: 使用属性变量消除配置文件中分散的 ContiNew Admin 品牌元素

Browse Source 
1.项目配置属性前缀由 continew-admin 改为 project（暂时未发现属性前缀 project 冲突）
2.配置文件中涉及到项目元素信息使用的，统一通过变量引用项目配置属性（如此改动之后，仅需要修改项目配置即可快速调整大量项目配置信息）
This commit is contained in:
Charles7c
2023-08-20 10:23:12 +08:00
parent cd3ac8a120
commit 54ea41048a
10 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/SwaggerConfiguration.java
View File

@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.RandomUtil;
import top.charles7c.cnadmin.common.config.properties.ContiNewAdminProperties;
import top.charles7c.cnadmin.common.config.properties.ProjectProperties;
/**
* 接口文档配置
@@ -42,17 +42,17 @@ import top.charles7c.cnadmin.common.config.properties.ContiNewAdminProperties;
@ConditionalOnProperty(name = "springdoc.swagger-ui.enabled", havingValue = "true", matchIfMissing = true)
public class SwaggerConfiguration {
private final ContiNewAdminProperties continewAdminProperties;
private final ProjectProperties projectProperties;
/**
* 接口文档配置
*/
@Bean
public OpenAPI openApi() {
return new OpenAPI().info(new Info().title(continewAdminProperties.getName() + " 接口文档")
.version(String.format("v%s", continewAdminProperties.getVersion()))
.description(continewAdminProperties.getDescription()).termsOfService(continewAdminProperties.getUrl())
.contact(continewAdminProperties.getAuthor()).license(continewAdminProperties.getLicense()));
return new OpenAPI().info(new Info().title(projectProperties.getName() + " 接口文档")
.version(String.format("v%s", projectProperties.getVersion()))
.description(projectProperties.getDescription()).termsOfService(projectProperties.getUrl())
.contact(projectProperties.getAuthor()).license(projectProperties.getLicense()));
}
/**

6
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/ContiNewAdminProperties.java → continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/ProjectProperties.java
View File

@@ -36,8 +36,8 @@ import cn.hutool.extra.spring.SpringUtil;
*/
@Data
@Component
@ConfigurationProperties(prefix = "continew-admin")
public class ContiNewAdminProperties {
@ConfigurationProperties(prefix = "project")
public class ProjectProperties {
/**
* 名称
@@ -87,6 +87,6 @@ public class ContiNewAdminProperties {
public static final boolean IP_ADDR_LOCAL_PARSE_ENABLED;
static {
IP_ADDR_LOCAL_PARSE_ENABLED = Convert.toBool(SpringUtil.getProperty("continew-admin.ipAddrLocalParseEnabled"));
IP_ADDR_LOCAL_PARSE_ENABLED = Convert.toBool(SpringUtil.getProperty("project.ipAddrLocalParseEnabled"));
}
}

4
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/IpUtils.java
View File

@@ -27,7 +27,7 @@ import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import top.charles7c.cnadmin.common.config.properties.ContiNewAdminProperties;
import top.charles7c.cnadmin.common.config.properties.ProjectProperties;
import net.dreamlu.mica.ip2region.core.Ip2regionSearcher;
import net.dreamlu.mica.ip2region.core.IpInfo;
@@ -55,7 +55,7 @@ public class IpUtils {
* @return 归属地信息
*/
public static String getCityInfo(String ip) {
if (ContiNewAdminProperties.IP_ADDR_LOCAL_PARSE_ENABLED) {
if (ProjectProperties.IP_ADDR_LOCAL_PARSE_ENABLED) {
return getLocalCityInfo(ip);
} else {
return getHttpCityInfo(ip);