From 6cee5a61040b922a29e56dda80f2b43892fb2504 Mon Sep 17 00:00:00 2001
From: mkg <1650473152@qq.com>
Date: Tue, 16 Nov 2021 23:18:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E8=A7=A3=E5=86=B3logo=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .flaskenv                      |  3 +++
 applications/__init__.py       |  5 ++---
 applications/configs/common.py | 24 ------------------------
 applications/configs/config.py | 28 +++++++++++++++++++++++++++-
 4 files changed, 32 insertions(+), 28 deletions(-)
 delete mode 100644 applications/configs/common.py

diff --git a/.flaskenv b/.flaskenv
index 5f77bab..ddabb3b 100644
--- a/.flaskenv
+++ b/.flaskenv
@@ -5,6 +5,9 @@ FLASK_DEBUG=1
 FLASK_RUN_HOST = 127.0.0.1
 FLASK_RUN_PORT = 5000
 
+# pear admin flask配置
+SYSTEM_NAME = Pear Admin
+
 # MySql配置信息
 MYSQL_HOST=127.0.0.1
 # MYSQL_HOST=dbserver
diff --git a/applications/__init__.py b/applications/__init__.py
index b4384cb..e24950e 100644
--- a/applications/__init__.py
+++ b/applications/__init__.py
@@ -2,7 +2,6 @@ import os
 from flask import Flask
 
 from applications.common.script import init_script
-from applications.configs import common
 from applications.extensions import init_plugs
 from applications.view import init_view
 from applications.configs import config
@@ -16,7 +15,6 @@ def create_app(config_name=None):
         config_name = os.getenv('FLASK_CONFIG', 'development')
 
     # 引入数据库配置
-    app.config.from_object(common)
     app.config.from_object(config[config_name])
 
     # 注册各种插件
@@ -28,7 +26,8 @@ def create_app(config_name=None):
     # 注册命令
     init_script(app)
 
-    logo()
+    if os.environ.get('WERKZEUG_RUN_MAIN') == 'true':
+        logo()
 
     return app
 
diff --git a/applications/configs/common.py b/applications/configs/common.py
deleted file mode 100644
index a58c9ee..0000000
--- a/applications/configs/common.py
+++ /dev/null
@@ -1,24 +0,0 @@
-SYSTEM_NAME = "Pear Admin"
-# 主题面板的链接列表配置
-SYSTEM_PANEL_LINKS = [
-    {
-        "icon": "layui-icon layui-icon-auz",
-        "title": "官方网站",
-        "href": "http://www.pearadmin.com"
-    },
-    {
-        "icon": "layui-icon layui-icon-auz",
-        "title": "开发文档",
-        "href": "http://www.pearadmin.com"
-    },
-    {
-        "icon": "layui-icon layui-icon-auz",
-        "title": "开源地址",
-        "href": "https://gitee.com/Jmysy/Pear-Admin-Layui"
-    }
-]
-
-UPLOADED_PHOTOS_DEST = 'static/upload'
-UPLOADED_FILES_ALLOW = ['gif', 'jpg']
-# JSON配置
-JSON_AS_ASCII = False
diff --git a/applications/configs/config.py b/applications/configs/config.py
index 9f06f79..bdae8ec 100644
--- a/applications/configs/config.py
+++ b/applications/configs/config.py
@@ -3,6 +3,33 @@ import os
 
 
 class BaseConfig:
+
+    SYSTEM_NAME = os.getenv('SYSTEM_NAME', 'Pear Admin')
+    # 主题面板的链接列表配置
+    SYSTEM_PANEL_LINKS = [
+        {
+            "icon": "layui-icon layui-icon-auz",
+            "title": "官方网站",
+            "href": "http://www.pearadmin.com"
+        },
+        {
+            "icon": "layui-icon layui-icon-auz",
+            "title": "开发文档",
+            "href": "http://www.pearadmin.com"
+        },
+        {
+            "icon": "layui-icon layui-icon-auz",
+            "title": "开源地址",
+            "href": "https://gitee.com/Jmysy/Pear-Admin-Layui"
+        }
+    ]
+
+    UPLOADED_PHOTOS_DEST = 'static/upload'
+    UPLOADED_FILES_ALLOW = ['gif', 'jpg']
+
+    # JSON配置
+    JSON_AS_ASCII = False
+
     SECRET_KEY = os.getenv('SECRET_KEY', 'dev key')
 
     # redis配置
@@ -16,7 +43,6 @@ class BaseConfig:
     MYSQL_PORT = int(os.getenv('MYSQL_PORT') or 3306)
     MYSQL_DATABASE = os.getenv('MYSQL_DATABASE') or "PearAdminFlask"
 
-
     # mysql 数据库的配置信息
     SQLALCHEMY_DATABASE_URI = f"mysql+pymysql://{MYSQL_USERNAME}:{MYSQL_PASSWORD}@{MYSQL_HOST}:{MYSQL_PORT}/{MYSQL_DATABASE}"
     # 默认日志等级