作者 wanweibin

update

# Generated by Django 3.1.1 on 2020-10-08 07:45
# Generated by Django 3.1.1 on 2020-10-08 08:34
from django.db import migrations, models
import django.db.models.deletion
... ...
# Generated by Django 3.1.1 on 2020-10-08 07:45
# Generated by Django 3.1.1 on 2020-10-08 08:34
from django.conf import settings
from django.db import migrations, models
... ... @@ -28,6 +28,6 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='auditor',
name='user',
field=models.ForeignKey(choices=[(1, 'admin'), (2, 'wanweibin'), (3, 'wanweibin1')], on_delete=django.db.models.deletion.CASCADE, related_name='aud', to=settings.AUTH_USER_MODEL, verbose_name='审批人员'),
field=models.ForeignKey(choices=[(1, '邓望明'), (2, '杜波')], on_delete=django.db.models.deletion.CASCADE, related_name='aud', to=settings.AUTH_USER_MODEL, verbose_name='审批人员'),
),
]
... ...
from django.db import models
from usercenter.models import User
users = User.objects.filter(is_active=True).values('username', 'id').all()
AUDITOR_CHOICE = [(i['id'], i['username']) for i in users]
# users = User.objects.filter(is_active=True).values('username', 'id').all()
# AUDITOR_CHOICE = [(i['id'], i['username']) for i in users]
AUDITOR_CHOICE = [(2, '邓望明'), (3, '杜波')]
class Auditor(models.Model):
... ...
# Generated by Django 3.1.1 on 2020-10-08 07:45
# Generated by Django 3.1.1 on 2020-10-08 08:34
from django.conf import settings
from django.db import migrations, models
... ...
... ... @@ -6,11 +6,10 @@ import environ
from pathlib import Path
from datetime import timedelta
# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = Path(__file__).resolve().parent.parent
env = environ.Env()
READ_DOT_ENV_FILE = env.bool('DJANGO_READ_DOT_ENV_FILE', default=True) # 使用.env,此项设置为True
READ_DOT_ENV_FILE = env.bool('DJANGO_READ_DOT_ENV_FILE', default=True)
if READ_DOT_ENV_FILE:
env.read_env(os.path.join(BASE_DIR, '.env'))
... ... @@ -31,9 +30,9 @@ INSTALLED_APPS = [
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'usercenter.apps.UsercenterConfig',
'project.apps.ProjectConfig',
'rest_framework',
'usercenter',
'project',
'django_filters',
]
... ... @@ -71,6 +70,9 @@ WSGI_APPLICATION = 'wxProject.wsgi.application'
# Database
# https://docs.djangoproject.com/en/3.1/ref/settings/#databases
# 项目用户验证模型
AUTH_USER_MODEL = "usercenter.User"
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.mysql',
... ... @@ -171,6 +173,3 @@ SIMPLE_JWT = {
'SLIDING_TOKEN_LIFETIME': timedelta(minutes=5),
'SLIDING_TOKEN_REFRESH_LIFETIME': timedelta(days=1),
}
# 项目用户验证模型
AUTH_USER_MODEL = "usercenter.User"
... ...