style: 调整cache函数名

configure/__init__.py

@@ -21,7 +21,12 @@ conf = {
     "REDIS_NAME": "localhost",
     "REDIS_PASSWD": "123456",
     "REDIS_DATABASE": 0,
-    "REDIS_EXPIRE": 604800,  # 默认七天过期
+    "CACHE_REDIS_HOST": "localhost",
+    "CACHE_REDIS_PORT": 6379,
+    "CACHE_REDIS_NAME": "localhost",
+    "CACHE_REDIS_PASSWD": "123456",
+    "CACHE_REDIS_DATABASE": 0,
+    "CACHE_EXPIRE": 604800,  # 默认七天过期
     "MAIL_SERVER": "",
     "MAIL_PORT": "",
     "MAIL_USE_TLS": False,

sql/__init__.py

@@ -9,8 +9,8 @@ db = DB(host=conf["MYSQL_URL"],
         port=conf["MYSQL_PORT"],
         database=conf["MYSQL_DATABASE"])
 
-cache = redis.RedisDB(host=conf["REDIS_HOST"],
-                      port=conf["REDIS_PORT"],
-                      username=conf["REDIS_NAME"],
-                      passwd=conf["REDIS_PASSWD"],
-                      db=conf["REDIS_DATABASE"])
+cache = redis.RedisDB(host=conf["CACHE_REDIS_HOST"],
+                      port=conf["CACHE_REDIS_PORT"],
+                      username=conf["CACHE_REDIS_NAME"],
+                      passwd=conf["CACHE_REDIS_PASSWD"],
+                      db=conf["CACHE_REDIS_DATABASE"])

sql/archive.py

@@ -1,5 +1,5 @@
 from sql import db
-from sql.cache import (read_archive_from_cache, write_archive_to_cache, delete_archive_from_cache,
+from sql.cache import (get_archive_from_cache, write_archive_to_cache, delete_archive_from_cache,
                        get_blog_archive_from_cache, write_blog_archive_to_cache, delete_blog_archive_from_cache,
                        delete_all_blog_archive_from_cache)
 from typing import Optional
@@ -18,7 +18,7 @@ def create_archive(name: str, describe: str):
 
 def read_archive(archive_id: int):
     """ 获取归档 ID """
-    res = read_archive_from_cache(archive_id)
+    res = get_archive_from_cache(archive_id)
     if res is not None:
         return res
 

sql/blog.py

@@ -1,6 +1,6 @@
 from sql import db
 from sql.archive import add_blog_to_archive
-from sql.cache import (write_blog_to_cache, read_blog_from_cache, delete_blog_from_cache,
+from sql.cache import (write_blog_to_cache, get_blog_from_cache, delete_blog_from_cache,
                        write_blog_count_to_cache, get_blog_count_from_cache, delete_blog_count_from_cache,
                        write_archive_blog_count_to_cache, get_archive_blog_count_from_cache,
                        delete_all_archive_blog_count_from_cache, delete_archive_blog_count_from_cache,
@@ -52,7 +52,7 @@ def update_blog(blog_id: int, content: str) -> bool:
 
 def read_blog(blog_id: int) -> list:
     """ 读取blog内容 """
-    res = read_blog_from_cache(blog_id)
+    res = get_blog_from_cache(blog_id)
     if res is not None:
         return res
 

sql/cache.py

@@ -6,7 +6,7 @@ from functools import wraps
 from datetime import datetime
 
 
-CACHE_TIME = int(conf["REDIS_EXPIRE"])
+CACHE_TIME = int(conf["CACHE_EXPIRE"])
 
 
 def __try_redis(ret=None):
@@ -24,7 +24,7 @@ def __try_redis(ret=None):
 
 
 @__try_redis(None)
-def read_msg_from_cache(msg_id: int):
+def get_msg_from_cache(msg_id: int):
     msg = cache.hgetall(f"cache:msg:{msg_id}")
     if len(msg) != 4:
         return None
@@ -98,7 +98,7 @@ def delete_all_user_msg_count_from_cache():
 
 
 @__try_redis(None)
-def read_blog_from_cache(blog_id: int):
+def get_blog_from_cache(blog_id: int):
     blog = cache.hgetall(f"cache:blog:{blog_id}")
     if len(blog) != 7:
         return None
@@ -138,7 +138,6 @@ def get_blog_count_from_cache():
     count = cache.get("cache:blog_count")
     if count is not None:
         return int(count)
-    return
 
 
 @__try_redis(None)
@@ -206,7 +205,7 @@ def delete_user_blog_count_from_cache(user_id: int):
 
 
 @__try_redis(None)
-def read_archive_from_cache(archive_id: int):
+def get_archive_from_cache(archive_id: int):
     archive = cache.hgetall(f"cache:archive:{archive_id}")
     if len(archive) != 2:
         return None
@@ -257,7 +256,7 @@ def delete_all_blog_archive_from_cache():
 
 
 @__try_redis(None)
-def read_comment_from_cache(comment_id: int):
+def get_comment_from_cache(comment_id: int):
     comment = cache.hgetall(f"cache:comment:{comment_id}")
     if len(comment) != 2:
         return None
@@ -312,7 +311,7 @@ def delete_all_user_comment_count_from_cache():
 
 
 @__try_redis(None)
-def read_user_from_cache(email: str):
+def get_user_from_cache(email: str):
     user = cache.hgetall(f"cache:user:{email}")
     if len(user) != 2:
         return None

sql/comment.py

@@ -1,5 +1,5 @@
 from sql import db
-from sql.cache import (read_comment_from_cache, write_comment_to_cache, delete_comment_from_cache,
+from sql.cache import (get_comment_from_cache, write_comment_to_cache, delete_comment_from_cache,
                        get_user_comment_count_from_cache, write_user_comment_count_to_cache,
                        delete_all_user_comment_count_from_cache, delete_user_comment_count_from_cache)
 
@@ -29,7 +29,7 @@ def create_comment(blog_id: int, user_id: int, content: str):
 
 def read_comment(comment_id: int):
     """ 读取 comment """
-    res = read_comment_from_cache(comment_id)
+    res = get_comment_from_cache(comment_id)
     if res is not None:
         return res
 

sql/msg.py

@@ -1,5 +1,5 @@
 from sql import db
-from sql.cache import (read_msg_from_cache, write_msg_to_cache, delete_msg_from_cache,
+from sql.cache import (get_msg_from_cache, write_msg_to_cache, delete_msg_from_cache,
                        get_msg_cout_from_cache, write_msg_count_to_cache, delete_msg_count_from_cache,
                        get_user_msg_count_from_cache, write_user_msg_count_to_cache,
                        delete_all_user_msg_count_from_cache, delete_user_msg_count_from_cache)
@@ -51,7 +51,7 @@ def create_msg(auth: int, content: str, secret: bool = False):
 
 
 def read_msg(msg_id: int):
-    res = read_msg_from_cache(msg_id)
+    res = get_msg_from_cache(msg_id)
     if res is not None:
         return res
 

sql/user.py

@@ -1,6 +1,6 @@
 from sql import db
 from sql.base import DBBit
-from sql.cache import (read_user_from_cache, write_user_to_cache, delete_user_from_cache,
+from sql.cache import (get_user_from_cache, write_user_to_cache, delete_user_from_cache,
                        get_user_email_from_cache, write_user_email_to_cache, delete_user_email_from_cache,
                        get_role_name_from_cache, write_role_name_to_cache, delete_role_name_from_cache,
                        get_role_operate_from_cache, write_role_operate_to_cache, delete_role_operate_from_cache)
@@ -16,7 +16,7 @@ role_authority = ["WriteBlog", "WriteComment", "WriteMsg", "CreateUser",
 
 def read_user(email: str):
     """ 读取用户 """
-    res = read_user_from_cache(email)
+    res = get_user_from_cache(email)
     if res is not None:
         return res