From b43c08b5d24637660fbd9fe7b413185428cdf8fe Mon Sep 17 00:00:00 2001
From: Wu Clan <jianhengwu0407@gmail.com>
Date: Thu, 22 Aug 2024 12:28:05 +0800
Subject: [PATCH] Update redis cache prefix separator to `:` (#387)

* Update redis cache prefix separator to `:`

* Update refresh token redis prefix
---
 backend/app/admin/conf.py |  4 ++--
 backend/app/task/conf.py  |  2 +-
 backend/core/conf.py      | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/backend/app/admin/conf.py b/backend/app/admin/conf.py
index 8d19e9d7..a9624cb6 100644
--- a/backend/app/admin/conf.py
+++ b/backend/app/admin/conf.py
@@ -27,11 +27,11 @@ class AdminSettings(BaseSettings):
     OAUTH2_FRONTEND_REDIRECT_URI: str = 'http://localhost:5173/oauth2/callback'
 
     # Captcha
-    CAPTCHA_LOGIN_REDIS_PREFIX: str = 'fba_login_captcha'
+    CAPTCHA_LOGIN_REDIS_PREFIX: str = 'fba:login:captcha'
     CAPTCHA_LOGIN_EXPIRE_SECONDS: int = 60 * 5  # 过期时间，单位：秒
 
     # Config
-    CONFIG_REDIS_KEY: str = 'fba_config'
+    CONFIG_REDIS_KEY: str = 'fba:config'
 
 
 @lru_cache
diff --git a/backend/app/task/conf.py b/backend/app/task/conf.py
index c5df6384..08b604d2 100644
--- a/backend/app/task/conf.py
+++ b/backend/app/task/conf.py
@@ -31,7 +31,7 @@ class TaskSettings(BaseSettings):
 
     # Celery
     CELERY_BROKER: Literal['rabbitmq', 'redis'] = 'redis'
-    CELERY_BACKEND_REDIS_PREFIX: str = 'fba_celery'
+    CELERY_BACKEND_REDIS_PREFIX: str = 'fba:celery'
     CELERY_BACKEND_REDIS_TIMEOUT: float = 5.0
     CELERY_TASKS_PACKAGES: list[str] = [
         'app.task.celery_task',
diff --git a/backend/core/conf.py b/backend/core/conf.py
index fa44fb0b..2ac86c2d 100644
--- a/backend/core/conf.py
+++ b/backend/core/conf.py
@@ -67,7 +67,7 @@ def validate_openapi_url(cls, values):
     LOCATION_PARSE: Literal['online', 'offline', 'false'] = 'offline'
 
     # Limiter
-    LIMITER_REDIS_PREFIX: str = 'fba_limiter'
+    LIMITER_REDIS_PREFIX: str = 'fba:limiter'
 
     # DateTime
     DATETIME_TIMEZONE: str = 'Asia/Shanghai'
@@ -85,14 +85,14 @@ def validate_openapi_url(cls, values):
     TOKEN_ALGORITHM: str = 'HS256'  # 算法
     TOKEN_EXPIRE_SECONDS: int = 60 * 60 * 24 * 1  # 过期时间，单位：秒
     TOKEN_REFRESH_EXPIRE_SECONDS: int = 60 * 60 * 24 * 7  # 刷新过期时间，单位：秒
-    TOKEN_REDIS_PREFIX: str = 'fba_token'
-    TOKEN_REFRESH_REDIS_PREFIX: str = 'fba_refresh_token'
+    TOKEN_REDIS_PREFIX: str = 'fba:token'
+    TOKEN_REFRESH_REDIS_PREFIX: str = 'fba:token:refresh'
     TOKEN_EXCLUDE: list[str] = [  # JWT / RBAC 白名单
         f'{API_V1_STR}/auth/login',
     ]
 
     # Sys User
-    USER_REDIS_PREFIX: str = 'fba_user'
+    USER_REDIS_PREFIX: str = 'fba:user'
     USER_REDIS_EXPIRE_SECONDS: int = 60 * 60 * 24 * 7
 
     # Log
@@ -107,7 +107,7 @@ def validate_openapi_url(cls, values):
 
     # RBAC Permission
     PERMISSION_MODE: Literal['casbin', 'role-menu'] = 'casbin'
-    PERMISSION_REDIS_PREFIX: str = 'fba_permission'
+    PERMISSION_REDIS_PREFIX: str = 'fba:permission'
 
     # Casbin Auth
     CASBIN_EXCLUDE: set[tuple[str, str]] = {
@@ -139,7 +139,7 @@ def validate_openapi_url(cls, values):
     ]
 
     # Ip location
-    IP_LOCATION_REDIS_PREFIX: str = 'fba_ip_location'
+    IP_LOCATION_REDIS_PREFIX: str = 'fba:ip:location'
     IP_LOCATION_EXPIRE_SECONDS: int = 60 * 60 * 24 * 1  # 过期时间，单位：秒