Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
a16b3260
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,发现更多精彩内容 >>
提交
a16b3260
编写于
6月 03, 2020
作者:
B
Bai
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of
https://github.com/jumpserver/jumpserver
into dev
上级
1845821f
27d906a8
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
20 addition
and
19 deletion
+20
-19
apps/authentication/templates/authentication/login_wait_confirm.html
...tication/templates/authentication/login_wait_confirm.html
+0
-1
apps/jumpserver/urls.py
apps/jumpserver/urls.py
+1
-8
apps/static/js/jumpserver.js
apps/static/js/jumpserver.js
+4
-0
apps/templates/_base_only_content.html
apps/templates/_base_only_content.html
+0
-1
apps/templates/_base_only_msg_content.html
apps/templates/_base_only_msg_content.html
+0
-1
apps/templates/_foot_js.html
apps/templates/_foot_js.html
+0
-1
apps/templates/_without_nav_base.html
apps/templates/_without_nav_base.html
+0
-1
apps/terminal/api/command.py
apps/terminal/api/command.py
+15
-5
apps/users/templates/users/user_password_update.html
apps/users/templates/users/user_password_update.html
+0
-1
未找到文件。
apps/authentication/templates/authentication/login_wait_confirm.html
浏览文件 @
a16b3260
...
...
@@ -10,7 +10,6 @@
<title>
{{ title }}
</title>
{% include '_head_css_js.html' %}
<link
href=
"{% static "
css
/
jumpserver.css
"
%}"
rel=
"stylesheet"
>
<script
type=
"text/javascript"
src=
"{% url 'javascript-catalog' %}"
></script>
<script
src=
"{% static "
js
/
jumpserver.js
"
%}"
></script>
</head>
...
...
apps/jumpserver/urls.py
浏览文件 @
a16b3260
# ~*~ coding: utf-8 ~*~
from
__future__
import
unicode_literals
import
os
from
django.urls
import
path
,
include
,
re_path
from
django.conf
import
settings
from
django.conf.urls.static
import
static
from
django.conf.urls.i18n
import
i18n_patterns
from
django.views.i18n
import
JavaScriptCatalog
from
.
import
views
,
api
...
...
@@ -45,10 +42,6 @@ if settings.XPACK_ENABLED:
path
(
'xpack/'
,
include
(
'xpack.urls.api_urls'
,
namespace
=
'api-xpack'
))
)
js_i18n_patterns
=
i18n_patterns
(
path
(
'jsi18n/'
,
JavaScriptCatalog
.
as_view
(),
name
=
'javascript-catalog'
),
)
apps
=
[
'users'
,
'assets'
,
'perms'
,
'terminal'
,
'ops'
,
'audits'
,
'orgs'
,
'auth'
,
...
...
@@ -71,7 +64,7 @@ urlpatterns = [
urlpatterns
+=
static
(
settings
.
MEDIA_URL
,
document_root
=
settings
.
MEDIA_ROOT
)
\
+
static
(
settings
.
STATIC_URL
,
document_root
=
settings
.
STATIC_ROOT
)
urlpatterns
+=
js_i18n_patterns
#
urlpatterns += js_i18n_patterns
handler404
=
'jumpserver.views.handler404'
handler500
=
'jumpserver.views.handler500'
...
...
apps/static/js/jumpserver.js
浏览文件 @
a16b3260
...
...
@@ -3,6 +3,10 @@
//此函数用于checkbox的全选和反选
var
checked
=
false
;
function
gettext
(
s
)
{
return
s
}
function
check_all
(
form
)
{
var
checkboxes
=
document
.
getElementById
(
form
);
if
(
checked
===
false
)
{
...
...
apps/templates/_base_only_content.html
浏览文件 @
a16b3260
...
...
@@ -11,7 +11,6 @@
{% include '_head_css_js.html' %}
<link
href=
"{% static "
css
/
jumpserver.css
"
%}"
rel=
"stylesheet"
>
<script
type=
"text/javascript"
src=
"{% url 'javascript-catalog' %}"
></script>
<script
src=
"{% static "
js
/
jumpserver.js
"
%}"
></script>
<style>
.passwordBox
{
...
...
apps/templates/_base_only_msg_content.html
浏览文件 @
a16b3260
...
...
@@ -10,7 +10,6 @@
<link
rel=
"shortcut icon"
href=
"{{ FAVICON_URL }}"
type=
"image/x-icon"
>
{% include '_head_css_js.html' %}
<link
href=
"{% static "
css
/
jumpserver.css
"
%}"
rel=
"stylesheet"
>
<script
type=
"text/javascript"
src=
"{% url 'javascript-catalog' %}"
></script>
<script
src=
"{% static "
js
/
jumpserver.js
"
%}"
></script>
<style>
.captcha
{
...
...
apps/templates/_foot_js.html
浏览文件 @
a16b3260
...
...
@@ -6,7 +6,6 @@
<!-- Custom and plugin javascript -->
<script
src=
"{% static "
js
/
plugins
/
toastr
/
toastr.min.js
"
%}"
></script>
<script
src=
"{% static "
js
/
inspinia.js
"
%}"
></script>
<script
type=
"text/javascript"
src=
"{% url 'javascript-catalog' %}"
></script>
<script
src=
"{% static "
js
/
jumpserver.js
"
%}?
v=
8"
></script>
<script
src=
"{% static 'js/plugins/select2/select2.full.min.js' %}"
></script>
<script
src=
"{% static 'js/plugins/select2/i18n/zh-CN.js' %}"
></script>
...
...
apps/templates/_without_nav_base.html
浏览文件 @
a16b3260
...
...
@@ -11,7 +11,6 @@
<link
rel=
"stylesheet"
href=
"{% static 'css/otp.css' %}"
/>
<script
src=
"{% static 'js/jquery-3.1.1.min.js' %}"
></script>
<script
src=
"{% static "
js
/
plugins
/
qrcode
/
qrcode.min.js
"
%}"
></script>
<script
type=
"text/javascript"
src=
"{% url 'javascript-catalog' %}"
></script>
</head>
<body>
...
...
apps/terminal/api/command.py
浏览文件 @
a16b3260
...
...
@@ -5,6 +5,7 @@ from django.utils import timezone
from
django.shortcuts
import
HttpResponse
from
rest_framework
import
viewsets
from
rest_framework
import
generics
from
rest_framework.fields
import
DateTimeField
from
rest_framework.response
import
Response
from
django.template
import
loader
...
...
@@ -71,12 +72,21 @@ class CommandQueryMixin:
def
get_date_range
(
self
):
now
=
timezone
.
now
()
days_ago
=
now
-
timezone
.
timedelta
(
days
=
self
.
default_days_ago
)
default_start_st
=
days_ago
.
timestamp
()
default_end_st
=
now
.
timestamp
()
date_from_st
=
days_ago
.
timestamp
()
date_to_st
=
now
.
timestamp
()
query_params
=
self
.
request
.
query_params
date_from_st
=
query_params
.
get
(
"date_from"
)
or
default_start_st
date_to_st
=
query_params
.
get
(
"date_to"
)
or
default_end_st
return
float
(
date_from_st
),
float
(
date_to_st
)
date_from_q
=
query_params
.
get
(
"date_from"
)
date_to_q
=
query_params
.
get
(
"date_to"
)
dt_parser
=
DateTimeField
().
to_internal_value
if
date_from_q
:
date_from_st
=
dt_parser
(
date_from_q
).
timestamp
()
if
date_to_q
:
date_to_st
=
dt_parser
(
date_to_q
).
timestamp
()
return
date_from_st
,
date_to_st
class
CommandViewSet
(
CommandQueryMixin
,
viewsets
.
ModelViewSet
):
...
...
apps/users/templates/users/user_password_update.html
浏览文件 @
a16b3260
...
...
@@ -8,7 +8,6 @@
<link
href=
"{% static "
css
/
plugins
/
sweetalert
/
sweetalert.css
"
%}"
rel=
"stylesheet"
>
<script
src=
"{% static "
js
/
plugins
/
sweetalert
/
sweetalert.min.js
"
%}"
></script>
<script
type=
"text/javascript"
src=
"{% static 'js/pwstrength-bootstrap.js' %}"
></script>
<script
type=
"text/javascript"
src=
"{% url 'javascript-catalog' %}"
></script>
<script
src=
"{% static "
js
/
jumpserver.js
"
%}"
></script>
<style>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录