diff --git a/safesite/migrations/0287_auto_20191118_2252.py b/safesite/migrations/0287_auto_20191118_2252.py new file mode 100644 index 00000000..0688d724 --- /dev/null +++ b/safesite/migrations/0287_auto_20191118_2252.py @@ -0,0 +1,23 @@ +# Generated by Django 2.1.5 on 2019-11-18 22:52 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0286_auto_20191030_1632'), + ] + + operations = [ + # migrations.RemoveField( + # model_name='companyinfo', + # name='liaison_fax', + # ), + migrations.AddField( + model_name='user', + name='epassword', + field=models.CharField(default=None, max_length=60), + preserve_default=False, + ), + ] diff --git a/safesite/migrations/0288_auto_20191118_2253.py b/safesite/migrations/0288_auto_20191118_2253.py new file mode 100644 index 00000000..cc908209 --- /dev/null +++ b/safesite/migrations/0288_auto_20191118_2253.py @@ -0,0 +1,22 @@ +# Generated by Django 2.1.5 on 2019-11-18 22:53 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0287_auto_20191118_2252'), + ] + + operations = [ + # migrations.RemoveField( + # model_name='companyinfo', + # name='liaison_fax', + # ), + migrations.AlterField( + model_name='user', + name='epassword', + field=models.CharField(default='', max_length=60), + ), + ] diff --git a/safesite/migrations/0289_auto_20191118_2256.py b/safesite/migrations/0289_auto_20191118_2256.py new file mode 100644 index 00000000..e7c14986 --- /dev/null +++ b/safesite/migrations/0289_auto_20191118_2256.py @@ -0,0 +1,22 @@ +# Generated by Django 2.1.5 on 2019-11-18 22:56 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0288_auto_20191118_2253'), + ] + + operations = [ + # migrations.RemoveField( + # model_name='companyinfo', + # name='liaison_fax', + # ), + migrations.AlterField( + model_name='user', + name='epassword', + field=models.CharField(blank=True, max_length=60, null=True), + ), + ] diff --git a/safesite/migrations/0290_auto_20191118_2256.py b/safesite/migrations/0290_auto_20191118_2256.py new file mode 100644 index 00000000..6578cbb1 --- /dev/null +++ b/safesite/migrations/0290_auto_20191118_2256.py @@ -0,0 +1,21 @@ +# Generated by Django 2.1.5 on 2019-11-18 22:56 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0289_auto_20191118_2256'), + ] + + operations = [ + # migrations.RemoveField( + # model_name='companyinfo', + # name='liaison_fax', + # ), + migrations.RemoveField( + model_name='user', + name='epassword', + ), + ] diff --git a/safesite/migrations/0291_auto_20191118_2309.py b/safesite/migrations/0291_auto_20191118_2309.py new file mode 100644 index 00000000..6c2f73c8 --- /dev/null +++ b/safesite/migrations/0291_auto_20191118_2309.py @@ -0,0 +1,22 @@ +# Generated by Django 2.1.5 on 2019-11-18 23:09 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0290_auto_20191118_2256'), + ] + + operations = [ + # migrations.RemoveField( + # model_name='companyinfo', + # name='liaison_fax', + # ), + migrations.AddField( + model_name='user', + name='epassword', + field=models.CharField(blank=True, max_length=60, null=True), + ), + ] diff --git a/safesite/models.py b/safesite/models.py index 9a8edf16..eff996c9 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -50,7 +50,8 @@ class User(models.Model): empid = models.CharField(max_length=20,blank=True,null=True)#工号 username = models.CharField(max_length=30,unique=True)#账号 name = models.CharField(max_length=20) - password = models.CharField(max_length=30) + password = models.CharField(max_length=30) + epassword = models.CharField(max_length=60,blank=True,null=True) ubelongpart = models.ForeignKey(Partment,related_name='upart', on_delete=models.CASCADE) openid=models.CharField(max_length=200,null=True,blank=True)#公众号openid nickname=models.CharField(max_length=200,null=True,blank=True)#昵称 diff --git a/safesite/views.py b/safesite/views.py index ccb54563..9e847f40 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -30,6 +30,7 @@ from .models import CompanyInfo from django.contrib.sessions.models import Session from groups import models as g_models import logging +from django.contrib.auth.hashers import make_password, check_password logger = logging.getLogger('log') #分页功能