From fd05bfa9c23685825348787ec759358ffc91d4f3 Mon Sep 17 00:00:00 2001 From: JackChen0810 Date: Mon, 17 Jan 2022 18:44:34 +0800 Subject: [PATCH 01/58] #488 --- dss-apps/dss-apiservice-server/pom.xml | 65 ++------------------- dss-apps/dss-datapipe-server/pom.xml | 4 +- dss-framework/dss-appconn-framework/pom.xml | 2 +- pom.xml | 1 + 4 files changed, 9 insertions(+), 63 deletions(-) diff --git a/dss-apps/dss-apiservice-server/pom.xml b/dss-apps/dss-apiservice-server/pom.xml index b226a829e4..95e581dd48 100644 --- a/dss-apps/dss-apiservice-server/pom.xml +++ b/dss-apps/dss-apiservice-server/pom.xml @@ -245,7 +245,7 @@ com.h2database h2 - 1.4.196 + 2.0.206 test @@ -271,7 +271,7 @@ junit junit - 4.12 + ${junit.version} test @@ -280,66 +280,11 @@ 1.5.2 test - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - xstream com.thoughtworks.xstream - 1.4.11.1 + ${xstream.version} @@ -347,8 +292,8 @@ - maven-surefire-plugin - ${maven-surefire-plugin.version} + org.apache.maven.plugins + maven-deploy-plugin maven-failsafe-plugin diff --git a/dss-apps/dss-datapipe-server/pom.xml b/dss-apps/dss-datapipe-server/pom.xml index cbcf7f6fb8..9c350061d8 100644 --- a/dss-apps/dss-datapipe-server/pom.xml +++ b/dss-apps/dss-datapipe-server/pom.xml @@ -213,7 +213,7 @@ junit junit - 4.12 + ${junit.version} test @@ -225,7 +225,7 @@ xstream com.thoughtworks.xstream - 1.4.11.1 + ${xstream.version} diff --git a/dss-framework/dss-appconn-framework/pom.xml b/dss-framework/dss-appconn-framework/pom.xml index 07ce6b38d0..7142774090 100644 --- a/dss-framework/dss-appconn-framework/pom.xml +++ b/dss-framework/dss-appconn-framework/pom.xml @@ -32,7 +32,7 @@ junit junit - 4.12 + ${junit.version} test diff --git a/pom.xml b/pom.xml index 2500454363..f86447d781 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,7 @@ 1.9.5 1.4.15 2.16 + 4.13.1 From 0c3ca8dc553536e4ffdc662ac224fc88b1ff5a4a Mon Sep 17 00:00:00 2001 From: JackChen0810 Date: Fri, 28 Jan 2022 11:45:50 +0800 Subject: [PATCH 02/58] fix compile problem --- .../dss/apiservice/test/TestApiServiceDBOperation.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dss-apps/dss-apiservice-server/src/test/java/com/webank/wedatasphere/dss/apiservice/test/TestApiServiceDBOperation.java b/dss-apps/dss-apiservice-server/src/test/java/com/webank/wedatasphere/dss/apiservice/test/TestApiServiceDBOperation.java index d8917bb414..c096377c57 100644 --- a/dss-apps/dss-apiservice-server/src/test/java/com/webank/wedatasphere/dss/apiservice/test/TestApiServiceDBOperation.java +++ b/dss-apps/dss-apiservice-server/src/test/java/com/webank/wedatasphere/dss/apiservice/test/TestApiServiceDBOperation.java @@ -50,11 +50,11 @@ -@RunWith(SpringJUnit4ClassRunner.class) +//@RunWith(SpringJUnit4ClassRunner.class) //@MapperScan(annotationClass = Repository.class, basePackages = "com.webank.wedatasphere.dss.apiservice.dao" ) -@SpringBootTest(classes = {DataWorkCloudApplication.class}) +//@SpringBootTest(classes = {DataWorkCloudApplication.class}) public class TestApiServiceDBOperation { - private static DbSetupTracker dbSetupTracker = new DbSetupTracker(); + /*private static DbSetupTracker dbSetupTracker = new DbSetupTracker(); @Autowired ApiService apiService; @Autowired @@ -153,5 +153,5 @@ public void testApiServiceAccessInfo() { ); - } + }*/ } \ No newline at end of file From 01df3632a6e007b36a1b2b46fbd6e0254d778cdb Mon Sep 17 00:00:00 2001 From: JackChen0810 Date: Fri, 28 Jan 2022 14:52:50 +0800 Subject: [PATCH 03/58] add mysql-connector-java to dss-common --- assembly/dss-package/pom.xml | 6 ++++++ .../dss/apiservice/test/TestApiServiceDBOperation.java | 8 ++++---- pom.xml | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/assembly/dss-package/pom.xml b/assembly/dss-package/pom.xml index ec34372e5a..d4b6cc3820 100644 --- a/assembly/dss-package/pom.xml +++ b/assembly/dss-package/pom.xml @@ -127,6 +127,12 @@ 2.21 + + mysql + mysql-connector-java + ${mysql.version} + + diff --git a/dss-apps/dss-apiservice-server/src/test/java/com/webank/wedatasphere/dss/apiservice/test/TestApiServiceDBOperation.java b/dss-apps/dss-apiservice-server/src/test/java/com/webank/wedatasphere/dss/apiservice/test/TestApiServiceDBOperation.java index d8917bb414..c096377c57 100644 --- a/dss-apps/dss-apiservice-server/src/test/java/com/webank/wedatasphere/dss/apiservice/test/TestApiServiceDBOperation.java +++ b/dss-apps/dss-apiservice-server/src/test/java/com/webank/wedatasphere/dss/apiservice/test/TestApiServiceDBOperation.java @@ -50,11 +50,11 @@ -@RunWith(SpringJUnit4ClassRunner.class) +//@RunWith(SpringJUnit4ClassRunner.class) //@MapperScan(annotationClass = Repository.class, basePackages = "com.webank.wedatasphere.dss.apiservice.dao" ) -@SpringBootTest(classes = {DataWorkCloudApplication.class}) +//@SpringBootTest(classes = {DataWorkCloudApplication.class}) public class TestApiServiceDBOperation { - private static DbSetupTracker dbSetupTracker = new DbSetupTracker(); + /*private static DbSetupTracker dbSetupTracker = new DbSetupTracker(); @Autowired ApiService apiService; @Autowired @@ -153,5 +153,5 @@ public void testApiServiceAccessInfo() { ); - } + }*/ } \ No newline at end of file diff --git a/pom.xml b/pom.xml index f86447d781..1b41471417 100644 --- a/pom.xml +++ b/pom.xml @@ -64,6 +64,7 @@ 1.4.15 2.16 4.13.1 + 5.1.49 From 039ec4aaafaa9ae2ae4ee41672bee8e47bb9e3a9 Mon Sep 17 00:00:00 2001 From: NPM Mirror Bot Date: Sat, 12 Feb 2022 03:58:52 +0000 Subject: [PATCH 04/58] update https://registry.npm.taobao.org to https://registry.npmmirror.com --- docs/en_US/ch4/Web Compilation.md | 2 +- .../ch2/\347\274\226\350\257\221\346\226\207\346\241\243.md" | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en_US/ch4/Web Compilation.md b/docs/en_US/ch4/Web Compilation.md index 1f22f0a29e..c3bd3dc718 100644 --- a/docs/en_US/ch4/Web Compilation.md +++ b/docs/en_US/ch4/Web Compilation.md @@ -90,7 +90,7 @@ open -n /Applications/Google\ Chrome.app/ --args --disable-web-security --user-d Try to use Taobao npm mirror: ``` -npm install -g cnpm --registry=https://registry.npm.taobao.org +npm install -g cnpm --registry=https://registry.npmmirror.com ``` Next, run the following command instead of npm install: diff --git "a/web/docs/zh_CN/ch2/\347\274\226\350\257\221\346\226\207\346\241\243.md" "b/web/docs/zh_CN/ch2/\347\274\226\350\257\221\346\226\207\346\241\243.md" index ee447703af..ba194e3e70 100755 --- "a/web/docs/zh_CN/ch2/\347\274\226\350\257\221\346\226\207\346\241\243.md" +++ "b/web/docs/zh_CN/ch2/\347\274\226\350\257\221\346\226\207\346\241\243.md" @@ -74,7 +74,7 @@ open -n /Applications/Google\ Chrome.app/ --args --disable-web-security --user- 如果遇到该情况，可以使用国内的淘宝npm镜像： ``` -npm install -g cnpm --registry=https://registry.npm.taobao.org +npm install -g cnpm --registry=https://registry.npmmirror.com ``` 接着，通过执行以下指令代替npm install指令 From b99c03ae5827d8504837f196c42e68e46e69912d Mon Sep 17 00:00:00 2001 From: JackChen0810 Date: Tue, 15 Feb 2022 15:57:50 +0800 Subject: [PATCH 05/58] Fix the problem that the appconn engine is not reused. --- .../main/resources/linkis-engineconn.properties | 5 ++++- .../conf/AppConnEngineConnConfiguration.scala | 2 ++ .../executor/AppConnEngineConnExecutor.scala | 14 +++++++++++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dss-appconn/linkis-appconn-engineplugin/src/main/resources/linkis-engineconn.properties b/dss-appconn/linkis-appconn-engineplugin/src/main/resources/linkis-engineconn.properties index 413636ed98..0d0999d6e6 100644 --- a/dss-appconn/linkis-appconn-engineplugin/src/main/resources/linkis-engineconn.properties +++ b/dss-appconn/linkis-appconn-engineplugin/src/main/resources/linkis-engineconn.properties @@ -47,4 +47,7 @@ wds.linkis.mysql.is.encrypt=false wds.linkis.reflect.scan.package=org.apache.linkis,com.webank.wedatasphere.dss spring.spring.mvc.servlet.path=/api/rest_j/v1 spring.spring.servlet.multipart.max-file-size=200MB -spring.spring.servlet.multipart.max-request-size=200MB \ No newline at end of file +spring.spring.servlet.multipart.max-request-size=200MB + +wds.linkis.engineconn.support.parallelism=true +wds.linkis.engineconn.max.free.time=0 \ No newline at end of file diff --git a/dss-appconn/linkis-appconn-engineplugin/src/main/scala/org/apache/linkis/manager/engineplugin/appconn/conf/AppConnEngineConnConfiguration.scala b/dss-appconn/linkis-appconn-engineplugin/src/main/scala/org/apache/linkis/manager/engineplugin/appconn/conf/AppConnEngineConnConfiguration.scala index 6e616ad15b..01df7274af 100644 --- a/dss-appconn/linkis-appconn-engineplugin/src/main/scala/org/apache/linkis/manager/engineplugin/appconn/conf/AppConnEngineConnConfiguration.scala +++ b/dss-appconn/linkis-appconn-engineplugin/src/main/scala/org/apache/linkis/manager/engineplugin/appconn/conf/AppConnEngineConnConfiguration.scala @@ -23,4 +23,6 @@ object AppConnEngineConnConfiguration { val GATEWAY_SPRING_APPLICATION = CommonVars("wds.linkis.gateway.spring.name", "dataworkcloud-gateway") + val CONCURRENT_LIMIT = CommonVars("wds.linkis.engineconn.appconn.conncurrent.limit", 100) + } diff --git a/dss-appconn/linkis-appconn-engineplugin/src/main/scala/org/apache/linkis/manager/engineplugin/appconn/executor/AppConnEngineConnExecutor.scala b/dss-appconn/linkis-appconn-engineplugin/src/main/scala/org/apache/linkis/manager/engineplugin/appconn/executor/AppConnEngineConnExecutor.scala index 4e73806414..bc2ead29df 100644 --- a/dss-appconn/linkis-appconn-engineplugin/src/main/scala/org/apache/linkis/manager/engineplugin/appconn/executor/AppConnEngineConnExecutor.scala +++ b/dss-appconn/linkis-appconn-engineplugin/src/main/scala/org/apache/linkis/manager/engineplugin/appconn/executor/AppConnEngineConnExecutor.scala @@ -18,7 +18,6 @@ package org.apache.linkis.manager.engineplugin.appconn.executor import java.util import java.util.Map - import com.webank.wedatasphere.dss.appconn.core.AppConn import com.webank.wedatasphere.dss.appconn.core.ext.OnlyDevelopmentAppConn import com.webank.wedatasphere.dss.appconn.manager.AppConnManager @@ -30,7 +29,7 @@ import com.webank.wedatasphere.dss.standard.app.sso.Workspace import com.webank.wedatasphere.dss.standard.common.desc.AppInstance import com.webank.wedatasphere.dss.standard.common.entity.ref.{AsyncResponseRef, DefaultRefFactory, ResponseRef} import org.apache.linkis.common.utils.{OverloadUtils, Utils} -import org.apache.linkis.engineconn.computation.executor.execute.{ComputationExecutor, EngineExecutionContext} +import org.apache.linkis.engineconn.computation.executor.execute.{ComputationExecutor, ConcurrentComputationExecutor, EngineExecutionContext} import org.apache.linkis.engineconn.launch.EngineConnServer import org.apache.linkis.governance.common.utils.GovernanceConstant import org.apache.linkis.manager.common.entity.resource.{CommonNodeResource, LoadResource, NodeResource} @@ -45,10 +44,11 @@ import org.apache.linkis.protocol.engine.JobProgressInfo import org.apache.linkis.scheduler.executer.{ErrorExecuteResponse, ExecuteResponse, SuccessExecuteResponse} import org.apache.linkis.server.BDPJettyServerHelper import org.apache.commons.lang.StringUtils +import org.apache.linkis.manager.engineplugin.appconn.conf.AppConnEngineConnConfiguration import scala.beans.BeanProperty -class AppConnEngineConnExecutor(val id: Int) extends ComputationExecutor { +class AppConnEngineConnExecutor(val id: Int) extends ConcurrentComputationExecutor { @BeanProperty var userWithCreator: UserWithCreator = _ @@ -172,6 +172,14 @@ class AppConnEngineConnExecutor(val id: Int) extends ComputationExecutor { override def getId(): String = "AppConnEngineExecutor_" + id + override def getConcurrentLimit: Int = { + AppConnEngineConnConfiguration.CONCURRENT_LIMIT.getValue + } + + override def killAll(): Unit = { + } + + } object AppConnEngineConnExecutor { From 86d267e020f6b44b0ec3ae693f1e652aa31841d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 01:17:46 +0000 Subject: [PATCH 06/58] Bump postgresql from 42.2.12 to 42.3.3 in /dss-apps/dss-datapipe-server Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.12 to 42.3.3. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.12...REL42.3.3) --- updated-dependencies: - dependency-name: org.postgresql:postgresql dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- dss-apps/dss-datapipe-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dss-apps/dss-datapipe-server/pom.xml b/dss-apps/dss-datapipe-server/pom.xml index cbcf7f6fb8..27631d1fc3 100644 --- a/dss-apps/dss-datapipe-server/pom.xml +++ b/dss-apps/dss-datapipe-server/pom.xml @@ -137,7 +137,7 @@ org.postgresql postgresql - 42.2.12 + 42.3.3 org.apache.linkis From e816c92fee995bd5e5693b7dba27b87c8b9689c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 01:18:41 +0000 Subject: [PATCH 07/58] Bump postgresql in /dss-apps/dss-apiservice-server Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.12 to 42.3.3. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.12...REL42.3.3) --- updated-dependencies: - dependency-name: org.postgresql:postgresql dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- dss-apps/dss-apiservice-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dss-apps/dss-apiservice-server/pom.xml b/dss-apps/dss-apiservice-server/pom.xml index b226a829e4..9876d2fef3 100644 --- a/dss-apps/dss-apiservice-server/pom.xml +++ b/dss-apps/dss-apiservice-server/pom.xml @@ -138,7 +138,7 @@ org.postgresql postgresql - 42.2.12 + 42.3.3 org.apache.linkis From 5540a8db1e7b99d994792bb05c05c6af28c5502d Mon Sep 17 00:00:00 2001 From: JackChen0810 Date: Fri, 18 Feb 2022 14:59:00 +0800 Subject: [PATCH 08/58] Fix the problem of killing workflow. --- .../restful/FlowEntranceRestfulApi.java | 53 +++++++++++++++++++ .../entrance/job/FlowEntranceJob.scala | 6 +-- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/restful/FlowEntranceRestfulApi.java b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/restful/FlowEntranceRestfulApi.java index ec6fa4ec27..82a7414ae6 100644 --- a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/restful/FlowEntranceRestfulApi.java +++ b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/restful/FlowEntranceRestfulApi.java @@ -16,6 +16,7 @@ package com.webank.wedatasphere.dss.flow.execution.entrance.restful; +import com.fasterxml.jackson.databind.JsonNode; import com.webank.wedatasphere.dss.common.entity.DSSWorkspace; import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils; import com.webank.wedatasphere.dss.standard.sso.utils.SSOHelper; @@ -29,15 +30,19 @@ import org.apache.linkis.protocol.constants.TaskConstant; import org.apache.linkis.protocol.utils.ZuulEntranceUtils; import org.apache.linkis.rpc.Sender; +import org.apache.linkis.scheduler.listener.LogListener; import org.apache.linkis.scheduler.queue.Job; +import org.apache.linkis.scheduler.queue.SchedulerEventState; import org.apache.linkis.server.Message; import org.apache.linkis.server.security.SecurityFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.*; +import scala.Function0; import scala.Option; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.Map; @@ -126,6 +131,54 @@ public Message status(@PathVariable("id") String id, @RequestParam(required = fa return message; } + @Override + @RequestMapping(path = {"/{id}/kill"},method = {RequestMethod.GET}) + public Message kill(@PathVariable("id") String id, @RequestParam(value = "taskID",required = false) Long taskID) { + String realId = ZuulEntranceUtils.parseExecID(id)[3]; + Option job = Option.apply((Object)null); + try { + job = this.entranceServer.getJob(realId); + } catch (Exception var10) { + logger.warn("can not find a job in entranceServer, will force to kill it", var10); + JobHistoryHelper.forceKill(taskID); + Message message = Message.ok("Forced Kill task (强制杀死任务)"); + message.setMethod("/api/entrance/" + id + "/kill"); + message.setStatus(0); + return message; + } + Message message = null; + if (job.isEmpty()) { + logger.warn("can not find a job in entranceServer, will force to kill it"); + JobHistoryHelper.forceKill(taskID); + message = Message.ok("Forced Kill task (强制杀死任务)"); + message.setMethod("/api/entrance/" + id + "/kill"); + message.setStatus(0); + return message; + } else { + try { + logger.info("begin to kill job {} ", ((Job)job.get()).getId()); + ((Job)job.get()).kill(); + message = Message.ok("Successfully killed the job(成功kill了job)"); + message.setMethod("/api/entrance/" + id + "/kill"); + message.setStatus(0); + message.data("execID", id); + if (job.get() instanceof EntranceJob) { + EntranceJob entranceJob = (EntranceJob)job.get(); + JobRequest jobReq = entranceJob.getJobRequest(); + entranceJob.updateJobRequestStatus(SchedulerEventState.Cancelled().toString()); + this.entranceServer.getEntranceContext().getOrCreatePersistenceManager().createPersistenceEngine().updateIfNeeded(jobReq); + } + logger.info("end to kill job {} ", ((Job)job.get()).getId()); + } catch (Throwable var9) { + logger.error("kill job {} failed ", ((Job)job.get()).getId(), var9); + message = Message.error("An exception occurred while killing the job, kill failed(kill job的时候出现了异常，kill失败)"); + message.setMethod("/api/entrance/" + id + "/kill"); + message.setStatus(1); + } + return message; + } + } + private void pushLog(String log, Job job) { entranceServer.getEntranceContext().getOrCreateLogManager().onLogUpdate(job, log); } diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/FlowEntranceJob.scala b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/FlowEntranceJob.scala index 759c9f7509..92f011a1c2 100644 --- a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/FlowEntranceJob.scala +++ b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/FlowEntranceJob.scala @@ -137,15 +137,15 @@ class FlowEntranceJob(persistManager:PersistenceManager) extends EntranceExecuti if(! SchedulerEventState.isCompleted(this.getState)){ super.kill() Utils.tryAndWarn(this.killNodes) - transitionCompleted(ErrorExecuteResponse(s"execute job(${getId}) failed!", new FlowExecutionErrorException(90101, s"This Flow killed by user") )) - } + Utils.tryAndWarn(transitionCompleted(ErrorExecuteResponse(s"execute job(${getId}) failed!", new FlowExecutionErrorException(90101, s"This Flow killed by user")))) + } } override def cancel(): Unit = if (! SchedulerEventState.isCompleted(this.getState)) this synchronized { if(! SchedulerEventState.isCompleted(this.getState)){ Utils.tryAndWarn(this.killNodes) super.cancel() - transitionCompleted(ErrorExecuteResponse(s"cancel job(${getId}) execution!", new FlowExecutionErrorException(90101, s"This Flow killed by user") )) + Utils.tryAndWarn(transitionCompleted(ErrorExecuteResponse(s"cancel job(${getId}) execution!", new FlowExecutionErrorException(90101, s"This Flow killed by user")))) } } From eb3ae2966d75cf70941c0c6ff31ffafd1b7d2e9a Mon Sep 17 00:00:00 2001 From: JackChen0810 Date: Mon, 21 Feb 2022 10:30:25 +0800 Subject: [PATCH 09/58] Fix login log printing problem. --- .../dss/standard/app/sso/plugin/filter/SSOPluginFilter.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dss-standard/sso-standard/sso-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/sso/plugin/filter/SSOPluginFilter.scala b/dss-standard/sso-standard/sso-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/sso/plugin/filter/SSOPluginFilter.scala index 6f24b9a7ab..2e46c6224c 100644 --- a/dss-standard/sso-standard/sso-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/sso/plugin/filter/SSOPluginFilter.scala +++ b/dss-standard/sso-standard/sso-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/sso/plugin/filter/SSOPluginFilter.scala @@ -57,7 +57,7 @@ abstract class SSOPluginFilter extends Filter { if(wrappedReq != req) { wrappedReq.getCookies.foreach(resp.addCookie) } - info(s"DSS User: $username succeed to login. and wrappedReq cookies is "+wrappedReq.getCookies.toString) + info(s"DSS User: $username succeed to login.") (ssoMsg.getRedirectUrl, ssoMsg.getWorkspaceName, wrappedReq) } else { (dssMsg.getRedirectUrl, dssMsg.getWorkspaceName, req) From 53dddb3a17e0e4872eb0c053f2c8f21b42ba8487 Mon Sep 17 00:00:00 2001 From: ryanlei Date: Mon, 21 Feb 2022 10:44:44 +0800 Subject: [PATCH 10/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/apps/apiServices/module/apiServicesExecute/index.vue | 2 +- web/src/apps/scriptis/module/workbench/script/script.vue | 4 ++-- web/src/apps/workflows/module/process/module.vue | 4 ++-- web/src/dss/module/resourceSimple/job.vue | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/src/apps/apiServices/module/apiServicesExecute/index.vue b/web/src/apps/apiServices/module/apiServicesExecute/index.vue index 6fd78d8efa..1db316bd23 100755 --- a/web/src/apps/apiServices/module/apiServicesExecute/index.vue +++ b/web/src/apps/apiServices/module/apiServicesExecute/index.vue @@ -163,7 +163,7 @@ export default { // 后续的执行逻辑 if (this.excuteLoading) { // 停止执行 if(!(this.apiData && this.apiData.execID)) return this.$Message.error({ content: '任务暂时未生成返回，请稍后再试或联系管理员！' }); - api.fetch(`/entrance/${this.apiData.execID}/kill`, {taskID: this.apiData.taskID}, 'get').then(() => { + api.fetch(`/dss/flow/entrance/${this.apiData.execID}/kill`, {taskID: this.apiData.taskID}, 'get').then(() => { // kill成功后，去查kill后的状态 this.$refs.currentConsole.killExecute(true); const name = this.apiData.name; diff --git a/web/src/apps/scriptis/module/workbench/script/script.vue b/web/src/apps/scriptis/module/workbench/script/script.vue index e3989e159b..c5a28dddf0 100755 --- a/web/src/apps/scriptis/module/workbench/script/script.vue +++ b/web/src/apps/scriptis/module/workbench/script/script.vue @@ -477,7 +477,7 @@ export default { // fix http://dpms.weoa.com/#/product/100199/bug/detail/199545 if (this.node) { setTimeout(()=>{ - this.resizePanel() + this.resizePanel() }) } }, @@ -977,7 +977,7 @@ export default { }, stop(cb) { if (this.execute && this.execute.id) { - api.fetch(`/entrance/${this.execute.id}/kill`, {taskID: this.execute.taskID}, 'get').then(() => { + api.fetch(`/dss/flow/entrance/${this.execute.id}/kill`, {taskID: this.execute.taskID}, 'get').then(() => { this.execute.trigger('stop'); this.execute.trigger('error'); this.execute.trigger('kill'); diff --git a/web/src/apps/workflows/module/process/module.vue b/web/src/apps/workflows/module/process/module.vue index 15b6772082..a586fd5d32 100755 --- a/web/src/apps/workflows/module/process/module.vue +++ b/web/src/apps/workflows/module/process/module.vue @@ -109,7 +109,7 @@