From b3dbc599bd42305d791283b24eac4ea743d616a3 Mon Sep 17 00:00:00 2001 From: zqburde Date: Thu, 8 Dec 2022 15:54:24 +0800 Subject: [PATCH 1/2] Add version 1.1.0 to 1.1.1 sql. --- db/version_update/from_v110_to_v111.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 db/version_update/from_v110_to_v111.sql diff --git a/db/version_update/from_v110_to_v111.sql b/db/version_update/from_v110_to_v111.sql new file mode 100644 index 0000000000..a78764a786 --- /dev/null +++ b/db/version_update/from_v110_to_v111.sql @@ -0,0 +1,8 @@ +select @schedulis_appconn_id:=id from dss_appconn where appconn_name='schedulis'; +update dss_appconn_instance set enhance_json = '{"reqUri":""}', homepage_uri = '/manager' where appconn_id = @schedulis_appconn_id; + +select @qualitis_appconn_id:=id from dss_appconn where appconn_name='qualitis'; +update dss_appconn_instance set enhance_json = '{"reqUri":""}', homepage_uri = '#/dashboard' where appconn_id = @qualitis_appconn_id; + +select @dolphinscheduler_appconn_id:=id from dss_appconn where appconn_name='dolphinscheduler'; +update dss_appconn_instance set enhance_json = '{"reqUri":"dolphinscheduler/projects/analysis/define-user-count"}', homepage_uri = 'dolphinscheduler' where appconn_id = @dolphinscheduler_appconn_id; \ No newline at end of file From c04e8d985e2aa7830189e8ebf30a99008048ee26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=96=87=E5=90=9B?= <17366018883@163.com> Date: Thu, 29 Dec 2022 11:17:15 +0800 Subject: [PATCH 2/2] Linkis removes common lang package adaptation --- .../execution/execution/impl/LinkisNodeExecutionImpl.java | 4 ++-- .../wedatasphere/dss/linkis/node/execution/job/Builder.java | 2 +- .../dss/linkis/node/execution/parser/CodeParser.java | 2 +- .../node/execution/service/impl/BuildJobActionImpl.java | 4 ++-- .../linkis/node/execution/utils/LinkisJobExecutionUtils.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/execution/impl/LinkisNodeExecutionImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/execution/impl/LinkisNodeExecutionImpl.java index 9615f5c112..0c8a636997 100644 --- a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/execution/impl/LinkisNodeExecutionImpl.java +++ b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/execution/impl/LinkisNodeExecutionImpl.java @@ -39,7 +39,7 @@ import org.apache.linkis.ujes.client.response.JobInfoResult; import org.apache.linkis.ujes.client.response.JobLogResult; import org.apache.linkis.ujes.client.response.OpenLogResult; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import scala.tools.nsc.settings.Final; import java.text.MessageFormat; @@ -49,7 +49,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class LinkisNodeExecutionImpl implements LinkisNodeExecution , LinkisExecutionListener { diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/job/Builder.java b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/job/Builder.java index bc36a4a7b7..c282e1bc2c 100644 --- a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/job/Builder.java +++ b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/job/Builder.java @@ -23,7 +23,7 @@ import com.webank.wedatasphere.dss.linkis.node.execution.utils.LinkisJobExecutionUtils; import com.webank.wedatasphere.dss.linkis.node.execution.utils.LinkisUjesClientUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.linkis.common.utils.JsonUtils; import org.apache.linkis.httpclient.dws.DWSHttpClient; import org.apache.linkis.httpclient.dws.config.DWSClientConfig; diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/parser/CodeParser.java b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/parser/CodeParser.java index cecc1cf17d..78a4bca414 100644 --- a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/parser/CodeParser.java +++ b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/parser/CodeParser.java @@ -35,7 +35,7 @@ import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class CodeParser implements JobParser { diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java index 956d03d0ff..3692ad228d 100644 --- a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java +++ b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java @@ -22,8 +22,8 @@ import com.webank.wedatasphere.dss.linkis.node.execution.job.Job; import com.webank.wedatasphere.dss.linkis.node.execution.job.LinkisJob; import com.webank.wedatasphere.dss.linkis.node.execution.service.BuildJobAction; -import org.apache.commons.lang.SerializationUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.SerializationUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.linkis.manager.label.constant.LabelKeyConstant; import org.apache.linkis.manager.label.entity.engine.EngineTypeLabel; import org.apache.linkis.manager.label.utils.EngineTypeLabelCreator; diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/utils/LinkisJobExecutionUtils.java b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/utils/LinkisJobExecutionUtils.java index e91264b720..4af58571ae 100644 --- a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/utils/LinkisJobExecutionUtils.java +++ b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/utils/LinkisJobExecutionUtils.java @@ -21,7 +21,7 @@ import com.google.gson.reflect.TypeToken; import com.webank.wedatasphere.dss.linkis.node.execution.conf.LinkisJobExecutionConfiguration; import com.webank.wedatasphere.dss.linkis.node.execution.entity.BMLResource; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.*;