diff --git a/Cargo.lock b/Cargo.lock index f6e93a9..8bc0e76 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -137,7 +137,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper 1.0.1", "tokio", - "tower 0.4.13", + "tower", "tower-layer", "tower-service", "tracing", @@ -180,7 +180,7 @@ dependencies = [ "mime", "pin-project-lite", "serde", - "tower 0.4.13", + "tower", "tower-layer", "tower-service", "tracing", @@ -988,7 +988,7 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower 0.4.13", + "tower", "tower-service", "tracing", ] @@ -1149,7 +1149,7 @@ dependencies = [ "tokio", "tokio-cron-scheduler", "toml", - "tower 0.5.1", + "tower", "tower-http", "tracing", "tracing-appender", @@ -2058,7 +2058,7 @@ dependencies = [ "sqlx", "tokio", "tokio-cron-scheduler", - "tower 0.5.1", + "tower", "tower-http", "tracing", "validator", @@ -2720,16 +2720,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tower" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" -dependencies = [ - "tower-layer", - "tower-service", -] - [[package]] name = "tower-http" version = "0.5.2" diff --git a/Cargo.toml b/Cargo.toml index 6dbce02..5d01a78 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,7 +53,7 @@ proc-macro2 = "1.0.86" syn = "2.0.77" quote = "1.0.37" hyper = "1.4.1" -tower = "0.5.1" +tower = "0.4.13" csv = "1.3.0" strum = "0.26.3" strum_macros = "0.26.3" \ No newline at end of file diff --git a/server/src/controller/mod.rs b/server/src/controller/mod.rs index 0e87be0..4ea5550 100644 --- a/server/src/controller/mod.rs +++ b/server/src/controller/mod.rs @@ -22,7 +22,4 @@ pub fn init() -> Router { post(feedback_controller::add_feedback) .get(feedback_controller::get_feedback_list_by_page), ) - .layer(axum::middleware::from_fn( - library::middleware::req_ctx::authenticate_ctx, - )) } \ No newline at end of file diff --git a/server/src/lib.rs b/server/src/lib.rs index 21d1aeb..8fcb248 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -1,6 +1,7 @@ use axum::{body::Body, extract::Request, routing::get, Router}; use library::{config, task}; use tasks::get_tasks; +use tower::ServiceBuilder; use tower_http::trace::TraceLayer; mod controller; @@ -38,12 +39,17 @@ fn init() -> Router { Router::new() .route("/", get(|| async { "hello" })) .nest("/gm/v1", auth) - .layer(axum::middleware::from_fn( - library::middleware::req_log::handle, - )) - .layer(axum::middleware::from_fn(library::middleware::cors::handle)) - .layer(trace_layer) - .layer(axum::middleware::from_fn( - library::middleware::req_id::handle, - )) + .layer( + ServiceBuilder::new() + .layer(axum::middleware::from_fn( + library::middleware::req_ctx::authenticate_ctx, + )) + .layer(axum::middleware::from_fn( + library::middleware::req_log::handle, + )) + .layer(axum::middleware::from_fn(library::middleware::cors::handle)) + .layer(axum::middleware::from_fn( + library::middleware::req_id::handle, + )) + ) } \ No newline at end of file