From c96a107e0a9ffc58fd3e3a8a4ad79197cf4b51f2 Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Mon, 26 Feb 2018 17:28:03 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=E5=AF=B9=E9=BD=90=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E3=80=82=E4=BF=AE=E6=94=B9=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/templates/_nav.html      | 13 +++++++------
 apps/templates/_nav_user.html |  6 +++---
 apps/templates/index.html     |  6 +++---
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/apps/templates/_nav.html b/apps/templates/_nav.html
index 032fb54bd..71584a0c5 100644
--- a/apps/templates/_nav.html
+++ b/apps/templates/_nav.html
@@ -1,12 +1,13 @@
 {% load i18n %}
 <li id="index">
     <a href="{% url 'index' %}">
-        <i class="fa fa-dashboard" style="font-size: 13px"></i> <span class="nav-label">{% trans 'Dashboard' %}</span><span class="label label-info pull-right"></span>
+        <i class="fa fa-dashboard" style="width: 14px"></i> <span class="nav-label">{% trans 'Dashboard' %}</span><span
+            class="label label-info pull-right"></span>
     </a>
 </li>
 <li id="users">
     <a href="#">
-        <i class="fa fa-group" style="font-size: 13px"></i> <span class="nav-label">{% trans 'Users' %}</span><span class="fa arrow"></span>
+        <i class="fa fa-group" style="width: 14px"></i> <span class="nav-label">{% trans 'Users' %}</span><span class="fa arrow"></span>
     </a>
     <ul class="nav nav-second-level active">
         <li id="user"><a href="{% url 'users:user-list' %}">{% trans 'User list' %}</a></li>
@@ -16,7 +17,7 @@
 </li>
 <li id="assets">
     <a>
-        <i class="fa fa-inbox"></i> <span class="nav-label">{% trans 'Assets' %}</span><span class="fa arrow"></span>
+        <i class="fa fa-inbox" style="width: 14px"></i> <span class="nav-label">{% trans 'Assets' %}</span><span class="fa arrow"></span>
     </a>
     <ul class="nav nav-second-level">
         <li id="asset"><a href="{% url 'assets:asset-list' %}">{% trans 'Asset list' %}</a></li>
@@ -26,7 +27,7 @@
     </ul>
 </li>
 <li id="perms">
-    <a href="#"><i class="fa fa-edit"></i> <span class="nav-label">{% trans 'Perms' %}</span><span class="fa arrow"></span></a>
+    <a href="#"><i class="fa fa-edit" style="width: 14px"></i> <span class="nav-label">{% trans 'Perms' %}</span><span class="fa arrow"></span></a>
     <ul class="nav nav-second-level">
         <li id="asset-permission">
             <a href="{% url 'perms:asset-permission-list' %}">{% trans 'Asset permission' %}</a>
@@ -35,7 +36,7 @@
 </li>
 <li id="terminal">
     <a>
-        <i class="fa fa-rocket"></i> <span class="nav-label">{% trans 'Sessions' %}</span><span class="fa arrow"></span>
+        <i class="fa fa-rocket" style="width: 14px"></i> <span class="nav-label">{% trans 'Sessions' %}</span><span class="fa arrow"></span>
     </a>
     <ul class="nav nav-second-level">
         <li id="session-online"><a href="{% url 'terminal:session-online-list' %}">{% trans 'Session online' %}</a></li>
@@ -46,7 +47,7 @@
 </li>
 <li id="ops">
     <a>
-        <i class="fa fa-coffee"></i> <span class="nav-label">{% trans 'Job Center' %}</span><span class="fa arrow"></span>
+        <i class="fa fa-coffee" style="width: 14px"></i> <span class="nav-label">{% trans 'Job Center' %}</span><span class="fa arrow"></span>
     </a>
     <ul class="nav nav-second-level">
         <li id="task"><a href="{% url 'ops:task-list' %}">{% trans 'Task list' %}</a></li>
diff --git a/apps/templates/_nav_user.html b/apps/templates/_nav_user.html
index f82ad6776..30e397ebd 100644
--- a/apps/templates/_nav_user.html
+++ b/apps/templates/_nav_user.html
@@ -1,16 +1,16 @@
 {% load i18n %}
 <li id="assets">
     <a href="{% url 'assets:user-asset-list' %}">
-        <i class="fa fa-files-o"></i><span class="nav-label">{% trans 'My assets' %}</span><span class="label label-info pull-right"></span>
+        <i class="fa fa-files-o" style="width: 14px"></i><span class="nav-label">{% trans 'My assets' %}</span><span class="label label-info pull-right"></span>
     </a>
 </li>
 <li id="users">
     <a href="{% url 'users:user-profile' %}">
-        <i class="fa fa-user" ></i> <span class="nav-label">{% trans 'Profile' %}</span><span class="label label-info pull-right"></span>
+        <i class="fa fa-user" style="width: 14px"></i> <span class="nav-label">{% trans 'Profile' %}</span><span class="label label-info pull-right"></span>
     </a>
 </li>
 <li >
-    <a href="{% url 'terminal:web-terminal' %}" target="_blank"><i class="fa fa-window-maximize"></i>
+    <a href="{% url 'terminal:web-terminal' %}" target="_blank"><i class="fa fa-window-maximize" style="width: 14px"></i>
         <span class="nav-label">{% trans 'Web terminal' %}</span>
     </a>
 </li>
\ No newline at end of file
diff --git a/apps/templates/index.html b/apps/templates/index.html
index 6ba8cd8a4..64b8637ce 100644
--- a/apps/templates/index.html
+++ b/apps/templates/index.html
@@ -11,7 +11,7 @@
                 </div>
                 <div class="ibox-content">
                     <h1 class="no-margins"><a href="{% url 'users:user-list' %}">{{ users_count }}</a></h1>
-                    <small>All user</small>
+                    <small>All users</small>
                 </div>
             </div>
         </div>
@@ -23,7 +23,7 @@
                 </div>
                 <div class="ibox-content">
                     <h1 class="no-margins"><a href="{% url 'assets:asset-list' %}">{{ assets_count }}</a></h1>
-                    <small>All host</small>
+                    <small>All hosts</small>
                 </div>
             </div>
         </div>
@@ -36,7 +36,7 @@
                 </div>
                 <div class="ibox-content">
                     <h1 class="no-margins"><a href="{% url 'terminal:session-online-list' %}"> <span id="online_users"></span>{{ online_user_count }}</a></h1>
-                    <small>Online user</small>
+                    <small>Online users</small>
                 </div>
             </div>
         </div>

From 9292e485548a3b62e59fb5eb5ecab59a79ba1860 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 27 Feb 2018 12:18:36 +0800
Subject: [PATCH 02/17] =?UTF-8?q?[Bugfix]=20=E7=94=A8=E6=88=B7csv=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E7=BC=96=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/views/asset.py    |  1 +
 apps/common/forms.py          |  4 ++--
 apps/users/apps.py            |  3 +++
 apps/users/signals.py         | 20 ++------------------
 apps/users/signals_handler.py | 20 ++++++++++++++++++++
 apps/users/views/user.py      | 24 ++++++++++++++----------
 6 files changed, 42 insertions(+), 30 deletions(-)
 create mode 100644 apps/users/signals_handler.py

diff --git a/apps/assets/views/asset.py b/apps/assets/views/asset.py
index 900adefc3..e1a9fcb2d 100644
--- a/apps/assets/views/asset.py
+++ b/apps/assets/views/asset.py
@@ -248,6 +248,7 @@ class BulkImportAssetView(AdminUserRequiredMixin, JSONResponseMixin, FormView):
         f = form.cleaned_data['file']
         det_result = chardet.detect(f.read())
         f.seek(0)  # reset file seek index
+
         file_data = f.read().decode(det_result['encoding']).strip(codecs.BOM_UTF8.decode())
         csv_file = StringIO(file_data)
         reader = csv.reader(csv_file)
diff --git a/apps/common/forms.py b/apps/common/forms.py
index 0d0f057cf..d7e6b104b 100644
--- a/apps/common/forms.py
+++ b/apps/common/forms.py
@@ -68,7 +68,7 @@ class BaseForm(forms.Form):
 class BasicSettingForm(BaseForm):
     SITE_URL = forms.URLField(
         label=_("Current SITE URL"),
-        help_text="http://jumpserver.abc.com:8080"
+        help_text="eg: http://jumpserver.abc.com:8080"
     )
     USER_GUIDE_URL = forms.URLField(
         label=_("User Guide URL"),
@@ -135,7 +135,7 @@ class LDAPSettingForm(BaseForm):
     AUTH_LDAP_START_TLS = forms.BooleanField(
         label=_("Use SSL"), initial=False, required=False
     )
-    AUTH_LDAP = forms.BooleanField(label=_("Enable LDAP auth"), initial=False)
+    AUTH_LDAP = forms.BooleanField(label=_("Enable LDAP auth"), initial=False, required=False)
 
 
 class TerminalSettingForm(BaseForm):
diff --git a/apps/users/apps.py b/apps/users/apps.py
index af3dddf8e..f37fa6cf5 100644
--- a/apps/users/apps.py
+++ b/apps/users/apps.py
@@ -6,3 +6,6 @@ from django.apps import AppConfig
 class UsersConfig(AppConfig):
     name = 'users'
 
+    def ready(self):
+        from . import signals_handler
+        super().ready()
diff --git a/apps/users/signals.py b/apps/users/signals.py
index f942c39b7..324cd1627 100644
--- a/apps/users/signals.py
+++ b/apps/users/signals.py
@@ -1,21 +1,5 @@
-# -*- coding: utf-8 -*-
-#
-
-from django.dispatch import Signal, receiver
-from django.db.models.signals import post_save
-
-from common.utils import get_logger
-from .models import User
-
-logger = get_logger(__file__)
+from django.dispatch import Signal
 
 
-@receiver(post_save, sender=User)
-def on_user_created(sender, instance=None, created=False, **kwargs):
-    if created:
-        logger.debug("Receive user `{}` create signal".format(instance.name))
-        from .utils import send_user_created_mail
-        logger.info("   - Sending welcome mail ...".format(instance.name))
-        if instance.email:
-            send_user_created_mail(instance)
+post_user_create = Signal(providing_args=('user',))
 
diff --git a/apps/users/signals_handler.py b/apps/users/signals_handler.py
new file mode 100644
index 000000000..9e1abf350
--- /dev/null
+++ b/apps/users/signals_handler.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+#
+
+from django.dispatch import receiver
+from django.db.models.signals import post_save
+
+from common.utils import get_logger
+from .models import User
+
+logger = get_logger(__file__)
+
+
+@receiver(post_save, sender=User)
+def on_user_created(sender, instance=None, created=False, **kwargs):
+    if created:
+        logger.debug("Receive user `{}` create signal".format(instance.name))
+        from .utils import send_user_created_mail
+        logger.info("   - Sending welcome mail ...".format(instance.name))
+        if instance.email:
+            send_user_created_mail(instance)
\ No newline at end of file
diff --git a/apps/users/views/user.py b/apps/users/views/user.py
index 93f19f313..e85f04877 100644
--- a/apps/users/views/user.py
+++ b/apps/users/views/user.py
@@ -6,6 +6,7 @@ import json
 import uuid
 import csv
 import codecs
+import chardet
 from io import StringIO
 
 from django.contrib import messages
@@ -20,6 +21,7 @@ from django.utils.translation import ugettext as _
 from django.utils.decorators import method_decorator
 from django.views import View
 from django.views.generic.base import TemplateView
+from django.db import transaction
 from django.views.generic.edit import (
     CreateView, UpdateView, FormMixin, FormView
 )
@@ -33,7 +35,7 @@ from common.utils import get_logger, get_object_or_none, is_uuid
 from .. import forms
 from ..models import User, UserGroup
 from ..utils import AdminUserRequiredMixin
-from ..signals import on_user_created
+from ..signals import post_user_create
 
 
 __all__ = [
@@ -212,8 +214,10 @@ class UserBulkImportView(AdminUserRequiredMixin, JSONResponseMixin, FormView):
 
     # todo: need be patch, method to long
     def form_valid(self, form):
-        file = form.cleaned_data['file']
-        data = file.read().decode('utf-8').strip(codecs.BOM_UTF8.decode('utf-8'))
+        f = form.cleaned_data['file']
+        det_result = chardet.detect(f.read())
+        f.seek(0)  # reset file seek index
+        data = f.read().decode(det_result['encoding']).strip(codecs.BOM_UTF8.decode())
         csv_file = StringIO(data)
         reader = csv.reader(csv_file)
         csv_data = [row for row in reader]
@@ -252,15 +256,15 @@ class UserBulkImportView(AdminUserRequiredMixin, JSONResponseMixin, FormView):
                 else:
                     continue
                 user_dict[k] = v
-
-            user = get_object_or_none(User, id=id_) if is_uuid(id_) else None
+            user = get_object_or_none(User, id=id_) if id_ and is_uuid(id_) else None
             if not user:
                 try:
-                    groups = user_dict.pop('groups')
-                    user = User.objects.create(**user_dict)
-                    user.groups.set(groups)
-                    created.append(user_dict['username'])
-                    on_user_created.send(self.__class__, user=user)
+                    with transaction.atomic():
+                        groups = user_dict.pop('groups')
+                        user = User.objects.create(**user_dict)
+                        user.groups.set(groups)
+                        created.append(user_dict['username'])
+                        post_user_create.send(self.__class__, user=user)
                 except Exception as e:
                     failed.append('%s: %s' % (user_dict['username'], str(e)))
             else:

From 870b863136708518f68af3a264769da1889615c4 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 27 Feb 2018 15:04:05 +0800
Subject: [PATCH 03/17] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=9A=84=E4=B8=80=E4=BA=9Brequire?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/templates/assets/asset_list.html | 2 +-
 apps/common/forms.py                         | 2 +-
 apps/users/models/user.py                    | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html
index 8a56f2c0f..62996cc47 100644
--- a/apps/assets/templates/assets/asset_list.html
+++ b/apps/assets/templates/assets/asset_list.html
@@ -415,7 +415,7 @@ $(document).ready(function(){
         current_node = nodes[0];
         url += "?node_id=" + current_node.id;
     }
-    window.open(url);
+    window.open(url, '_self');
 })
 .on('click', '.btn_asset_delete', function () {
     var $this = $(this);
diff --git a/apps/common/forms.py b/apps/common/forms.py
index d7e6b104b..8a6c87fe4 100644
--- a/apps/common/forms.py
+++ b/apps/common/forms.py
@@ -71,7 +71,7 @@ class BasicSettingForm(BaseForm):
         help_text="eg: http://jumpserver.abc.com:8080"
     )
     USER_GUIDE_URL = forms.URLField(
-        label=_("User Guide URL"),
+        label=_("User Guide URL"), required=False,
         help_text=_("User first login update profile done redirect to it")
     )
     EMAIL_SUBJECT_PREFIX = forms.CharField(
diff --git a/apps/users/models/user.py b/apps/users/models/user.py
index 8ef432108..25d7d0303 100644
--- a/apps/users/models/user.py
+++ b/apps/users/models/user.py
@@ -151,6 +151,10 @@ class User(AbstractUser):
     def save(self, *args, **kwargs):
         if not self.name:
             self.name = self.username
+        if self.username == 'admin':
+            self.role = 'Admin'
+            self.is_active = True
+
         super().save(*args, **kwargs)
 
     @property

From 91863107d7a40c3cc9d55a59e4ca397f23658e01 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 27 Feb 2018 15:32:30 +0800
Subject: [PATCH 04/17] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=94=A8=E6=88=B7=E6=97=A0=E6=B3=95=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/models/user.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/apps/assets/models/user.py b/apps/assets/models/user.py
index 999b9e016..a429d9895 100644
--- a/apps/assets/models/user.py
+++ b/apps/assets/models/user.py
@@ -175,15 +175,12 @@ class AdminUser(AssetUser):
         return info
 
     def get_related_assets(self):
-        assets = []
-        for cluster in self.cluster_set.all():
-            assets.extend(cluster.assets.all())
-        assets.extend(self.asset_set.all())
-        return list(set(assets))
+        assets = self.asset_set.all()
+        return assets
 
     @property
     def assets_amount(self):
-        return len(self.get_related_assets())
+        return self.get_related_assets().count()
 
     class Meta:
         ordering = ['name']

From f886e7c2f5bca809f48b389d7dfbb6c96b7d9eca Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 27 Feb 2018 19:39:27 +0800
Subject: [PATCH 05/17] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83api,=20windows=E8=B5=84=E4=BA=A7=E5=8F=AA=E6=9C=89rdp?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=EF=BC=8Clinux=E5=8F=AA=E6=9C=89ssh=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/forms/asset.py                     |  4 ++--
 apps/assets/models/asset.py                    | 18 +++++++++++++++++-
 apps/assets/templates/assets/asset_create.html |  1 +
 apps/assets/templates/assets/asset_update.html |  1 +
 apps/perms/api.py                              | 15 +++++++++++++--
 .../templates/perms/asset_permission_list.html |  2 +-
 apps/terminal/models.py                        |  2 ++
 apps/terminal/tasks.py                         | 16 +++++++++++++---
 .../templates/terminal/session_list.html       |  2 ++
 9 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/apps/assets/forms/asset.py b/apps/assets/forms/asset.py
index 763608daf..34865c544 100644
--- a/apps/assets/forms/asset.py
+++ b/apps/assets/forms/asset.py
@@ -15,7 +15,7 @@ class AssetCreateForm(forms.ModelForm):
         model = Asset
         fields = [
             'hostname', 'ip', 'public_ip', 'port',  'comment',
-            'nodes', 'is_active', 'admin_user', 'labels',
+            'nodes', 'is_active', 'admin_user', 'labels', 'platform',
 
         ]
         widgets = {
@@ -44,7 +44,7 @@ class AssetUpdateForm(forms.ModelForm):
     class Meta:
         model = Asset
         fields = [
-            'hostname', 'ip', 'port', 'nodes',  'is_active',
+            'hostname', 'ip', 'port', 'nodes',  'is_active', 'platform',
             'public_ip', 'number', 'comment', 'admin_user', 'labels',
         ]
         widgets = {
diff --git a/apps/assets/models/asset.py b/apps/assets/models/asset.py
index 01c9ad255..3f7dec4ec 100644
--- a/apps/assets/models/asset.py
+++ b/apps/assets/models/asset.py
@@ -38,6 +38,14 @@ def default_node():
 
 class Asset(models.Model):
     # Important
+    PLATFORM_CHOICES = (
+        ('Linux', 'Linux'),
+        ('Unix', 'Unix'),
+        ('MacOS', 'MacOS'),
+        ('BSD', 'BSD'),
+        ('Windows', 'Windows'),
+        ('Other', 'Other'),
+    )
     id = models.UUIDField(default=uuid.uuid4, primary_key=True)
     ip = models.GenericIPAddressField(max_length=32, verbose_name=_('IP'), db_index=True)
     hostname = models.CharField(max_length=128, unique=True, verbose_name=_('Hostname'))
@@ -64,7 +72,7 @@ class Asset(models.Model):
     disk_total = models.CharField(max_length=1024, null=True, blank=True, verbose_name=_('Disk total'))
     disk_info = models.CharField(max_length=1024, null=True, blank=True, verbose_name=_('Disk info'))
 
-    platform = models.CharField(max_length=128, null=True, blank=True, verbose_name=_('Platform'))
+    platform = models.CharField(max_length=128, choices=PLATFORM_CHOICES, default='Linux', verbose_name=_('Platform'))
     os = models.CharField(max_length=128, null=True, blank=True, verbose_name=_('OS'))
     os_version = models.CharField(max_length=16, null=True, blank=True, verbose_name=_('OS version'))
     os_arch = models.CharField(max_length=16, blank=True, null=True, verbose_name=_('OS arch'))
@@ -87,6 +95,12 @@ class Asset(models.Model):
             return True, ''
         return False, warning
 
+    def is_unixlike(self):
+        if self.platform not in ("Windows", "Other"):
+            return True
+        else:
+            return False
+
     @property
     def hardware_info(self):
         if self.cpu_count:
@@ -99,6 +113,8 @@ class Asset(models.Model):
 
     @property
     def is_connective(self):
+        if not self.is_unixlike():
+            return True
         val = cache.get(ASSET_ADMIN_CONN_CACHE_KEY.format(self.hostname))
         if val == 1:
             return True
diff --git a/apps/assets/templates/assets/asset_create.html b/apps/assets/templates/assets/asset_create.html
index 7091aa74a..1eae7ebd4 100644
--- a/apps/assets/templates/assets/asset_create.html
+++ b/apps/assets/templates/assets/asset_create.html
@@ -17,6 +17,7 @@
     {% bootstrap_field form.hostname layout="horizontal" %}
     {% bootstrap_field form.ip layout="horizontal" %}
     {% bootstrap_field form.port layout="horizontal" %}
+    {% bootstrap_field form.platform layout="horizontal" %}
     {% bootstrap_field form.public_ip layout="horizontal" %}
 
     <div class="hr-line-dashed"></div>
diff --git a/apps/assets/templates/assets/asset_update.html b/apps/assets/templates/assets/asset_update.html
index 515780f55..5d8006451 100644
--- a/apps/assets/templates/assets/asset_update.html
+++ b/apps/assets/templates/assets/asset_update.html
@@ -22,6 +22,7 @@
     {% bootstrap_field form.hostname layout="horizontal" %}
     {% bootstrap_field form.ip layout="horizontal" %}
     {% bootstrap_field form.port layout="horizontal" %}
+    {% bootstrap_field form.platform layout="horizontal" %}
     {% bootstrap_field form.public_ip layout="horizontal" %}
 
     <div class="hr-line-dashed"></div>
diff --git a/apps/perms/api.py b/apps/perms/api.py
index 958ee6838..6b0b15f76 100644
--- a/apps/perms/api.py
+++ b/apps/perms/api.py
@@ -54,7 +54,11 @@ class UserGrantedAssetsApi(ListAPIView):
             user = self.request.user
 
         for k, v in NodePermissionUtil.get_user_assets(user).items():
-            k.system_users_granted = v
+            if k.is_unixlike():
+                system_users_granted = [s for s in v if s.protocol == 'ssh']
+            else:
+                system_users_granted = [s for s in v if s.protocol == 'rdp']
+            k.system_users_granted = system_users_granted
             queryset.append(k)
         return queryset
 
@@ -118,9 +122,16 @@ class UserGrantedNodesWithAssetsApi(ListAPIView):
             user = get_object_or_404(User, id=user_id)
 
         nodes = NodePermissionUtil.get_user_nodes_with_assets(user)
+        assets = {}
+        for k, v in NodePermissionUtil.get_user_assets(user).items():
+            if k.is_unixlike():
+                system_users_granted = [s for s in v if s.protocol == 'ssh']
+            else:
+                system_users_granted = [s for s in v if s.protocol == 'rdp']
+            assets[k] = system_users_granted
         for node, v in nodes.items():
             for asset in v['assets']:
-                asset.system_users_granted = v['system_users']
+                asset.system_users_granted = assets[asset]
             node.assets_granted = v['assets']
             queryset.append(node)
         return queryset
diff --git a/apps/perms/templates/perms/asset_permission_list.html b/apps/perms/templates/perms/asset_permission_list.html
index 9b1bd3875..f87241d54 100644
--- a/apps/perms/templates/perms/asset_permission_list.html
+++ b/apps/perms/templates/perms/asset_permission_list.html
@@ -223,7 +223,7 @@ $(document).ready(function(){
         current_node = nodes[0];
         url += "?node=" + current_node.id;
     }
-    window.open(url);
+    window.open(url, '_self');
 })
 .on('click', '.btn-del', function () {
     var $this = $(this);
diff --git a/apps/terminal/models.py b/apps/terminal/models.py
index 23cb70f8e..c4ac25192 100644
--- a/apps/terminal/models.py
+++ b/apps/terminal/models.py
@@ -4,6 +4,7 @@ import uuid
 
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
+from django.utils import timezone
 from django.conf import settings
 
 from users.models import User
@@ -127,6 +128,7 @@ class Session(models.Model):
     has_replay = models.BooleanField(default=False, verbose_name=_("Replay"))
     has_command = models.BooleanField(default=False, verbose_name=_("Command"))
     terminal = models.ForeignKey(Terminal, null=True, on_delete=models.CASCADE)
+    date_last_active = models.DateTimeField(verbose_name=_("Date last active"), default=timezone.now)
     date_start = models.DateTimeField(verbose_name=_("Date start"))
     date_end = models.DateTimeField(verbose_name=_("Date end"), null=True)
 
diff --git a/apps/terminal/tasks.py b/apps/terminal/tasks.py
index ed404a54b..f6b46f2a8 100644
--- a/apps/terminal/tasks.py
+++ b/apps/terminal/tasks.py
@@ -1,17 +1,27 @@
 # -*- coding: utf-8 -*-
 #
 
+import datetime
+
 from celery import shared_task
+from django.utils import timezone
+
+from common.celery import register_as_period_task, after_app_ready_start, \
+    after_app_shutdown_clean
+from .models import Status
 
 
 CACHE_REFRESH_INTERVAL = 10
 RUNNING = False
 
 
-# Todo: 定期清理上报history
 @shared_task
-def clean_terminal_history():
-    pass
+@register_as_period_task(interval=3600)
+@after_app_ready_start
+@after_app_shutdown_clean
+def delete_terminal_status_period():
+    yesterday = timezone.now() - datetime.timedelta(days=1)
+    Status.objects.filter(date_created__lt=yesterday).delete()
 
 
 
diff --git a/apps/terminal/templates/terminal/session_list.html b/apps/terminal/templates/terminal/session_list.html
index 3bf2600c8..dd9908487 100644
--- a/apps/terminal/templates/terminal/session_list.html
+++ b/apps/terminal/templates/terminal/session_list.html
@@ -75,6 +75,7 @@
     <th class="text-center">{% trans 'Terminal' %}</th>
     <th class="text-center">{% trans 'Command' %}</th>
     <th class="text-center">{% trans 'Date start' %}</th>
+{#    <th class="text-center">{% trans 'Date last active' %}</th>#}
     <th class="text-center">{% trans 'Duration' %}</th>
     <th class="text-center">{% trans 'Action' %}</th>
 {% endblock %}
@@ -94,6 +95,7 @@
             <td class="text-center">{{ session.id | get_session_command_amount }}</td>
 
             <td class="text-center">{{ session.date_start }}</td>
+{#            <td class="text-center">{{ session.date_last_active }}</td>#}
             <td class="text-center">{{ session.date_start|time_util_with_seconds:session.date_end }}</td>
             <td>
                 {% if session.is_finished %}

From 1e5b9fb3ef78445549fc2f12337412344819fde5 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 28 Feb 2018 10:39:38 +0800
Subject: [PATCH 06/17] =?UTF-8?q?[Update]=20terminal=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/terminal/forms.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/apps/terminal/forms.py b/apps/terminal/forms.py
index a3672eeef..ab4520b03 100644
--- a/apps/terminal/forms.py
+++ b/apps/terminal/forms.py
@@ -25,18 +25,22 @@ def get_all_replay_storage():
 
 
 class TerminalForm(forms.ModelForm):
-    command_storage = forms.ChoiceField(choices=get_all_command_storage(),
-                                        label=_("Command storage"))
-    replay_storage = forms.ChoiceField(choices=get_all_replay_storage(),
-                                       label=_("Replay storage"))
+    command_storage = forms.ChoiceField(
+        choices=get_all_command_storage(),
+        label=_("Command storage")
+    )
+    replay_storage = forms.ChoiceField(
+        choices=get_all_replay_storage(),
+        label=_("Replay storage")
+    )
 
     class Meta:
         model = Terminal
-        fields = ['name', 'remote_addr', 'ssh_port', 'http_port', 'comment', 'command_storage', 'replay_storage']
+        fields = [
+            'name', 'remote_addr', 'ssh_port', 'http_port', 'comment',
+            'command_storage', 'replay_storage',
+        ]
         help_texts = {
             'ssh_port': _("Coco ssh listen port"),
             'http_port': _("Coco http/ws listen port"),
         }
-        widgets = {
-            'name': forms.TextInput(attrs={'readonly': 'readonly'})
-        }

From 521a5c57a2f4540b10e54b6ca4cdf2ae1abc3651 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 28 Feb 2018 11:23:04 +0800
Subject: [PATCH 07/17] =?UTF-8?q?[Update]=20=E7=BB=9F=E4=B8=80copyright?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/templates/_copyright.html                  | 1 +
 apps/templates/flash_message_standalone.html    | 2 +-
 apps/users/templates/users/forgot_password.html | 7 ++-----
 apps/users/templates/users/login.html           | 7 ++-----
 apps/users/templates/users/reset_password.html  | 7 ++-----
 5 files changed, 8 insertions(+), 16 deletions(-)
 create mode 100644 apps/templates/_copyright.html

diff --git a/apps/templates/_copyright.html b/apps/templates/_copyright.html
new file mode 100644
index 000000000..ebff34379
--- /dev/null
+++ b/apps/templates/_copyright.html
@@ -0,0 +1 @@
+<strong>Copyright</strong> 北京堆栈科技有限公司 &copy; 2014-2018
\ No newline at end of file
diff --git a/apps/templates/flash_message_standalone.html b/apps/templates/flash_message_standalone.html
index 539ab5429..c7bbe7843 100644
--- a/apps/templates/flash_message_standalone.html
+++ b/apps/templates/flash_message_standalone.html
@@ -49,7 +49,7 @@
         <hr/>
         <div class="row">
             <div class="col-md-6">
-                Copyright Jumpserver.org
+                {% include '_copyright.html' %}
             </div>
             <div class="col-md-6 text-right">
                <small>2014-2018</small>
diff --git a/apps/users/templates/users/forgot_password.html b/apps/users/templates/users/forgot_password.html
index 1a5a9fb77..0ceed556e 100644
--- a/apps/users/templates/users/forgot_password.html
+++ b/apps/users/templates/users/forgot_password.html
@@ -51,11 +51,8 @@
         </div>
         <hr/>
         <div class="row">
-            <div class="col-md-6">
-                Copyright Jumpserver.org
-            </div>
-            <div class="col-md-6 text-right">
-               <small>© 2014-2018</small>
+            <div class="col-md-12">
+                 {% include '_copyright.html' %}
             </div>
         </div>
     </div>
diff --git a/apps/users/templates/users/login.html b/apps/users/templates/users/login.html
index 18339356a..ded2e3474 100644
--- a/apps/users/templates/users/login.html
+++ b/apps/users/templates/users/login.html
@@ -74,11 +74,8 @@
         </div>
         <hr/>
         <div class="row">
-            <div class="col-md-6">
-                Copyright 北京堆栈科技有限公司
-            </div>
-            <div class="col-md-6 text-right">
-               <small>© 2014-2018</small>
+            <div class="col-md-12">
+                 {% include '_copyright.html' %}
             </div>
         </div>
     </div>
diff --git a/apps/users/templates/users/reset_password.html b/apps/users/templates/users/reset_password.html
index 9033a4c9e..0bab32809 100644
--- a/apps/users/templates/users/reset_password.html
+++ b/apps/users/templates/users/reset_password.html
@@ -70,11 +70,8 @@
         </div>
         <hr/>
         <div class="row">
-            <div class="col-md-6">
-                Copyright Jumpserver.org
-            </div>
-            <div class="col-md-6 text-right">
-               <small>© 2014-2018</small>
+            <div class="col-md-12">
+                 {% include '_copyright.html' %}
             </div>
         </div>
     </div>

From 31629fc97570bbd7d73f31c2f54309595bc89135 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 1 Mar 2018 10:44:55 +0800
Subject: [PATCH 08/17] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E7=A6=81=E7=94=A8=E8=BF=98=E5=8F=AF=E4=BB=A5=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/models/node.py            | 6 ++++++
 apps/perms/utils.py                   | 4 ++--
 apps/users/templates/users/login.html | 8 ++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py
index a502694c9..b4ecc1302 100644
--- a/apps/assets/models/node.py
+++ b/apps/assets/models/node.py
@@ -61,6 +61,9 @@ class Node(models.Model):
         assets = Asset.objects.filter(nodes__id=self.id)
         return assets
 
+    def get_active_assets(self):
+        return self.get_assets().filter(is_active=True)
+
     def get_all_assets(self):
         from .asset import Asset
         if self.is_root():
@@ -70,6 +73,9 @@ class Node(models.Model):
             assets = Asset.objects.filter(nodes__in=nodes)
         return assets
 
+    def get_all_active_assets(self):
+        return self.get_all_assets().filter(is_active=True)
+
     def is_root(self):
         return self.key == '0'
 
diff --git a/apps/perms/utils.py b/apps/perms/utils.py
index c067bbd11..7abf96352 100644
--- a/apps/perms/utils.py
+++ b/apps/perms/utils.py
@@ -56,7 +56,7 @@ class NodePermissionUtil:
         nodes_with_assets = dict()
         for node, system_users in nodes.items():
             nodes_with_assets[node] = {
-                'assets': node.get_assets(),
+                'assets': node.get_active_assets(),
                 'system_users': system_users
             }
         return nodes_with_assets
@@ -87,7 +87,7 @@ class NodePermissionUtil:
         nodes_with_assets = dict()
         for node, system_users in nodes.items():
             nodes_with_assets[node] = {
-                'assets': node.get_assets(),
+                'assets': node.get_active_assets(),
                 'system_users': system_users
             }
         return nodes_with_assets
diff --git a/apps/users/templates/users/login.html b/apps/users/templates/users/login.html
index ded2e3474..0a3be6274 100644
--- a/apps/users/templates/users/login.html
+++ b/apps/users/templates/users/login.html
@@ -24,16 +24,16 @@
             <div class="col-md-6">
                 <h2 class="font-bold">欢迎使用Jumpserver开源跳板机</h2>
                 <p>
-                    Jumpserver是一款使用Python, Django开发的开源跳板机系统, 助力互联网企业高效 用户、资产、权限、审计 管理
+                    符合4A规范的专业运维审计系统：拥有跳板机的所有功能，认证，授权，审计，文件上传；
                 </p>
                 <p>
-                    我们自五湖四海，我们对开源精神无比敬仰和崇拜，我们对完美、整洁、优雅 无止境的追求
+                    极致的用户使用体验：拥有时尚外观是区别与以往版本和其他软件的铭牌，高雅的气质让你爱不释手；
                 </p>
                 <p>
-                    专注自动化运维，努力打造 易用、稳定、安全、自动化 的跳板机, 这是我们的不懈的追求和动力
+                    混合云环境下的堡垒机：怎么能容忍传统堡垒机的繁琐步骤，Jumpserver让你极致省力。
                 </p>
                 <p>
-                    <small>永远年轻，永远热泪盈眶 stay foolish stay hungry</small>
+                    <small>改变世界，从一点点开始</small>
                 </p>
 
             </div>

From 5a0068d86af8aa52e8c32a0b2c0afbb8b5220e42 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 1 Mar 2018 10:45:51 +0800
Subject: [PATCH 09/17] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E6=96=87?=
 =?UTF-8?q?=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/users/templates/users/login.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/users/templates/users/login.html b/apps/users/templates/users/login.html
index 0a3be6274..f8385bae7 100644
--- a/apps/users/templates/users/login.html
+++ b/apps/users/templates/users/login.html
@@ -33,7 +33,7 @@
                     混合云环境下的堡垒机：怎么能容忍传统堡垒机的繁琐步骤，Jumpserver让你极致省力。
                 </p>
                 <p>
-                    <small>改变世界，从一点点开始</small>
+                    <small>改变世界，从一点点开始。</small>
                 </p>
 
             </div>

From 1018deda96a7923bc73ad1450d4908b91953196d Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 1 Mar 2018 12:40:41 +0800
Subject: [PATCH 10/17] =?UTF-8?q?[Update]=20=E6=94=AF=E6=8C=81=E6=8B=96?=
 =?UTF-8?q?=E6=8B=BD=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/api/node.py                       | 21 ++++++-
 apps/assets/models/node.py                    |  4 ++
 apps/assets/serializers/node.py               |  6 +-
 apps/assets/templates/assets/asset_list.html  | 57 ++++++++++++++++++-
 apps/assets/urls/api_urls.py                  |  1 +
 .../perms/asset_permission_list.html          | 12 +---
 apps/users/templates/users/login.html         |  2 +-
 7 files changed, 87 insertions(+), 16 deletions(-)

diff --git a/apps/assets/api/node.py b/apps/assets/api/node.py
index 9538a265c..78cd7a27a 100644
--- a/apps/assets/api/node.py
+++ b/apps/assets/api/node.py
@@ -19,7 +19,7 @@ from rest_framework.response import Response
 from rest_framework_bulk import BulkModelViewSet
 from django.utils.translation import ugettext_lazy as _
 
-from common.utils import get_logger
+from common.utils import get_logger, get_object_or_none
 from ..hands import IsSuperUser
 from ..models import Node
 from .. import serializers
@@ -29,6 +29,7 @@ logger = get_logger(__file__)
 __all__ = [
     'NodeViewSet', 'NodeChildrenApi',
     'NodeAddAssetsApi', 'NodeRemoveAssetsApi',
+    'NodeAddChildrenApi',
 ]
 
 
@@ -75,6 +76,24 @@ class NodeChildrenApi(mixins.ListModelMixin, generics.CreateAPIView):
         return Response(response, status=200)
 
 
+class NodeAddChildrenApi(generics.UpdateAPIView):
+    queryset = Node.objects.all()
+    permission_classes = (IsSuperUser,)
+    serializer_class = serializers.NodeAddChildrenSerializer
+    instance = None
+
+    def put(self, request, *args, **kwargs):
+        instance = self.get_object()
+        nodes_id = request.data.get("nodes")
+        children = [get_object_or_none(Node, id=pk) for pk in nodes_id]
+        for node in children:
+            if not node:
+                continue
+            node.parent = instance
+            node.save()
+        return Response("OK")
+
+
 class NodeAddAssetsApi(generics.UpdateAPIView):
     serializer_class = serializers.NodeAssetsSerializer
     queryset = Node.objects.all()
diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py
index b4ecc1302..5ce195783 100644
--- a/apps/assets/models/node.py
+++ b/apps/assets/models/node.py
@@ -94,6 +94,10 @@ class Node(models.Model):
         else:
             return parent
 
+    @parent.setter
+    def parent(self, parent):
+        self.key = parent.get_next_child_key()
+
     @property
     def ancestor(self):
         if self.parent == self.__class__.root():
diff --git a/apps/assets/serializers/node.py b/apps/assets/serializers/node.py
index 6e69008bb..f6654aef9 100644
--- a/apps/assets/serializers/node.py
+++ b/apps/assets/serializers/node.py
@@ -65,4 +65,8 @@ class NodeAssetsSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Node
-        fields = ['assets']
\ No newline at end of file
+        fields = ['assets']
+
+
+class NodeAddChildrenSerializer(serializers.Serializer):
+    nodes = serializers.ListField()
diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html
index 62996cc47..4933b26e2 100644
--- a/apps/assets/templates/assets/asset_list.html
+++ b/apps/assets/templates/assets/asset_list.html
@@ -224,6 +224,7 @@ function editTreeNode() {
 	if (!current_node){
 	    return
     }
+    current_node.name = current_node.value;
     zTree.editName(current_node);
 }
 
@@ -308,6 +309,44 @@ function selectQueryNode() {
     }
 }
 
+function beforeDrag() {
+    return true
+}
+
+function beforeDrop() {
+    return true
+}
+
+function onDrag(event, treeId, treeNodes) {
+}
+
+function onDrop(event, treeId, treeNodes, targetNode, moveType) {
+    console.log("DROP");
+    console.log(event);
+    console.log(treeNodes);
+    console.log(targetNode);
+    console.log(moveType);
+
+    var treeNodesNames = [];
+    var treeNodesIds = [];
+    $.each(treeNodes, function (index, value) {
+        treeNodesNames.push(value.value);
+        treeNodesIds.push(value.id);
+    });
+
+    var msg = "你想移动节点: `" + treeNodesNames.join(",") + "` 到 `" + targetNode.value + "` 下吗?";
+    var the_url = "{% url 'api-assets:node-add-children' pk=DEFAULT_PK %}".replace("{{ DEFAULT_PK }}", targetNode.id);
+    var body = {nodes: treeNodesIds};
+    if (confirm(msg)){
+        APIUpdateAttr({
+            url: the_url,
+            method: "PUT",
+            body: JSON.stringify(body)
+        })
+    }
+
+}
+
 function initTree() {
     var setting = {
         view: {
@@ -319,11 +358,24 @@ function initTree() {
                 enable: true
             }
         },
+        edit: {
+            enable: true,
+			showRemoveBtn: false,
+			showRenameBtn: false,
+            drag: {
+                isCopy: true,
+                isMove: true
+            }
+        },
         callback: {
             onRightClick: OnRightClick,
             beforeClick: beforeClick,
             onRename: onRename,
-            onSelected: onSelected
+            onSelected: onSelected,
+            beforeDrag: beforeDrag,
+            onDrag: onDrag,
+            beforeDrop: beforeDrop,
+            onDrop: onDrop
         }
     };
 
@@ -334,7 +386,8 @@ function initTree() {
             {#if (value["key"] === "0") {#}
             value["open"] = true;
             {# }#}
-            value["name"] = value["value"] + ' (' + value['assets_amount'] + ')'
+            value["name"] = value["value"] + ' (' + value['assets_amount'] + ')';
+            value['value'] = value['value'];
         });
         zNodes = data;
         $.fn.zTree.init($("#assetTree"), setting, zNodes);
diff --git a/apps/assets/urls/api_urls.py b/apps/assets/urls/api_urls.py
index 236a1f854..38494539c 100644
--- a/apps/assets/urls/api_urls.py
+++ b/apps/assets/urls/api_urls.py
@@ -44,6 +44,7 @@ urlpatterns = [
     url(r'^v1/system-user/(?P<pk>[0-9a-zA-Z\-]{36})/connective/$',
         api.SystemUserTestConnectiveApi.as_view(), name='system-user-connective'),
     url(r'^v1/nodes/(?P<pk>[0-9a-zA-Z\-]{36})/children/$', api.NodeChildrenApi.as_view(), name='node-children'),
+    url(r'^v1/nodes/(?P<pk>[0-9a-zA-Z\-]{36})/children/add/$', api.NodeAddChildrenApi.as_view(), name='node-add-children'),
     url(r'^v1/nodes/(?P<pk>[0-9a-zA-Z\-]{36})/assets/add/$', api.NodeAddAssetsApi.as_view(), name='node-add-assets'),
     url(r'^v1/nodes/(?P<pk>[0-9a-zA-Z\-]{36})/assets/remove/$', api.NodeRemoveAssetsApi.as_view(), name='node-remove-assets'),
 ]
diff --git a/apps/perms/templates/perms/asset_permission_list.html b/apps/perms/templates/perms/asset_permission_list.html
index f87241d54..fa9118dcd 100644
--- a/apps/perms/templates/perms/asset_permission_list.html
+++ b/apps/perms/templates/perms/asset_permission_list.html
@@ -215,16 +215,6 @@ $(document).ready(function(){
     initTable();
     initTree();
 })
-.on('click', '.btn-create-asset', function () {
-    var url = "{% url 'assets:asset-create' %}";
-    var nodes = zTree.getSelectedNodes();
-    var current_node;
-    if (nodes && nodes.length ===1 ){
-        current_node = nodes[0];
-        url += "?node=" + current_node.id;
-    }
-    window.open(url, '_self');
-})
 .on('click', '.btn-del', function () {
     var $this = $(this);
     var uid = $this.data('uid');
@@ -241,7 +231,7 @@ $(document).ready(function(){
         current_node = nodes[0];
         url += "?node_id=" + current_node.id;
     }
-    window.open(url);
+    window.open(url, '_self');
 })
 
 </script>
diff --git a/apps/users/templates/users/login.html b/apps/users/templates/users/login.html
index f8385bae7..1f6498370 100644
--- a/apps/users/templates/users/login.html
+++ b/apps/users/templates/users/login.html
@@ -30,7 +30,7 @@
                     极致的用户使用体验：拥有时尚外观是区别与以往版本和其他软件的铭牌，高雅的气质让你爱不释手；
                 </p>
                 <p>
-                    混合云环境下的堡垒机：怎么能容忍传统堡垒机的繁琐步骤，Jumpserver让你极致省力。
+                    混合云环境下的堡垒机：怎么能容忍传统堡垒机的繁琐步骤，Jumpserver让你极致省力;
                 </p>
                 <p>
                     <small>改变世界，从一点点开始。</small>

From f7ab13952e0c783e81e06602c42c4e774cad9d61 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Fri, 2 Mar 2018 09:36:17 +0800
Subject: [PATCH 11/17] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8Dbug=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9celery=20beat=E7=89=88=E6=9C=AC=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/templates/assets/_system_user.html |  22 ++
 apps/i18n/zh/LC_MESSAGES/django.mo            | Bin 29645 -> 29707 bytes
 apps/i18n/zh/LC_MESSAGES/django.po            | 309 +++++++++---------
 apps/jumpserver/views.py                      |   3 +-
 apps/perms/serializers.py                     |   2 +-
 apps/templates/_header_bar.html               |   7 +-
 apps/templates/index.html                     |   2 +-
 requirements/requirements.txt                 |   4 +-
 8 files changed, 194 insertions(+), 155 deletions(-)

diff --git a/apps/assets/templates/assets/_system_user.html b/apps/assets/templates/assets/_system_user.html
index fe06a6fc7..358f7dd5e 100644
--- a/apps/assets/templates/assets/_system_user.html
+++ b/apps/assets/templates/assets/_system_user.html
@@ -81,6 +81,14 @@
 {% block custom_foot_js %}
     <script>
         var auto_generate_key = '#'+'{{ form.auto_generate_key.id_for_label }}';
+        var protocol_id = '#' + '{{ form.protocol.id_for_label }}';
+        var password_id = '#' + '{{ form.password.id_for_label }}';
+        var private_key_id = '#' + '{{ form.private_key_file.id_for_label }}';
+        var sudo_id = '#' + '{{ form.sudo.id_for_label }}';
+        var shell_id = '#' + '{{ form.shell.id_for_label }}';
+
+        var need_change_field = [auto_generate_key, private_key_id, sudo_id, shell_id] ;
+
         function authFieldsDisplay() {
             if ($(auto_generate_key).prop('checked')) {
                 $('.auth-fields').addClass('hidden');
@@ -88,9 +96,23 @@
                 $('.auth-fields').removeClass('hidden');
             }
         }
+
+        function protocolChange() {
+            if ($(protocol_id).attr('value') === 'rdp') {
+                $.each(need_change_field, function (index, value) {
+                    $(value).addClass('hidden')
+                });
+                $(password_id).removeClass('hidden')
+            } else {
+                $.each(need_change_field, function (index, value) {
+                    $(value).removeClass('hidden')
+                });
+            }
+        }
         $(document).ready(function () {
             $('.select2').select2();
             authFieldsDisplay();
+            protocolChange();
             $(auto_generate_key).change(function () {
                 authFieldsDisplay();
             });
diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo
index c38fdb5c95de35a3b356c579efeb49a768e2b168..0f8484c1f0472e1e1fa8c24c510a58fd62f8b3de 100644
GIT binary patch
delta 10569
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
be#_tg_KfkjHqN;-{p&kfW3s!XW%&LdphT3p

delta 10523
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

diff --git a/apps/i18n/zh/LC_MESSAGES/django.po b/apps/i18n/zh/LC_MESSAGES/django.po
index 0a839e612..792cb9195 100644
--- a/apps/i18n/zh/LC_MESSAGES/django.po
+++ b/apps/i18n/zh/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jumpserver 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-26 16:54+0800\n"
+"POT-Creation-Date: 2018-03-01 15:29+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: assets/api/node.py:54
+#: assets/api/node.py:55
 msgid "New node {}"
 msgstr "新节点 {}"
 
 #: assets/forms/asset.py:23 assets/forms/asset.py:52 assets/forms/user.py:125
-#: assets/models/asset.py:45 assets/models/user.py:221
+#: assets/models/asset.py:53 assets/models/user.py:218
 #: assets/templates/assets/asset_detail.html:181
 #: assets/templates/assets/asset_detail.html:189
 #: assets/templates/assets/system_user_detail.html:164
@@ -30,16 +30,16 @@ msgid "Nodes"
 msgstr "节点管理"
 
 #: assets/forms/asset.py:26 assets/forms/asset.py:55 assets/forms/asset.py:90
-#: assets/forms/asset.py:94 assets/models/asset.py:49
-#: assets/models/cluster.py:19 assets/models/user.py:190
-#: assets/templates/assets/asset_detail.html:73 templates/_nav.html:23
+#: assets/forms/asset.py:94 assets/models/asset.py:57
+#: assets/models/cluster.py:19 assets/models/user.py:187
+#: assets/templates/assets/asset_detail.html:73 templates/_nav.html:24
 msgid "Admin user"
 msgstr "管理用户"
 
-#: assets/forms/asset.py:29 assets/forms/asset.py:58 assets/models/asset.py:73
-#: assets/templates/assets/asset_create.html:31
+#: assets/forms/asset.py:29 assets/forms/asset.py:58 assets/models/asset.py:81
+#: assets/templates/assets/asset_create.html:32
 #: assets/templates/assets/asset_detail.html:218
-#: assets/templates/assets/asset_update.html:36 templates/_nav.html:25
+#: assets/templates/assets/asset_update.html:37 templates/_nav.html:26
 msgid "Labels"
 msgstr "标签管理"
 
@@ -54,7 +54,7 @@ msgstr "管理用户是资产上已经存在的特权用户，如 root或者其
 msgid "Select assets"
 msgstr "选择资产"
 
-#: assets/forms/asset.py:86 assets/models/asset.py:44
+#: assets/forms/asset.py:86 assets/models/asset.py:52
 #: assets/templates/assets/admin_user_assets.html:53
 #: assets/templates/assets/asset_detail.html:69
 #: assets/templates/assets/system_user_asset.html:51
@@ -62,7 +62,7 @@ msgstr "选择资产"
 msgid "Port"
 msgstr "端口"
 
-#: assets/forms/asset.py:106 assets/templates/assets/asset_create.html:35
+#: assets/forms/asset.py:106 assets/templates/assets/asset_create.html:36
 msgid "Select labels"
 msgstr "选择标签"
 
@@ -70,11 +70,11 @@ msgstr "选择标签"
 msgid "Select nodes"
 msgstr "选择节点"
 
-#: assets/forms/label.py:13 assets/models/asset.py:137
+#: assets/forms/label.py:13 assets/models/asset.py:153
 #: assets/templates/assets/admin_user_list.html:24
 #: assets/templates/assets/label_list.html:16
 #: assets/templates/assets/system_user_list.html:26 perms/models.py:17
-#: terminal/backends/command/models.py:11 terminal/models.py:116
+#: terminal/backends/command/models.py:11 terminal/models.py:123
 #: terminal/templates/terminal/command_list.html:40
 #: terminal/templates/terminal/command_list.html:73
 #: terminal/templates/terminal/session_list.html:41
@@ -116,11 +116,11 @@ msgstr "密码和私钥, 必须输入一个"
 #: assets/templates/assets/system_user_detail.html:58
 #: assets/templates/assets/system_user_list.html:24 common/models.py:26
 #: common/templates/common/terminal_setting.html:67
-#: common/templates/common/terminal_setting.html:88 ops/models.py:31
+#: common/templates/common/terminal_setting.html:85 ops/models.py:31
 #: ops/templates/ops/task_detail.html:56 ops/templates/ops/task_list.html:34
 #: perms/models.py:14 perms/templates/perms/asset_permission_detail.html:62
-#: perms/templates/perms/asset_permission_user.html:54 terminal/models.py:15
-#: terminal/models.py:141 terminal/templates/terminal/terminal_detail.html:43
+#: perms/templates/perms/asset_permission_user.html:54 terminal/models.py:16
+#: terminal/models.py:149 terminal/templates/terminal/terminal_detail.html:43
 #: terminal/templates/terminal/terminal_list.html:29 users/models/group.py:14
 #: users/models/user.py:35 users/templates/users/_select_user_modal.html:13
 #: users/templates/users/user_detail.html:63
@@ -162,7 +162,7 @@ msgid ""
 "than 2 system user"
 msgstr "高优先级的系统用户将会作为默认登录用户"
 
-#: assets/models/asset.py:42 assets/templates/assets/_asset_list_modal.html:21
+#: assets/models/asset.py:50 assets/templates/assets/_asset_list_modal.html:21
 #: assets/templates/assets/admin_user_assets.html:52
 #: assets/templates/assets/asset_detail.html:61
 #: assets/templates/assets/asset_list.html:81
@@ -175,7 +175,7 @@ msgstr "高优先级的系统用户将会作为默认登录用户"
 msgid "IP"
 msgstr "IP"
 
-#: assets/models/asset.py:43 assets/templates/assets/_asset_list_modal.html:20
+#: assets/models/asset.py:51 assets/templates/assets/_asset_list_modal.html:20
 #: assets/templates/assets/admin_user_assets.html:51
 #: assets/templates/assets/asset_detail.html:57
 #: assets/templates/assets/asset_list.html:80
@@ -187,77 +187,77 @@ msgstr "IP"
 msgid "Hostname"
 msgstr "主机名"
 
-#: assets/models/asset.py:46 assets/models/label.py:20
+#: assets/models/asset.py:54 assets/models/label.py:20
 #: assets/templates/assets/asset_detail.html:105
 #: perms/templates/perms/asset_permission_list.html:70
 msgid "Is active"
 msgstr "激活"
 
-#: assets/models/asset.py:52 assets/templates/assets/asset_detail.html:65
+#: assets/models/asset.py:60 assets/templates/assets/asset_detail.html:65
 msgid "Public IP"
 msgstr "公网IP"
 
-#: assets/models/asset.py:53 assets/templates/assets/asset_detail.html:113
+#: assets/models/asset.py:61 assets/templates/assets/asset_detail.html:113
 msgid "Asset number"
 msgstr "资产编号"
 
-#: assets/models/asset.py:56 assets/templates/assets/asset_detail.html:77
+#: assets/models/asset.py:64 assets/templates/assets/asset_detail.html:77
 msgid "Vendor"
 msgstr "制造商"
 
-#: assets/models/asset.py:57 assets/templates/assets/asset_detail.html:81
+#: assets/models/asset.py:65 assets/templates/assets/asset_detail.html:81
 msgid "Model"
 msgstr "型号"
 
-#: assets/models/asset.py:58 assets/templates/assets/asset_detail.html:109
+#: assets/models/asset.py:66 assets/templates/assets/asset_detail.html:109
 msgid "Serial number"
 msgstr "序列号"
 
-#: assets/models/asset.py:60
+#: assets/models/asset.py:68
 msgid "CPU model"
 msgstr "CPU型号"
 
-#: assets/models/asset.py:61
+#: assets/models/asset.py:69
 msgid "CPU count"
 msgstr "CPU数量"
 
-#: assets/models/asset.py:62
+#: assets/models/asset.py:70
 msgid "CPU cores"
 msgstr "CPU核数"
 
-#: assets/models/asset.py:63 assets/templates/assets/asset_detail.html:89
+#: assets/models/asset.py:71 assets/templates/assets/asset_detail.html:89
 msgid "Memory"
 msgstr "内存"
 
-#: assets/models/asset.py:64
+#: assets/models/asset.py:72
 msgid "Disk total"
 msgstr "硬盘大小"
 
-#: assets/models/asset.py:65
+#: assets/models/asset.py:73
 msgid "Disk info"
 msgstr "硬盘信息"
 
-#: assets/models/asset.py:67 assets/templates/assets/asset_detail.html:97
+#: assets/models/asset.py:75 assets/templates/assets/asset_detail.html:97
 msgid "Platform"
 msgstr "系统平台"
 
-#: assets/models/asset.py:68 assets/templates/assets/asset_detail.html:101
+#: assets/models/asset.py:76 assets/templates/assets/asset_detail.html:101
 msgid "OS"
 msgstr "操作系统"
 
-#: assets/models/asset.py:69
+#: assets/models/asset.py:77
 msgid "OS version"
 msgstr "系统版本"
 
-#: assets/models/asset.py:70
+#: assets/models/asset.py:78
 msgid "OS arch"
 msgstr "系统架构"
 
-#: assets/models/asset.py:71
+#: assets/models/asset.py:79
 msgid "Hostname raw"
 msgstr "主机名原始"
 
-#: assets/models/asset.py:74 assets/models/cluster.py:28
+#: assets/models/asset.py:82 assets/models/cluster.py:28
 #: assets/models/group.py:21 assets/models/user.py:36
 #: assets/templates/assets/admin_user_detail.html:68
 #: assets/templates/assets/asset_detail.html:117
@@ -268,7 +268,7 @@ msgstr "主机名原始"
 msgid "Created by"
 msgstr "创建者"
 
-#: assets/models/asset.py:75 assets/models/cluster.py:26
+#: assets/models/asset.py:83 assets/models/cluster.py:26
 #: assets/models/group.py:22 assets/models/label.py:23
 #: assets/templates/assets/admin_user_detail.html:64
 #: assets/templates/assets/system_user_detail.html:92
@@ -280,7 +280,7 @@ msgstr "创建者"
 msgid "Date created"
 msgstr "创建日期"
 
-#: assets/models/asset.py:76 assets/models/cluster.py:29
+#: assets/models/asset.py:84 assets/models/cluster.py:29
 #: assets/models/group.py:23 assets/models/label.py:21 assets/models/user.py:33
 #: assets/templates/assets/admin_user_detail.html:72
 #: assets/templates/assets/admin_user_list.html:28
@@ -288,7 +288,7 @@ msgstr "创建日期"
 #: assets/templates/assets/system_user_detail.html:100
 #: assets/templates/assets/system_user_list.html:30 common/models.py:30
 #: ops/models.py:37 perms/models.py:24 perms/models.py:81
-#: perms/templates/perms/asset_permission_detail.html:98 terminal/models.py:25
+#: perms/templates/perms/asset_permission_detail.html:98 terminal/models.py:26
 #: terminal/templates/terminal/terminal_detail.html:63 users/models/group.py:15
 #: users/models/user.py:47 users/templates/users/user_detail.html:111
 #: users/templates/users/user_group_detail.html:67
@@ -331,7 +331,7 @@ msgid "Default"
 msgstr "默认"
 
 #: assets/models/cluster.py:36 assets/models/label.py:13
-#: users/models/user.py:261
+#: users/models/user.py:265
 msgid "System"
 msgstr "系统"
 
@@ -352,13 +352,13 @@ msgid "Default asset group"
 msgstr "默认资产组"
 
 #: assets/models/label.py:14 perms/models.py:15
-#: terminal/backends/command/models.py:10 terminal/models.py:115
+#: terminal/backends/command/models.py:10 terminal/models.py:122
 #: terminal/templates/terminal/command_list.html:32
 #: terminal/templates/terminal/command_list.html:72
 #: terminal/templates/terminal/session_list.html:33
 #: terminal/templates/terminal/session_list.html:71 users/forms.py:190
 #: users/models/user.py:30 users/templates/users/user_group_detail.html:78
-#: users/templates/users/user_group_list.html:13 users/views/user.py:330
+#: users/templates/users/user_group_list.html:13 users/views/user.py:334
 msgid "User"
 msgstr "用户"
 
@@ -383,32 +383,32 @@ msgstr "ssh密钥"
 msgid "SSH public key"
 msgstr "ssh公钥"
 
-#: assets/models/user.py:222
+#: assets/models/user.py:219
 msgid "Priority"
 msgstr "优先级"
 
-#: assets/models/user.py:223 assets/templates/assets/system_user_detail.html:66
+#: assets/models/user.py:220 assets/templates/assets/system_user_detail.html:66
 msgid "Protocol"
 msgstr "协议"
 
-#: assets/models/user.py:224 assets/templates/assets/_system_user.html:58
+#: assets/models/user.py:221 assets/templates/assets/_system_user.html:58
 #: assets/templates/assets/system_user_detail.html:118
 #: assets/templates/assets/system_user_update.html:11
 msgid "Auto push"
 msgstr "自动推送"
 
-#: assets/models/user.py:225 assets/templates/assets/system_user_detail.html:70
+#: assets/models/user.py:222 assets/templates/assets/system_user_detail.html:70
 msgid "Sudo"
 msgstr "Sudo"
 
-#: assets/models/user.py:226 assets/templates/assets/system_user_detail.html:75
+#: assets/models/user.py:223 assets/templates/assets/system_user_detail.html:75
 msgid "Shell"
 msgstr "Shell"
 
-#: assets/models/user.py:269 perms/forms.py:25 perms/models.py:19
+#: assets/models/user.py:266 perms/forms.py:25 perms/models.py:19
 #: perms/models.py:76 perms/templates/perms/asset_permission_detail.html:136
-#: perms/templates/perms/asset_permission_list.html:69 templates/_nav.html:24
-#: terminal/backends/command/models.py:12 terminal/models.py:117
+#: perms/templates/perms/asset_permission_list.html:69 templates/_nav.html:25
+#: terminal/backends/command/models.py:12 terminal/models.py:124
 #: terminal/templates/terminal/command_list.html:48
 #: terminal/templates/terminal/command_list.html:74
 #: terminal/templates/terminal/session_list.html:49
@@ -479,7 +479,7 @@ msgstr "仅修改你需要更新的字段"
 #: assets/views/label.py:42 assets/views/label.py:58
 #: assets/views/system_user.py:28 assets/views/system_user.py:44
 #: assets/views/system_user.py:60 assets/views/system_user.py:74
-#: templates/_nav.html:19
+#: templates/_nav.html:20
 msgid "Assets"
 msgstr "资产管理"
 
@@ -564,7 +564,7 @@ msgstr "可连接"
 #: ops/templates/ops/adhoc_history.html:59 ops/templates/ops/task_adhoc.html:61
 #: ops/templates/ops/task_history.html:62 ops/templates/ops/task_list.html:41
 #: perms/templates/perms/asset_permission_list.html:72
-#: terminal/templates/terminal/session_list.html:79
+#: terminal/templates/terminal/session_list.html:80
 #: terminal/templates/terminal/terminal_list.html:36
 #: users/templates/users/user_group_list.html:15
 #: users/templates/users/user_list.html:28
@@ -599,16 +599,16 @@ msgstr "激活所选"
 #: assets/templates/assets/_system_user.html:71
 #: assets/templates/assets/admin_user_create_update.html:46
 #: assets/templates/assets/asset_bulk_update.html:24
-#: assets/templates/assets/asset_create.html:65
+#: assets/templates/assets/asset_create.html:66
 #: assets/templates/assets/asset_list.html:102
-#: assets/templates/assets/asset_update.html:69
+#: assets/templates/assets/asset_update.html:70
 #: assets/templates/assets/label_create_update.html:17
 #: common/templates/common/basic_setting.html:59
 #: common/templates/common/email_setting.html:60
 #: common/templates/common/ldap_setting.html:60
-#: common/templates/common/terminal_setting.html:108
+#: common/templates/common/terminal_setting.html:103
 #: perms/templates/perms/asset_permission_create_update.html:72
-#: terminal/templates/terminal/terminal_update.html:47
+#: terminal/templates/terminal/terminal_update.html:48
 #: users/templates/users/_user.html:44
 #: users/templates/users/first_login.html:62
 #: users/templates/users/forgot_password.html:44
@@ -673,8 +673,8 @@ msgid "Basic"
 msgstr "基本"
 
 #: assets/templates/assets/_system_user.html:44
-#: assets/templates/assets/asset_create.html:23
-#: assets/templates/assets/asset_update.html:28
+#: assets/templates/assets/asset_create.html:24
+#: assets/templates/assets/asset_update.html:29
 #: assets/templates/assets/system_user_update.html:7
 #: users/templates/users/user_create.html:9
 #: users/templates/users/user_update.html:6
@@ -686,25 +686,25 @@ msgid "Auto generate key"
 msgstr "自动生成秘钥"
 
 #: assets/templates/assets/_system_user.html:64
-#: assets/templates/assets/asset_create.html:57
-#: assets/templates/assets/asset_update.html:61
+#: assets/templates/assets/asset_create.html:58
+#: assets/templates/assets/asset_update.html:62
 #: perms/templates/perms/asset_permission_create_update.html:49
-#: terminal/templates/terminal/terminal_update.html:41
+#: terminal/templates/terminal/terminal_update.html:42
 msgid "Other"
 msgstr "其它"
 
 #: assets/templates/assets/_system_user.html:70
 #: assets/templates/assets/admin_user_create_update.html:45
 #: assets/templates/assets/asset_bulk_update.html:23
-#: assets/templates/assets/asset_create.html:64
-#: assets/templates/assets/asset_update.html:68
+#: assets/templates/assets/asset_create.html:65
+#: assets/templates/assets/asset_update.html:69
 #: assets/templates/assets/label_create_update.html:16
 #: common/templates/common/basic_setting.html:58
 #: common/templates/common/email_setting.html:59
 #: common/templates/common/ldap_setting.html:59
-#: common/templates/common/terminal_setting.html:106
+#: common/templates/common/terminal_setting.html:101
 #: perms/templates/perms/asset_permission_create_update.html:71
-#: terminal/templates/terminal/terminal_update.html:46
+#: terminal/templates/terminal/terminal_update.html:47
 #: users/templates/users/_user.html:43
 #: users/templates/users/user_bulk_update.html:23
 #: users/templates/users/user_password_update.html:58
@@ -773,7 +773,7 @@ msgstr "替换资产的管理员"
 
 #: assets/templates/assets/admin_user_detail.html:100
 #: assets/templates/assets/asset_detail.html:198
-#: assets/templates/assets/asset_list.html:482
+#: assets/templates/assets/asset_list.html:535
 #: assets/templates/assets/system_user_detail.html:181
 #: assets/templates/assets/system_user_list.html:135 templates/_modal.html:16
 #: terminal/templates/terminal/session_detail.html:108
@@ -799,16 +799,16 @@ msgstr "不可达"
 msgid "Ratio"
 msgstr "比例"
 
-#: assets/templates/assets/asset_create.html:27
-#: assets/templates/assets/asset_update.html:32 perms/models.py:74
+#: assets/templates/assets/asset_create.html:28
+#: assets/templates/assets/asset_update.html:33 perms/models.py:74
 #: perms/templates/perms/asset_permission_create_update.html:40
 #: perms/templates/perms/asset_permission_list.html:67
 msgid "Node"
 msgstr "节点"
 
-#: assets/templates/assets/asset_create.html:33
+#: assets/templates/assets/asset_create.html:34
 #: assets/templates/assets/asset_list.html:69
-#: assets/templates/assets/asset_update.html:38
+#: assets/templates/assets/asset_update.html:39
 msgid "Label"
 msgstr "标签"
 
@@ -893,7 +893,7 @@ msgstr "创建节点失败"
 msgid "Have child node, cancel"
 msgstr "存在子节点，不能删除"
 
-#: assets/templates/assets/asset_list.html:477
+#: assets/templates/assets/asset_list.html:530
 #: assets/templates/assets/system_user_list.html:130
 #: users/templates/users/user_detail.html:334
 #: users/templates/users/user_detail.html:359
@@ -902,24 +902,24 @@ msgstr "存在子节点，不能删除"
 msgid "Are you sure?"
 msgstr "你确认吗?"
 
-#: assets/templates/assets/asset_list.html:478
+#: assets/templates/assets/asset_list.html:531
 msgid "This will delete the selected assets !!!"
 msgstr "删除选择资产"
 
-#: assets/templates/assets/asset_list.html:486
+#: assets/templates/assets/asset_list.html:539
 msgid "Asset Deleted."
 msgstr "已被删除"
 
-#: assets/templates/assets/asset_list.html:487
-#: assets/templates/assets/asset_list.html:492
+#: assets/templates/assets/asset_list.html:540
+#: assets/templates/assets/asset_list.html:545
 msgid "Asset Delete"
 msgstr "删除"
 
-#: assets/templates/assets/asset_list.html:491
+#: assets/templates/assets/asset_list.html:544
 msgid "Asset Deleting failed."
 msgstr "删除失败"
 
-#: assets/templates/assets/asset_update.html:57
+#: assets/templates/assets/asset_update.html:58
 msgid "Configuration"
 msgstr "配置"
 
@@ -1011,7 +1011,7 @@ msgstr "更新管理用户"
 msgid "Admin user detail"
 msgstr "管理用户详情"
 
-#: assets/views/asset.py:49 assets/views/asset.py:62 templates/_nav.html:22
+#: assets/views/asset.py:49 assets/views/asset.py:62 templates/_nav.html:23
 msgid "Asset list"
 msgstr "资产列表"
 
@@ -1023,7 +1023,7 @@ msgstr "批量更新资产"
 msgid "Update asset"
 msgstr "编辑资产"
 
-#: assets/views/asset.py:296
+#: assets/views/asset.py:297
 msgid "already exists"
 msgstr "已经存在"
 
@@ -1195,7 +1195,7 @@ msgid "Public key auth"
 msgstr "秘钥认证"
 
 #: common/forms.py:159 common/templates/common/terminal_setting.html:63
-#: terminal/forms.py:21 terminal/models.py:19
+#: terminal/forms.py:30 terminal/models.py:20
 msgid "Command storage"
 msgstr "命令存储"
 
@@ -1205,8 +1205,8 @@ msgid ""
 "other storage and some terminal using"
 msgstr "设置终端命令存储，default是默认用的存储方式"
 
-#: common/forms.py:165 common/templates/common/terminal_setting.html:84
-#: terminal/models.py:20
+#: common/forms.py:165 common/templates/common/terminal_setting.html:81
+#: terminal/forms.py:34 terminal/models.py:21
 msgid "Replay storage"
 msgstr "录像存储"
 
@@ -1263,19 +1263,13 @@ msgid "Test connection"
 msgstr "测试连接"
 
 #: common/templates/common/terminal_setting.html:68
-#: common/templates/common/terminal_setting.html:89
+#: common/templates/common/terminal_setting.html:86
 #: users/templates/users/login_log_list.html:50
 msgid "Type"
 msgstr "类型"
 
-#: common/templates/common/terminal_setting.html:90
-#: users/templates/users/reset_password.html:57
-#: users/templates/users/user_profile.html:20
-msgid "Setting"
-msgstr "设置"
-
 #: common/views.py:20 common/views.py:46 common/views.py:72 common/views.py:102
-#: templates/_nav.html:66
+#: templates/_nav.html:67
 msgid "Settings"
 msgstr "系统设置"
 
@@ -1430,7 +1424,7 @@ msgstr "执行历史"
 
 #: ops/templates/ops/adhoc_history.html:52
 #: ops/templates/ops/adhoc_history_detail.html:58
-#: ops/templates/ops/task_history.html:55 terminal/models.py:124
+#: ops/templates/ops/task_history.html:55 terminal/models.py:132
 #: terminal/templates/terminal/session_list.html:77
 msgid "Date start"
 msgstr "开始日期"
@@ -1542,7 +1536,7 @@ msgstr "任务开始: "
 msgid "Ops"
 msgstr "作业中心"
 
-#: ops/views.py:37 templates/_nav.html:52
+#: ops/views.py:37 templates/_nav.html:53
 msgid "Task list"
 msgstr "任务列表"
 
@@ -1551,7 +1545,7 @@ msgid "Task run history"
 msgstr "执行历史"
 
 #: perms/forms.py:22 perms/models.py:16 perms/models.py:75
-#: perms/templates/perms/asset_permission_list.html:68 templates/_nav.html:13
+#: perms/templates/perms/asset_permission_list.html:68 templates/_nav.html:14
 #: users/models/user.py:37 users/templates/users/_select_user_modal.html:16
 #: users/templates/users/user_detail.html:179
 #: users/templates/users/user_list.html:26
@@ -1566,7 +1560,7 @@ msgstr "用户组"
 msgid "Date expired"
 msgstr "失效日期"
 
-#: perms/models.py:88 templates/_nav.html:32
+#: perms/models.py:88 templates/_nav.html:33
 msgid "Asset permission"
 msgstr "资产授权"
 
@@ -1660,7 +1654,7 @@ msgstr "添加用户组"
 msgid "Select user groups"
 msgstr "选择用户组"
 
-#: perms/views.py:23 perms/views.py:47 perms/views.py:67 templates/_nav.html:29
+#: perms/views.py:23 perms/views.py:47 perms/views.py:67 templates/_nav.html:30
 msgid "Perms"
 msgstr "权限管理"
 
@@ -1677,37 +1671,41 @@ msgid "Update asset permission"
 msgstr "更新资产授权"
 
 #: templates/_header_bar.html:18
-msgid "Help"
-msgstr "帮助"
+msgid "Supports"
+msgstr "商业支持"
 
-#: templates/_header_bar.html:32 templates/_nav_user.html:9
+#: templates/_header_bar.html:23
+msgid "Docs"
+msgstr "文档"
+
+#: templates/_header_bar.html:37 templates/_nav_user.html:9
 #: users/templates/users/_user.html:36
 #: users/templates/users/user_password_update.html:37
 #: users/templates/users/user_profile.html:17
 #: users/templates/users/user_profile_update.html:37
 #: users/templates/users/user_profile_update.html:57
-#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:313
+#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:317
 msgid "Profile"
 msgstr "个人信息"
 
-#: templates/_header_bar.html:36
+#: templates/_header_bar.html:41
 msgid "Admin page"
 msgstr "管理页面"
 
-#: templates/_header_bar.html:38
+#: templates/_header_bar.html:43
 msgid "User page"
 msgstr "用户页面"
 
-#: templates/_header_bar.html:41
+#: templates/_header_bar.html:46
 msgid "Logout"
 msgstr "注销登录"
 
-#: templates/_header_bar.html:45 users/templates/users/login.html:42
+#: templates/_header_bar.html:50 users/templates/users/login.html:42
 #: users/templates/users/login.html:61
 msgid "Login"
 msgstr "登录"
 
-#: templates/_header_bar.html:58 templates/_nav.html:4
+#: templates/_header_bar.html:63 templates/_nav.html:4
 msgid "Dashboard"
 msgstr "仪表盘"
 
@@ -1741,39 +1739,39 @@ msgstr ""
 msgid "Close"
 msgstr "关闭"
 
-#: templates/_nav.html:9 users/views/group.py:28 users/views/group.py:44
+#: templates/_nav.html:10 users/views/group.py:28 users/views/group.py:44
 #: users/views/group.py:62 users/views/group.py:79 users/views/login.py:200
-#: users/views/login.py:249 users/views/user.py:57 users/views/user.py:72
-#: users/views/user.py:91 users/views/user.py:147 users/views/user.py:300
-#: users/views/user.py:312 users/views/user.py:348 users/views/user.py:370
+#: users/views/login.py:249 users/views/user.py:59 users/views/user.py:74
+#: users/views/user.py:93 users/views/user.py:149 users/views/user.py:304
+#: users/views/user.py:316 users/views/user.py:352 users/views/user.py:374
 msgid "Users"
 msgstr "用户管理"
 
-#: templates/_nav.html:12 users/views/user.py:58
+#: templates/_nav.html:13 users/views/user.py:60
 msgid "User list"
 msgstr "用户列表"
 
-#: templates/_nav.html:14
+#: templates/_nav.html:15
 msgid "Login logs"
 msgstr "登录日志"
 
-#: templates/_nav.html:38
+#: templates/_nav.html:39
 msgid "Sessions"
 msgstr "会话管理"
 
-#: templates/_nav.html:41
+#: templates/_nav.html:42
 msgid "Session online"
 msgstr "在线会话"
 
-#: templates/_nav.html:42
+#: templates/_nav.html:43
 msgid "Session offline"
 msgstr "历史会话"
 
-#: templates/_nav.html:43
+#: templates/_nav.html:44
 msgid "Commands"
 msgstr "命令记录"
 
-#: templates/_nav.html:44 terminal/templates/terminal/session_list.html:75
+#: templates/_nav.html:45 terminal/templates/terminal/session_list.html:75
 #: terminal/views/command.py:47 terminal/views/session.py:75
 #: terminal/views/session.py:92 terminal/views/session.py:114
 #: terminal/views/terminal.py:31 terminal/views/terminal.py:46
@@ -1781,7 +1779,7 @@ msgstr "命令记录"
 msgid "Terminal"
 msgstr "终端管理"
 
-#: templates/_nav.html:49
+#: templates/_nav.html:50
 msgid "Job Center"
 msgstr "作业中心"
 
@@ -1819,71 +1817,77 @@ msgstr "输出"
 msgid "Session"
 msgstr "会话"
 
-#: terminal/forms.py:27
+#: terminal/forms.py:44
 msgid "Coco ssh listen port"
 msgstr "SSH 监听端口"
 
-#: terminal/forms.py:28
+#: terminal/forms.py:45
 msgid "Coco http/ws listen port"
 msgstr "Http/Websocket 监听端口"
 
-#: terminal/models.py:16
+#: terminal/models.py:17
 msgid "Remote Address"
 msgstr "远端地址"
 
-#: terminal/models.py:17
+#: terminal/models.py:18
 msgid "SSH Port"
 msgstr "SSH端口"
 
-#: terminal/models.py:18
+#: terminal/models.py:19
 msgid "HTTP Port"
 msgstr "HTTP端口"
 
-#: terminal/models.py:91
+#: terminal/models.py:98
 msgid "Session Online"
 msgstr "在线会话"
 
-#: terminal/models.py:92
+#: terminal/models.py:99
 msgid "CPU Usage"
 msgstr "CPU使用"
 
-#: terminal/models.py:93
+#: terminal/models.py:100
 msgid "Memory Used"
 msgstr "内存使用"
 
-#: terminal/models.py:94
+#: terminal/models.py:101
 msgid "Connections"
 msgstr "连接数"
 
-#: terminal/models.py:95
+#: terminal/models.py:102
 msgid "Threads"
 msgstr "线程数"
 
-#: terminal/models.py:96
+#: terminal/models.py:103
 msgid "Boot Time"
 msgstr "运行时间"
 
-#: terminal/models.py:119 terminal/templates/terminal/session_list.html:74
+#: terminal/models.py:126 terminal/templates/terminal/session_list.html:74
 #: terminal/templates/terminal/terminal_detail.html:47
 msgid "Remote addr"
 msgstr "远端地址"
 
-#: terminal/models.py:121 terminal/templates/terminal/session_list.html:100
+#: terminal/models.py:128 terminal/templates/terminal/session_list.html:102
 msgid "Replay"
 msgstr "回放"
 
-#: terminal/models.py:122 terminal/templates/terminal/command_list.html:55
+#: terminal/models.py:129 terminal/templates/terminal/command_list.html:55
 #: terminal/templates/terminal/command_list.html:71
 #: terminal/templates/terminal/session_detail.html:48
 #: terminal/templates/terminal/session_list.html:76
 msgid "Command"
 msgstr "命令"
 
-#: terminal/models.py:125
+#: terminal/models.py:131
+#, fuzzy
+#| msgid "Date start"
+msgid "Date last active"
+msgstr "开始日期"
+
+#: terminal/models.py:133
 msgid "Date end"
 msgstr "结束日期"
 
-#: terminal/models.py:142
+#: terminal/models.py:150
 msgid "Args"
 msgstr "参数"
 
@@ -1922,19 +1926,19 @@ msgstr "监控"
 msgid "Terminate session"
 msgstr "终止会话"
 
-#: terminal/templates/terminal/session_list.html:78
+#: terminal/templates/terminal/session_list.html:79
 msgid "Duration"
 msgstr "时长"
 
-#: terminal/templates/terminal/session_list.html:102
+#: terminal/templates/terminal/session_list.html:104
 msgid "Monitor"
 msgstr "监控"
 
-#: terminal/templates/terminal/session_list.html:103
+#: terminal/templates/terminal/session_list.html:105
 msgid "Terminate"
 msgstr "终断"
 
-#: terminal/templates/terminal/session_list.html:119
+#: terminal/templates/terminal/session_list.html:121
 msgid "Terminate task send, waiting ..."
 msgstr "终断任务已发送，请等待"
 
@@ -2129,7 +2133,7 @@ msgstr "Agent"
 msgid "Date login"
 msgstr "登录日期"
 
-#: users/models/user.py:29 users/models/user.py:257
+#: users/models/user.py:29 users/models/user.py:261
 msgid "Administrator"
 msgstr "管理员"
 
@@ -2168,7 +2172,7 @@ msgstr "二次验证"
 msgid "Public key"
 msgstr "ssh公钥"
 
-#: users/models/user.py:260
+#: users/models/user.py:264
 msgid "Administrator is the super user of system"
 msgstr "Administrator是初始的超级管理员"
 
@@ -2269,8 +2273,13 @@ msgstr "重置密码"
 msgid "Password again"
 msgstr "再次输入密码"
 
+#: users/templates/users/reset_password.html:57
+#: users/templates/users/user_profile.html:20
+msgid "Setting"
+msgstr "设置"
+
 #: users/templates/users/user_create.html:4
-#: users/templates/users/user_list.html:16 users/views/user.py:72
+#: users/templates/users/user_list.html:16 users/views/user.py:74
 msgid "Create user"
 msgstr "创建用户"
 
@@ -2279,7 +2288,7 @@ msgid "Reset link will be generated and sent to the user. "
 msgstr "生成重置密码连接，通过邮件发送给用户"
 
 #: users/templates/users/user_detail.html:19
-#: users/templates/users/user_granted_asset.html:18 users/views/user.py:148
+#: users/templates/users/user_granted_asset.html:18 users/views/user.py:150
 msgid "User detail"
 msgstr "用户详情"
 
@@ -2399,8 +2408,8 @@ msgstr "用户删除失败"
 msgid "OTP"
 msgstr ""
 
-#: users/templates/users/user_profile.html:100 users/views/user.py:177
-#: users/views/user.py:229
+#: users/templates/users/user_profile.html:100 users/views/user.py:179
+#: users/views/user.py:233
 msgid "User groups"
 msgstr "用户组"
 
@@ -2420,7 +2429,7 @@ msgstr "指纹"
 msgid "Update public key"
 msgstr "更新密钥"
 
-#: users/templates/users/user_update.html:4 users/views/user.py:91
+#: users/templates/users/user_update.html:4 users/views/user.py:93
 msgid "Update user"
 msgstr "编辑用户"
 
@@ -2611,27 +2620,29 @@ msgstr "首次登陆"
 msgid "Login log list"
 msgstr "登录日志"
 
-#: users/views/user.py:101
+#: users/views/user.py:103
 msgid "Bulk update user success"
 msgstr "批量更新用户成功"
 
-#: users/views/user.py:206
+#: users/views/user.py:208
 msgid "Invalid file."
 msgstr "文件不合法"
 
-#: users/views/user.py:301
+#: users/views/user.py:305
 msgid "User granted assets"
 msgstr "用户授权资产"
 
-#: users/views/user.py:331
+#: users/views/user.py:335
 msgid "Profile setting"
 msgstr "个人信息设置"
 
-#: users/views/user.py:349
+#: users/views/user.py:353
 msgid "Password update"
 msgstr "密码更新"
 
-#: users/views/user.py:371
+#: users/views/user.py:375
 msgid "Public key update"
 msgstr "秘钥更新"
 
+#~ msgid "Help"
+#~ msgstr "帮助"
diff --git a/apps/jumpserver/views.py b/apps/jumpserver/views.py
index 0ddba94bf..d37a3ff26 100644
--- a/apps/jumpserver/views.py
+++ b/apps/jumpserver/views.py
@@ -45,7 +45,8 @@ class IndexView(LoginRequiredMixin, TemplateView):
         return self.session_week.values('user').distinct().count()
 
     def get_week_login_asset_count(self):
-        return self.session_week.values('asset').distinct().count()
+        return self.session_week.count()
+        # return self.session_week.values('asset').distinct().count()
 
     def get_month_day_metrics(self):
         month_str = [d.strftime('%m-%d') for d in self.session_month_dates] or ['0']
diff --git a/apps/perms/serializers.py b/apps/perms/serializers.py
index cc65fc33e..6decf663b 100644
--- a/apps/perms/serializers.py
+++ b/apps/perms/serializers.py
@@ -12,7 +12,7 @@ class AssetPermissionCreateUpdateSerializer(serializers.ModelSerializer):
     class Meta:
         model = NodePermission
         fields = [
-            'node', 'user_group', 'system_user',
+            'id', 'node', 'user_group', 'system_user',
             'is_active', 'date_expired'
         ]
 
diff --git a/apps/templates/_header_bar.html b/apps/templates/_header_bar.html
index 74c0787c9..9c72fe38b 100644
--- a/apps/templates/_header_bar.html
+++ b/apps/templates/_header_bar.html
@@ -15,7 +15,12 @@
 {#            </li>#}
             <li class="dropdown">
                 <a class="dropdown-toggle count-info" data-toggle="dropdown" href="#">
-                     <span class="m-r-sm text-muted welcome-message">{% trans 'Help' %}</span>
+                    <span class="m-r-sm text-muted welcome-message">{% trans 'Supports' %}</span>
+                </a>
+            </li>
+            <li class="dropdown">
+                <a class="count-info"  href="http://jumpserver.readthedocs.io/zh/docs/_build/html/">
+                     <span class="m-r-sm text-muted welcome-message">{% trans 'Docs' %}</span>
                 </a>
             </li>
             <li class="dropdown">
diff --git a/apps/templates/index.html b/apps/templates/index.html
index 64b8637ce..800b1d46f 100644
--- a/apps/templates/index.html
+++ b/apps/templates/index.html
@@ -57,7 +57,7 @@
     <div class="row">
         <div class="col-sm-2 border-bottom white-bg dashboard-header" style="margin-left:15px;height: 346px">
             <h2>活跃用户TOP5</h2>
-            <small>过去一周共有<span class="text-info">{{ user_visit_count_weekly }}</span>位用户登录<span class="text-success">{{ asset_visit_count_weekly }}</span>次服务器.</small>
+            <small>过去一周共有<span class="text-info">{{ user_visit_count_weekly }}</span>位用户登录<span class="text-success">{{ asset_visit_count_weekly }}</span>次资产.</small>
             <ul class="list-group clear-list m-t">
                 {% for data in user_visit_count_top_five %}
                     <li class="list-group-item fist-item">
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 47989e7e8..42f3bc36a 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -56,8 +56,8 @@ uritemplate==3.0.0
 urllib3==1.22
 vine==1.1.4
 gunicorn==19.7.1
-https://github.com/celery/django-celery-beat/zipball/master#egg=django-celery-beat
-#django_celery_beat==1.1.0
+#https://github.com/celery/django-celery-beat/zipball/master#egg=django-celery-beat
+django_celery_beat==1.1.1
 ephem==3.7.6.0
 python-gssapi==0.6.4
 jms-es-sdk

From d284c2175d9e8be54d717e6897153ad06eb3d6f1 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Fri, 2 Mar 2018 15:39:01 +0800
Subject: [PATCH 12/17] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/templates/assets/asset_list.html | 12 +++++-----
 apps/common/mixins.py                        |  5 ++---
 apps/common/templatetags/common_tags.py      | 23 +++++++++++---------
 apps/templates/_header_bar.html              |  2 +-
 apps/users/templates/users/login.html        |  8 +++++--
 apps/users/views/login.py                    | 10 ++++++++-
 6 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html
index 4933b26e2..553014de2 100644
--- a/apps/assets/templates/assets/asset_list.html
+++ b/apps/assets/templates/assets/asset_list.html
@@ -2,6 +2,12 @@
 {% load static %}
 {% load i18n %}
 
+{% block help_message %}
+    <div class="alert alert-info help-message">
+    左侧是资产树，右击可以新建、删除、更改树节点，授权资产也是以节点方式组织的，右侧是属于该节点下的资产
+    </div>
+{% endblock %}
+
 {% block custom_head_css_js %}
     <link href="{% static 'css/plugins/ztree/awesomeStyle/awesome.css' %}" rel="stylesheet">
     <script type="text/javascript" src="{% static 'js/plugins/ztree/jquery.ztree.all.min.js' %}"></script>
@@ -321,12 +327,6 @@ function onDrag(event, treeId, treeNodes) {
 }
 
 function onDrop(event, treeId, treeNodes, targetNode, moveType) {
-    console.log("DROP");
-    console.log(event);
-    console.log(treeNodes);
-    console.log(targetNode);
-    console.log(moveType);
-
     var treeNodesNames = [];
     var treeNodesIds = [];
     $.each(treeNodes, function (index, value) {
diff --git a/apps/common/mixins.py b/apps/common/mixins.py
index 57509af6c..243ee93c6 100644
--- a/apps/common/mixins.py
+++ b/apps/common/mixins.py
@@ -99,9 +99,8 @@ class DatetimeSearchMixin:
 
         if date_from_s:
             date_from = timezone.datetime.strptime(date_from_s, self.date_format)
-            self.date_from = date_from.replace(
-                tzinfo=timezone.get_current_timezone()
-            )
+            tz = timezone.get_current_timezone()
+            self.date_from = tz.localize(date_from)
         else:
             self.date_from = timezone.now() - timezone.timedelta(7)
 
diff --git a/apps/common/templatetags/common_tags.py b/apps/common/templatetags/common_tags.py
index 747868430..9123ecef8 100644
--- a/apps/common/templatetags/common_tags.py
+++ b/apps/common/templatetags/common_tags.py
@@ -73,17 +73,20 @@ def to_html(s):
 
 @register.filter
 def time_util_with_seconds(date_from, date_to):
-    if date_from and date_to:
-        delta = date_to - date_from
-        seconds = delta.seconds
-        if seconds < 60:
-            return '{} s'.format(seconds)
-        elif seconds < 60*60:
-            return '{} m'.format(seconds//60)
-        else:
-            return '{} h'.format(seconds//3600)
-    else:
+    if not date_from:
         return ''
+    if not date_to:
+        return ''
+        date_to = timezone.now()
+
+    delta = date_to - date_from
+    seconds = delta.seconds
+    if seconds < 60:
+        return '{} s'.format(seconds)
+    elif seconds < 60*60:
+        return '{} m'.format(seconds//60)
+    else:
+        return '{} h'.format(seconds//3600)
 
 
 @register.filter
diff --git a/apps/templates/_header_bar.html b/apps/templates/_header_bar.html
index 9c72fe38b..712f2eece 100644
--- a/apps/templates/_header_bar.html
+++ b/apps/templates/_header_bar.html
@@ -14,7 +14,7 @@
 {#                <span class="m-r-sm text-muted welcome-message">{% trans 'Welcome to use Jumpserver system' %}</span>#}
 {#            </li>#}
             <li class="dropdown">
-                <a class="dropdown-toggle count-info" data-toggle="dropdown" href="#">
+                <a class="dropdown-toggle count-info" data-toggle="dropdown" href="https://market.aliyun.com/products/53690006/cmgj026011.html?spm=5176.730005.0.0.cY2io1">
                     <span class="m-r-sm text-muted welcome-message">{% trans 'Supports' %}</span>
                 </a>
             </li>
diff --git a/apps/users/templates/users/login.html b/apps/users/templates/users/login.html
index 1f6498370..76eaad511 100644
--- a/apps/users/templates/users/login.html
+++ b/apps/users/templates/users/login.html
@@ -60,12 +60,16 @@
                         </div>
                         <button type="submit" class="btn btn-primary block full-width m-b">{% trans 'Login' %}</button>
 
+                        {% if demo_mode %}
+                        <p class="text-muted font-bold" style="color: red">
+                            Demo账号: admin 密码: admin
+                        </p>
+                        {% endif %}
+
                         <a href="{% url 'users:forgot-password' %}">
                             <small>{% trans 'Forgot password' %}?</small>
                         </a>
 
-                        <p class="text-muted text-center">
-                        </p>
                     </form>
                     <p class="m-t">
                     </p>
diff --git a/apps/users/views/login.py b/apps/users/views/login.py
index 10ad697ba..671bdf8ce 100644
--- a/apps/users/views/login.py
+++ b/apps/users/views/login.py
@@ -1,6 +1,7 @@
 # ~*~ coding: utf-8 ~*~
 
 from __future__ import unicode_literals
+import os
 from django import forms
 from django.shortcuts import render
 from django.contrib.auth import login as auth_login, logout as auth_logout
@@ -75,6 +76,13 @@ class UserLoginView(FormView):
             self.redirect_field_name,
             self.request.GET.get(self.redirect_field_name, reverse('index')))
 
+    def get_context_data(self, **kwargs):
+        context = {
+            'demo_mode': os.environ.get("DEMO_MODE"),
+        }
+        kwargs.update(context)
+        return super().get_context_data(**kwargs)
+
 
 @method_decorator(never_cache, name='dispatch')
 class UserLogoutView(TemplateView):
@@ -237,7 +245,7 @@ class LoginLogListView(DatetimeSearchMixin, ListView):
         if self.user:
             queryset = queryset.filter(username=self.user)
         if self.keyword:
-            queryset = self.queryset.filter(
+            queryset = queryset.filter(
                 Q(ip__contains=self.keyword) |
                 Q(city__contains=self.keyword) |
                 Q(username__contains=self.keyword)

From bd4f96134ff81afc1743f7c4c0b86e2f6db915a1 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Sun, 4 Mar 2018 13:01:33 +0800
Subject: [PATCH 13/17] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/templates/assets/asset_list.html | 30 +++++++++++---------
 apps/assets/views/asset.py                   |  3 +-
 apps/i18n/zh/LC_MESSAGES/django.po           | 16 +++++------
 apps/jumpserver/urls.py                      |  4 +--
 apps/jumpserver/views.py                     | 12 +++++++-
 apps/static/css/style.css                    |  2 +-
 apps/templates/_header_bar.html              |  4 +--
 apps/templates/_nav.html                     |  5 ++++
 apps/terminal/views/command.py               |  4 +--
 apps/terminal/views/session.py               |  2 +-
 apps/users/api.py                            |  3 +-
 apps/users/models/authentication.py          |  3 +-
 apps/users/views/login.py                    |  1 +
 apps/users/views/user.py                     |  1 -
 14 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html
index 553014de2..1c3015523 100644
--- a/apps/assets/templates/assets/asset_list.html
+++ b/apps/assets/templates/assets/asset_list.html
@@ -319,32 +319,36 @@ function beforeDrag() {
     return true
 }
 
-function beforeDrop() {
-    return true
+function beforeDrop(treeId, treeNodes, targetNode, moveType) {
+    var treeNodesNames = [];
+    $.each(treeNodes, function (index, value) {
+        treeNodesNames.push(value.value);
+    });
+
+    var msg = "你想移动节点: `" + treeNodesNames.join(",") + "` 到 `" + targetNode.value + "` 下吗?";
+    if (confirm(msg)){
+        return true
+    } else {
+        return false
+    }
 }
 
 function onDrag(event, treeId, treeNodes) {
 }
 
 function onDrop(event, treeId, treeNodes, targetNode, moveType) {
-    var treeNodesNames = [];
     var treeNodesIds = [];
     $.each(treeNodes, function (index, value) {
-        treeNodesNames.push(value.value);
         treeNodesIds.push(value.id);
     });
 
-    var msg = "你想移动节点: `" + treeNodesNames.join(",") + "` 到 `" + targetNode.value + "` 下吗?";
     var the_url = "{% url 'api-assets:node-add-children' pk=DEFAULT_PK %}".replace("{{ DEFAULT_PK }}", targetNode.id);
     var body = {nodes: treeNodesIds};
-    if (confirm(msg)){
-        APIUpdateAttr({
-            url: the_url,
-            method: "PUT",
-            body: JSON.stringify(body)
-        })
-    }
-
+    APIUpdateAttr({
+        url: the_url,
+        method: "PUT",
+        body: JSON.stringify(body)
+    })
 }
 
 function initTree() {
diff --git a/apps/assets/views/asset.py b/apps/assets/views/asset.py
index e1a9fcb2d..466bf7f4c 100644
--- a/apps/assets/views/asset.py
+++ b/apps/assets/views/asset.py
@@ -58,8 +58,7 @@ class UserAssetListView(LoginRequiredMixin, TemplateView):
 
     def get_context_data(self, **kwargs):
         context = {
-            'app': _('Assets'),
-            'action': _('Asset list'),
+            'action': _('My assets'),
             'system_users': SystemUser.objects.all(),
         }
         kwargs.update(context)
diff --git a/apps/i18n/zh/LC_MESSAGES/django.po b/apps/i18n/zh/LC_MESSAGES/django.po
index 792cb9195..84d9c2ba1 100644
--- a/apps/i18n/zh/LC_MESSAGES/django.po
+++ b/apps/i18n/zh/LC_MESSAGES/django.po
@@ -84,7 +84,7 @@ msgstr "资产"
 
 #: assets/forms/user.py:24
 msgid "Password or private key passphrase"
-msgstr "密码或秘钥密码"
+msgstr "密码或密钥密码"
 
 #: assets/forms/user.py:25 assets/models/user.py:30 common/forms.py:113
 #: users/forms.py:16 users/forms.py:24 users/templates/users/login.html:56
@@ -683,7 +683,7 @@ msgstr "认证"
 
 #: assets/templates/assets/_system_user.html:47
 msgid "Auto generate key"
-msgstr "自动生成秘钥"
+msgstr "自动生成密钥"
 
 #: assets/templates/assets/_system_user.html:64
 #: assets/templates/assets/asset_create.html:58
@@ -1192,7 +1192,7 @@ msgstr "密码认证"
 
 #: common/forms.py:156
 msgid "Public key auth"
-msgstr "秘钥认证"
+msgstr "密钥认证"
 
 #: common/forms.py:159 common/templates/common/terminal_setting.html:63
 #: terminal/forms.py:30 terminal/models.py:20
@@ -1731,7 +1731,7 @@ msgid ""
 "        "
 msgstr ""
 "\n"
-"                您的ssh秘钥没有设置或已失效，请点击 <a href="
+"                您的ssh密钥没有设置或已失效，请点击 <a href="
 "\"%(user_pubkey_update)s\"> 链接 </a> 更新\n"
 "        "
 
@@ -2329,7 +2329,7 @@ msgstr "将失效用户当前密码，并发送重设密码邮件到用户邮箱
 msgid ""
 "The reset-ssh-public-key E-mail has been sent successfully. Please inform "
 "the user to update his new ssh public key."
-msgstr "重设秘钥邮件将会发送到用户邮箱"
+msgstr "重设密钥邮件将会发送到用户邮箱"
 
 #: users/templates/users/user_detail.html:350
 #: users/templates/users/user_profile.html:140
@@ -2338,7 +2338,7 @@ msgstr "重置SSH密钥"
 
 #: users/templates/users/user_detail.html:360
 msgid "This will reset the user public key and send a reset mail"
-msgstr "将会失效用户当前秘钥，并发送重置邮件到用户邮箱"
+msgstr "将会失效用户当前密钥，并发送重置邮件到用户邮箱"
 
 #: users/templates/users/user_detail.html:377
 #: users/templates/users/user_profile.html:166
@@ -2561,7 +2561,7 @@ msgstr "禁用或失效"
 
 #: users/utils.py:154
 msgid "Password or SSH public key invalid"
-msgstr "密码或秘钥不合法"
+msgstr "密码或密钥不合法"
 
 #: users/views/group.py:29
 msgid "User group list"
@@ -2642,7 +2642,7 @@ msgstr "密码更新"
 
 #: users/views/user.py:375
 msgid "Public key update"
-msgstr "秘钥更新"
+msgstr "密钥更新"
 
 #~ msgid "Help"
 #~ msgstr "帮助"
diff --git a/apps/jumpserver/urls.py b/apps/jumpserver/urls.py
index 2eb54d87d..986f9b0cb 100644
--- a/apps/jumpserver/urls.py
+++ b/apps/jumpserver/urls.py
@@ -4,16 +4,16 @@ from __future__ import unicode_literals
 from django.conf.urls import url, include
 from django.conf import settings
 from django.conf.urls.static import static
-from django.views.static import serve as static_serve
 
 from rest_framework.schemas import get_schema_view
 from rest_framework_swagger.renderers import SwaggerUIRenderer, OpenAPIRenderer
 
-from .views import IndexView
+from .views import IndexView, LunaView
 
 schema_view = get_schema_view(title='Users API', renderer_classes=[OpenAPIRenderer, SwaggerUIRenderer])
 urlpatterns = [
     url(r'^$', IndexView.as_view(), name='index'),
+    url(r'^luna/$', LunaView.as_view(), name='luna-error'),
     url(r'^users/', include('users.urls.views_urls', namespace='users')),
     url(r'^assets/', include('assets.urls.views_urls', namespace='assets')),
     url(r'^perms/', include('perms.urls.views_urls', namespace='perms')),
diff --git a/apps/jumpserver/views.py b/apps/jumpserver/views.py
index d37a3ff26..67fb725c5 100644
--- a/apps/jumpserver/views.py
+++ b/apps/jumpserver/views.py
@@ -1,4 +1,5 @@
-from django.views.generic import TemplateView
+from django.http import HttpResponse
+from django.views.generic import TemplateView, View
 from django.utils import timezone
 from django.db.models import Count
 from django.contrib.auth.mixins import LoginRequiredMixin
@@ -150,3 +151,12 @@ class IndexView(LoginRequiredMixin, TemplateView):
 
         kwargs.update(context)
         return super(IndexView, self).get_context_data(**kwargs)
+
+
+class LunaView(View):
+    def get(self, request):
+        msg = """
+        Luna是单独部署的一个程序，你需要部署luna，coco，配置nginx做url分发, 
+        如果你看到了这个页面，证明你访问的不是nginx监听的端口，祝你好运
+        """
+        return HttpResponse(msg)
\ No newline at end of file
diff --git a/apps/static/css/style.css b/apps/static/css/style.css
index c02935fb5..1bfc8ed34 100644
--- a/apps/static/css/style.css
+++ b/apps/static/css/style.css
@@ -3299,7 +3299,7 @@ body.tour-open .animated {
   border-bottom: 1px solid #e7eaec;
 }
 body {
-  font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: "open sans", "Helvetica Neue", "微软雅黑", Helvetica, Arial, sans-serif;
   background-color: #2f4050;
   font-size: 13px;
   color: #676a6c;
diff --git a/apps/templates/_header_bar.html b/apps/templates/_header_bar.html
index 712f2eece..64ef5dec6 100644
--- a/apps/templates/_header_bar.html
+++ b/apps/templates/_header_bar.html
@@ -62,11 +62,11 @@
             <li>
                 <a href="">{% trans 'Dashboard' %}</a>
             </li>
-            <li>
             {% if app %}
+            <li>
                 <a>{{ app }}</a>
-            {% endif %}
             </li>
+            {% endif %}
             {% if action %}
             <li class="active">
                 <strong>{{ action }}</strong>
diff --git a/apps/templates/_nav.html b/apps/templates/_nav.html
index 71584a0c5..fad4c6090 100644
--- a/apps/templates/_nav.html
+++ b/apps/templates/_nav.html
@@ -42,6 +42,11 @@
         <li id="session-online"><a href="{% url 'terminal:session-online-list' %}">{% trans 'Session online' %}</a></li>
         <li id="session-offline"><a href="{% url 'terminal:session-offline-list' %}">{% trans 'Session offline' %}</a></li>
         <li id="command"><a href="{% url 'terminal:command-list' %}">{% trans 'Commands' %}</a></li>
+        <li>
+            <a href="{% url 'terminal:web-terminal' %}" target="_blank">
+            <span class="nav-label">{% trans 'Web terminal' %}</span>
+            </a>
+        </li>
         <li id="terminal"><a href="{% url 'terminal:terminal-list' %}">{% trans 'Terminal' %}</a></li>
     </ul>
 </li>
diff --git a/apps/terminal/views/command.py b/apps/terminal/views/command.py
index 6fdf905bd..0af0b5bfd 100644
--- a/apps/terminal/views/command.py
+++ b/apps/terminal/views/command.py
@@ -6,7 +6,7 @@ from django.conf import settings
 from django.utils import timezone
 from django.utils.translation import ugettext as _
 
-from common.mixins import DatetimeSearchMixin
+from common.mixins import DatetimeSearchMixin, AdminUserRequiredMixin
 from ..models import Command
 from .. import utils
 from ..backends import get_multi_command_store
@@ -15,7 +15,7 @@ __all__ = ['CommandListView']
 common_storage = get_multi_command_store()
 
 
-class CommandListView(DatetimeSearchMixin, ListView):
+class CommandListView(DatetimeSearchMixin, AdminUserRequiredMixin, ListView):
     model = Command
     template_name = "terminal/command_list.html"
     context_object_name = 'command_list'
diff --git a/apps/terminal/views/session.py b/apps/terminal/views/session.py
index 0970cade2..6fb27baed 100644
--- a/apps/terminal/views/session.py
+++ b/apps/terminal/views/session.py
@@ -97,7 +97,7 @@ class SessionOfflineListView(SessionListView):
         return super().get_context_data(**kwargs)
 
 
-class SessionDetailView(SingleObjectMixin, ListView):
+class SessionDetailView(SingleObjectMixin, AdminUserRequiredMixin, ListView):
     template_name = 'terminal/session_detail.html'
     model = Session
     object = None
diff --git a/apps/users/api.py b/apps/users/api.py
index 0d99e0a4c..b485a593e 100644
--- a/apps/users/api.py
+++ b/apps/users/api.py
@@ -145,7 +145,8 @@ class UserAuthApi(APIView):
 
         if not login_ip:
             x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR', '').split(',')
-            if x_forwarded_for:
+
+            if x_forwarded_for and x_forwarded_for[0]:
                 login_ip = x_forwarded_for[0]
             else:
                 login_ip = request.META.get("REMOTE_ADDR")
diff --git a/apps/users/models/authentication.py b/apps/users/models/authentication.py
index f023d3d59..5169a79d2 100644
--- a/apps/users/models/authentication.py
+++ b/apps/users/models/authentication.py
@@ -16,7 +16,8 @@ class AccessKey(models.Model):
                           default=uuid.uuid4, editable=False)
     secret = models.UUIDField(verbose_name='AccessKeySecret',
                               default=uuid.uuid4, editable=False)
-    user = models.ForeignKey(User, verbose_name='User', on_delete=models.CASCADE, related_name='access_key')
+    user = models.ForeignKey(User, verbose_name='User',
+                             on_delete=models.CASCADE, related_name='access_key')
 
     def get_id(self):
         return str(self.id)
diff --git a/apps/users/views/login.py b/apps/users/views/login.py
index 671bdf8ce..0b70238c0 100644
--- a/apps/users/views/login.py
+++ b/apps/users/views/login.py
@@ -57,6 +57,7 @@ class UserLoginView(FormView):
             return HttpResponse(_("Please enable cookies and try again."))
         auth_login(self.request, form.get_user())
         x_forwarded_for = self.request.META.get('HTTP_X_FORWARDED_FOR', '').split(',')
+
         if x_forwarded_for and x_forwarded_for[0]:
             login_ip = x_forwarded_for[0]
         else:
diff --git a/apps/users/views/user.py b/apps/users/views/user.py
index e85f04877..bf2ecca57 100644
--- a/apps/users/views/user.py
+++ b/apps/users/views/user.py
@@ -313,7 +313,6 @@ class UserProfileView(LoginRequiredMixin, TemplateView):
 
     def get_context_data(self, **kwargs):
         context = {
-            'app': _('Users'),
             'action': _('Profile'),
         }
         kwargs.update(context)

From e12359973596186858c058024ebfc0637990cd92 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 5 Mar 2018 12:59:14 +0800
Subject: [PATCH 14/17] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9Bbug=E5=92=8C=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/templates/assets/asset_list.html |  4 +++-
 apps/users/models/group.py                   |  1 +
 apps/users/models/user.py                    |  1 +
 apps/users/templates/users/login.html        | 15 +++++++++------
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html
index 1c3015523..628d0f905 100644
--- a/apps/assets/templates/assets/asset_list.html
+++ b/apps/assets/templates/assets/asset_list.html
@@ -230,7 +230,9 @@ function editTreeNode() {
 	if (!current_node){
 	    return
     }
-    current_node.name = current_node.value;
+    if (current_node.value) {
+        current_node.name = current_node.value;
+    }
     zTree.editName(current_node);
 }
 
diff --git a/apps/users/models/group.py b/apps/users/models/group.py
index 07238c1a5..128fbdbcb 100644
--- a/apps/users/models/group.py
+++ b/apps/users/models/group.py
@@ -22,6 +22,7 @@ class UserGroup(NoDeleteModelMixin):
 
     class Meta:
         ordering = ['name']
+        verbose_name = _("User group")
 
     @classmethod
     def initial(cls):
diff --git a/apps/users/models/user.py b/apps/users/models/user.py
index 25d7d0303..4c051db22 100644
--- a/apps/users/models/user.py
+++ b/apps/users/models/user.py
@@ -251,6 +251,7 @@ class User(AbstractUser):
 
     class Meta:
         ordering = ['username']
+        verbose_name = _("User")
 
     #: Use this method initial user
     @classmethod
diff --git a/apps/users/templates/users/login.html b/apps/users/templates/users/login.html
index 76eaad511..13276f6fe 100644
--- a/apps/users/templates/users/login.html
+++ b/apps/users/templates/users/login.html
@@ -22,24 +22,27 @@
     <div class="loginColumns animated fadeInDown">
         <div class="row">
             <div class="col-md-6">
-                <h2 class="font-bold">欢迎使用Jumpserver开源跳板机</h2>
+                <h2 class="font-bold">欢迎使用Jumpserver开源堡垒机</h2>
                 <p>
-                    符合4A规范的专业运维审计系统：拥有跳板机的所有功能，认证，授权，审计，文件上传；
+                    全球首款完全开源的堡垒机，使用GNU GPL v2.0开源协议，是符合 4A 的专业运维审计系统。
                 </p>
                 <p>
-                    极致的用户使用体验：拥有时尚外观是区别与以往版本和其他软件的铭牌，高雅的气质让你爱不释手；
+                    使用Python / Django 进行开发，遵循 Web 2.0 规范，配备了业界领先的 Web Terminal 解决方案，交互界面美观、用户体验好。
                 </p>
                 <p>
-                    混合云环境下的堡垒机：怎么能容忍传统堡垒机的繁琐步骤，Jumpserver让你极致省力;
+                    采纳分布式架构，支持多机房跨区域部署，中心节点提供 API，各机房部署登录节点，可横向扩展、无并发访问限制。
                 </p>
                 <p>
-                    <small>改变世界，从一点点开始。</small>
+                    改变世界，从一点点开始。
                 </p>
 
             </div>
             <div class="col-md-6">
                 <div class="ibox-content">
-                    <div><img src="{% static 'img/logo.png' %}" width="82" height="82"> <span class="font-bold text-center" style="font-size: 32px; font-family: inherit">{% trans 'Login' %}</span></div>
+                    <div>
+                        <img src="{% static 'img/logo.png' %}" width="60" height="60">
+                        <span class="font-bold text-center" style="font-size: 24px; font-family: inherit; margin-left: 20px">{% trans 'Login' %}</span>
+                    </div>
                     <form class="m-t" role="form" method="post" action="">
                         {% csrf_token %}
                         {% if form.errors %}

From bc230e0ea59d49e9dc235314e62ea10d45654e41 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 5 Mar 2018 15:25:49 +0800
Subject: [PATCH 15/17] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/templates/_header_bar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/templates/_header_bar.html b/apps/templates/_header_bar.html
index 64ef5dec6..6ba60f51b 100644
--- a/apps/templates/_header_bar.html
+++ b/apps/templates/_header_bar.html
@@ -19,7 +19,7 @@
                 </a>
             </li>
             <li class="dropdown">
-                <a class="count-info"  href="http://jumpserver.readthedocs.io/zh/docs/_build/html/">
+                <a class="count-info"  href="http://jumpserver.readthedocs.io/">
                      <span class="m-r-sm text-muted welcome-message">{% trans 'Docs' %}</span>
                 </a>
             </li>

From 86c0a2d28b0249f5bec85231bb0a3c5dfaa98b66 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 5 Mar 2018 17:14:42 +0800
Subject: [PATCH 16/17] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E7=BF=BB=E8=AF=91=E5=92=8C=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/models/user.py         |   4 +-
 apps/i18n/zh/LC_MESSAGES/django.mo | Bin 29645 -> 29732 bytes
 apps/i18n/zh/LC_MESSAGES/django.po |  85 +++++++++++++++--------------
 apps/users/views/group.py          |   4 +-
 docs/_static/img/structure.png     | Bin 0 -> 29785 bytes
 docs/index.rst                     |  21 -------
 docs/intro.rst                     |  48 ++++++++++++++++
 docs/user_guide.rst                |   4 +-
 8 files changed, 98 insertions(+), 68 deletions(-)
 create mode 100644 docs/_static/img/structure.png

diff --git a/apps/assets/models/user.py b/apps/assets/models/user.py
index 999b9e016..875c17710 100644
--- a/apps/assets/models/user.py
+++ b/apps/assets/models/user.py
@@ -26,14 +26,14 @@ signer = get_signer()
 class AssetUser(models.Model):
     id = models.UUIDField(default=uuid.uuid4, primary_key=True)
     name = models.CharField(max_length=128, unique=True, verbose_name=_('Name'))
-    username = models.CharField(max_length=16, verbose_name=_('Username'))
+    username = models.CharField(max_length=128, verbose_name=_('Username'))
     _password = models.CharField(max_length=256, blank=True, null=True, verbose_name=_('Password'))
     _private_key = models.TextField(max_length=4096, blank=True, null=True, verbose_name=_('SSH private key'), validators=[private_key_validator, ])
     _public_key = models.TextField(max_length=4096, blank=True, verbose_name=_('SSH public key'))
     comment = models.TextField(blank=True, verbose_name=_('Comment'))
     date_created = models.DateTimeField(auto_now_add=True)
     date_updated = models.DateTimeField(auto_now=True)
-    created_by = models.CharField(max_length=32, null=True, verbose_name=_('Created by'))
+    created_by = models.CharField(max_length=128, null=True, verbose_name=_('Created by'))
 
     @property
     def password(self):
diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo
index c38fdb5c95de35a3b356c579efeb49a768e2b168..2b2f10466b85d7e953bebde9576bae7ee32ee9b7 100644
GIT binary patch
delta 10553
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
MZTW^nDOt1pA1Mir1^@s6

delta 10508
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
aZBM$jXWiY@q<fp!-uY-^O3@)1eE$nEAA64g

diff --git a/apps/i18n/zh/LC_MESSAGES/django.po b/apps/i18n/zh/LC_MESSAGES/django.po
index 0a839e612..26c536822 100644
--- a/apps/i18n/zh/LC_MESSAGES/django.po
+++ b/apps/i18n/zh/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jumpserver 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-26 16:54+0800\n"
+"POT-Creation-Date: 2018-03-05 15:49+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@@ -74,7 +74,7 @@ msgstr "选择节点"
 #: assets/templates/assets/admin_user_list.html:24
 #: assets/templates/assets/label_list.html:16
 #: assets/templates/assets/system_user_list.html:26 perms/models.py:17
-#: terminal/backends/command/models.py:11 terminal/models.py:116
+#: terminal/backends/command/models.py:11 terminal/models.py:122
 #: terminal/templates/terminal/command_list.html:40
 #: terminal/templates/terminal/command_list.html:73
 #: terminal/templates/terminal/session_list.html:41
@@ -116,11 +116,11 @@ msgstr "密码和私钥, 必须输入一个"
 #: assets/templates/assets/system_user_detail.html:58
 #: assets/templates/assets/system_user_list.html:24 common/models.py:26
 #: common/templates/common/terminal_setting.html:67
-#: common/templates/common/terminal_setting.html:88 ops/models.py:31
+#: common/templates/common/terminal_setting.html:85 ops/models.py:31
 #: ops/templates/ops/task_detail.html:56 ops/templates/ops/task_list.html:34
 #: perms/models.py:14 perms/templates/perms/asset_permission_detail.html:62
 #: perms/templates/perms/asset_permission_user.html:54 terminal/models.py:15
-#: terminal/models.py:141 terminal/templates/terminal/terminal_detail.html:43
+#: terminal/models.py:147 terminal/templates/terminal/terminal_detail.html:43
 #: terminal/templates/terminal/terminal_list.html:29 users/models/group.py:14
 #: users/models/user.py:35 users/templates/users/_select_user_modal.html:13
 #: users/templates/users/user_detail.html:63
@@ -352,7 +352,7 @@ msgid "Default asset group"
 msgstr "默认资产组"
 
 #: assets/models/label.py:14 perms/models.py:15
-#: terminal/backends/command/models.py:10 terminal/models.py:115
+#: terminal/backends/command/models.py:10 terminal/models.py:121
 #: terminal/templates/terminal/command_list.html:32
 #: terminal/templates/terminal/command_list.html:72
 #: terminal/templates/terminal/session_list.html:33
@@ -408,7 +408,7 @@ msgstr "Shell"
 #: assets/models/user.py:269 perms/forms.py:25 perms/models.py:19
 #: perms/models.py:76 perms/templates/perms/asset_permission_detail.html:136
 #: perms/templates/perms/asset_permission_list.html:69 templates/_nav.html:24
-#: terminal/backends/command/models.py:12 terminal/models.py:117
+#: terminal/backends/command/models.py:12 terminal/models.py:123
 #: terminal/templates/terminal/command_list.html:48
 #: terminal/templates/terminal/command_list.html:74
 #: terminal/templates/terminal/session_list.html:49
@@ -606,9 +606,9 @@ msgstr "激活所选"
 #: common/templates/common/basic_setting.html:59
 #: common/templates/common/email_setting.html:60
 #: common/templates/common/ldap_setting.html:60
-#: common/templates/common/terminal_setting.html:108
+#: common/templates/common/terminal_setting.html:103
 #: perms/templates/perms/asset_permission_create_update.html:72
-#: terminal/templates/terminal/terminal_update.html:47
+#: terminal/templates/terminal/terminal_update.html:48
 #: users/templates/users/_user.html:44
 #: users/templates/users/first_login.html:62
 #: users/templates/users/forgot_password.html:44
@@ -689,7 +689,7 @@ msgstr "自动生成秘钥"
 #: assets/templates/assets/asset_create.html:57
 #: assets/templates/assets/asset_update.html:61
 #: perms/templates/perms/asset_permission_create_update.html:49
-#: terminal/templates/terminal/terminal_update.html:41
+#: terminal/templates/terminal/terminal_update.html:42
 msgid "Other"
 msgstr "其它"
 
@@ -702,9 +702,9 @@ msgstr "其它"
 #: common/templates/common/basic_setting.html:58
 #: common/templates/common/email_setting.html:59
 #: common/templates/common/ldap_setting.html:59
-#: common/templates/common/terminal_setting.html:106
+#: common/templates/common/terminal_setting.html:101
 #: perms/templates/perms/asset_permission_create_update.html:71
-#: terminal/templates/terminal/terminal_update.html:46
+#: terminal/templates/terminal/terminal_update.html:47
 #: users/templates/users/_user.html:43
 #: users/templates/users/user_bulk_update.html:23
 #: users/templates/users/user_password_update.html:58
@@ -1195,7 +1195,7 @@ msgid "Public key auth"
 msgstr "秘钥认证"
 
 #: common/forms.py:159 common/templates/common/terminal_setting.html:63
-#: terminal/forms.py:21 terminal/models.py:19
+#: terminal/forms.py:29 terminal/models.py:19
 msgid "Command storage"
 msgstr "命令存储"
 
@@ -1205,8 +1205,8 @@ msgid ""
 "other storage and some terminal using"
 msgstr "设置终端命令存储，default是默认用的存储方式"
 
-#: common/forms.py:165 common/templates/common/terminal_setting.html:84
-#: terminal/models.py:20
+#: common/forms.py:165 common/templates/common/terminal_setting.html:81
+#: terminal/forms.py:31 terminal/models.py:20
 msgid "Replay storage"
 msgstr "录像存储"
 
@@ -1263,17 +1263,11 @@ msgid "Test connection"
 msgstr "测试连接"
 
 #: common/templates/common/terminal_setting.html:68
-#: common/templates/common/terminal_setting.html:89
+#: common/templates/common/terminal_setting.html:86
 #: users/templates/users/login_log_list.html:50
 msgid "Type"
 msgstr "类型"
 
-#: common/templates/common/terminal_setting.html:90
-#: users/templates/users/reset_password.html:57
-#: users/templates/users/user_profile.html:20
-msgid "Setting"
-msgstr "设置"
-
 #: common/views.py:20 common/views.py:46 common/views.py:72 common/views.py:102
 #: templates/_nav.html:66
 msgid "Settings"
@@ -1430,7 +1424,7 @@ msgstr "执行历史"
 
 #: ops/templates/ops/adhoc_history.html:52
 #: ops/templates/ops/adhoc_history_detail.html:58
-#: ops/templates/ops/task_history.html:55 terminal/models.py:124
+#: ops/templates/ops/task_history.html:55 terminal/models.py:130
 #: terminal/templates/terminal/session_list.html:77
 msgid "Date start"
 msgstr "开始日期"
@@ -1742,10 +1736,11 @@ msgid "Close"
 msgstr "关闭"
 
 #: templates/_nav.html:9 users/views/group.py:28 users/views/group.py:44
-#: users/views/group.py:62 users/views/group.py:79 users/views/login.py:200
-#: users/views/login.py:249 users/views/user.py:57 users/views/user.py:72
-#: users/views/user.py:91 users/views/user.py:147 users/views/user.py:300
-#: users/views/user.py:312 users/views/user.py:348 users/views/user.py:370
+#: users/views/group.py:62 users/views/group.py:79 users/views/group.py:95
+#: users/views/login.py:200 users/views/login.py:249 users/views/user.py:57
+#: users/views/user.py:72 users/views/user.py:91 users/views/user.py:147
+#: users/views/user.py:300 users/views/user.py:312 users/views/user.py:348
+#: users/views/user.py:370
 msgid "Users"
 msgstr "用户管理"
 
@@ -1819,11 +1814,11 @@ msgstr "输出"
 msgid "Session"
 msgstr "会话"
 
-#: terminal/forms.py:27
+#: terminal/forms.py:37
 msgid "Coco ssh listen port"
 msgstr "SSH 监听端口"
 
-#: terminal/forms.py:28
+#: terminal/forms.py:38
 msgid "Coco http/ws listen port"
 msgstr "Http/Websocket 监听端口"
 
@@ -1839,51 +1834,51 @@ msgstr "SSH端口"
 msgid "HTTP Port"
 msgstr "HTTP端口"
 
-#: terminal/models.py:91
+#: terminal/models.py:97
 msgid "Session Online"
 msgstr "在线会话"
 
-#: terminal/models.py:92
+#: terminal/models.py:98
 msgid "CPU Usage"
 msgstr "CPU使用"
 
-#: terminal/models.py:93
+#: terminal/models.py:99
 msgid "Memory Used"
 msgstr "内存使用"
 
-#: terminal/models.py:94
+#: terminal/models.py:100
 msgid "Connections"
 msgstr "连接数"
 
-#: terminal/models.py:95
+#: terminal/models.py:101
 msgid "Threads"
 msgstr "线程数"
 
-#: terminal/models.py:96
+#: terminal/models.py:102
 msgid "Boot Time"
 msgstr "运行时间"
 
-#: terminal/models.py:119 terminal/templates/terminal/session_list.html:74
+#: terminal/models.py:125 terminal/templates/terminal/session_list.html:74
 #: terminal/templates/terminal/terminal_detail.html:47
 msgid "Remote addr"
 msgstr "远端地址"
 
-#: terminal/models.py:121 terminal/templates/terminal/session_list.html:100
+#: terminal/models.py:127 terminal/templates/terminal/session_list.html:100
 msgid "Replay"
 msgstr "回放"
 
-#: terminal/models.py:122 terminal/templates/terminal/command_list.html:55
+#: terminal/models.py:128 terminal/templates/terminal/command_list.html:55
 #: terminal/templates/terminal/command_list.html:71
 #: terminal/templates/terminal/session_detail.html:48
 #: terminal/templates/terminal/session_list.html:76
 msgid "Command"
 msgstr "命令"
 
-#: terminal/models.py:125
+#: terminal/models.py:131
 msgid "Date end"
 msgstr "结束日期"
 
-#: terminal/models.py:142
+#: terminal/models.py:148
 msgid "Args"
 msgstr "参数"
 
@@ -2269,6 +2264,11 @@ msgstr "重置密码"
 msgid "Password again"
 msgstr "再次输入密码"
 
+#: users/templates/users/reset_password.html:57
+#: users/templates/users/user_profile.html:20
+msgid "Setting"
+msgstr "设置"
+
 #: users/templates/users/user_create.html:4
 #: users/templates/users/user_list.html:16 users/views/user.py:72
 msgid "Create user"
@@ -2351,7 +2351,7 @@ msgstr "取消"
 #: users/templates/users/user_group_granted_asset.html:18
 #: users/views/group.py:80
 msgid "User group detail"
-msgstr "资产组详情"
+msgstr "用户组详情"
 
 #: users/templates/users/user_group_detail.html:86
 msgid "Add user"
@@ -2562,6 +2562,10 @@ msgstr "用户组列表"
 msgid "Update user group"
 msgstr "编辑用户组"
 
+#: users/views/group.py:96
+msgid "User group granted asset"
+msgstr "用户组授权资产"
+
 #: users/views/login.py:56
 msgid "Please enable cookies and try again."
 msgstr "设置你的浏览器支持cookie"
@@ -2634,4 +2638,3 @@ msgstr "密码更新"
 #: users/views/user.py:371
 msgid "Public key update"
 msgstr "秘钥更新"
-
diff --git a/apps/users/views/group.py b/apps/users/views/group.py
index fb279b582..958c00ccc 100644
--- a/apps/users/views/group.py
+++ b/apps/users/views/group.py
@@ -92,8 +92,8 @@ class UserGroupGrantedAssetView(AdminUserRequiredMixin, DetailView):
 
     def get_context_data(self, **kwargs):
         context = {
-            'app': 'User',
-            'action': 'User group granted asset',
+            'app': _('Users'),
+            'action': _('User group granted asset'),
         }
         kwargs.update(context)
         return super().get_context_data(**kwargs)
diff --git a/docs/_static/img/structure.png b/docs/_static/img/structure.png
new file mode 100644
index 0000000000000000000000000000000000000000..90476014cc132e1a936e23b2b05295feab934f92
GIT binary patch
literal 29785
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
MJvwRyyAPlF4<?}E!2kdN

literal 0
HcmV?d00001

diff --git a/docs/index.rst b/docs/index.rst
index 162062e5a..787f05564 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -6,27 +6,6 @@
 Jumpserver 文档
 ======================================
 
-有关Jumpserver
-`````````````````
-
-欢迎来到 Jumpserver 文档。
-
-Jumpserver 是一款完全开源的跳板机(堡垒机)系统，遵循GPL v2协议，使用Python，Django开发。
-
-Jumpserver 是符合4A（认证Authentication，账号Account，授权Authorization，审计Audit) 的专业运维审计系统。
-
-Jumpserver 从设计时考虑分布式，没有性能瓶颈，满足混合云架构，一个中心，不同Region不同登录点。
-
-Jumpserver 界面漂亮、简单易用，并有领先的Web terminal解决方案。
-
-Jumpserver 深度集成了Ansible，支持自动化运维任务。
-
-Jumpserver 支持容器化部署，windows，LDAP, s3, elasticsearch存储等功能，并提供了强大API方便对接其它系统。
-
-
-
-
-
 .. toctree::
    :maxdepth: 2
    :caption: 文档:
diff --git a/docs/intro.rst b/docs/intro.rst
index 5fa75ea13..a8810e14f 100644
--- a/docs/intro.rst
+++ b/docs/intro.rst
@@ -1,3 +1,51 @@
 简介
 ============
 
+Jumpserver是混合云下更好用的堡垒机, 分布式架构设计无限扩展，轻松对接混合云资产，支持使用云存储（AWS S3, ES等）存储录像、命令
+
+Jumpserver颠覆传统堡垒机, 无主机和并发数量限制，支持水平扩容，FIT2CLOUD提供完备的商业服务支持，用户无后顾之忧
+
+Jumpserver拥有极致的用户体验, 极致UI体验，容器化的部署方式，部署过程方便快捷，可持续升级
+
+
+组件说明
+++++++++++++++++++++++++
+
+Jumpserver
+```````````
+现指Jumpserver管理后台，是核心组件(Core), 使用 Django Class Based View 风格开发，支持Restful API。
+
+`Github <https://github.com/jumpserver/jumpserver.git>`_
+
+
+Coco
+````````
+实现了SSH Server 和 Web Terminal Server的组件，提供ssh和websocket接口, 使用 Paramiko 和 Flask 开发。
+
+
+`Github <https://github.com/jumpserver/coco.git>`__
+
+
+Luna
+````````
+现在是Web Terminal前端，计划前端页面都由该项目提供，Jumpserver只提供API，不再负责后台渲染html等。
+
+`Github <https://github.com/jumpserver/luna.git>`__
+
+
+Guacamole
+```````````
+Apache 跳板机项目，Jumpserver使用其组件实现RDP功能，Jumpserver并没有修改其代码而是添加了额外的插件，支持Jumpserver调用
+
+
+Jumpserver-python-sdk
+```````````````````````
+Jumpserver API Python SDK，Coco目前使用该SDK与Jumpserver API交互
+
+`Github <https://github.com/jumpserver/jumpserver-python-sdk.git>`__
+
+
+组件架构图
+++++++++++++++++++++++++
+.. image:: _static/img/structure.png
+    :alt: 组件架构图
diff --git a/docs/user_guide.rst b/docs/user_guide.rst
index 92b68a066..97d9810b3 100644
--- a/docs/user_guide.rst
+++ b/docs/user_guide.rst
@@ -1,7 +1,7 @@
 用户使用文档
-===========
+=============
 
-这部分给您介绍Jumpserver的用户使用方法。
+这部分给您介绍Jumpserver的用户管理模块的使用方法。
 
 .. toctree::
    :maxdepth: 1

From 25ebb5c442ef651048834e0ea9b49969db3e593a Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 6 Mar 2018 17:05:36 +0800
Subject: [PATCH 17/17] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/jumpserver/settings.py                   |   2 +-
 apps/static/css/jumpserver.css                |   6 ++++++
 apps/static/img/logo-text.png                 | Bin 12674 -> 18125 bytes
 apps/templates/_header_bar.html               |   5 ++---
 apps/templates/_user_profile.html             |   2 +-
 apps/terminal/tasks.py                        |  18 ++++++++++++------
 .../templates/terminal/session_list.html      |  15 +++++++++++++++
 7 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py
index 8151147d2..04fe210b2 100644
--- a/apps/jumpserver/settings.py
+++ b/apps/jumpserver/settings.py
@@ -397,6 +397,6 @@ BOOTSTRAP3 = {
 }
 
 TOKEN_EXPIRATION = CONFIG.TOKEN_EXPIRATION or 3600
-DISPLAY_PER_PAGE = CONFIG.DISPLAY_PER_PAGE
+DISPLAY_PER_PAGE = CONFIG.DISPLAY_PER_PAGE or 25
 DEFAULT_EXPIRED_YEARS = 70
 USER_GUIDE_URL = ""
diff --git a/apps/static/css/jumpserver.css b/apps/static/css/jumpserver.css
index 947fae9a2..29e786eb3 100644
--- a/apps/static/css/jumpserver.css
+++ b/apps/static/css/jumpserver.css
@@ -427,3 +427,9 @@ div.dataTables_wrapper div.dataTables_filter {
     text-align: center;
     padding: 5px 0;
 }
+
+.profile-dropdown li a {
+    font-size: 12px !important;
+}
+
+
diff --git a/apps/static/img/logo-text.png b/apps/static/img/logo-text.png
index cb76b555a93c625868fe898898ed3d5e1d621f9c..9d532a2857c06703a99b64243e7f6d8ad8e4c36c 100644
GIT binary patch
literal 18125
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
GLSTZaL|)1O

literal 12674
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

diff --git a/apps/templates/_header_bar.html b/apps/templates/_header_bar.html
index 6ba60f51b..fba075e16 100644
--- a/apps/templates/_header_bar.html
+++ b/apps/templates/_header_bar.html
@@ -33,9 +33,8 @@
                         </span>
                     </span>
                 </a>
-                <ul class="dropdown-menu animated fadeInRight m-t-xs">
-                    <li><a href="{% url 'users:user-profile' %}"><i class="fa fa-cogs">  </i><span> {% trans 'Profile' %}</span></a></li>
-                    <li class="divider"></li>
+                <ul class="dropdown-menu animated fadeInRight m-t-xs profile-dropdown">
+                    <li><a href="{% url 'users:user-profile' %}"><i class="fa fa-cogs"> </i><span> {% trans 'Profile' %}</span></a></li>
                     {% if request.user.is_superuser %}
                         {% if request.COOKIES.IN_ADMIN_PAGE == 'No' %}
                             <li><a id="switch_admin"><i class="fa fa-exchange"></i><span> {% trans 'Admin page' %}</span></a></li>
diff --git a/apps/templates/_user_profile.html b/apps/templates/_user_profile.html
index f2ccf81a9..d7525958b 100644
--- a/apps/templates/_user_profile.html
+++ b/apps/templates/_user_profile.html
@@ -3,7 +3,7 @@
 <li class="nav-header">
     <div class="dropdown profile-element">
         <div href="http://www.jumpserver.org" target="_blank">
-            <img alt="image" height="55" src="/static/img/logo-text.png" style="margin-left: 10px"/>
+            <img alt="logo" height="55" width="185" src="/static/img/logo-text.png" style="margin-left: 20px"/>
         </div>
     </div>
     <div class="clearfix"></div>
diff --git a/apps/terminal/tasks.py b/apps/terminal/tasks.py
index f6b46f2a8..89f9cc5cc 100644
--- a/apps/terminal/tasks.py
+++ b/apps/terminal/tasks.py
@@ -8,7 +8,7 @@ from django.utils import timezone
 
 from common.celery import register_as_period_task, after_app_ready_start, \
     after_app_shutdown_clean
-from .models import Status
+from .models import Status, Session
 
 
 CACHE_REFRESH_INTERVAL = 10
@@ -20,11 +20,17 @@ RUNNING = False
 @after_app_ready_start
 @after_app_shutdown_clean
 def delete_terminal_status_period():
-    yesterday = timezone.now() - datetime.timedelta(days=1)
+    yesterday = timezone.now() - datetime.timedelta(days=3)
     Status.objects.filter(date_created__lt=yesterday).delete()
 
 
-
-
-
-
+@shared_task
+@register_as_period_task(interval=3600)
+@after_app_ready_start
+@after_app_shutdown_clean
+def clean_orphan_session():
+    active_sessions = Session.objects.filter(is_finished=False)
+    for session in active_sessions:
+        if not session.terminal.is_active:
+            session.is_finished = True
+            session.save()
diff --git a/apps/terminal/templates/terminal/session_list.html b/apps/terminal/templates/terminal/session_list.html
index dd9908487..b5168f8e4 100644
--- a/apps/terminal/templates/terminal/session_list.html
+++ b/apps/terminal/templates/terminal/session_list.html
@@ -109,6 +109,21 @@
     {% endfor %}
 {% endblock %}
 
+{% block content_bottom_left %}
+    <div id="actions" >
+        <div class="input-group">
+            <select class="form-control m-b" style="width: auto" id="slct_bulk_update">
+                <option value="delete">{% trans 'Terminate selected' %}</option>
+            </select>
+            <div class="input-group-btn pull-left" style="padding-left: 5px;">
+                <button id='btn_bulk_update' style="height: 32px;"  class="btn btn-sm btn-primary">
+                 {% trans 'Submit' %}
+                </button>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+
 {% block custom_foot_js %}
     <script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script>
     <script>