From c2042d5f8054be289a363283345ea05f27e00ec4 Mon Sep 17 00:00:00 2001 From: mkg <1650473152@qq.com> Date: Thu, 28 Oct 2021 07:56:41 +0000 Subject: [PATCH 1/4] update start.sh. --- start.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/start.sh b/start.sh index faecf80..4c3aca5 100644 --- a/start.sh +++ b/start.sh @@ -1,2 +1 @@ -source venv/bin/activate exec gunicorn -c gunicorn.conf.py "applications:create_app('development')" \ No newline at end of file From 9caa7a22e55a5abd56e63f8fb1b0a6f1ee8db7c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E8=83=9C=E8=88=9F?= <1650473152@qq.com> Date: Sat, 6 Nov 2021 09:17:49 +0000 Subject: [PATCH 2/4] update applications/configs/config.py. --- applications/configs/config.py | 1 - 1 file changed, 1 deletion(-) diff --git a/applications/configs/config.py b/applications/configs/config.py index 15c61af..9f06f79 100644 --- a/applications/configs/config.py +++ b/applications/configs/config.py @@ -16,7 +16,6 @@ class BaseConfig: MYSQL_PORT = int(os.getenv('MYSQL_PORT') or 3306) MYSQL_DATABASE = os.getenv('MYSQL_DATABASE') or "PearAdminFlask" - UPLOADED_PHOTOS_DEST = '/static' # mysql 数据库的配置信息 SQLALCHEMY_DATABASE_URI = f"mysql+pymysql://{MYSQL_USERNAME}:{MYSQL_PASSWORD}@{MYSQL_HOST}:{MYSQL_PORT}/{MYSQL_DATABASE}" From 724e0817a58a08e39dd56c32c2c00ea5affa1a24 Mon Sep 17 00:00:00 2001 From: sys Date: Sat, 6 Nov 2021 12:31:52 +0000 Subject: [PATCH 3/4] update applications/view/admin/user.py. --- applications/view/admin/user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/view/admin/user.py b/applications/view/admin/user.py index 41e5405..c22b0f2 100644 --- a/applications/view/admin/user.py +++ b/applications/view/admin/user.py @@ -132,7 +132,7 @@ def update(): @login_required def center(): user_info = current_user - user_logs = AdminLog.query.filter_by(url='/admin/login').filter_by(uid=current_user.id).order_by( + user_logs = AdminLog.query.filter_by(url='/passport/login').filter_by(uid=current_user.id).order_by( desc(AdminLog.create_time)).limit(10) return render_template('admin/user/center.html', user_info=user_info, user_logs=user_logs) From 044e432eb772906527e0481a6d226f25237408a0 Mon Sep 17 00:00:00 2001 From: sys Date: Sat, 6 Nov 2021 17:22:05 +0000 Subject: [PATCH 4/4] update applications/common/admin.py. --- applications/common/admin.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/applications/common/admin.py b/applications/common/admin.py index 275e6de..403c983 100644 --- a/applications/common/admin.py +++ b/applications/common/admin.py @@ -60,6 +60,18 @@ def make_menu_tree(): for p0 in power0_dict: for p1 in power1_dict: + for p2 in power1_dict: + if p1.get('id') == p2.get('parent_id') and int(p2.get('type'))<2: + if p1.get("children") is None: + p1['children'] = [] + p1['children'].append(p2) + else: + hassame = 0 + for tmp in p1['children']: + if tmp.get('id') == p2.get('id'): + hassame =1 + if hassame == 0: + p1['children'].append(p2) if p0.get('id') == p1.get('parent_id'): if p0.get("children") is None: p0['children'] = []