处理异味

api/src/middleware/log.rs

@@ -73,23 +73,15 @@ async fn drain_body(request: Request, next: Next) -> Result<(Response, Option<St
         .and_then(|value| value.to_str().ok())
     {
         Some(v) => {
-            if v.starts_with("application/json")
-                || v.starts_with("application/x-www-form-urlencoded")
-            {
-                true
-            } else {
-                false
-            }
+            v.starts_with("application/json") || v.starts_with("application/x-www-form-urlencoded")
         }
         None => false,
     };
-
     if !ok {
         return Ok((next.run(request).await, None));
     }
 
     let (parts, body) = request.into_parts();
-
     // this wont work if the body is an long running stream
     let bytes = match body.collect().await {
         Ok(v) => v.to_bytes(),
@@ -98,14 +90,9 @@ async fn drain_body(request: Request, next: Next) -> Result<(Response, Option<St
             return Err(ApiErr::ErrSystem(None));
         }
     };
-
-    let body = std::str::from_utf8(&bytes)
-        .and_then(|s| Ok(s.to_string()))
-        .ok();
-
+    let body = std::str::from_utf8(&bytes).map(|s| s.to_string()).ok();
     let response = next
         .run(Request::from_parts(parts, Body::from(bytes)))
         .await;
-
     Ok((response, body))
 }

api/src/service/account.rs

@@ -104,7 +104,7 @@ pub struct RespList {
 pub async fn list(query: HashMap<String, String>) -> Result<ApiOK<RespList>> {
     let mut builder = Account::find();
     if let Some(username) = query.get("username") {
-        if username.len() > 0 {
+        if !username.is_empty() {
             builder = builder.filter(account::Column::Username.eq(username.to_owned()));
         }
     }

api/src/service/identity.rs

@@ -1,3 +1,5 @@
+use std::fmt::Display;
+
 use anyhow::{anyhow, Result};
 use base64::{prelude::BASE64_STANDARD, Engine};
 use sea_orm::EntityTrait;
@@ -65,7 +67,7 @@ impl Identity {
         match serde_json::from_slice::<Identity>(&plain) {
             Err(e) => {
                 tracing::error!(error = ?e, "error invalid auth_token");
-                return Identity::empty();
+                Identity::empty()
             }
             Ok(identity) => identity,
         }
@@ -110,22 +112,24 @@ impl Identity {
         match Account::find_by_id(self.id()).one(db::conn()).await? {
             None => return Err(anyhow!("授权账号不存在")),
             Some(v) => {
-                if v.login_token.len() == 0 || self.t != v.login_token {
+                if v.login_token.is_empty() || self.t != v.login_token {
                     return Err(anyhow!("授权已失效"));
                 }
             }
         }
 
         Ok(())
     }
+}
 
-    pub fn to_string(&self) -> String {
+impl Display for Identity {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         if self.i == 0 {
-            return String::from("<none>");
+            return write!(f, "<none>");
         }
         if self.r == 0 {
-            return format!("id:{}|token:{}", self.i, self.t);
+            return write!(f, "id:{}|token:{}", self.i, self.t);
         }
-        format!("id:{}|role:{}|token:{}", self.i, self.r, self.t)
+        write!(f, "id:{}|role:{}|token:{}", self.i, self.r, self.t)
     }
 }

api/src/service/project.rs

@@ -80,12 +80,12 @@ pub async fn list(identity: Identity, query: HashMap<String, String>) -> Result<
         builder = builder.filter(project::Column::AccountId.eq(identity.id()));
     }
     if let Some(code) = query.get("code") {
-        if code.len() > 0 {
+        if !code.is_empty() {
             builder = builder.filter(project::Column::Code.eq(code.to_owned()));
         }
     }
     if let Some(name) = query.get("name") {
-        if name.len() > 0 {
+        if !name.is_empty() {
             builder = builder.filter(project::Column::Name.contains(name));
         }
     }

pkg/Cargo.toml

@@ -11,7 +11,7 @@ thiserror = "1.0"
 anyhow = "1.0"
 rand = "0.8"
 const-hex = "1.10"
-openssl = "0.10"
+openssl = { version = "0.10", features = ["vendored"] }
 digest = "0.10"
 md-5 = "0.10"
 sha1 = "0.10"

pkg/src/cache.rs

@@ -161,10 +161,10 @@ impl mobc::Manager for RedisAsyncConnManager {
     }
 
     async fn check(&self, mut conn: Self::Connection) -> Result<Self::Connection, Self::Error> {
-        if !redis::cmd("PING")
+        if redis::cmd("PING")
             .query_async::<Self::Connection, String>(&mut conn)
             .await
-            .is_ok()
+            .is_err()
         {
             return Err(redis::RedisError::from(io::Error::from(
                 io::ErrorKind::BrokenPipe,
@@ -195,10 +195,10 @@ impl mobc::Manager for RedisClusterAsyncConnManager {
     }
 
     async fn check(&self, mut conn: Self::Connection) -> Result<Self::Connection, Self::Error> {
-        if !redis::cmd("PING")
+        if redis::cmd("PING")
             .query_async::<Self::Connection, String>(&mut conn)
             .await
-            .is_ok()
+            .is_err()
         {
             return Err(redis::RedisError::from(io::Error::from(
                 io::ErrorKind::BrokenPipe,

pkg/src/mutex.rs

@@ -55,7 +55,7 @@ impl RedisLock {
                     self.token = token;
                     return Ok(true);
                 }
-                return Ok(false);
+                Ok(false)
             }
             Err(e) => {
                 // 尝试GET一次：避免因redis网络错误导致误加锁
@@ -65,7 +65,7 @@ impl RedisLock {
                     self.token = token;
                     return Ok(true);
                 }
-                return Ok(false);
+                Ok(false)
             }
         }
     }
@@ -74,7 +74,7 @@ impl RedisLock {
 // 释放锁
 impl Drop for RedisLock {
     fn drop(&mut self) {
-        if self.token.len() == 0 {
+        if self.token.is_empty() {
             return;
         }
 

pkg/src/time.rs

@@ -42,7 +42,7 @@ impl<'a> Format<'a> {
 
     // 日期转Unix时间戳
     pub fn to_timestamp(self, datetime: &str) -> i64 {
-        if datetime.len() == 0 {
+        if datetime.is_empty() {
             return 0;
         }
 

pkg/src/util.rs

@@ -17,7 +17,6 @@ pub fn query_page(args: &HashMap<String, String>) -> (u64, u64) {
             limit = size
         }
     }
-
     if limit > 100 {
         limit = 100
     }
@@ -33,9 +32,9 @@ pub fn query_page(args: &HashMap<String, String>) -> (u64, u64) {
 }
 
 pub fn new_validation_err(s: String) -> ValidationError {
-    return ValidationError {
+    ValidationError {
         code: Cow::from(""),
         message: Some(Cow::from(s)),
         params: HashMap::new(),
-    };
+    }
 }