test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-11-30 03:08:01 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #611 from analysys/dev-1.1.0

Browse Source 
make escheduler-ui works in combined server
This commit is contained in:
乔占卫 2019-07-19 16:05:10 +08:00 committed by GitHub
commit 58f778616c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
escheduler-api/src/main/java/cn/escheduler/api/configuration/AppConfiguration.java
View File

@ -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("*");

6
escheduler-ui/build/config.js
View File

@ -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

2
escheduler-ui/package.json
View File

@ -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",

2
escheduler-ui/src/js/conf/home/store/user/actions.js
View File

@ -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)

4
escheduler-ui/src/js/conf/login/App.vue
View File

@ -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 => {

2
escheduler-ui/src/js/module/io/index.js
View File

@ -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

8
escheduler-ui/src/view/common/meta.inc
View File

@ -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>

2
escheduler-ui/src/view/common/outro.inc
View File

@ -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>