gitee
/
django-vue-admin
mirror of https://gitee.com/liqianglog/django-vue-admin
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v2.x' into v2.x

pull/49/head
猿小天 2022-04-15 19:08:04 +08:00
parent c8602c59c5 1f4a1a0cd3
commit d28d55d356
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/conf/env.example.py
View File

@ -7,22 +7,21 @@ from application.settings import BASE_DIR
# ================================================= #
# 数据库 ENGINE ，默认演示使用 sqlite3 数据库，正式环境建议使用 mysql 数据库
# sqlite3 设置
DATABASE_ENGINE = "django.db.backends.sqlite3"
# 数据库名
DATABASE_NAME = os.path.join(BASE_DIR, 'db.sqlite3')
#************mysql配置*******************#
# 使用mysql时，改为此配置
# DATABASE_ENGINE = "django.db.backends.mysql"
# DATABASE_NAME = 'django-vue-admin' # mysql 时使用
# 数据库地址 改为自己数据库地址
# DATABASE_HOST = "127.0.0.1"
DATABASE_HOST = "127.0.0.1"
# # 数据库端口
# DATABASE_PORT = 3306
DATABASE_PORT = 3306
# # 数据库用户名
# DATABASE_USER = "root"
DATABASE_USER = "root"
# # 数据库密码
# DATABASE_PASSWORD = "123456"
DATABASE_PASSWORD = "123456"
# ================================================= #
# ************** redis配置，无redis 可不进行配置 ************** #

2
backend/dvadmin/utils/serializers.py
View File

@ -68,7 +68,7 @@ class CustomModelSerializer(DynamicFieldsMixin,ModelSerializer):
def update(self, instance, validated_data):
if self.request:
if hasattr(self.instance, self.modifier_field_id):
self.instance[self.modifier_field_id] = self.get_request_user_id()
setattr(self.instance, self.modifier_field_id, self.get_request_user_id())
return super().update(instance, validated_data)
def get_request_username(self):