You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by jo...@apache.org on 2020/02/04 13:46:28 UTC
[incubator-dolphinscheduler] branch refactor-logger updated:
refactor-logger branch login error modify (#1890)
This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch refactor-logger
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/refactor-logger by this push:
new 91ec979 refactor-logger branch login error modify (#1890)
91ec979 is described below
commit 91ec9790773a16f667a91d842085b12a9b43f2f8
Author: qiaozhanwei <qi...@outlook.com>
AuthorDate: Tue Feb 4 21:46:19 2020 +0800
refactor-logger branch login error modify (#1890)
* refactor-logger branch login error modify
* refactor-logger branch rollback LogClientService
* refactor-logger branch api server ResourceServiceTest fetch from dev
---
.../apache/dolphinscheduler/api/service/ResourcesServiceTest.java | 3 +++
dolphinscheduler-ui/src/js/conf/login/App.vue | 7 +++++--
dolphinscheduler-ui/src/js/module/io/index.js | 4 ++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java
index c0caaaa..6d07ebd 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java
@@ -41,6 +41,7 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.slf4j.Logger;
@@ -53,6 +54,7 @@ import java.util.List;
import java.util.Map;
@RunWith(PowerMockRunner.class)
+@PowerMockIgnore({"sun.security.*", "javax.net.*"})
@PrepareForTest({HadoopUtils.class,PropertyUtils.class, FileUtils.class,org.apache.dolphinscheduler.api.utils.FileUtils.class})
public class ResourcesServiceTest {
private static final Logger logger = LoggerFactory.getLogger(ResourcesServiceTest.class);
@@ -115,6 +117,7 @@ public class ResourcesServiceTest {
//UDF_RESOURCE_SUFFIX_NOT_JAR
mockMultipartFile = new MockMultipartFile("ResourcesServiceTest.pdf","ResourcesServiceTest.pdf","pdf",new String("test").getBytes());
+ PowerMockito.when(FileUtils.suffix("ResourcesServiceTest.pdf")).thenReturn("pdf");
result = resourcesService.createResource(user,"ResourcesServiceTest.pdf","ResourcesServiceTest",ResourceType.UDF,mockMultipartFile);
logger.info(result.toString());
Assert.assertEquals(Status.UDF_RESOURCE_SUFFIX_NOT_JAR.getMsg(),result.getMsg());
diff --git a/dolphinscheduler-ui/src/js/conf/login/App.vue b/dolphinscheduler-ui/src/js/conf/login/App.vue
index 886ff2e..d89d9a9 100644
--- a/dolphinscheduler-ui/src/js/conf/login/App.vue
+++ b/dolphinscheduler-ui/src/js/conf/login/App.vue
@@ -84,8 +84,11 @@
this._gLogin().then(res => {
setTimeout(() => {
this.spinnerLoading = false
- sessionStorage.setItem("sessionId", res.data)
- cookies.set('sessionId', res.data,{ path: '/' })
+ if (res.data.hasOwnProperty("sessionId")) {
+ let sessionId=res.data.sessionId
+ sessionStorage.setItem("sessionId", sessionId)
+ cookies.set('sessionId', sessionId,{ path: '/' })
+ }
if (this.userName === 'admin') {
window.location.href = `${PUBLIC_PATH}/#/security/tenant`
} else {
diff --git a/dolphinscheduler-ui/src/js/module/io/index.js b/dolphinscheduler-ui/src/js/module/io/index.js
index f5713a5..e9ea1b7 100644
--- a/dolphinscheduler-ui/src/js/module/io/index.js
+++ b/dolphinscheduler-ui/src/js/module/io/index.js
@@ -76,8 +76,8 @@ io.interceptors.request.use(
let sIdCookie = cookies.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`
+ if(sIdCookie !== null && requstUrl!=='login' && sIdCookie!=sessionId) {
+ window.location.href = `${PUBLIC_PATH}/view/login/index.html`
} else {
let { method } = config
if (method === 'get') {