diff --git a/conf/dss-framework-orchestrator-server.properties b/conf/dss-framework-orchestrator-server.properties index c1f80dc566..3119ce02f9 100644 --- a/conf/dss-framework-orchestrator-server.properties +++ b/conf/dss-framework-orchestrator-server.properties @@ -18,7 +18,7 @@ spring.server.port=9203 spring.spring.application.name=dss-framework-orchestrator-server -wds.linkis.test.mode=true +wds.linkis.test.mode=false wds.linkis.test.user=neiljianliu diff --git a/conf/dss-workflow-server.properties b/conf/dss-workflow-server.properties index d76bbc5dd8..82bf35fb36 100644 --- a/conf/dss-workflow-server.properties +++ b/conf/dss-workflow-server.properties @@ -18,7 +18,7 @@ spring.server.port=9207 spring.spring.application.name=dss-workflow-server -wds.linkis.test.mode=true +wds.linkis.test.mode=false wds.linkis.test.user=neiljianliu diff --git a/conf/dss.properties b/conf/dss.properties index 96648dec80..d6a574acdb 100644 --- a/conf/dss.properties +++ b/conf/dss.properties @@ -33,4 +33,6 @@ wds.dss.appconn.scheduler.job.label=dev 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.session.ticket.key=bdp-user-ticket-id \ No newline at end of file diff --git a/dss-appconn/linkis-appconn-engineplugin/pom.xml b/dss-appconn/linkis-appconn-engineplugin/pom.xml index f2cf5f2168..39d30932b1 100644 --- a/dss-appconn/linkis-appconn-engineplugin/pom.xml +++ b/dss-appconn/linkis-appconn-engineplugin/pom.xml @@ -55,7 +55,7 @@ org.apache.linkis - linkis-message-scheduler + linkis-rpc ${linkis.version} 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 0d0999d6e6..570b955334 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 @@ -50,4 +50,6 @@ spring.spring.servlet.multipart.max-file-size=200MB 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 +wds.linkis.engineconn.max.free.time=0 + +wds.linkis.default.computation.executormanager.clazz=org.apache.linkis.manager.engineplugin.appconn.executor.AppConnComputationExecutorManagerImpl \ No newline at end of file diff --git a/dss-appconn/linkis-appconn-engineplugin/src/main/resources/log4j2.xml b/dss-appconn/linkis-appconn-engineplugin/src/main/resources/log4j2.xml new file mode 100644 index 0000000000..a928038938 --- /dev/null +++ b/dss-appconn/linkis-appconn-engineplugin/src/main/resources/log4j2.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dss-appconn/linkis-appconn-engineplugin/src/main/scala/org/apache/linkis/manager/engineplugin/appconn/executor/AppConnComputationExecutorManagerImpl.scala b/dss-appconn/linkis-appconn-engineplugin/src/main/scala/org/apache/linkis/manager/engineplugin/appconn/executor/AppConnComputationExecutorManagerImpl.scala new file mode 100644 index 0000000000..bd716efc2e --- /dev/null +++ b/dss-appconn/linkis-appconn-engineplugin/src/main/scala/org/apache/linkis/manager/engineplugin/appconn/executor/AppConnComputationExecutorManagerImpl.scala @@ -0,0 +1,26 @@ +/* + * Copyright 2019 WeBank + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.linkis.manager.engineplugin.appconn.executor + +import org.apache.linkis.engineconn.computation.executor.creation.ComputationExecutorManagerImpl +import org.apache.linkis.manager.label.entity.Label + + +class AppConnComputationExecutorManagerImpl extends ComputationExecutorManagerImpl { + + override protected def getLabelKey(labels: Array[Label[_]]): String = "appconn" +} diff --git a/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/service/impl/ApiServiceImpl.java b/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/service/impl/ApiServiceImpl.java index 16c0e3db8f..b81259acbb 100644 --- a/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/service/impl/ApiServiceImpl.java +++ b/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/service/impl/ApiServiceImpl.java @@ -46,7 +46,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.http.Consts; import org.apache.ibatis.annotations.Param; -import org.mortbay.log.Log; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -245,7 +244,7 @@ public void update(ApiServiceVo apiService) throws Exception { apiService.setCreator(maxTargetApiVersionVo.getCreator()); apiService.setId(maxTargetApiVersionVo.getApiId()); apiServiceDao.updateToTarget(apiService); - Log.info("Update to other Api Service, ID: " + apiService.getTargetServiceId() + ",resourceId:" + maxTargetApiVersionVo.getBmlResourceId()); + LOG.info("Update to other Api Service, ID: " + apiService.getTargetServiceId() + ",resourceId:" + maxTargetApiVersionVo.getBmlResourceId()); String version = updateResult.get("version"); diff --git a/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/token/JwtManager.java b/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/token/JwtManager.java index ba8ada90de..522ec1e6a3 100644 --- a/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/token/JwtManager.java +++ b/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/token/JwtManager.java @@ -29,7 +29,6 @@ import io.jsonwebtoken.SignatureException; import io.jsonwebtoken.UnsupportedJwtException; import io.jsonwebtoken.impl.crypto.MacProvider; -import org.mortbay.log.Log; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.crypto.SecretKey; @@ -71,7 +70,7 @@ public final static TemporalAmount getTokenHour() { public static SecretKey generalKey() { byte[] encodedKey = Base64.decode(JWT_SECERT); SecretKey key = new SecretKeySpec(encodedKey, 0, encodedKey.length, "AES"); - Log.info("token key str:"+key.toString()); + LOG.info("token key str:"+key.toString()); return key; } 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 21244d843d..45363bcdfe 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 @@ -74,7 +74,7 @@ public Message execute(HttpServletRequest req, @RequestBody Map // try{ logger.info("Begin to get an execID"); DSSWorkspace workspace = SSOHelper.getWorkspace(req); - json.put(TaskConstant.UMUSER, SecurityFilter.getLoginUsername(req)); + json.put(TaskConstant.EXECUTE_USER, SecurityFilter.getLoginUsername(req)); Map params = (Map) json.get("params"); params.put("workspace", workspace); String label = ((Map) json.get(DSSCommonUtils.DSS_LABELS_KEY)).get("route").toString(); diff --git a/pom.xml b/pom.xml index 3fe07652d5..23f8157d0a 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 1.0.1 - 1.1.0 + 1.1.1 2.11.12 1.8 3.3.3