diff --git a/README.md b/README.md index c743b195c..45d5edd4b 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,38 @@ -## [文档和规范] + // Jumpserver // + + + ~ Jumpserver是什么? + + Jumpserver是一款开源的跳板机(堡垒机)产品, 主要使用Python,Django开发 + 他实现了跳板机(堡垒机)的主要功能,删减、优化了传统堡垒机,致力于为互联网 + 运维提供服务 + + ~ 版本依赖 + + * Python 2.7 + + * Django 1.10 + + + ~ 快速开始 + + ``` + pip install -r requirements.txt + + cp config-example.py config.py + + cd apps/ && python manage.py loaddata users # 初始化数据 + + python manage.py runserver 0.0.0.0:80 + + ``` + + ~ 文档 -#### [项目结构描述](https://code.simcu.com/jumpserver/jumpserver/blob/master/docs/project_structure.md) -#### [Python代码规范](https://code.simcu.com/jumpserver/jumpserver/blob/master/docs/python_style_guide.md) -#### [API设计规范](https://code.simcu.com/jumpserver/jumpserver/blob/master/docs/api_style_guide.md) -#### [表结构](https://code.simcu.com/jumpserver/jumpserver/wikis/table_structure_image) + * [项目结构描述](https://code.simcu.com/jumpserver/jumpserver/blob/master/docs/project_structure.md) + * [Python代码规范](https://code.simcu.com/jumpserver/jumpserver/blob/master/docs/python_style_guide.md) + * [API设计规范](https://code.simcu.com/jumpserver/jumpserver/blob/master/docs/api_style_guide.md) + * [表结构](https://code.simcu.com/jumpserver/jumpserver/wikis/table_structure_image) diff --git a/apps/users/migrations/0002_auto_20160814_1237.py b/apps/users/migrations/0002_auto_20160814_1237.py deleted file mode 100644 index 63caa6e9a..000000000 --- a/apps/users/migrations/0002_auto_20160814_1237.py +++ /dev/null @@ -1,57 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-14 04:37 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='comment', - field=models.CharField(blank=True, max_length=200, verbose_name='\u63cf\u8ff0'), - ), - migrations.AlterField( - model_name='user', - name='date_expired', - field=models.DateTimeField(default=datetime.datetime(9999, 12, 31, 23, 59, 59, 999999)), - ), - migrations.AlterField( - model_name='user', - name='phone', - field=models.CharField(max_length=20, verbose_name='\u624b\u673a\u53f7'), - ), - migrations.AlterField( - model_name='user', - name='private_key', - field=models.CharField(max_length=5000, verbose_name='ssh\u79c1\u94a5'), - ), - migrations.AlterField( - model_name='user', - name='public_key', - field=models.CharField(max_length=1000, verbose_name='\u516c\u94a5'), - ), - migrations.AlterField( - model_name='user', - name='role', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='users.Role', verbose_name='\u89d2\u8272'), - ), - migrations.AlterField( - model_name='usergroup', - name='comment', - field=models.TextField(blank=True, verbose_name='\u63cf\u8ff0'), - ), - migrations.AlterField( - model_name='usergroup', - name='name', - field=models.CharField(max_length=100, unique=True, verbose_name='\u7ec4\u540d\u79f0'), - ), - ] diff --git a/apps/users/migrations/0003_auto_20160814_1758.py b/apps/users/migrations/0003_auto_20160814_1758.py deleted file mode 100644 index b2f908b2b..000000000 --- a/apps/users/migrations/0003_auto_20160814_1758.py +++ /dev/null @@ -1,56 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-14 09:58 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0002_auto_20160814_1237'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='name', - field=models.CharField(default='guanghongwei', max_length=20), - preserve_default=False, - ), - migrations.AlterField( - model_name='user', - name='avatar', - field=models.ImageField(blank=True, upload_to=b'', verbose_name='\u5934\u50cf'), - ), - migrations.AlterField( - model_name='user', - name='created_by', - field=models.CharField(default='', max_length=30), - ), - migrations.AlterField( - model_name='user', - name='phone', - field=models.CharField(blank=True, max_length=20, verbose_name='\u624b\u673a\u53f7'), - ), - migrations.AlterField( - model_name='user', - name='private_key', - field=models.CharField(blank=True, max_length=5000, verbose_name='ssh\u79c1\u94a5'), - ), - migrations.AlterField( - model_name='user', - name='public_key', - field=models.CharField(blank=True, max_length=1000, verbose_name='\u516c\u94a5'), - ), - migrations.AlterField( - model_name='user', - name='secret_key_2FA', - field=models.CharField(blank=True, max_length=16), - ), - migrations.AlterField( - model_name='user', - name='wechat', - field=models.CharField(blank=True, max_length=30, verbose_name='\u5fae\u4fe1'), - ), - ] diff --git a/apps/users/migrations/0004_auto_20160815_2257.py b/apps/users/migrations/0004_auto_20160815_2257.py deleted file mode 100644 index 41e8fb85b..000000000 --- a/apps/users/migrations/0004_auto_20160815_2257.py +++ /dev/null @@ -1,41 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-15 14:57 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0003_auto_20160814_1758'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='date_expired', - field=models.DateTimeField(default=datetime.datetime(9999, 12, 31, 23, 59, 59, 999999), verbose_name='\u6709\u6548\u671f'), - ), - migrations.AlterField( - model_name='user', - name='email', - field=models.EmailField(help_text='* required', max_length=30, unique=True, verbose_name='\u90ae\u4ef6'), - ), - migrations.AlterField( - model_name='user', - name='groups', - field=models.ManyToManyField(to='users.UserGroup', verbose_name='\u7528\u6237\u7ec4'), - ), - migrations.AlterField( - model_name='user', - name='name', - field=models.CharField(help_text='* required', max_length=20, verbose_name='\u59d3\u540d'), - ), - migrations.AlterField( - model_name='user', - name='username', - field=models.CharField(help_text='* required', max_length=20, unique=True, verbose_name='\u7528\u6237\u540d'), - ), - ] diff --git a/apps/users/migrations/0005_auto_20160816_1358.py b/apps/users/migrations/0005_auto_20160816_1358.py deleted file mode 100644 index 7f743eb7f..000000000 --- a/apps/users/migrations/0005_auto_20160816_1358.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-16 05:58 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0004_auto_20160815_2257'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='comment', - field=models.TextField(blank=True, max_length=200, verbose_name='\u63cf\u8ff0'), - ), - ] diff --git a/apps/users/migrations/0005_auto_20160816_2252.py b/apps/users/migrations/0005_auto_20160816_2252.py deleted file mode 100644 index ed4fe4fae..000000000 --- a/apps/users/migrations/0005_auto_20160816_2252.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-16 14:52 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0004_auto_20160815_2257'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='comment', - field=models.TextField(blank=True, max_length=200, verbose_name='\u63cf\u8ff0'), - ), - ] diff --git a/apps/users/migrations/0006_merge_20160817_0032.py b/apps/users/migrations/0006_merge_20160817_0032.py deleted file mode 100644 index 594dbefc0..000000000 --- a/apps/users/migrations/0006_merge_20160817_0032.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-16 16:32 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0005_auto_20160816_1358'), - ('users', '0005_auto_20160816_2252'), - ] - - operations = [ - ] diff --git a/apps/users/migrations/0007_auto_20160817_0032.py b/apps/users/migrations/0007_auto_20160817_0032.py deleted file mode 100644 index aa5eb3341..000000000 --- a/apps/users/migrations/0007_auto_20160817_0032.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-16 16:32 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0006_merge_20160817_0032'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='avatar', - field=models.ImageField(blank=True, upload_to='avatar', verbose_name='\u5934\u50cf'), - ), - ] diff --git a/apps/users/migrations/0008_auto_20160817_2303.py b/apps/users/migrations/0008_auto_20160817_2303.py deleted file mode 100644 index dac68a94c..000000000 --- a/apps/users/migrations/0008_auto_20160817_2303.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-17 15:03 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0007_auto_20160817_0032'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='avatar', - field=models.ImageField(upload_to='avatar', verbose_name='\u5934\u50cf'), - ), - ] diff --git a/apps/users/migrations/0009_auto_20160818_1444.py b/apps/users/migrations/0009_auto_20160818_1444.py deleted file mode 100644 index 7cedfa867..000000000 --- a/apps/users/migrations/0009_auto_20160818_1444.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-18 06:44 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0008_auto_20160817_2303'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='groups', - field=models.ManyToManyField(help_text='* required', to='users.UserGroup', verbose_name='\u7528\u6237\u7ec4'), - ), - ] diff --git a/apps/users/migrations/0010_auto_20160820_2243.py b/apps/users/migrations/0010_auto_20160820_2243.py deleted file mode 100644 index f4862701b..000000000 --- a/apps/users/migrations/0010_auto_20160820_2243.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-20 22:43 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0009_auto_20160818_1444'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='date_expired', - field=models.DateTimeField(default=datetime.datetime(2086, 8, 3, 22, 43, 39, 338972), verbose_name='\u6709\u6548\u671f'), - ), - migrations.AlterField( - model_name='user', - name='username', - field=models.CharField(max_length=20, unique=True, verbose_name='\u7528\u6237\u540d'), - ), - ] diff --git a/apps/users/migrations/0011_auto_20160820_2312.py b/apps/users/migrations/0011_auto_20160820_2312.py deleted file mode 100644 index 27548699c..000000000 --- a/apps/users/migrations/0011_auto_20160820_2312.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-20 15:12 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0010_auto_20160820_2243'), - ] - - operations = [ - migrations.RenameField( - model_name='user', - old_name='enable_2FA', - new_name='enable_otp', - ), - migrations.RenameField( - model_name='user', - old_name='secret_key_2FA', - new_name='secret_key_otp', - ), - migrations.AlterField( - model_name='user', - name='date_expired', - field=models.DateTimeField(verbose_name='\u6709\u6548\u671f'), - ), - ] diff --git a/apps/users/migrations/0012_auto_20160820_2313.py b/apps/users/migrations/0012_auto_20160820_2313.py deleted file mode 100644 index 4adcac5a9..000000000 --- a/apps/users/migrations/0012_auto_20160820_2313.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-20 15:13 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models -from django.utils.timezone import utc - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0011_auto_20160820_2312'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='date_expired', - field=models.DateTimeField(default=datetime.datetime(2086, 8, 3, 15, 13, 28, 819421, tzinfo=utc), verbose_name='\u6709\u6548\u671f'), - ), - ] diff --git a/apps/users/migrations/0013_auto_20160820_2313.py b/apps/users/migrations/0013_auto_20160820_2313.py deleted file mode 100644 index 950c70831..000000000 --- a/apps/users/migrations/0013_auto_20160820_2313.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-20 15:13 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models -from django.utils.timezone import utc - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0012_auto_20160820_2313'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='date_expired', - field=models.DateTimeField(default=datetime.datetime(2086, 8, 3, 15, 13, 45, 910700, tzinfo=utc), verbose_name='\u6709\u6548\u671f'), - ), - ]