mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-06-01 19:35:23 +00:00
perf: migrations merge
This commit is contained in:
parent
0f5681de7d
commit
a317549a01
@ -36,6 +36,7 @@ class Migration(migrations.Migration):
|
|||||||
],
|
],
|
||||||
options={
|
options={
|
||||||
"verbose_name": "Directory service",
|
"verbose_name": "Directory service",
|
||||||
|
"default_related_name": "ds"
|
||||||
},
|
},
|
||||||
bases=("assets.asset",),
|
bases=("assets.asset",),
|
||||||
),
|
),
|
||||||
@ -53,7 +54,7 @@ class Migration(migrations.Migration):
|
|||||||
on_delete=django.db.models.deletion.SET_NULL,
|
on_delete=django.db.models.deletion.SET_NULL,
|
||||||
related_name="ds_platforms",
|
related_name="ds_platforms",
|
||||||
to="assets.directoryservice",
|
to="assets.directoryservice",
|
||||||
verbose_name="Active Directory",
|
verbose_name="Directory service",
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
@ -9,7 +9,6 @@ import common.db.encoder
|
|||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
initial = True
|
initial = True
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
@ -19,10 +18,14 @@ class Migration(migrations.Migration):
|
|||||||
migrations.CreateModel(
|
migrations.CreateModel(
|
||||||
name='ActivityLog',
|
name='ActivityLog',
|
||||||
fields=[
|
fields=[
|
||||||
('org_id', models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization')),
|
('org_id',
|
||||||
|
models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization')),
|
||||||
('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
|
('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
|
||||||
('type', models.CharField(choices=[('O', 'Operate log'), ('S', 'Session log'), ('L', 'Login log'), ('T', 'Task')], default=None, max_length=2, null=True, verbose_name='Activity type')),
|
('type', models.CharField(
|
||||||
('resource_id', models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Resource')),
|
choices=[('O', 'Operate log'), ('S', 'Session log'), ('L', 'Login log'), ('T', 'Task')],
|
||||||
|
default=None, max_length=2, null=True, verbose_name='Activity type')),
|
||||||
|
('resource_id',
|
||||||
|
models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Resource')),
|
||||||
('datetime', models.DateTimeField(auto_now=True, db_index=True, verbose_name='Datetime')),
|
('datetime', models.DateTimeField(auto_now=True, db_index=True, verbose_name='Datetime')),
|
||||||
('detail', models.TextField(blank=True, default='', verbose_name='Detail')),
|
('detail', models.TextField(blank=True, default='', verbose_name='Detail')),
|
||||||
('detail_id', models.CharField(default=None, max_length=36, null=True, verbose_name='Detail ID')),
|
('detail_id', models.CharField(default=None, max_length=36, null=True, verbose_name='Detail ID')),
|
||||||
@ -35,13 +38,17 @@ class Migration(migrations.Migration):
|
|||||||
migrations.CreateModel(
|
migrations.CreateModel(
|
||||||
name='FTPLog',
|
name='FTPLog',
|
||||||
fields=[
|
fields=[
|
||||||
('org_id', models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization')),
|
('org_id',
|
||||||
|
models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization')),
|
||||||
('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
|
('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
|
||||||
('user', models.CharField(max_length=128, verbose_name='User')),
|
('user', models.CharField(max_length=128, verbose_name='User')),
|
||||||
('remote_addr', models.CharField(blank=True, max_length=128, null=True, verbose_name='Remote addr')),
|
('remote_addr', models.CharField(blank=True, max_length=128, null=True, verbose_name='Remote addr')),
|
||||||
('asset', models.CharField(max_length=1024, verbose_name='Asset')),
|
('asset', models.CharField(max_length=1024, verbose_name='Asset')),
|
||||||
('account', models.CharField(max_length=128, verbose_name='Account')),
|
('account', models.CharField(max_length=128, verbose_name='Account')),
|
||||||
('operate', models.CharField(choices=[('mkdir', 'Mkdir'), ('rmdir', 'Rmdir'), ('delete', 'Delete'), ('upload', 'Upload'), ('rename', 'Rename'), ('symlink', 'Symlink'), ('download', 'Download'), ('rename_dir', 'Rename dir')], max_length=16, verbose_name='Operate')),
|
('operate', models.CharField(
|
||||||
|
choices=[('mkdir', 'Mkdir'), ('rmdir', 'Rmdir'), ('delete', 'Delete'), ('upload', 'Upload'),
|
||||||
|
('rename', 'Rename'), ('symlink', 'Symlink'), ('download', 'Download'),
|
||||||
|
('rename_dir', 'Rename dir')], max_length=16, verbose_name='Operate')),
|
||||||
('filename', models.CharField(max_length=1024, verbose_name='Filename')),
|
('filename', models.CharField(max_length=1024, verbose_name='Filename')),
|
||||||
('is_success', models.BooleanField(default=True, verbose_name='Success')),
|
('is_success', models.BooleanField(default=True, verbose_name='Success')),
|
||||||
('date_start', models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='Date start')),
|
('date_start', models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='Date start')),
|
||||||
@ -55,13 +62,32 @@ class Migration(migrations.Migration):
|
|||||||
migrations.CreateModel(
|
migrations.CreateModel(
|
||||||
name='OperateLog',
|
name='OperateLog',
|
||||||
fields=[
|
fields=[
|
||||||
('org_id', models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization')),
|
('org_id',
|
||||||
|
models.CharField(blank=True, db_index=True, default='', max_length=36, verbose_name='Organization')),
|
||||||
('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
|
('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
|
||||||
('user', models.CharField(max_length=128, verbose_name='User')),
|
('user', models.CharField(max_length=128, verbose_name='User')),
|
||||||
('action', models.CharField(choices=[('view', 'View'), ('update', 'Update'), ('delete', 'Delete'), ('create', 'Create'), ('download', 'Download'), ('connect', 'Connect'), ('login', 'Login'), ('change_password', 'Change password'), ('accept', 'Accept'), ('review', 'Review'), ('notice', 'Notifications'), ('reject', 'Reject'), ('approve', 'Approve'), ('close', 'Close'), ('finished', 'Finished')], max_length=16, verbose_name='Action')),
|
('action', models.CharField(choices=[
|
||||||
|
("view", "View"),
|
||||||
|
("update", "Update"),
|
||||||
|
("delete", "Delete"),
|
||||||
|
("create", "Create"),
|
||||||
|
("export", "Export"),
|
||||||
|
("download", "Download"),
|
||||||
|
("connect", "Connect"),
|
||||||
|
("login", "Login"),
|
||||||
|
("change_password", "Change password"),
|
||||||
|
("accept", "Accept"),
|
||||||
|
("review", "Review"),
|
||||||
|
("notice", "Notifications"),
|
||||||
|
("reject", "Reject"),
|
||||||
|
("approve", "Approve"),
|
||||||
|
("close", "Close"),
|
||||||
|
("finished", "Finished"),
|
||||||
|
], max_length=16, verbose_name='Action')),
|
||||||
('resource_type', models.CharField(max_length=64, verbose_name='Resource Type')),
|
('resource_type', models.CharField(max_length=64, verbose_name='Resource Type')),
|
||||||
('resource', models.CharField(max_length=128, verbose_name='Resource')),
|
('resource', models.CharField(max_length=128, verbose_name='Resource')),
|
||||||
('resource_id', models.CharField(blank=True, db_index=True, default='', max_length=128, verbose_name='Resource')),
|
('resource_id',
|
||||||
|
models.CharField(blank=True, db_index=True, default='', max_length=128, verbose_name='Resource')),
|
||||||
('remote_addr', models.CharField(blank=True, max_length=128, null=True, verbose_name='Remote addr')),
|
('remote_addr', models.CharField(blank=True, max_length=128, null=True, verbose_name='Remote addr')),
|
||||||
('datetime', models.DateTimeField(auto_now=True, db_index=True, verbose_name='Datetime')),
|
('datetime', models.DateTimeField(auto_now=True, db_index=True, verbose_name='Datetime')),
|
||||||
('diff', models.JSONField(default=dict, encoder=common.db.encoder.ModelJSONFieldEncoder, null=True)),
|
('diff', models.JSONField(default=dict, encoder=common.db.encoder.ModelJSONFieldEncoder, null=True)),
|
||||||
@ -89,14 +115,18 @@ class Migration(migrations.Migration):
|
|||||||
fields=[
|
fields=[
|
||||||
('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
|
('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
|
||||||
('username', models.CharField(max_length=128, verbose_name='Username')),
|
('username', models.CharField(max_length=128, verbose_name='Username')),
|
||||||
('type', models.CharField(choices=[('W', 'Web'), ('T', 'Terminal'), ('U', 'Unknown')], max_length=2, verbose_name='Login type')),
|
('type', models.CharField(choices=[('W', 'Web'), ('T', 'Terminal'), ('U', 'Unknown')], max_length=2,
|
||||||
|
verbose_name='Login type')),
|
||||||
('ip', models.GenericIPAddressField(verbose_name='Login IP')),
|
('ip', models.GenericIPAddressField(verbose_name='Login IP')),
|
||||||
('city', models.CharField(blank=True, max_length=254, null=True, verbose_name='Login city')),
|
('city', models.CharField(blank=True, max_length=254, null=True, verbose_name='Login city')),
|
||||||
('user_agent', models.CharField(blank=True, max_length=254, null=True, verbose_name='User agent')),
|
('user_agent', models.CharField(blank=True, max_length=254, null=True, verbose_name='User agent')),
|
||||||
('mfa', models.SmallIntegerField(choices=[(0, 'Disabled'), (1, 'Enabled'), (2, '-')], default=2, verbose_name='MFA')),
|
('mfa', models.SmallIntegerField(choices=[(0, 'Disabled'), (1, 'Enabled'), (2, '-')], default=2,
|
||||||
|
verbose_name='MFA')),
|
||||||
('reason', models.CharField(blank=True, default='', max_length=128, verbose_name='Reason')),
|
('reason', models.CharField(blank=True, default='', max_length=128, verbose_name='Reason')),
|
||||||
('status', models.BooleanField(choices=[(1, 'Success'), (0, 'Failed')], default=1, verbose_name='Status')),
|
('status',
|
||||||
('datetime', models.DateTimeField(db_index=True, default=django.utils.timezone.now, verbose_name='Login Date')),
|
models.BooleanField(choices=[(1, 'Success'), (0, 'Failed')], default=1, verbose_name='Status')),
|
||||||
|
('datetime',
|
||||||
|
models.DateTimeField(db_index=True, default=django.utils.timezone.now, verbose_name='Login Date')),
|
||||||
('backend', models.CharField(default='', max_length=32, verbose_name='Auth backend')),
|
('backend', models.CharField(default='', max_length=32, verbose_name='Auth backend')),
|
||||||
],
|
],
|
||||||
options={
|
options={
|
||||||
@ -112,7 +142,8 @@ class Migration(migrations.Migration):
|
|||||||
('key', models.CharField(max_length=128, verbose_name='Session key')),
|
('key', models.CharField(max_length=128, verbose_name='Session key')),
|
||||||
('city', models.CharField(blank=True, max_length=254, null=True, verbose_name='Login city')),
|
('city', models.CharField(blank=True, max_length=254, null=True, verbose_name='Login city')),
|
||||||
('user_agent', models.CharField(blank=True, max_length=254, null=True, verbose_name='User agent')),
|
('user_agent', models.CharField(blank=True, max_length=254, null=True, verbose_name='User agent')),
|
||||||
('type', models.CharField(choices=[('W', 'Web'), ('T', 'Terminal'), ('U', 'Unknown')], max_length=2, verbose_name='Login type')),
|
('type', models.CharField(choices=[('W', 'Web'), ('T', 'Terminal'), ('U', 'Unknown')], max_length=2,
|
||||||
|
verbose_name='Login type')),
|
||||||
('backend', models.CharField(default='', max_length=32, verbose_name='Auth backend')),
|
('backend', models.CharField(default='', max_length=32, verbose_name='Auth backend')),
|
||||||
('date_created', models.DateTimeField(blank=True, null=True, verbose_name='Login date')),
|
('date_created', models.DateTimeField(blank=True, null=True, verbose_name='Login date')),
|
||||||
],
|
],
|
||||||
|
Loading…
Reference in New Issue
Block a user