Browse Source

Solve cookie concatenation and pop-up display centering (#1069)

pull/2/head
break60 5 years ago committed by lgcareer
parent
commit
1306206b7c
  1. 5
      dolphinscheduler-ui/src/js/conf/login/App.vue
  2. 21
      dolphinscheduler-ui/src/js/module/io/index.js

5
dolphinscheduler-ui/src/js/conf/login/App.vue

@ -28,7 +28,7 @@
type="text" type="text"
v-model="userName" v-model="userName"
:placeholder="$t('Please enter user name')" :placeholder="$t('Please enter user name')"
maxlength="20" maxlength="60"
@on-enterkey="_ok"> @on-enterkey="_ok">
</x-input> </x-input>
</div> </div>
@ -62,6 +62,7 @@
<script> <script>
import i18n from '@/module/i18n' import i18n from '@/module/i18n'
import io from '@/module/io' import io from '@/module/io'
import cookie from '@/module/util/cookie'
export default { export default {
name: 'login-model', name: 'login-model',
@ -84,6 +85,8 @@
this._gLogin().then(res => { this._gLogin().then(res => {
setTimeout(() => { setTimeout(() => {
this.spinnerLoading = false this.spinnerLoading = false
sessionStorage.setItem("sessionId", res.data)
cookie.set('sessionId', res.data,{ path: '/' })
if (this.userName === 'admin') { if (this.userName === 'admin') {
window.location.href = `${PUBLIC_PATH}/#/security/tenant` window.location.href = `${PUBLIC_PATH}/#/security/tenant`
} else { } else {

21
dolphinscheduler-ui/src/js/module/io/index.js

@ -16,6 +16,8 @@
*/ */
import io from '~/@fedor/io/dist/io' import io from '~/@fedor/io/dist/io'
import cookie from '@/module/util/cookie'
const apiPrefix = '/dolphinscheduler' const apiPrefix = '/dolphinscheduler'
const reSlashPrefix = /^\/+/ const reSlashPrefix = /^\/+/
@ -71,13 +73,20 @@ io.interceptors.response.use(
// Global request interceptor registion // Global request interceptor registion
io.interceptors.request.use( io.interceptors.request.use(
config => { config => {
let { method } = config let sIdCookie = cookie.get('sessionId')
if (method === 'get') { let sessionId = sessionStorage.getItem("sessionId")
config.params = Object.assign({}, config.params, { let requstUrl = config.url.substring(config.url.lastIndexOf("/")+1)
_t: Math.random() 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 => { }, error => {
// Do something with request error // Do something with request error
return Promise.reject(error) return Promise.reject(error)

Loading…
Cancel
Save