From 9051e8138cc7be8169acd8b778e04319e5f486c8 Mon Sep 17 00:00:00 2001
From: mkg <1650473152@qq.com>
Date: Sun, 14 Nov 2021 18:36:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8E=AF=E5=A2=83=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/common/script/initdb.py   |  2 +-
 applications/extensions/__init__.py    |  2 ++
 applications/extensions/init_dotenv.py | 12 +++++++-----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/applications/common/script/initdb.py b/applications/common/script/initdb.py
index 09f310c..84399ff 100644
--- a/applications/common/script/initdb.py
+++ b/applications/common/script/initdb.py
@@ -1,7 +1,7 @@
 from dotenv import dotenv_values
 import sqlparse
 import pymysql
-config = dotenv_values('.env')
+config = dotenv_values('.flaskenv')
 # MySql配置信息
 HOST = config.get('MYSQL_HOST') or '127.0.0.1'
 PORT = config.get('MYSQL_PORT') or 3306
diff --git a/applications/extensions/__init__.py b/applications/extensions/__init__.py
index 3a0ac03..2e7e108 100644
--- a/applications/extensions/__init__.py
+++ b/applications/extensions/__init__.py
@@ -8,6 +8,7 @@ from .init_error_views import init_error_views
 from .init_mail import init_mail
 from .init_apscheduler import init_scheduler
 from .init_upload import init_upload
+from .init_dotenv import init_dotenv
 
 
 def init_plugs(app: Flask) -> None:
@@ -19,3 +20,4 @@ def init_plugs(app: Flask) -> None:
     init_mail(app)
     init_scheduler(app)
     init_upload(app)
+    init_dotenv()
diff --git a/applications/extensions/init_dotenv.py b/applications/extensions/init_dotenv.py
index dd90d48..f67d3a4 100644
--- a/applications/extensions/init_dotenv.py
+++ b/applications/extensions/init_dotenv.py
@@ -2,11 +2,13 @@ import os
 from dotenv import load_dotenv
 
 root_path = os.path.abspath(os.path.dirname(__file__)).split('applications')[0]
-dot_env_path = os.path.join(root_path, '.env')
+# dot_env_path = os.path.join(root_path, '.env')
 flask_env_path = os.path.join(root_path, '.flaskenv')
 
-if os.path.exists(dot_env_path):
-    load_dotenv(dot_env_path)
 
-if os.path.exists(flask_env_path):
-    load_dotenv(flask_env_path)
+# if os.path.exists(dot_env_path):
+#     load_dotenv(dot_env_path)
+
+def init_dotenv():
+    if os.path.exists(flask_env_path):
+        load_dotenv(flask_env_path)