From e5d9d070840d9b7d07331786d914687cc1c6dfb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E8=BF=90=E5=AE=B6?= <liyunjia@inspur.com>
Date: Sat, 2 Nov 2024 14:21:36 +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

---
 domain/src/entities/account.rs             | 8 ++++----
 library/src/extractor/context_extractor.rs | 2 +-
 library/src/extractor/path_extractor.rs    | 2 +-
 library/src/middleware/req_ctx.rs          | 4 ++--
 library/src/social/wechat.rs               | 2 +-
 macro/src/route.rs                         | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/domain/src/entities/account.rs b/domain/src/entities/account.rs
index e03f149..e3e65b7 100644
--- a/domain/src/entities/account.rs
+++ b/domain/src/entities/account.rs
@@ -195,10 +195,10 @@ impl Account {
                ($1, $2, $3, $4, $5) returning *
             "#,
             self.username,
-            self.google_id.clone().unwrap(),
-            self.email.clone().unwrap(),
-            self.display_name.clone().unwrap(),
-            self.avatar_url.clone().unwrap()
+            self.google_id.as_ref().unwrap(),
+            self.email.as_ref().unwrap(),
+            self.display_name.as_ref().unwrap(),
+            self.avatar_url.as_ref().unwrap()
         )
         .fetch_one(&mut **transaction)
         .await
diff --git a/library/src/extractor/context_extractor.rs b/library/src/extractor/context_extractor.rs
index 2cb04eb..36dae06 100644
--- a/library/src/extractor/context_extractor.rs
+++ b/library/src/extractor/context_extractor.rs
@@ -13,6 +13,6 @@ where
 
     async fn from_request_parts(parts: &mut Parts, _: &S) -> Result<Self, Self::Rejection> {
         let context: &Context = parts.extensions.get().unwrap();
-        Ok(context.clone())
+        Ok(context.to_owned())
     }
 }
\ No newline at end of file
diff --git a/library/src/extractor/path_extractor.rs b/library/src/extractor/path_extractor.rs
index 9cd14f2..a2f9f49 100644
--- a/library/src/extractor/path_extractor.rs
+++ b/library/src/extractor/path_extractor.rs
@@ -17,7 +17,7 @@ where
     type Rejection = ResErr;
 
     async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self, Self::Rejection> {
-        let context_parts = parts.clone();
+        let context_parts = parts.to_owned();
         let context: &Context = context_parts.extensions.get().unwrap();
         let lang_tag = context.get_lang_tag();
 
diff --git a/library/src/middleware/req_ctx.rs b/library/src/middleware/req_ctx.rs
index 1c7c641..d66abc3 100644
--- a/library/src/middleware/req_ctx.rs
+++ b/library/src/middleware/req_ctx.rs
@@ -19,7 +19,7 @@ const WHITE_LIST: &[(&str, &str)] = &[
 /// 认证中间件，包括网络请求白名单、token验证、登录缓存
 pub async fn authenticate_ctx(mut req: Request, next: Next) -> Response {
     // 获取请求的url和method，然后判断是否在白名单中，如果在白名单中，则直接返回next(req)，否则继续执行下面的代码
-    let method = req.method().clone().to_string();
+    let method = req.method().as_str();
     let mut uri = req.uri().path_and_query().unwrap().to_string();
     uri = uri.replace(&config!().server.prefix_url, "");
     tracing::debug!("请求路径: {}", uri);
@@ -28,7 +28,7 @@ pub async fn authenticate_ctx(mut req: Request, next: Next) -> Response {
     }).is_some() {
         // 解析语言
         let language = request_util::get_lang_tag(req.headers());
-        req.extensions_mut().insert(Context { lang_tag: Arc::new(language.clone()), account: None, token: None });
+        req.extensions_mut().insert(Context { lang_tag: Arc::new(language), account: None, token: None });
         return next.run(req).await;
     }
 
diff --git a/library/src/social/wechat.rs b/library/src/social/wechat.rs
index 9499ae3..ff948d5 100644
--- a/library/src/social/wechat.rs
+++ b/library/src/social/wechat.rs
@@ -118,7 +118,7 @@ impl WechatSocial {
             *wechat_access_token = new_wechat_access_token;
         }
         tracing::info!("wechat access token: {:?}", wechat_access_token);
-        Ok(wechat_access_token.clone())
+        Ok(wechat_access_token.to_owned())
     }
 
     /// 微信登录登录
diff --git a/macro/src/route.rs b/macro/src/route.rs
index 4b3befa..2f914d5 100644
--- a/macro/src/route.rs
+++ b/macro/src/route.rs
@@ -103,7 +103,7 @@ impl Parse for Args {
 impl Args {
     pub fn get_arg(&self, index: usize) -> syn::Result<Option<syn::Expr>> {
         match self.vars.get(index) {
-            Some(var) => Ok(Some(var.clone())),
+            Some(var) => Ok(Some(var.to_owned())),
             None => {
                 // 第一个参数使路由url，必须存在，其他的参数根据实际需求进一步解析
                 if index != 0 {