mirror of
https://gitee.com/dolphinscheduler/DolphinScheduler.git
synced 2024-12-01 19:58:29 +08:00
Solve cookie concatenation and pop-up display centering (#1069)
This commit is contained in:
parent
26c96d8ed1
commit
1306206b7c
@ -28,7 +28,7 @@
|
||||
type="text"
|
||||
v-model="userName"
|
||||
:placeholder="$t('Please enter user name')"
|
||||
maxlength="20"
|
||||
maxlength="60"
|
||||
@on-enterkey="_ok">
|
||||
</x-input>
|
||||
</div>
|
||||
@ -62,6 +62,7 @@
|
||||
<script>
|
||||
import i18n from '@/module/i18n'
|
||||
import io from '@/module/io'
|
||||
import cookie from '@/module/util/cookie'
|
||||
|
||||
export default {
|
||||
name: 'login-model',
|
||||
@ -84,6 +85,8 @@
|
||||
this._gLogin().then(res => {
|
||||
setTimeout(() => {
|
||||
this.spinnerLoading = false
|
||||
sessionStorage.setItem("sessionId", res.data)
|
||||
cookie.set('sessionId', res.data,{ path: '/' })
|
||||
if (this.userName === 'admin') {
|
||||
window.location.href = `${PUBLIC_PATH}/#/security/tenant`
|
||||
} else {
|
||||
|
@ -16,6 +16,8 @@
|
||||
*/
|
||||
|
||||
import io from '~/@fedor/io/dist/io'
|
||||
import cookie from '@/module/util/cookie'
|
||||
|
||||
|
||||
const apiPrefix = '/dolphinscheduler'
|
||||
const reSlashPrefix = /^\/+/
|
||||
@ -71,13 +73,20 @@ io.interceptors.response.use(
|
||||
// Global request interceptor registion
|
||||
io.interceptors.request.use(
|
||||
config => {
|
||||
let { method } = config
|
||||
if (method === 'get') {
|
||||
config.params = Object.assign({}, config.params, {
|
||||
_t: Math.random()
|
||||
})
|
||||
let sIdCookie = cookie.get('sessionId')
|
||||
let sessionId = sessionStorage.getItem("sessionId")
|
||||
let requstUrl = config.url.substring(config.url.lastIndexOf("/")+1)
|
||||
if(requstUrl!=='login' && sIdCookie!=sessionId) {
|
||||
window.location.href = `${PUBLIC_PATH}/view/login/index.html`
|
||||
} else {
|
||||
let { method } = config
|
||||
if (method === 'get') {
|
||||
config.params = Object.assign({}, config.params, {
|
||||
_t: Math.random()
|
||||
})
|
||||
}
|
||||
return config
|
||||
}
|
||||
return config
|
||||
}, error => {
|
||||
// Do something with request error
|
||||
return Promise.reject(error)
|
||||
|
Loading…
Reference in New Issue
Block a user