Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
zrll12 committed Jun 12, 2024
1 parent b8b36d9 commit 6e07dfe
Show file tree
Hide file tree
Showing 9 changed files with 7 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/extractor/auth.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
2 changes: 0 additions & 2 deletions src/service/folder/create.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use axum::http::HeaderMap;
use axum::Json;
use sea_orm::{ActiveModelTrait, EntityTrait, IntoActiveModel, NotSet};
use sea_orm::ActiveValue::Set;
Expand All @@ -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<CreateFolderRequest>) -> Result<(), ErrorMessage> {
let parent = Folder::find_by_id(query.parent).one(&*DATABASE).await.unwrap()
Expand Down
2 changes: 0 additions & 2 deletions src/service/folder/get.rs
Original file line number Diff line number Diff line change
@@ -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<HashMap<String, String>>) -> Result<String, ErrorMessage> {
let query_id: i64 = query.get("id")
Expand Down
1 change: 0 additions & 1 deletion src/service/folder/rename.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/service/picture/delete.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/service/picture/get.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<ListPictureRequest>) -> impl IntoResponse {
if query.size > 100 {
Expand Down
7 changes: 3 additions & 4 deletions src/service/picture/rename.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -11,14 +10,14 @@ use crate::service::error::ErrorMessage;

pub async fn rename_picture(AuthUser(user): AuthUser, Query(query): Query<RenamePictureRequest>) -> Result<String, ErrorMessage> {
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())
}

Expand Down
3 changes: 1 addition & 2 deletions src/service/trade/wechat/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down

0 comments on commit 6e07dfe

Please sign in to comment.