• 老广's avatar
    Merge to dev (#1051) · c2abd58d
    老广 authored
    * [Update] 修改 success message, 添加资产组时可以添加资产
    
    * [Update] system user form add label
    
    * [Update] set default cluster
    
    * [Update] 修改一些翻译
    
    * [Bugfix] 修复重置密码bug
    
    * [Bugfix] 默认default cluster
    
    * [Bugfix] 用户添加报错
    
    * 修改tab样式
    
    * [Bugfix] 修复了一些显示上的bug
    
    * 修复全选按钮在搜索后仍然选择全部的问题
    
    * [Bugfix] 修复以下bug
    1. 查看执行历史异常
    2. 用户授权资产页显示message
    
    * [Update] api 返回platform, 并增加web terminal nav
    
    * [Feature] 添加setting页面
    
    * [Feature] 添加basic settings
    
    * [Update] 修改翻译
    
    * [Update] 修改config
    
    * [Update] 启动加载common setting
    
    * [Bugfix] 修复cluster创建的bug
    
    * [Bugfix] 修复title显示Jumpserver
    
    * [Bugfix] setting tables not found
    
    * [Bugfix] settings add option
    
    * [Feature] 添加后端paging
    
    * [Bugfix] 资产列表选择别的页会报错
    
    * [Update] check all 只选择当前页面
    
    * [Bugfix] user login ip
    
    * [Bugfix] for login ip
    
    * [Bugfix] 修复资产列表显示bug
    
    * [Remove] labels
    
    * [Bugfix] task运行失败,因为tasks没有设置
    
    * [Feature] 增加标签
    
    * [Bugfix] 读取不到prefix
    
    * For storage
    
    * [Change] 修改部分翻译
    
    * [Update] 启用ldap移动位置
    
    * [Update] 修改翻译
    
    * [Feature] 支持es存储命令
    
    * Update README.md
    
    * [Feature] 添加es支持
    
    * [update] 修改用户创建时 姓名和用户名的位置
    
    * [Update] 修改install.md
    
    * [Update] remote default PAGE_SIZE stting
    
    * [Feature] terminal config load
    
    * [Feature] es support
    
    * [Update] 修改requirement
    
    * [Update] 修改requirements
    
    * [Update] 修改dictfiled
    
    * [Fix] 修改Logger
    
    * [Bugfix] 倒序显示
    
    * [Update] 修改默认头像和logo
    
    * [Update] 修改django-celery-beat的版本
    
    * [Feature] 添加修改用户密码api
    
    * add logo test
    
    * [Bugfix] 修复一些bug
    
    * [Update] 修改copyrite
    
    * [Update] 修改copyright
    
    * Update ISSUE_TEMPLATE.md
    
    * [Update] 修改禁止排序的颜色
    
    * [Feature] 标签管理功能
    
    * [Bugfix] git status
    
    * [Model] 修改create_by字段
    
    * [Update] 修改位置
    
    * [Update] 修改签名md5算法
    
    * [Feature] 资产列表标签搜索
    
    * [Feature] 添加资产详情标签
    
    * [Bugfix] 修复资产搜索bug
    
    * [Update] ansible disk bug
    
    * [Update] ansible disk bug
    
    * [Bugfix] 修复获取kvmcpu的bug
    
    * [Bugfix] 修复bsd获取cpu数量bug
    
    * [Bugfix] 修改翻译
    
    * [Bugfix] 资产model 太长
    
    * [Bugfix] 修改项目结构描述
    
    修正"项目多语言目录"
    
    * Update project_structure.md
    
    * [Update] add debug log
    
    * refactor: rename folder i18n
    
    * [Feature] 添加链接token
    
    * [Feature] Label 删除修改
    
    * [Update] 修改部分翻译
    
    * [Update] 修改小bug
    
    * [Update] 修复获取资产信息异常bug
    
    * [Bugfix] 修复系统用户上传秘钥的bug
    
    * [Update] 修改获取资产信息产生的异常
    
    * [Update] 删除部分资产属性
    
    * [Bugfix] 资产批量便捷
    
    * [Update] 修改认证
    
    * [Feature] 支持popover
    
    * [Feature] tree
    
    * [Feature] 添加资产树
    
    * [Feature] 使用ztree
    
    * [Feature] tree增删功能
    
    * [Bugfix] 修复组详情bug
    
    * [Bugfix] 修复组详情bug
    
    * [Bugfix] 修改创建label时报错的bug
    
    * [Bugfix] 修改label api bug
    
    * [Update] 去掉资产组添加
    
    * [Update] 修改ztrr
    
    * Update README.md
    
    * [Update] 修改资产创建
    
    * [Bugfix] 修复ldap认证bug
    
    * [Update] 修改一处翻译
    
    * [Update] 更改授权规则前commit
    
    * [Abandon] ...
    
    * Update README.md
    
    * Update README.md
    
    * Update README.md
    
    * [Feature] 完成资产授权和资产添加
    
    * [Update] 修改授权
    
    * [Bugfix] 修改创建系统用户的bug
    
    * feat: rdp support
    
    * [Update] 拆分asset api module
    
    * [Update] 资产列表选中和移除资产
    
    * [Feature] 更改perms api
    
    * [Update] 使用资产树,去掉集群和资产组
    
    * [Update] 修改系统用户推送,拆分assets的部分模块
    
    * [Update] 完成树形改造
    
    * [Update] 完成资产书
    
    * [Update] 修改资产model
    
    * ubuntu16.04 deb_requirements.txt update (#1007)
    
    * Update run server.py (#915)
    
    Fix  for not callable error when  config.py not exists
    
    * [Update]一些修改
    
    * [Update] 修改初始
    
    * feat: replay setting page and api
    
    * 增加隐藏树功能
    
    * [Update] 修改翻译
    
    * 对齐菜单文字。修改英文
    
    * feat: update app setting
    
    * fix: app get replay storage
    
    * [Update] 修改文案
    
    * [Docs] 初始化doc
    
    * [Bugfix] 用户csv导入编码问题
    
    * [Update] 修改设置的一些require
    
    * [Bugfix] 修复管理用户无法查看的bug
    
    * [Update] 修改授权api, windows资产只有rdp协议,linux只有ssh协议
    
    * [Update] terminal可以更改名称
    
    * [Update] 统一copyright
    
    * [Update] 修改文档
    
    * [Bugfix] 修复资产禁用还可以登录
    
    * [Update] 修改文案
    
    * [Update] 支持拖拽更新
    
    * [Bugfix] 修复bug,修改celery beat版本依赖
    
    * [Update] 修改一些小问题
    
    * 添加普通用户使用内容
    
    * [Update] 修改一些文案
    
    * Update README.md
    
    * Update README.md
    
    * Update README.md
    
    * 用户列表
    
    * [Update] 修改一些bug和文案
    
    * [Delete] 删除build 页面
    
    * [Update] 修改conf
    
    * [Update] bugfix
    
    * [Update] 更新文档地址
    
    * [Update] 修改部分翻译和文档
    
    * [Update] 修改一些bug
    
    * [Update] 修改链接
    
    * [Update] 增加批量终端session api
    
    * [Update] 修改Node value唯一
    
    * [Bugfix] 修复首页无法显示数据的bug
    
    * feat: s3 replay file get
    
    * feat: update
    
    * [Update] 修改bug
    c2abd58d
0001_initial.py 7.28 KB
# -*- coding: utf-8 -*-
# Generated by Django 1.11 on 2017-12-21 16:06
from __future__ import unicode_literals

import common.utils
from django.contrib.auth.hashers import make_password
from django.conf import settings
import django.contrib.auth.models
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone
import uuid


def add_default_group(apps, schema_editor):
    group_model = apps.get_model("users", "UserGroup")
    db_alias = schema_editor.connection.alias
    group_model.objects.using(db_alias).create(
        name="Default"
    )


def add_default_admin(apps, schema_editor):
    user_model = apps.get_model("users", "User")
    db_alias = schema_editor.connection.alias
    admin = user_model.objects.using(db_alias).create(
        username="admin", name="Administrator",
        email="admin@mycomany.com", role="Admin",
        password=make_password("admin"),
    )
    group_model = apps.get_model("users", "UserGroup")
    default_group = group_model.objects.using(db_alias).get(name="Default")
    admin.groups.add(default_group)


class Migration(migrations.Migration):

    initial = True

    dependencies = [
        ('auth', '0008_alter_user_username_max_length'),
    ]

    operations = [
        migrations.CreateModel(
            name='User',
            fields=[
                ('password', models.CharField(max_length=128, verbose_name='password')),
                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
                ('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')),
                ('last_name', models.CharField(blank=True, max_length=30, verbose_name='last name')),
                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
                ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
                ('username', models.CharField(max_length=20, unique=True, verbose_name='Username')),
                ('name', models.CharField(max_length=20, verbose_name='Name')),
                ('email', models.EmailField(max_length=30, unique=True, verbose_name='Email')),
                ('role', models.CharField(blank=True, choices=[('Admin', 'Administrator'), ('User', 'User'), ('App', 'Application')], default='User', max_length=10, verbose_name='Role')),
                ('avatar', models.ImageField(null=True, upload_to='avatar', verbose_name='Avatar')),
                ('wechat', models.CharField(blank=True, max_length=30, verbose_name='Wechat')),
                ('phone', models.CharField(blank=True, max_length=20, null=True, verbose_name='Phone')),
                ('enable_otp', models.BooleanField(default=False, verbose_name='Enable OTP')),
                ('secret_key_otp', models.CharField(blank=True, max_length=16)),
                ('_private_key', models.CharField(blank=True, max_length=5000, verbose_name='Private key')),
                ('_public_key', models.CharField(blank=True, max_length=5000, verbose_name='Public key')),
                ('comment', models.TextField(blank=True, max_length=200, verbose_name='Comment')),
                ('is_first_login', models.BooleanField(default=False)),
                ('date_expired', models.DateTimeField(blank=True, default=common.utils.date_expired_default, null=True, verbose_name='Date expired')),
                ('created_by', models.CharField(default='', max_length=30, verbose_name='Created by')),
            ],
            options={
                'ordering': ['username'],
            },
            managers=[
                ('objects', django.contrib.auth.models.UserManager()),
            ],
        ),
        migrations.CreateModel(
            name='AccessKey',
            fields=[
                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, verbose_name='AccessKeyID')),
                ('secret', models.UUIDField(default=uuid.uuid4, editable=False, verbose_name='AccessKeySecret')),
                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='access_key', to=settings.AUTH_USER_MODEL, verbose_name='User')),
            ],
        ),
        migrations.CreateModel(
            name='LoginLog',
            fields=[
                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
                ('username', models.CharField(max_length=20, verbose_name='Username')),
                ('type', models.CharField(choices=[('W', 'Web'), ('T', 'Terminal')], max_length=2, verbose_name='Login type')),
                ('ip', models.GenericIPAddressField(verbose_name='Login ip')),
                ('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')),
                ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date login')),
            ],
            options={
                'ordering': ['-datetime', 'username'],
            },
        ),
        migrations.CreateModel(
            name='PrivateToken',
            fields=[
                ('key', models.CharField(max_length=40, primary_key=True, serialize=False, verbose_name='Key')),
                ('created', models.DateTimeField(auto_now_add=True, verbose_name='Created')),
                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='auth_token', to=settings.AUTH_USER_MODEL, verbose_name='User')),
            ],
            options={
                'verbose_name': 'Private Token',
            },
        ),
        migrations.CreateModel(
            name='UserGroup',
            fields=[
                ('is_discard', models.BooleanField(default=False, verbose_name='is discard')),
                ('discard_time', models.DateTimeField(blank=True, null=True, verbose_name='discard time')),
                ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
                ('name', models.CharField(max_length=128, verbose_name='Name')),
                ('comment', models.TextField(blank=True, verbose_name='Comment')),
                ('date_created', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Date created')),
                ('created_by', models.CharField(max_length=100)),
            ],
            options={
                'ordering': ['name'],
            },
        ),
        migrations.AddField(
            model_name='user',
            name='groups',
            field=models.ManyToManyField(blank=True, related_name='users', to='users.UserGroup', verbose_name='User group'),
        ),
        migrations.AddField(
            model_name='user',
            name='user_permissions',
            field=models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions'),
        ),
        migrations.RunPython(add_default_group),
        migrations.RunPython(add_default_admin),
    ]