From 5eb57f4570fc0ef67ae1181f05ebd546ea959863 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E8=BF=90=E5=AE=B6?= <liyunjia@inspur.com>
Date: Wed, 6 Nov 2024 10:02:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=B1=8F=E8=94=BDrequest-id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.toml                         |  4 ++--
 library/src/cache/inner_cache.rs | 12 +++++++-----
 server/src/lib.rs                |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app.toml b/app.toml
index d7c8699..2c9ba0b 100644
--- a/app.toml
+++ b/app.toml
@@ -20,8 +20,8 @@ expires = 1800
 refresh_expires = 3600
 
 [redis]
-url = "47.95.198.7:33000"
-#url = "127.0.0.1:33001"
+#url = "47.95.198.7:33000"
+url = "127.0.0.1:33001"
 password = "3aB7kRt9pDf1nQzW"
 db = 0
 
diff --git a/library/src/cache/inner_cache.rs b/library/src/cache/inner_cache.rs
index 5872f6f..dc56cc8 100644
--- a/library/src/cache/inner_cache.rs
+++ b/library/src/cache/inner_cache.rs
@@ -68,8 +68,8 @@ where
 
     /// 初始化缓存，从redis中读取缓存数据
     pub async fn init(&self) {
-        let cache_datas = RedisCache::get(self.cache_type.clone()).await;
-        for element in cache_datas {
+        let cache_data = RedisCache::get(self.cache_type.clone()).await;
+        for element in cache_data {
             let cache_key = element.cache_key.clone();
             let data_json = element.data;
             let cache_data = serde_json::from_str::<D>(&data_json).unwrap();
@@ -114,8 +114,11 @@ where
 /// Redis缓存封装
 #[derive(Debug, Clone, Default)]
 struct RedisCache {
+    // 缓存类型，内存缓存可能包含多种缓存数据，每种缓存数据作为一个类型
     pub cache_type: Arc<String>,
+    // 缓存key，作为redis中的key
     pub cache_key: String,
+    // 缓存数据
     pub data: String,
 }
 
@@ -142,8 +145,8 @@ impl RedisCache {
     pub async fn get(cache_type: Arc<String>) -> Vec<RedisCache> {
         let mut result = Vec::new();
         match REDIS_CACHE.hgetall(&cache_type).await {
-            Ok(cache_datas) => {
-                for (key, value) in cache_datas {
+            Ok(cache_data) => {
+                for (key, value) in cache_data {
                     let cache_data = RedisCache {
                         cache_type: cache_type.clone(),
                         cache_key: key,
@@ -156,7 +159,6 @@ impl RedisCache {
                 tracing::error!("从缓存Hash获取数据失败: {:?}", err);
             }
         }
-
         result
     }
 
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 92f7788..adcb328 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -51,10 +51,10 @@ fn init() -> Router {
         .nest(&config!().server.prefix_url, auth)
         .layer(
             ServiceBuilder::new()
-                .layer(trace_layer)
                 .layer(axum::middleware::from_fn(
                     library::middleware::req_id::handle,
                 ))
+                .layer(trace_layer)
                 .layer(axum::middleware::from_fn(library::middleware::cors::handle))
                 .layer(axum::middleware::from_fn(
                     library::middleware::req_log::handle,