diff --git a/api/src/controller/account.rs b/api/src/controller/account.rs index 6c4b94e..adc2b39 100644 --- a/api/src/controller/account.rs +++ b/api/src/controller/account.rs @@ -11,7 +11,7 @@ pub async fn authenticate_google( service::account::authenticate_google(req).await?; - Ok(ResOK(None)) + Ok(ResOK::none()) } pub async fn authenticate_with_password( diff --git a/library/src/resp/response.rs b/library/src/resp/response.rs index ce1f5c2..44f5573 100644 --- a/library/src/resp/response.rs +++ b/library/src/resp/response.rs @@ -24,6 +24,15 @@ where } } +impl ResOK { + pub fn none() -> Self { + ResOK(None) + } + pub fn some(data: T) -> Self { + ResOK(Some(data)) + } +} + #[derive(Debug)] pub enum ResErr { Error(i32, String), diff --git a/service/src/account.rs b/service/src/account.rs index c392131..211e8a0 100644 --- a/service/src/account.rs +++ b/service/src/account.rs @@ -58,5 +58,5 @@ pub async fn authenticate_google( ) .await; - return Ok(ResOK(Some((token, refresh_token)))); + return Ok(ResOK::some((token, refresh_token))); } diff --git a/service/src/feedback.rs b/service/src/feedback.rs index 8c5aa52..0f045b4 100644 --- a/service/src/feedback.rs +++ b/service/src/feedback.rs @@ -9,10 +9,10 @@ pub async fn get_feedback_list_by_page(page: i64, page_size: i64) -> ResResult::empty()))); + return Ok(ResOK::some(Pageable::::empty())); } let total = get_feedback_count().await; - Ok(ResOK(Some(Pageable::new(feedback_list.unwrap(), total)))) + Ok(ResOK::some(Pageable::new(feedback_list.unwrap(), total))) } /// 获取反馈信息总数 @@ -41,5 +41,5 @@ pub async fn add_feedback(req: FeedbackAdd) -> ResResult> { } } - Ok(ResOK(None)) + Ok(ResOK::none()) } \ No newline at end of file