Merge pull request #5972 from jumpserver/dev

v2.9.0 发版

apps/assets/migrations/0069_change_node_key0_to_key1.py

@@ -42,7 +42,9 @@ def change_key0_to_key1(apps, schema_editor):
             key_list = n.key.split(':')
             key_list[0] = '1'
             new_key = ':'.join(key_list)
+            new_parent_key = ':'.join(key_list[:-1])
             n.key = new_key
+            n.parent_key = new_parent_key
             n.save()
             print('--> Modify key ( {} > {} )'.format(old_key, new_key))
 

apps/assets/tasks/push_system_user.py

@@ -57,6 +57,7 @@ def get_push_unixlike_system_user_tasks(system_user, username=None):
         'state': 'present',
         'home': system_user.home or Empty,
         'groups': groups or Empty,
+        'expires': 99999,
         'comment': comment
     }