Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lhongjum2003
DolphinScheduler
提交
c44e9c4b
DolphinScheduler
项目概览
lhongjum2003
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
c44e9c4b
编写于
7月 19, 2019
作者:
journey2018
提交者:
GitHub
7月 19, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #596 from Baoqi/combine_ui
make escheduler-ui works in combined server
上级
923e4a84
cd7cb3d5
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
22 addition
and
12 deletion
+22
-12
escheduler-api/src/main/java/cn/escheduler/api/configuration/AppConfiguration.java
...ava/cn/escheduler/api/configuration/AppConfiguration.java
+7
-1
escheduler-ui/build/config.js
escheduler-ui/build/config.js
+5
-1
escheduler-ui/package.json
escheduler-ui/package.json
+1
-1
escheduler-ui/src/js/conf/home/store/user/actions.js
escheduler-ui/src/js/conf/home/store/user/actions.js
+1
-1
escheduler-ui/src/js/conf/login/App.vue
escheduler-ui/src/js/conf/login/App.vue
+2
-2
escheduler-ui/src/js/module/io/index.js
escheduler-ui/src/js/module/io/index.js
+1
-1
escheduler-ui/src/view/common/meta.inc
escheduler-ui/src/view/common/meta.inc
+4
-4
escheduler-ui/src/view/common/outro.inc
escheduler-ui/src/view/common/outro.inc
+1
-1
未找到文件。
escheduler-api/src/main/java/cn/escheduler/api/configuration/AppConfiguration.java
浏览文件 @
c44e9c4b
...
...
@@ -75,7 +75,7 @@ public class AppConfiguration implements WebMvcConfigurer {
//i18n
registry
.
addInterceptor
(
localeChangeInterceptor
());
registry
.
addInterceptor
(
loginInterceptor
()).
addPathPatterns
(
LOGIN_INTERCEPTOR_PATH_PATTERN
).
excludePathPatterns
(
LOGIN_PATH_PATTERN
,
"/swagger-resources/**"
,
"/webjars/**"
,
"/v2/**"
,
"/doc.html"
,
"*.html"
);
registry
.
addInterceptor
(
loginInterceptor
()).
addPathPatterns
(
LOGIN_INTERCEPTOR_PATH_PATTERN
).
excludePathPatterns
(
LOGIN_PATH_PATTERN
,
"/swagger-resources/**"
,
"/webjars/**"
,
"/v2/**"
,
"/doc.html"
,
"*.html"
,
"/ui/**"
);
}
...
...
@@ -87,6 +87,12 @@ public class AppConfiguration implements WebMvcConfigurer {
registry
.
addResourceHandler
(
"/ui/**"
).
addResourceLocations
(
"file:ui/"
);
}
@Override
public
void
addViewControllers
(
ViewControllerRegistry
registry
)
{
registry
.
addViewController
(
"/ui/"
).
setViewName
(
"forward:/ui/index.html"
);
registry
.
addViewController
(
"/"
).
setViewName
(
"forward:/ui/index.html"
);
}
@Override
public
void
addCorsMappings
(
CorsRegistry
registry
)
{
registry
.
addMapping
(
PATH_PATTERN
).
allowedOrigins
(
"*"
).
allowedMethods
(
"*"
);
...
...
escheduler-ui/build/config.js
浏览文件 @
c44e9c4b
...
...
@@ -189,11 +189,15 @@ const baseConfig = {
},
plugins
:
[
new
webpack
.
ProvidePlugin
({
vue
:
'
Vue
'
,
_
:
'
lodash
'
}),
new
webpack
.
DefinePlugin
({
PUBLIC_PATH
:
JSON
.
stringify
(
process
.
env
.
PUBLIC_PATH
?
process
.
env
.
PUBLIC_PATH
:
''
)
}),
new
HtmlWebpackExtPlugin
({
cache
:
true
,
delimiter
:
'
$
'
,
locals
:
{
NODE_ENV
:
isProduction
NODE_ENV
:
isProduction
,
PUBLIC_PATH
:
process
.
env
.
PUBLIC_PATH
?
process
.
env
.
PUBLIC_PATH
:
''
}
}),
...
pages
...
...
escheduler-ui/package.json
浏览文件 @
c44e9c4b
...
...
@@ -11,7 +11,7 @@
"lint:fix"
:
"standard
\"
**/*.{js,vue}
\"
--fix"
,
"start"
:
"npm run dev"
,
"combo"
:
"node ./build/combo.js"
,
"build:combined"
:
"npm run clean && cross-env NODE_ENV=production webpack --config ./build/webpack.config.combined.js"
"build:combined"
:
"npm run clean && cross-env NODE_ENV=production
PUBLIC_PATH=/escheduler/ui
webpack --config ./build/webpack.config.combined.js"
},
"dependencies"
:
{
"autoprefixer"
:
"^9.1.0"
,
...
...
escheduler-ui/src/js/conf/home/store/user/actions.js
浏览文件 @
c44e9c4b
...
...
@@ -37,7 +37,7 @@ export default {
signOut
()
{
io
.
post
(
`signOut`
,
res
=>
{
setTimeout
(()
=>
{
window
.
location
.
href
=
'
/view/login/index.html
'
window
.
location
.
href
=
`
${
PUBLIC_PATH
}
/view/login/index.html`
},
100
)
}).
catch
(
e
=>
{
console
.
log
(
e
)
...
...
escheduler-ui/src/js/conf/login/App.vue
浏览文件 @
c44e9c4b
...
...
@@ -69,9 +69,9 @@
setTimeout
(()
=>
{
this
.
spinnerLoading
=
false
if
(
this
.
userName
===
'
admin
'
)
{
window
.
location
.
href
=
'
/#/security/tenant
'
window
.
location
.
href
=
`${PUBLIC_PATH
}
/#/security/tenant`
}
else
{
window
.
location
.
href
=
'
/#/home
'
window
.
location
.
href
=
`${PUBLIC_PATH
}
/#/home`
}
}
,
1000
)
}
).
catch
(
e
=>
{
...
...
escheduler-ui/src/js/module/io/index.js
浏览文件 @
c44e9c4b
...
...
@@ -44,7 +44,7 @@ io.config.timeout = 0
io
.
config
.
maxContentLength
=
200000
io
.
config
.
validateStatus
=
function
(
status
)
{
if
(
status
===
401
||
status
===
504
)
{
window
.
location
.
href
=
'
/view/login/index.html
'
window
.
location
.
href
=
`
${
PUBLIC_PATH
}
/view/login/index.html`
return
}
return
status
...
...
escheduler-ui/src/view/common/meta.inc
浏览文件 @
c44e9c4b
...
...
@@ -11,12 +11,12 @@
<meta
name=
"theme-color"
content=
"#4a8dee"
>
<meta
name=
"msapplication-navbutton-color"
content=
"#4a8dee"
>
<meta
name=
"viewport"
content=
"width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"
>
<link
rel=
"shortcut icon"
href=
"/images/favicon.ico"
/>
<link
href=
"/combo/1.0.0/base.css?v1.0.0.1"
rel=
"stylesheet"
>
<link
href=
"/combo/1.0.0/3rd.css?v1.0.0.1"
rel=
"stylesheet"
>
<link
rel=
"shortcut icon"
href=
"
${locals.PUBLIC_PATH}
/images/favicon.ico"
/>
<link
href=
"
${locals.PUBLIC_PATH}
/combo/1.0.0/base.css?v1.0.0.1"
rel=
"stylesheet"
>
<link
href=
"
${locals.PUBLIC_PATH}
/combo/1.0.0/3rd.css?v1.0.0.1"
rel=
"stylesheet"
>
<!--[if lt IE 9]>
<script src="/combo/1.0.0/es5.js"></script>
<script src="
${locals.PUBLIC_PATH}
/combo/1.0.0/es5.js"></script>
<![endif]-->
<script>
...
...
escheduler-ui/src/view/common/outro.inc
浏览文件 @
c44e9c4b
...
...
@@ -2,7 +2,7 @@
<!--<script src="https://s1.analysys.cn/libs/??jqueryui/1.12.1/jquery-ui.min.js,twitter-bootstrap/3.3.7/js/bootstrap.min.js,jsPlumb/2.8.5/js/jsplumb.min.js"></script> -->
<!--<script src="https://s1.analysys.cn/libs/??highlight.js/9.13.1/highlight.min.js,element-ui/2.4.9/index.js,clipboard.js/2.0.1/clipboard.min.js,d3/3.3.6/d3.min.js,dayjs/1.7.8/dayjs.min.js"></script> -->
<script
src=
"/combo/1.0.0/3rd.js?v1.0.0.1"
type=
"text/javascript"
></script>
<script
src=
"
${locals.PUBLIC_PATH}
/combo/1.0.0/3rd.js?v1.0.0.1"
type=
"text/javascript"
></script>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录