变更代码目录

app.toml

@@ -20,7 +20,8 @@ expires = 1800
 refresh_expires = 3600
 
 [redis]
-url = "47.95.198.7:33000"
+# url = "47.95.198.7:33000"
+url = "127.0.0.1:33001"
 password = "3aB7kRt9pDf1nQzW"
 db = 0
 

library/src/cache/inner_cache.rs

@@ -10,7 +10,7 @@ use moka::{
 };
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 
-use crate::core::redis::REDIS_CONN;
+use crate::cache::redis_cache::REDIS_CACHE;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct CacheAccount {
@@ -124,7 +124,7 @@ struct RedisCache {
 impl RedisCache {
     /// 向redis缓存Hash中插入数据
     pub async fn insert(&self) {
-        match REDIS_CONN
+        match REDIS_CACHE
             .hset_ex(
                 &self.cache_type,
                 &self.cache_key,
@@ -143,7 +143,7 @@ impl RedisCache {
     /// 从redis缓存Hash中获取数据
     pub async fn get(cache_type: Arc<String>) -> Vec<RedisCache> {
         let mut result = Vec::new();
-        match REDIS_CONN.hgetall(&cache_type).await {
+        match REDIS_CACHE.hgetall(&cache_type).await {
             Ok(cache_datas) => {
                 for (key, value) in cache_datas {
                     let cache_data = RedisCache {
@@ -164,7 +164,7 @@ impl RedisCache {
 
     /// 从redis缓存Hash中删除数据
     pub async fn remove(&self) {
-        match REDIS_CONN.hdel(&self.cache_type, &self.cache_key).await {
+        match REDIS_CACHE.hdel(&self.cache_type, &self.cache_key).await {
             Ok(_) => {
                 tracing::info!("从缓存Hash删除数据成功");
             }

library/src/cache/mod.rs

@@ -0,0 +1,2 @@
+pub mod inner_cache;
+pub mod redis_cache;

library/src/cache/redis_cache.rs

@@ -195,5 +195,5 @@ impl RedisConnManager {
 }
 
 lazy_static! {
-    pub static ref REDIS_CONN: RedisConnManager = RedisConnManager::default();
+    pub static ref REDIS_CACHE: RedisConnManager = RedisConnManager::default();
 }

library/src/core/mod.rs

@@ -1,4 +1,3 @@
 pub mod config;
 pub mod logger;
-pub mod db;
+pub mod db;
-pub mod redis;

library/src/lib.rs

@@ -5,10 +5,10 @@ pub mod model;
 pub mod middleware;
 pub mod token;
 pub mod social;
-pub mod cache;
 pub mod context;
 pub mod task;
 pub mod utils;
 pub mod extractor;
 pub mod router;
-pub mod typed_router;
+pub mod typed_router;
+pub mod cache;

library/src/middleware/req_ctx.rs

@@ -5,7 +5,7 @@ use http::header;
 use i18n::{message, message_ids::MessageId};
 use jsonwebtoken::{decode, DecodingKey, Validation};
 
-use crate::{cache::LOGIN_ACCOUNT_CACHE, config, context::Context, model::response::ResErr, token::Claims, utils::request_util};
+use crate::{cache::inner_cache::LOGIN_ACCOUNT_CACHE, config, context::Context, model::response::ResErr, token::Claims, utils::request_util};
 
 const WHITE_LIST: &[(&str, &str)] = &[
     ("POST", "/account/sys"),

server/src/service/account_service.rs

@@ -6,7 +6,7 @@ use domain::entities::account::Account;
 use domain::vo::account::{LoginAccount, RefreshTokenResult};
 use i18n::message;
 use i18n::message_ids::MessageId;
-use library::cache::{CacheAccount, LOGIN_ACCOUNT_CACHE};
+use library::cache::inner_cache::{CacheAccount, LOGIN_ACCOUNT_CACHE};
 use library::context::Context;
 use library::model::response::ResErr::ErrPerm;
 use library::model::response::{ResErr, ResResult};

server/src/service/sys_account_service.rs

@@ -11,7 +11,7 @@ use i18n::{
     message_ids::MessageId,
 };
 use library::{
-    cache::{CacheAccount, LOGIN_ACCOUNT_CACHE}, context::Context, db, model::response::{ResErr, ResResult}, token::{generate_refresh_token, generate_token}
+    cache::inner_cache::{CacheAccount, LOGIN_ACCOUNT_CACHE}, context::Context, db, model::response::{ResErr, ResResult}, token::{generate_refresh_token, generate_token}
 };
 
 /// 登录, 使用账号和密码

src/main.rs

@@ -8,7 +8,7 @@ async fn main() {
     // 初始化日志、数据库连接池、内存缓存；初始化顺序不可变更
     let (_std_guard, _file_guard) = library::core::logger::init_log();
     library::core::db::init_database().await;
-    library::cache::init_cache().await;
+    library::cache::inner_cache::init_cache().await;
 
     server::serve().await;
 }