From b32c0973e82ec2886fb63df2396bb1dcff838b0e Mon Sep 17 00:00:00 2001 From: sichan Date: Wed, 29 May 2024 17:11:26 +0800 Subject: [PATCH] commit --- .gitignore | 4 +++- .idea/misc.xml | 2 +- XH_Digital_Management/settings.py | 17 ++++++++--------- templates/base.html | 16 ++++++++++------ 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 72b7b19..25a6a6b 100644 --- a/.gitignore +++ b/.gitignore @@ -102,4 +102,6 @@ target/ # Other files *.csv -*.json \ No newline at end of file +*.json +/.idea/misc.xml +/.gitignore diff --git a/.idea/misc.xml b/.idea/misc.xml index f5e6d46..b8cef98 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/XH_Digital_Management/settings.py b/XH_Digital_Management/settings.py index e4e4355..3250af2 100644 --- a/XH_Digital_Management/settings.py +++ b/XH_Digital_Management/settings.py @@ -121,10 +121,10 @@ DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', 'NAME': 'xh_digital_manage', # 数据库名 - 'USER': 'root', # 用户名 - 'PASSWORD': '123456', # 密码 - 'HOST': 'localhost', # 地址 - 'PORT': '3306', # 端口号 + 'USER': 'wsc', # 用户名 + 'PASSWORD': 'jsxh9512..', # 密码 + 'HOST': 'bj-cdb-7qxczedm.sql.tencentcdb.com', # 地址 + 'PORT': '59450', # 端口号 'OPTIONS': { # 这里可以添加一些额外的选项，比如连接超时时间 'connect_timeout': 20, @@ -178,15 +178,14 @@ USE_TZ = True STATIC_URL = "static/" +STATICFILES_DIRS = [ + os.path.join(BASE_DIR, 'static'), +] + # Default primary key field type # https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" - -STATICFILES_DIRS = [ - os.path.join(BASE_DIR, 'assets'), -] - LOGIN_REDIRECT_URL = '/' # 登录后重定向的URL LOGOUT_REDIRECT_URL = '/' # 登出后重定向的URL diff --git a/templates/base.html b/templates/base.html index 78ef4b5..928c830 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,6 +1,6 @@ -{% load static %} +{% load static %} 数字化管理系统 @@ -414,12 +414,16 @@ class="icon feather icon-settings">
- User-Profile-Image - 张三 - zhangsan@mail.com - + {% if user.is_authenticated %} + {{ user.last_name }}{{ user.first_name }} + {{ user.email }} + {% else %} + + 游客 + 请登录 + {% endif %} +