diff --git a/src/extractor/auth.rs b/src/extractor/auth.rs index 77c0124..daa7e80 100644 --- a/src/extractor/auth.rs +++ b/src/extractor/auth.rs @@ -1,5 +1,5 @@ use axum::async_trait; -use axum::extract::{FromRequest, FromRequestParts}; +use axum::extract::FromRequestParts; use axum::http::request::Parts; use crate::service::error::ErrorMessage; diff --git a/src/main.rs b/src/main.rs index 681826e..ae99131 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,8 +13,8 @@ use tower_http::catch_panic::CatchPanicLayer; use tower_http::classify::StatusInRangeAsFailures; use tower_http::cors::CorsLayer; use tower_http::sensitive_headers::SetSensitiveHeadersLayer; -use tower_http::trace::{DefaultOnFailure, TraceLayer}; -use tracing::{debug, info, Level, Span, warn}; +use tower_http::trace::TraceLayer; +use tracing::{debug, info, warn}; use tracing::log::LevelFilter; use tracing_appender::non_blocking; use tracing_appender::rolling::{RollingFileAppender, Rotation}; diff --git a/src/service/folder/create.rs b/src/service/folder/create.rs index b69ad8c..b8b3df8 100644 --- a/src/service/folder/create.rs +++ b/src/service/folder/create.rs @@ -1,4 +1,3 @@ -use axum::http::HeaderMap; use axum::Json; use sea_orm::{ActiveModelTrait, EntityTrait, IntoActiveModel, NotSet}; use sea_orm::ActiveValue::Set; @@ -8,7 +7,6 @@ use crate::DATABASE; use crate::extractor::auth::AuthUser; use crate::model::prelude::Folder; use crate::service::error::ErrorMessage; -use crate::service::user::login::login_by_token; pub async fn create_folder(AuthUser(user): AuthUser, Json(query): Json) -> Result<(), ErrorMessage> { let parent = Folder::find_by_id(query.parent).one(&*DATABASE).await.unwrap() diff --git a/src/service/folder/get.rs b/src/service/folder/get.rs index dd498db..64380e7 100644 --- a/src/service/folder/get.rs +++ b/src/service/folder/get.rs @@ -1,14 +1,12 @@ use std::collections::HashMap; use axum::extract::Query; -use axum::http::HeaderMap; use sea_orm::EntityTrait; use crate::DATABASE; use crate::extractor::auth::AuthUser; use crate::model::prelude::Folder; use crate::service::error::ErrorMessage; -use crate::service::user::login::login_by_token; pub async fn get_folder_info(AuthUser(user): AuthUser, Query(query): Query>) -> Result { let query_id: i64 = query.get("id") diff --git a/src/service/folder/rename.rs b/src/service/folder/rename.rs index 0ef9ea3..540ebf0 100644 --- a/src/service/folder/rename.rs +++ b/src/service/folder/rename.rs @@ -1,5 +1,4 @@ use axum::extract::Query; -use axum::http::HeaderMap; use sea_orm::{ActiveModelTrait, EntityTrait, IntoActiveModel}; use sea_orm::ActiveValue::Set; use serde::Deserialize; diff --git a/src/service/picture/delete.rs b/src/service/picture/delete.rs index 4671d32..345370b 100644 --- a/src/service/picture/delete.rs +++ b/src/service/picture/delete.rs @@ -1,5 +1,4 @@ use axum::extract::Query; -use axum::http::HeaderMap; use sea_orm::{ActiveModelTrait, EntityTrait, IntoActiveModel}; use sea_orm::ActiveValue::Set; use serde::Deserialize; diff --git a/src/service/picture/get.rs b/src/service/picture/get.rs index 00feb66..36aa309 100644 --- a/src/service/picture/get.rs +++ b/src/service/picture/get.rs @@ -10,7 +10,6 @@ use crate::extractor::auth::AuthUser; use crate::model::prelude::UserImage; use crate::service::error::ErrorMessage; use crate::service::picture::compress::ImageFile; -use crate::service::user::login::login_by_token; pub async fn list_picture(AuthUser(user): AuthUser, Query(query): Query) -> impl IntoResponse { if query.size > 100 { diff --git a/src/service/picture/rename.rs b/src/service/picture/rename.rs index 1c7d8bd..3f6d918 100644 --- a/src/service/picture/rename.rs +++ b/src/service/picture/rename.rs @@ -1,5 +1,4 @@ use axum::extract::Query; -use axum::http::HeaderMap; use sea_orm::{ActiveModelTrait, EntityTrait, IntoActiveModel}; use sea_orm::ActiveValue::Set; use serde::Deserialize; @@ -11,14 +10,14 @@ use crate::service::error::ErrorMessage; pub async fn rename_picture(AuthUser(user): AuthUser, Query(query): Query) -> Result { let picture = UserImage::find_by_id(query.id).one(&*DATABASE).await.unwrap().ok_or(ErrorMessage::NotFound)?; - if picture.user_id != user.id { + if picture.user_id != user.id { return Err(ErrorMessage::PermissionDenied); } - + let mut picture = picture.into_active_model(); picture.file_name = Set(query.name); picture.save(&*DATABASE).await.unwrap(); - + Ok("".to_string()) } diff --git a/src/service/trade/wechat/mod.rs b/src/service/trade/wechat/mod.rs index c80b609..b237de2 100644 --- a/src/service/trade/wechat/mod.rs +++ b/src/service/trade/wechat/mod.rs @@ -1,9 +1,8 @@ -use axum::http::HeaderMap; use axum::Json; use chrono::NaiveDate; use serde::Deserialize; -use crate::extractor::auth::AuthUser; +use crate::extractor::auth::AuthUser; use crate::service::error::ErrorMessage; use crate::service::trade::wechat::start::start_wechat; use crate::service::user::level::Level;