diff --git a/api/src/controller/feedback.rs b/api/src/controller/feedback.rs index 10909bb..b25fef8 100644 --- a/api/src/controller/feedback.rs +++ b/api/src/controller/feedback.rs @@ -23,7 +23,7 @@ pub async fn add_feedback( /// 获取反馈信息列表 pub async fn get_feedback_list_by_page( - Query(pageParams): Query + Query(page_params): Query ) -> ResResult>> { - service::feedback::get_feedback_list_by_page(pageParams.page, pageParams.page_size).await + service::feedback::get_feedback_list_by_page(page_params.page, page_params.page_size).await } \ No newline at end of file diff --git a/auth/src/firebase_admin.rs b/auth/src/firebase_admin.rs index a83e924..6e083cf 100644 --- a/auth/src/firebase_admin.rs +++ b/auth/src/firebase_admin.rs @@ -1,14 +1,11 @@ use std::sync::OnceLock; -use error_stack::Report; use futures_executor::block_on; use rs_firebase_admin_sdk::{ auth::{FirebaseAuthService, UserIdentifiers}, - client::ApiHttpClient, App, AuthenticationManager, }; use rs_firebase_admin_sdk::auth::token::{LiveTokenVerifier, TokenVerifier}; use rs_firebase_admin_sdk::auth::token::cache::{HttpCache, PubKeys}; -use rs_firebase_admin_sdk::auth::token::error::TokenVerificationError; use rs_firebase_admin_sdk::auth::token::jwt::JWToken; static LIVE_APP: OnceLock> = OnceLock::new(); @@ -30,8 +27,8 @@ fn get_id_token_verifier() -> &'static LiveTokenVerifier Result { match get_id_token_verifier().verify_token(id_token).await { - Ok(jwtToken) => { - Ok(jwtToken) + Ok(jwt_token) => { + Ok(jwt_token) } Err(error) => { tracing::error!("校验id token失败: {:?}", error); diff --git a/domain/src/dto/feedback.rs b/domain/src/dto/feedback.rs index 23a3938..70de7cf 100644 --- a/domain/src/dto/feedback.rs +++ b/domain/src/dto/feedback.rs @@ -1,4 +1,3 @@ -use sea_orm::prelude::DateTime; use serde::{Deserialize, Serialize}; use validator::Validate; diff --git a/domain/src/dto/player_info.rs b/domain/src/dto/player_info.rs index 15dfc2e..2d3d981 100644 --- a/domain/src/dto/player_info.rs +++ b/domain/src/dto/player_info.rs @@ -14,5 +14,5 @@ pub struct PlayerInfoRegister { #[validate(required(message = "用户所属区域不能为空"), length(min = 1, message = "用户所属区域不能为空"))] pub country_code: Option, #[validate(required(message = "用户ID Token不能为空"), length(min = 1, message = "用户ID Token不能为空"))] - pub idToken: Option + pub id_token: Option, } diff --git a/service/src/player_info.rs b/service/src/player_info.rs index 3e32451..731d6bd 100644 --- a/service/src/player_info.rs +++ b/service/src/player_info.rs @@ -24,7 +24,7 @@ pub async fn register(req: PlayerInfoRegister) -> ResResult> { } } - let verified_token = match firebase_admin::verify_user_id_token(req.idToken.unwrap().as_str()).await { + let verified_token = match firebase_admin::verify_user_id_token(req.id_token.unwrap().as_str()).await { Ok(token) => token, Err(err) => { tracing::error!(error = ?err, "校验用户id token失败");