作者 wanweibin

update

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