mirror of https://github.com/jumpserver/jumpserver
perf: 优化 redis 平台协议
parent
bd9b1f1a5b
commit
b3244d0215
|
@ -63,7 +63,20 @@ class DatabaseTypes(BaseType):
|
|||
cls.SQLSERVER: [{'name': 'SQLServer'}],
|
||||
cls.CLICKHOUSE: [{'name': 'ClickHouse'}],
|
||||
cls.MONGODB: [{'name': 'MongoDB'}],
|
||||
cls.REDIS: [{'name': 'Redis'}, {'name': 'Redis6+'}],
|
||||
cls.REDIS: [
|
||||
{
|
||||
'name': 'Redis',
|
||||
'protocols_setting': {
|
||||
'redis': {'auth_username': False}
|
||||
}
|
||||
},
|
||||
{
|
||||
'name': 'Redis6+',
|
||||
'protocols_setting': {
|
||||
'redis': {'auth_username': True}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@classmethod
|
||||
|
|
|
@ -304,7 +304,7 @@ class AllTypes(ChoicesMixin):
|
|||
setting = _protocols_setting.get(p['name'], {})
|
||||
p['required'] = p.pop('required', False)
|
||||
p['default'] = p.pop('default', False)
|
||||
p['setting'] = {**setting, **p.get('setting', {})}
|
||||
p['setting'] = {**p.get('setting', {}), **setting}
|
||||
|
||||
platform_data = {
|
||||
**default_platform_data, **d,
|
||||
|
|
|
@ -119,7 +119,7 @@ class ActivityLogHandler(object):
|
|||
def login_log_for_activity(obj):
|
||||
login_status = _('Success') if obj.status else _('Failed')
|
||||
detail = _('User {} login this system {}').format(
|
||||
obj.name, login_status
|
||||
obj.username, login_status
|
||||
)
|
||||
user_id = User.objects.filter(username=obj.username).values('id').first()
|
||||
return user_id['id'], detail, ActivityChoices.login_log
|
||||
|
|
Loading…
Reference in New Issue