You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ch...@apache.org on 2021/01/29 06:05:49 UTC

[incubator-dolphinscheduler] branch 1.3.5-prepare updated: [1.3.5-prepare][cherry-pick]#4162

This is an automated email from the ASF dual-hosted git repository.

chenxingchun pushed a commit to branch 1.3.5-prepare
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/1.3.5-prepare by this push:
     new a4295c7  [1.3.5-prepare][cherry-pick]#4162
     new a0e35c7  Merge pull request #4612 from chengshiwen/1.3.5-#4162
a4295c7 is described below

commit a4295c7a7bf1795323cc55409c8d72475e6ec6d2
Author: chengshiwen <ch...@gmail.com>
AuthorDate: Thu Jan 28 22:12:31 2021 +0800

    [1.3.5-prepare][cherry-pick]#4162
---
 dolphinscheduler-ui/src/js/module/io/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dolphinscheduler-ui/src/js/module/io/index.js b/dolphinscheduler-ui/src/js/module/io/index.js
index 9b806ab..79e2eb5 100644
--- a/dolphinscheduler-ui/src/js/module/io/index.js
+++ b/dolphinscheduler-ui/src/js/module/io/index.js
@@ -75,7 +75,7 @@ io.interceptors.request.use(
     const sIdCookie = cookies.get('sessionId')
     const sessionId = sessionStorage.getItem('sessionId')
     const requstUrl = config.url.substring(config.url.lastIndexOf('/') + 1)
-    if (sIdCookie !== null && requstUrl !== 'login' && sIdCookie !== sessionId) {
+    if ((!sIdCookie || (sessionId && sessionId !== sIdCookie)) && requstUrl !== 'login') {
       window.location.href = `${PUBLIC_PATH}/view/login/index.html`
     } else {
       const { method } = config