refactor: 验证码和会话缓存操作迁移至Raft集成缓存管理器

Author: heqingpan

src/console/login_api.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use std::sync::Arc;
 
 use super::model::login_model::{LoginConfig, LoginParam, LoginToken};
-use crate::cache::actor_model::CacheSetParam;
+use crate::cache::actor_model::{CacheManagerRaftResult, CacheSetParam};
 use crate::ldap::model::actor_model::{LdapMsgReq, LdapMsgResult};
 use crate::ldap::model::LdapUserParam;
 use crate::oauth2::model::actor_model::{OAuth2MsgReq, OAuth2MsgResult};
@@ -344,17 +344,18 @@ async fn check_captcha(
             Some("captcha token is empty".to_owned()),
         )));
     }
-    let cache_req = CacheManagerReq::Get(CacheKey::new(
+    let req = crate::cache::actor_model::CacheManagerLocalReq::Get(CacheKey::new(
         CacheType::String,
         Arc::new(format!("Captcha_{}", &captcha_token)),
     ));
-    let captcha_check_result = if let Ok(Ok(CacheManagerResult::Value(CacheValue::String(v)))) =
-        app.cache_manager.send(cache_req).await
-    {
-        &captcha_code == v.as_ref()
-    } else {
-        false
-    };
+    let captcha_check_result =
+        if let Ok(Ok(CacheManagerRaftResult::Value(crate::cache::model::CacheValue::String(v)))) =
+            app.direct_cache_manager.send(req).await
+        {
+            &captcha_code == v.as_ref()
+        } else {
+            false
+        };
     if !captcha_check_result {
         return Some(
             HttpResponse::Ok()
@@ -419,12 +420,16 @@ pub async fn gen_captcha(app: Data<Arc<AppShareData>>) -> actix_web::Result<impl
 
     let img = obj.as_base64().unwrap_or_default();
     //log::info!("gen_captcha code:{}", &code);
-    let cache_req = CacheManagerReq::Set {
-        key: CacheKey::new(CacheType::String, Arc::new(format!("Captcha_{}", &token))),
-        value: CacheValue::String(code),
-        ttl: 300,
-    };
-    app.cache_manager.send(cache_req).await.ok();
+    let cache_req =
+        crate::cache::actor_model::CacheManagerRaftReq::Set(CacheSetParam::new_with_ttl(
+            CacheKey::new(CacheType::String, Arc::new(format!("Captcha_{}", &token))),
+            crate::cache::model::CacheValue::String(code),
+            300,
+        ));
+    app.raft_request_route
+        .request(ClientRequest::CacheReq { req: cache_req })
+        .await
+        .ok();
     Ok(HttpResponse::Ok()
         .cookie(captcha_cookie)
         .insert_header(captcha_header)

src/grpc/server.rs

@@ -1,6 +1,7 @@
 use std::sync::Arc;
 use std::time::SystemTime;
 
+use crate::cache::actor_model::CacheManagerRaftResult;
 use crate::common::appdata::AppShareData;
 use crate::common::constant::{
     ACCESS_TOKEN_HEADER, AUTHORIZATION_HEADER, EMPTY_ARC_STRING, EMPTY_CLIENT_VERSION,
@@ -49,8 +50,8 @@ impl RequestServerImpl {
         };
         if self.app.sys_config.openapi_enable_auth && !token.is_empty() {
             if let Ok(Some(session)) = get_user_session(
-                &self.app.cache_manager,
-                CacheManagerReq::Get(CacheKey::new(CacheType::ApiTokenSession, token.clone())),
+                &self.app,
+                CacheKey::new(CacheType::ApiTokenSession, token.clone()),
             )
             .await
             {
@@ -259,11 +260,16 @@ impl BiRequestStream for BiRequestStreamServerImpl {
 }
 
 async fn get_user_session(
-    cache_manager: &Addr<CacheManager>,
-    req: CacheManagerReq,
+    app_share_data: &Arc<AppShareData>,
+    key: CacheKey,
 ) -> anyhow::Result<Option<Arc<TokenSession>>> {
-    match cache_manager.send(req).await?? {
-        CacheManagerResult::Value(CacheValue::ApiTokenSession(session)) => Ok(Some(session)),
-        _ => Ok(None),
+    let req = crate::cache::actor_model::CacheManagerLocalReq::Get(key);
+    if let CacheManagerRaftResult::Value(crate::cache::model::CacheValue::ApiTokenSession(
+        session,
+    )) = app_share_data.direct_cache_manager.send(req).await??
+    {
+        Ok(Some(session))
+    } else {
+        Ok(None)
     }
 }

src/openapi/middle/auth_middle.rs

@@ -114,7 +114,7 @@ where
             } else if token.is_empty() {
                 false
             } else if let Ok(Some(session)) = get_user_session(
-                app_share_data.clone(),
+                &app_share_data,
                 CacheKey::new(CacheType::ApiTokenSession, token.clone()),
             )
             .await
@@ -194,7 +194,7 @@ fn bytes_to_payload(buf: web::Bytes) -> dev::Payload {
 }
 
 async fn get_user_session(
-    app_share_data: Arc<AppShareData>,
+    app_share_data: &Arc<AppShareData>,
     key: CacheKey,
 ) -> anyhow::Result<Option<Arc<TokenSession>>> {
     /*