From 1c9db648de42c815c8e9c8871902c7499dd6b35e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=BF=90=E5=AE=B6?= Date: Wed, 6 Nov 2024 10:39:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/src/context.rs | 4 ++-- library/src/extractor/body_extractor.rs | 2 +- library/src/middleware/req_ctx.rs | 2 +- library/src/middleware/req_log.rs | 7 ++----- library/src/model/response.rs | 2 +- library/src/social/wechat.rs | 12 ++++++------ macro/src/route.rs | 22 +++++++++++----------- macro/src/task.rs | 4 ++-- 8 files changed, 26 insertions(+), 29 deletions(-) diff --git a/library/src/context.rs b/library/src/context.rs index aa6659e..ee9bcd9 100644 --- a/library/src/context.rs +++ b/library/src/context.rs @@ -12,7 +12,7 @@ pub struct Context { impl Context { pub fn get_account(&self) -> Option> { if let Some(account) = &self.account { - return Some(account.clone()); + Some(account.clone()) } else { None } @@ -20,7 +20,7 @@ impl Context { pub fn get_token(&self) -> Option> { if let Some(token) = &self.token { - return Some(token.clone()); + Some(token.clone()) } else { None } diff --git a/library/src/extractor/body_extractor.rs b/library/src/extractor/body_extractor.rs index 2d93ee2..b57b4e1 100644 --- a/library/src/extractor/body_extractor.rs +++ b/library/src/extractor/body_extractor.rs @@ -80,6 +80,6 @@ where return Err(ResErr::params(message!(lang_tag, MessageId::InvalidParams))); } - return Err(ResErr::params(message!(lang_tag, MessageId::InvalidParams))); + Err(ResErr::params(message!(lang_tag, MessageId::InvalidParams))) } } diff --git a/library/src/middleware/req_ctx.rs b/library/src/middleware/req_ctx.rs index 64d8896..4263a31 100644 --- a/library/src/middleware/req_ctx.rs +++ b/library/src/middleware/req_ctx.rs @@ -110,7 +110,7 @@ pub async fn authenticate_ctx(mut req: Request, next: Next) -> Response { tracing::error!("无效的 token, 解析失败"); // 解析语言 let language = request_util::get_lang_tag(req.headers()); - return ResErr::auth(message!(&language, MessageId::BadRequest)).into_response(); + ResErr::auth(message!(&language, MessageId::BadRequest)).into_response() } } } diff --git a/library/src/middleware/req_log.rs b/library/src/middleware/req_log.rs index 509344c..75c4720 100644 --- a/library/src/middleware/req_log.rs +++ b/library/src/middleware/req_log.rs @@ -56,10 +56,7 @@ fn header_to_string(h: &HeaderMap) -> String { map.insert(k.to_string(), vals); } - match serde_json::to_string(&map) { - Ok(v) => v, - Err(_) => String::from(""), - } + serde_json::to_string(&map).unwrap_or_else(|_| String::from("")) } async fn drain_body(request: Request, next: Next) -> Result<(Response, Option), ResErr> { @@ -86,7 +83,7 @@ async fn drain_body(request: Request, next: Next) -> Result<(Response, Option v.to_bytes(), Err(err) => { diff --git a/library/src/model/response.rs b/library/src/model/response.rs index dd92cc9..6e48abd 100644 --- a/library/src/model/response.rs +++ b/library/src/model/response.rs @@ -282,4 +282,4 @@ impl ResErr { } } -pub type ResResult = std::result::Result; +pub type ResResult = Result; diff --git a/library/src/social/wechat.rs b/library/src/social/wechat.rs index e6cd9df..01e43af 100644 --- a/library/src/social/wechat.rs +++ b/library/src/social/wechat.rs @@ -47,13 +47,13 @@ pub struct WeChatBaseResult { /// 微信登录登录 /// /// 登录成功 -/// ``` +/// ```json /// { -/// "openid": "odbV75XGs-Lwj0CmOxwIXjdDfVEY", -/// "session_key": "iM6cs8nhw0VtAty16RjswQ==", -/// "unionid": null, -/// "errcode": null, -/// "errmsg": null +/// "openid": "odbV75XGs-Lwj0CmOxwIXjdDfVEY", +/// "session_key": "iM6cs8nhw0VtAty16RjswQ==", +/// "unionid": null, +/// "errcode": null, +/// "errmsg": null /// } /// ``` #[derive(Deserialize, Serialize, Debug, Clone, Responsable)] diff --git a/macro/src/route.rs b/macro/src/route.rs index 2f914d5..76f5baa 100644 --- a/macro/src/route.rs +++ b/macro/src/route.rs @@ -21,7 +21,7 @@ struct RouteArgs { // 实现 Parse trait 以支持解析参数 impl Parse for RouteArgs { - fn parse(input: ParseStream) -> syn::parse::Result { + fn parse(input: ParseStream) -> Result { // 使用Meta解析 begin // let args = Punctuated::::parse_terminated(input)?; // let mut path = None; @@ -46,7 +46,7 @@ impl Parse for RouteArgs { // let path = path.expect("Expected a path argument"); // 使用Meta解析 end - let args = Punctuated::::parse_terminated(input)?; + let args = Punctuated::::parse_terminated(input)?; let mut path = None; let mut methods = Vec::new(); @@ -87,12 +87,12 @@ impl Parse for RouteArgs { } struct Args { - vars: Vec, + vars: Vec, } impl Parse for Args { - fn parse(input: ParseStream) -> syn::parse::Result { - let vars = Punctuated::::parse_terminated(input)?; + fn parse(input: ParseStream) -> Result { + let vars = Punctuated::::parse_terminated(input)?; Ok(Args { vars: vars.into_iter().collect(), @@ -101,18 +101,18 @@ impl Parse for Args { } impl Args { - pub fn get_arg(&self, index: usize) -> syn::Result> { + pub fn get_arg(&self, index: usize) -> Result> { match self.vars.get(index) { Some(var) => Ok(Some(var.to_owned())), None => { // 第一个参数使路由url，必须存在，其他的参数根据实际需求进一步解析 if index != 0 { - return Ok(None); + Ok(None) } else { - return Err(syn::Error::new( + Err(Error::new( Span::call_site().into(), "route must have one argument", - )); + )) } } } @@ -130,13 +130,13 @@ pub fn gen_route(attr: TokenStream, item: TokenStream, method: &str) -> TokenStr let mut method_routers = Vec::new(); if methods.is_empty() { - let method_name = syn::Ident::new(&method.to_lowercase(), method.span()); + let method_name = Ident::new(&method.to_lowercase(), method.span()); method_routers.push(quote! { (#path, axum::routing::#method_name(#ident::#ident)) }); } else { for method in methods { - let method_name = syn::Ident::new(&method.to_lowercase(), method.span()); + let method_name = Ident::new(&method.to_lowercase(), method.span()); method_routers.push(quote! { (#path, axum::routing::#method_name(#ident::#ident)) }); diff --git a/macro/src/task.rs b/macro/src/task.rs index 621bca8..3c48e8b 100644 --- a/macro/src/task.rs +++ b/macro/src/task.rs @@ -23,7 +23,7 @@ struct TaskArgs { // 实现 Parse trait 以支持解析参数 impl Parse for TaskArgs { fn parse(input: ParseStream) -> Result { - let args = Punctuated::::parse_terminated(input)?; + let args = Punctuated::::parse_terminated(input)?; let mut task_args = TaskArgs { cron: String::from(""), @@ -61,7 +61,7 @@ impl Parse for TaskArgs { } if task_args.cron.is_empty() && task_args.interval <= 0 { - return Err(syn::Error::new( + return Err(Error::new( Span::call_site().into(), "必须设置有效的cron表达式或者interval参数", ));