From b4632f2c9ad1ae3bf501e534972cd6ad73c2a786 Mon Sep 17 00:00:00 2001 From: cuiweizhi <560397@gree.com.cn> Date: Sat, 4 Nov 2023 12:12:21 +0800 Subject: [PATCH] Update project --- .editorconfig | 2 +- application/extensions/init_elasticsearch.py | 2 +- application/extensions/init_logger.py | 2 +- application/{lib => libs}/__init__.py | 0 application/{lib => libs}/config/__init__.py | 0 application/{lib => libs}/config/consul.py | 0 application/{lib => libs}/config/local.py | 0 application/{lib => libs}/flask_elasticsearch/__init__.py | 0 application/{lib => libs}/flask_elasticsearch/elasticsearch.py | 0 application/{lib => libs}/flask_loguru/__init__.py | 0 application/{lib => libs}/flask_loguru/format.py | 0 application/{lib => libs}/flask_loguru/logger.py | 0 application/utils/loaders/consul_loader.py | 2 +- application/utils/loaders/yaml_loader.py | 2 +- 14 files changed, 5 insertions(+), 5 deletions(-) rename application/{lib => libs}/__init__.py (100%) rename application/{lib => libs}/config/__init__.py (100%) rename application/{lib => libs}/config/consul.py (100%) rename application/{lib => libs}/config/local.py (100%) rename application/{lib => libs}/flask_elasticsearch/__init__.py (100%) rename application/{lib => libs}/flask_elasticsearch/elasticsearch.py (100%) rename application/{lib => libs}/flask_loguru/__init__.py (100%) rename application/{lib => libs}/flask_loguru/format.py (100%) rename application/{lib => libs}/flask_loguru/logger.py (100%) diff --git a/.editorconfig b/.editorconfig index f5c89b5..9476ec8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -22,7 +22,7 @@ indent_size = 4 [Makefile] indent_style = tab -# Indentation override for all JS under lib directory +# Indentation override for all JS under libs directory [lib/**.js] indent_style = space indent_size = 2 diff --git a/application/extensions/init_elasticsearch.py b/application/extensions/init_elasticsearch.py index 4e5aa21..20c2161 100644 --- a/application/extensions/init_elasticsearch.py +++ b/application/extensions/init_elasticsearch.py @@ -13,7 +13,7 @@ from flask import Flask -from application.lib import FlaskElasticsearch +from application.libs import FlaskElasticsearch es = FlaskElasticsearch() diff --git a/application/extensions/init_logger.py b/application/extensions/init_logger.py index 62e96a5..598f56c 100644 --- a/application/extensions/init_logger.py +++ b/application/extensions/init_logger.py @@ -12,7 +12,7 @@ from flask import Flask -from application.lib import FlaskLoguru +from application.libs import FlaskLoguru def init_logger(app: Flask) -> None: diff --git a/application/lib/__init__.py b/application/libs/__init__.py similarity index 100% rename from application/lib/__init__.py rename to application/libs/__init__.py diff --git a/application/lib/config/__init__.py b/application/libs/config/__init__.py similarity index 100% rename from application/lib/config/__init__.py rename to application/libs/config/__init__.py diff --git a/application/lib/config/consul.py b/application/libs/config/consul.py similarity index 100% rename from application/lib/config/consul.py rename to application/libs/config/consul.py diff --git a/application/lib/config/local.py b/application/libs/config/local.py similarity index 100% rename from application/lib/config/local.py rename to application/libs/config/local.py diff --git a/application/lib/flask_elasticsearch/__init__.py b/application/libs/flask_elasticsearch/__init__.py similarity index 100% rename from application/lib/flask_elasticsearch/__init__.py rename to application/libs/flask_elasticsearch/__init__.py diff --git a/application/lib/flask_elasticsearch/elasticsearch.py b/application/libs/flask_elasticsearch/elasticsearch.py similarity index 100% rename from application/lib/flask_elasticsearch/elasticsearch.py rename to application/libs/flask_elasticsearch/elasticsearch.py diff --git a/application/lib/flask_loguru/__init__.py b/application/libs/flask_loguru/__init__.py similarity index 100% rename from application/lib/flask_loguru/__init__.py rename to application/libs/flask_loguru/__init__.py diff --git a/application/lib/flask_loguru/format.py b/application/libs/flask_loguru/format.py similarity index 100% rename from application/lib/flask_loguru/format.py rename to application/libs/flask_loguru/format.py diff --git a/application/lib/flask_loguru/logger.py b/application/libs/flask_loguru/logger.py similarity index 100% rename from application/lib/flask_loguru/logger.py rename to application/libs/flask_loguru/logger.py diff --git a/application/utils/loaders/consul_loader.py b/application/utils/loaders/consul_loader.py index cea5dbe..d0ffa44 100644 --- a/application/utils/loaders/consul_loader.py +++ b/application/utils/loaders/consul_loader.py @@ -17,7 +17,7 @@ from dynaconf.base import LazySettings from dynaconf.utils.parse_conf import parse_conf_data from application.common import EnvVarHelper -from application.lib import ConsulConfig +from application.libs import ConsulConfig IDENTIFIER = "consul_loader" diff --git a/application/utils/loaders/yaml_loader.py b/application/utils/loaders/yaml_loader.py index e5d7e0a..0ddcd23 100644 --- a/application/utils/loaders/yaml_loader.py +++ b/application/utils/loaders/yaml_loader.py @@ -18,7 +18,7 @@ from dynaconf.base import LazySettings from dynaconf.utils.parse_conf import parse_conf_data from application.common import FileHelper -from application.lib import LocalConfig +from application.libs import LocalConfig IDENTIFIER = "yaml_loader" -- GitLab