提交 e867d5e7 作者: 方治民

feat: 优化 EnvConfig props Map 属性,减少自定义属性产生的警告信息

上级 cd15316f
...@@ -3,17 +3,17 @@ env: ...@@ -3,17 +3,17 @@ env:
# host: 192.168.0.156 # host: 192.168.0.156
host: 127.0.0.1 host: 127.0.0.1
prod: false prod: false
extra: props:
# username: admin # username: admin
password: 123456
username: postgres username: postgres
password: 123456
# ---------------------------------------------- # ----------------------------------------------
spring: spring:
datasource: datasource:
url: jdbc:postgresql://${env.host}:5432/basic_app url: jdbc:postgresql://${env.host}:5432/basic_app
username: ${env.extra.username} username: ${env.props.username}
password: ${env.extra.password} password: ${env.props.password}
jpa: jpa:
database-platform: org.hibernate.dialect.PostgreSQLDialect database-platform: org.hibernate.dialect.PostgreSQLDialect
open-in-view: true open-in-view: true
...@@ -37,7 +37,7 @@ spring: ...@@ -37,7 +37,7 @@ spring:
database: 5 database: 5
port: 6379 port: 6379
host: ${env.host} host: ${env.host}
password: ${env.extra.password} password: ${env.props.password}
# ---------------------------------------------- # ----------------------------------------------
# ---------------------------------------------- # ----------------------------------------------
...@@ -54,8 +54,8 @@ knife4j: ...@@ -54,8 +54,8 @@ knife4j:
enable: true enable: true
basic: basic:
enable: false enable: false
username: ${env.extra.username} username: ${env.props.username}
password: ${env.extra.password} password: ${env.props.password}
setting: setting:
language: zh_cn language: zh_cn
enableOpenApi: true enableOpenApi: true
......
...@@ -3,6 +3,8 @@ package com.yiring.common.config; ...@@ -3,6 +3,8 @@ package com.yiring.common.config;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Data; import lombok.Data;
import lombok.experimental.FieldDefaults; import lombok.experimental.FieldDefaults;
...@@ -37,30 +39,7 @@ public class EnvConfig implements Serializable { ...@@ -37,30 +39,7 @@ public class EnvConfig implements Serializable {
boolean prod; boolean prod;
/** /**
* 扩展配置 * 其他配置
*/ */
Extra extra; Map<String, String> props = new HashMap<>();
/**
* 扩展环境配置变量
*/
@Data
@FieldDefaults(level = AccessLevel.PRIVATE)
@Configuration("env.config.extra")
@ConfigurationProperties(prefix = "env.extra")
public static class Extra implements Serializable {
@Serial
private static final long serialVersionUID = -521508901960998020L;
/**
* 公共用户名
*/
String username;
/**
* 公共密码
*/
String password;
}
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论