Commit d2b45597 authored by 纪超's avatar 纪超

完成日志、配置文件、数据库工具模块

parent 294dd165
from . import *
...@@ -74,7 +74,7 @@ def env_var_constructor(loader, node, raw=False): ...@@ -74,7 +74,7 @@ def env_var_constructor(loader, node, raw=False):
def get_config(config_name=None): def get_config(config_name=None):
CONFIG_NAME = config_name or 'config.yml' CONFIG_NAME = config_name or 'config.yml'
path = f'{get_project_path()}{os.path.sep}config.yml' path = f'{get_project_path()}{os.path.sep}{CONFIG_NAME}'
with open(path, 'r', encoding='utf-8') as f: with open(path, 'r', encoding='utf-8') as f:
return yaml.safe_load(f) return yaml.safe_load(f)
......
...@@ -3,7 +3,6 @@ import pymysql ...@@ -3,7 +3,6 @@ import pymysql
import threading import threading
from pymysql.cursors import DictCursor from pymysql.cursors import DictCursor
from .__env_config import config as default_config from .__env_config import config as default_config
from functools import partial
class Database: class Database:
...@@ -60,7 +59,7 @@ def read(func=None, config=None, one=False): ...@@ -60,7 +59,7 @@ def read(func=None, config=None, one=False):
def write(func=None, config=None): def write(func=None, config=None):
if func is None: if func is None:
return functools.partial(write, func=func, config=config) return functools.partial(write, config=config)
def execute(db, sqls): def execute(db, sqls):
if isinstance(sqls, list): if isinstance(sqls, list):
...@@ -87,7 +86,7 @@ def write(func=None, config=None): ...@@ -87,7 +86,7 @@ def write(func=None, config=None):
def transaction(func=None, config=None): def transaction(func=None, config=None):
if func is None: if func is None:
return functools.partial(transaction, func=func, config=config) return functools.partial(transaction, config=config)
@functools.wraps(func) @functools.wraps(func)
def wraps(*args, **kwargs): def wraps(*args, **kwargs):
...@@ -105,5 +104,3 @@ def transaction(func=None, config=None): ...@@ -105,5 +104,3 @@ def transaction(func=None, config=None):
finally: finally:
del __local__.db del __local__.db
return wraps return wraps
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment