fix upgrade axum bug

Signed-off-by: junxiang Mu <1948535941@qq.com>
This commit is contained in:
junxiang Mu
2025-04-09 06:19:36 +00:00
parent 99a5866680
commit c900faba81
5 changed files with 28 additions and 4 deletions
Generated
+23
View File
@@ -752,6 +752,28 @@ dependencies = [
"tracing", "tracing",
] ]
[[package]]
name = "axum-extra"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45bf463831f5131b7d3c756525b305d40f1185b688565648a92e1392ca35713d"
dependencies = [
"axum",
"axum-core",
"bytes",
"futures-util",
"http",
"http-body",
"http-body-util",
"mime",
"pin-project-lite",
"rustversion",
"serde",
"tower 0.5.2",
"tower-layer",
"tower-service",
]
[[package]] [[package]]
name = "axum-server" name = "axum-server"
version = "0.7.2" version = "0.7.2"
@@ -7082,6 +7104,7 @@ dependencies = [
"async-trait", "async-trait",
"atoi", "atoi",
"axum", "axum",
"axum-extra",
"axum-server", "axum-server",
"bytes", "bytes",
"chrono", "chrono",
+2 -1
View File
@@ -52,7 +52,7 @@ common = { path = "./common/common" }
policy = { path = "./policy" } policy = { path = "./policy" }
hex = "0.4.3" hex = "0.4.3"
hyper = "1.6.0" hyper = "1.6.0"
hyper-util = { version = "0.1.10", features = [ hyper-util = { version = "0.1.11", features = [
"tokio", "tokio",
"server-auto", "server-auto",
"server-graceful", "server-graceful",
@@ -133,6 +133,7 @@ uuid = { version = "1.15.1", features = [
"macro-diagnostics", "macro-diagnostics",
] } ] }
axum = "0.8.3" axum = "0.8.3"
axum-extra = "0.10.1"
axum-server = { version = "0.7.2", features = ["tls-rustls"] } axum-server = { version = "0.7.2", features = ["tls-rustls"] }
md-5 = "0.10.6" md-5 = "0.10.6"
workers = { path = "./common/workers" } workers = { path = "./common/workers" }
+1
View File
@@ -70,6 +70,7 @@ transform-stream.workspace = true
uuid = "1.15.1" uuid = "1.15.1"
url.workspace = true url.workspace = true
axum.workspace = true axum.workspace = true
axum-extra = { workspace = true }
axum-server = { workspace = true } axum-server = { workspace = true }
matchit = "0.8.4" matchit = "0.8.4"
shadow-rs.workspace = true shadow-rs.workspace = true
+1 -1
View File
@@ -1,12 +1,12 @@
use crate::license::get_license; use crate::license::get_license;
use axum::{ use axum::{
body::Body, body::Body,
extract::Host,
http::{Response, StatusCode}, http::{Response, StatusCode},
response::IntoResponse, response::IntoResponse,
routing::get, routing::get,
Router, Router,
}; };
use axum_extra::extract::Host;
use axum_server::tls_rustls::RustlsConfig; use axum_server::tls_rustls::RustlsConfig;
use mime_guess::from_path; use mime_guess::from_path;
use rust_embed::RustEmbed; use rust_embed::RustEmbed;
+1 -2
View File
@@ -80,8 +80,7 @@ pin_project! {
impl<RestBody, GrpcBody> Default for HybridBody<RestBody, GrpcBody> impl<RestBody, GrpcBody> Default for HybridBody<RestBody, GrpcBody>
where where
RestBody: Default, RestBody: Default,
// GrpcBody: Default,
GrpcBody: Default,
{ {
fn default() -> Self { fn default() -> Self {
Self::Rest { Self::Rest {