i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-10-10 11:19:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream main into feat/500-api-key-ip-whitelist

Browse Source
This commit is contained in:
RWDai
2026-05-20 10:26:56 +08:00
parent d19bf71343 ed75ae6d56
commit bdc848b19e
501 changed files with 47013 additions and 3667 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/aether-gateway/src/handlers/admin/request/system/import.rs
+6 -5
View File
@@ -1197,7 +1197,7 @@ impl<'a> AdminAppState<'a> {
Err(_) => {
return Ok(Err(invalid_request(format!(
"Provider '{provider_name}' 配置格式无效"
))))
))));
}
};
let mut updated = invalid!(
@@ -1230,7 +1230,7 @@ impl<'a> AdminAppState<'a> {
Err(_) => {
return Ok(Err(invalid_request(format!(
"Provider '{provider_name}' 配置格式无效"
))))
))));
}
};
let (mut record, shift_existing_priorities_from) =
@@ -1301,7 +1301,7 @@ impl<'a> AdminAppState<'a> {
Err(_) => {
return Ok(Err(invalid_request(
"Provider Endpoint 配置格式无效",
)))
)));
}
};
let (fields, payload) = patch.into_parts();
@@ -1504,7 +1504,7 @@ impl<'a> AdminAppState<'a> {
) {
Ok(patch) => patch,
Err(_) => {
return Ok(Err(invalid_request("Provider Key 配置格式无效")))
return Ok(Err(invalid_request("Provider Key 配置格式无效")));
}
};
let mut updated = invalid!(
@@ -1885,6 +1885,7 @@ impl<'a> AdminAppState<'a> {
oauth_provider.extra_config,
"extra_config",
)),
icon_url: None,
is_enabled: oauth_provider.is_enabled,
};
invalid!(record.validate().map_err(|err| err.to_string()));
@@ -1985,7 +1986,7 @@ impl<'a> AdminAppState<'a> {
Err(_) => {
return Ok(Err(invalid_request(
"merge_mode 仅支持 skip / overwrite / error",
)))
)));
}
};
let empty = Vec::new();