Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
7c479c24
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,发现更多精彩内容 >>
提交
7c479c24
编写于
6月 03, 2020
作者:
baltery
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: 修改docs的url
上级
96551856
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
13 deletion
+18
-13
apps/jumpserver/urls.py
apps/jumpserver/urls.py
+15
-13
apps/jumpserver/views/other.py
apps/jumpserver/views/other.py
+3
-0
未找到文件。
apps/jumpserver/urls.py
浏览文件 @
7c479c24
...
...
@@ -67,14 +67,14 @@ if settings.XPACK_ENABLED:
)
js_i18n_patterns
=
i18n_patterns
(
#
path('jsi18n/', JavaScriptCatalog.as_view(), name='javascript-catalog'),
path
(
'jsi18n/'
,
JavaScriptCatalog
.
as_view
(),
name
=
'javascript-catalog'
),
)
apps
=
[
'users'
,
'assets'
,
'perms'
,
'terminal'
,
'ops'
,
'audits'
,
'orgs'
,
'auth'
,
'applications'
,
'tickets'
,
'settings'
,
'xpack'
'flower'
,
'luna'
,
'koko'
,
'ws'
,
'
i18n'
,
'jsi18n'
,
'
docs'
,
'redocs'
,
'flower'
,
'luna'
,
'koko'
,
'ws'
,
'docs'
,
'redocs'
,
]
...
...
@@ -94,23 +94,25 @@ urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \
+
static
(
settings
.
STATIC_URL
,
document_root
=
settings
.
STATIC_ROOT
)
urlpatterns
+=
js_i18n_patterns
# 兼容之前的
old_app_pattern
=
'|'
.
join
(
apps
)
urlpatterns
+=
[
re_path
(
old_app_pattern
,
views
.
redirect_old_apps_view
)]
handler404
=
'jumpserver.views.handler404'
handler500
=
'jumpserver.views.handler500'
if
settings
.
DEBUG
:
app_view_
patterns
+=
[
re_path
(
'^swagger(?P<format>\.json|\.yaml)$'
,
url
patterns
+=
[
re_path
(
'^
api/
swagger(?P<format>\.json|\.yaml)$'
,
views
.
get_swagger_view
().
without_ui
(
cache_timeout
=
1
),
name
=
'schema-json'
),
path
(
'docs/'
,
views
.
get_swagger_view
().
with_ui
(
'swagger'
,
cache_timeout
=
1
),
name
=
"docs"
),
path
(
'redoc/'
,
views
.
get_swagger_view
().
with_ui
(
'redoc'
,
cache_timeout
=
1
),
name
=
'redoc'
),
path
(
'
api/
docs/'
,
views
.
get_swagger_view
().
with_ui
(
'swagger'
,
cache_timeout
=
1
),
name
=
"docs"
),
path
(
'
api/
redoc/'
,
views
.
get_swagger_view
().
with_ui
(
'redoc'
,
cache_timeout
=
1
),
name
=
'redoc'
),
re_path
(
'^v2/swagger(?P<format>\.json|\.yaml)$'
,
re_path
(
'^
api/
v2/swagger(?P<format>\.json|\.yaml)$'
,
views
.
get_swagger_view
().
without_ui
(
cache_timeout
=
1
),
name
=
'schema-json'
),
path
(
'docs/v2/'
,
views
.
get_swagger_view
(
"v2"
).
with_ui
(
'swagger'
,
cache_timeout
=
1
),
name
=
"docs"
),
path
(
'redoc/v2/'
,
views
.
get_swagger_view
(
"v2"
).
with_ui
(
'redoc'
,
cache_timeout
=
1
),
name
=
'redoc'
),
path
(
'
api/
docs/v2/'
,
views
.
get_swagger_view
(
"v2"
).
with_ui
(
'swagger'
,
cache_timeout
=
1
),
name
=
"docs"
),
path
(
'
api/
redoc/v2/'
,
views
.
get_swagger_view
(
"v2"
).
with_ui
(
'redoc'
,
cache_timeout
=
1
),
name
=
'redoc'
),
]
# 兼容之前的
old_app_pattern
=
'|'
.
join
(
apps
)
urlpatterns
+=
[
re_path
(
old_app_pattern
,
views
.
redirect_old_apps_view
)]
apps/jumpserver/views/other.py
浏览文件 @
7c479c24
...
...
@@ -6,6 +6,7 @@ import time
from
django.http
import
HttpResponseRedirect
,
JsonResponse
,
Http404
from
django.conf
import
settings
from
django.views.generic
import
View
from
django.shortcuts
import
redirect
from
django.utils.translation
import
ugettext_lazy
as
_
from
rest_framework.views
import
APIView
from
django.views.decorators.csrf
import
csrf_exempt
...
...
@@ -55,6 +56,8 @@ def redirect_old_apps_view(request, *args, **kwargs):
path
=
request
.
get_full_path
()
if
path
.
find
(
'/core'
)
!=
-
1
:
raise
Http404
()
if
path
in
[
'/docs/'
,
'/docs'
,
'/core/docs/'
,
'/core/docs'
]:
return
redirect
(
'/api/docs/'
)
new_path
=
'/core{}'
.
format
(
path
)
return
HttpResponseTemporaryRedirect
(
new_path
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录