fix api-server env override order
This commit is contained in:
@@ -192,6 +192,7 @@ mod tests {
|
||||
let state = seed_authenticated_state(AppConfig {
|
||||
llm_base_url: server_url,
|
||||
llm_api_key: Some("test-key".to_string()),
|
||||
llm_model: "ark-router-test".to_string(),
|
||||
..AppConfig::default()
|
||||
})
|
||||
.await;
|
||||
@@ -267,6 +268,7 @@ mod tests {
|
||||
let state = seed_authenticated_state(AppConfig {
|
||||
llm_base_url: server_url,
|
||||
llm_api_key: Some("test-key".to_string()),
|
||||
llm_model: "ark-router-test".to_string(),
|
||||
..AppConfig::default()
|
||||
})
|
||||
.await;
|
||||
|
||||
@@ -99,10 +99,10 @@ fn run_api_server_with_runtime() -> Result<(), std::io::Error> {
|
||||
}
|
||||
|
||||
async fn run_api_server() -> Result<(), std::io::Error> {
|
||||
// 运行本地开发与联调时,优先从仓库根目录加载本地变量,避免手工逐项导出 OSS / APIMart 配置。
|
||||
// 运行本地开发与联调时,按 .env -> .env.local -> .env.secrets.local 逐级覆盖本地变量。
|
||||
let _ = dotenvy::from_filename(".env");
|
||||
let _ = dotenvy::from_filename(".env.local");
|
||||
let _ = dotenvy::from_filename(".env.secrets.local");
|
||||
let _ = dotenvy::from_filename_override(".env.local");
|
||||
let _ = dotenvy::from_filename_override(".env.secrets.local");
|
||||
|
||||
// 统一先从配置对象读取监听地址,避免后续把环境变量读取散落到入口和路由层。
|
||||
let config = AppConfig::from_env();
|
||||
|
||||
Reference in New Issue
Block a user