Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
b81e424e
J
jumpserver
项目概览
gjl2004yn
/
jumpserver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jumpserver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b81e424e
编写于
6月 16, 2020
作者:
baltery
浏览文件
操作
浏览文件
下载
差异文件
fix: 修改翻译
上级
1f159371
f4fa0117
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
75 addition
and
30 deletion
+75
-30
apps/authentication/api/mfa.py
apps/authentication/api/mfa.py
+2
-1
apps/locale/zh/LC_MESSAGES/django.mo
apps/locale/zh/LC_MESSAGES/django.mo
+0
-0
apps/locale/zh/LC_MESSAGES/django.po
apps/locale/zh/LC_MESSAGES/django.po
+15
-11
apps/ops/api/adhoc.py
apps/ops/api/adhoc.py
+12
-4
apps/ops/models/adhoc.py
apps/ops/models/adhoc.py
+4
-0
apps/ops/serializers/adhoc.py
apps/ops/serializers/adhoc.py
+40
-13
apps/tickets/serializers/ticket.py
apps/tickets/serializers/ticket.py
+2
-1
未找到文件。
apps/authentication/api/mfa.py
浏览文件 @
b81e424e
# -*- coding: utf-8 -*-
#
import
time
from
django.utils.translation
import
ugettext
as
_
from
rest_framework.permissions
import
AllowAny
from
rest_framework.generics
import
CreateAPIView
from
rest_framework.serializers
import
ValidationError
...
...
@@ -56,4 +57,4 @@ class UserOtpVerifyApi(CreateAPIView):
request
.
session
[
"MFA_VERIFY_TIME"
]
=
int
(
time
.
time
())
return
Response
({
"ok"
:
"1"
})
else
:
return
Response
({
"error"
:
"Code not valid"
},
status
=
400
)
return
Response
({
"error"
:
_
(
"Code is invalid"
)
},
status
=
400
)
apps/locale/zh/LC_MESSAGES/django.mo
浏览文件 @
b81e424e
无法预览此类型文件
apps/locale/zh/LC_MESSAGES/django.po
浏览文件 @
b81e424e
...
...
@@ -986,7 +986,7 @@ msgstr "状态"
msgid "Date login"
msgstr "登录日期"
#: audits/serializers.py:61 audits/serializers.py:73 ops/models/adhoc.py:24
0
#: audits/serializers.py:61 audits/serializers.py:73 ops/models/adhoc.py:24
4
msgid "Is success"
msgstr "是否成功"
...
...
@@ -1003,6 +1003,10 @@ msgstr "主机"
msgid "Run as"
msgstr "运行用户"
#: authentication/api/mfa.py:60
msgid "Code is invalid"
msgstr "Code无效"
#: authentication/backends/api.py:53
msgid "Invalid signature header. No credentials provided."
msgstr ""
...
...
@@ -1500,46 +1504,46 @@ msgstr "Become"
msgid "Create by"
msgstr "创建者"
#: ops/models/adhoc.py:23
3
#: ops/models/adhoc.py:23
7
msgid "Task display"
msgstr "任务展示"
#: ops/models/adhoc.py:23
4
#: ops/models/adhoc.py:23
8
msgid "Host amount"
msgstr "主机数量"
#: ops/models/adhoc.py:2
36
#: ops/models/adhoc.py:2
40
msgid "Start time"
msgstr "开始时间"
#: ops/models/adhoc.py:2
37
#: ops/models/adhoc.py:2
41
msgid "End time"
msgstr "完成时间"
#: ops/models/adhoc.py:2
38
xpack/plugins/change_auth_plan/models.py:179
#: ops/models/adhoc.py:2
42
xpack/plugins/change_auth_plan/models.py:179
#: xpack/plugins/change_auth_plan/models.py:310
#: xpack/plugins/gathered_user/models.py:79
msgid "Time"
msgstr "时间"
#: ops/models/adhoc.py:2
39
ops/models/command.py:26
#: ops/models/adhoc.py:2
43
ops/models/command.py:26
#: terminal/serializers/session.py:30
msgid "Is finished"
msgstr "是否完成"
#: ops/models/adhoc.py:24
1
#: ops/models/adhoc.py:24
5
msgid "Adhoc raw result"
msgstr "结果"
#: ops/models/adhoc.py:24
2
#: ops/models/adhoc.py:24
6
msgid "Adhoc result summary"
msgstr "汇总"
#: ops/models/adhoc.py:28
2
xpack/plugins/change_auth_plan/utils.py:137
#: ops/models/adhoc.py:28
6
xpack/plugins/change_auth_plan/utils.py:137
msgid "{} Start task: {}"
msgstr "{} 任务开始: {}"
#: ops/models/adhoc.py:29
1
xpack/plugins/change_auth_plan/utils.py:149
#: ops/models/adhoc.py:29
5
xpack/plugins/change_auth_plan/utils.py:149
msgid "{} Task finish"
msgstr "{} 任务结束"
...
...
apps/ops/api/adhoc.py
浏览文件 @
b81e424e
...
...
@@ -4,14 +4,17 @@
from
django.shortcuts
import
get_object_or_404
from
rest_framework
import
viewsets
,
generics
from
rest_framework.views
import
Response
from
django.db.models
import
Count
,
Q
from
common.permissions
import
IsOrgAdmin
from
common.serializers
import
CeleryTaskSerializer
from
orgs.utils
import
current_org
from
..models
import
Task
,
AdHoc
,
AdHocExecution
from
..serializers
import
TaskSerializer
,
AdHocSerializer
,
\
AdHocExecutionSerializer
,
TaskDetailSerializer
from
..serializers
import
(
TaskSerializer
,
AdHocSerializer
,
AdHocExecutionSerializer
,
TaskDetailSerializer
,
AdHocDetailSerializer
,
)
from
..tasks
import
run_ansible_task
__all__
=
[
...
...
@@ -53,6 +56,11 @@ class AdHocViewSet(viewsets.ModelViewSet):
serializer_class
=
AdHocSerializer
permission_classes
=
(
IsOrgAdmin
,)
def
get_serializer_class
(
self
):
if
self
.
action
==
'retrieve'
:
return
AdHocDetailSerializer
return
super
().
get_serializer_class
()
def
get_queryset
(
self
):
task_id
=
self
.
request
.
query_params
.
get
(
'task'
)
if
task_id
:
...
...
apps/ops/models/adhoc.py
浏览文件 @
b81e424e
...
...
@@ -150,6 +150,10 @@ class AdHoc(OrgModelMixin):
created_by
=
models
.
CharField
(
max_length
=
64
,
default
=
''
,
blank
=
True
,
null
=
True
,
verbose_name
=
_
(
'Create by'
))
date_created
=
models
.
DateTimeField
(
auto_now_add
=
True
,
db_index
=
True
)
@
lazyproperty
def
run_times
(
self
):
return
self
.
execution
.
count
()
@
property
def
inventory
(
self
):
if
self
.
become
:
...
...
apps/ops/serializers/adhoc.py
浏览文件 @
b81e424e
...
...
@@ -8,10 +8,16 @@ from ..models import Task, AdHoc, AdHocExecution, CommandExecution
class
AdHocExecutionSerializer
(
serializers
.
ModelSerializer
):
stat
=
serializers
.
SerializerMethodField
()
last_success
=
serializers
.
ListField
(
source
=
'success_hosts'
)
last_failure
=
serializers
.
DictField
(
source
=
'failed_hosts'
)
class
Meta
:
model
=
AdHocExecution
fields
=
'__all__'
fields
=
[
'id'
,
'task'
,
'task_display'
,
'hosts_amount'
,
'adhoc'
,
'date_start'
,
'stat'
,
'date_finished'
,
'timedelta'
,
'is_finished'
,
'is_success'
,
'result'
,
'summary'
,
'short_id'
,
'adhoc_short_id'
,
'last_success'
,
'last_failure'
]
@
staticmethod
def
get_task
(
obj
):
...
...
@@ -28,17 +34,15 @@ class AdHocExecutionSerializer(serializers.ModelSerializer):
"failed"
:
count_failed_hosts
}
def
get_field_names
(
self
,
declared_fields
,
info
):
fields
=
super
().
get_field_names
(
declared_fields
,
info
)
fields
.
extend
([
'short_id'
,
'adhoc_short_id'
])
return
fields
class
AdHocExecutionExcludeResultSerializer
(
AdHocExecutionSerializer
):
def
get_field_names
(
self
,
declared_fields
,
info
):
fields
=
super
().
get_field_names
(
declared_fields
,
info
)
fields
=
[
i
for
i
in
fields
if
i
not
in
[
'result'
,
'summary'
]]
return
fields
class
Meta
:
model
=
AdHocExecution
fields
=
[
'id'
,
'task'
,
'task_display'
,
'hosts_amount'
,
'adhoc'
,
'date_start'
,
'stat'
,
'date_finished'
,
'timedelta'
,
'is_finished'
,
'is_success'
,
'short_id'
,
'adhoc_short_id'
,
'last_success'
,
'last_failure'
]
class
TaskSerializer
(
serializers
.
ModelSerializer
):
...
...
@@ -60,15 +64,15 @@ class TaskSerializer(serializers.ModelSerializer):
class
TaskDetailSerializer
(
TaskSerializer
):
last_success
=
serializers
.
ListField
(
source
=
'latest_execution.success_hosts'
)
last_failure
=
serializers
.
DictField
(
source
=
'latest_execution.failed_hosts'
)
contents
=
serializers
.
ListField
(
source
=
'latest_adhoc.tasks'
)
class
Meta
(
TaskSerializer
.
Meta
):
fields
=
TaskSerializer
.
Meta
.
fields
+
[
'
last_success'
,
'last_failure
'
]
fields
=
TaskSerializer
.
Meta
.
fields
+
[
'
contents
'
]
class
AdHocSerializer
(
serializers
.
ModelSerializer
):
become_display
=
serializers
.
ReadOnlyField
()
tasks
=
serializers
.
ListField
()
class
Meta
:
model
=
AdHoc
...
...
@@ -86,6 +90,29 @@ class AdHocSerializer(serializers.ModelSerializer):
}
class
AdHocExecutionNestSerializer
(
serializers
.
ModelSerializer
):
last_success
=
serializers
.
ListField
(
source
=
'success_hosts'
)
last_failure
=
serializers
.
DictField
(
source
=
'failed_hosts'
)
last_run
=
serializers
.
CharField
(
source
=
'short_id'
)
class
Meta
:
model
=
AdHocExecution
fields
=
(
'last_success'
,
'last_failure'
,
'last_run'
,
'timedelta'
,
'is_finished'
,
'is_success'
)
class
AdHocDetailSerializer
(
AdHocSerializer
):
latest_execution
=
AdHocExecutionNestSerializer
(
allow_null
=
True
)
task_name
=
serializers
.
CharField
(
source
=
'task.name'
)
class
Meta
(
AdHocSerializer
.
Meta
):
fields
=
AdHocSerializer
.
Meta
.
fields
+
[
'latest_execution'
,
'created_by'
,
'run_times'
,
'task_name'
]
class
CommandExecutionSerializer
(
serializers
.
ModelSerializer
):
result
=
serializers
.
JSONField
(
read_only
=
True
)
log_url
=
serializers
.
SerializerMethodField
()
...
...
apps/tickets/serializers/ticket.py
浏览文件 @
b81e424e
...
...
@@ -23,7 +23,8 @@ class TicketSerializer(serializers.ModelSerializer):
]
extra_kwargs
=
{
'status'
:
{
'label'
:
_
(
'Status'
)},
'action'
:
{
'label'
:
_
(
'Action'
)}
'action'
:
{
'label'
:
_
(
'Action'
)},
'user_display'
:
{
'label'
:
_
(
'User'
)}
}
def
create
(
self
,
validated_data
):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录