Merge pull request WeBankFinTech#823 from JinyangRao/master

dss1.0.1 adopt to linkis1.1.1
wayson20 · Jun 10, 2022 · aee9c41 · aee9c41
2 parents a347bf7 + fe5ec7f
commit aee9c41
Show file tree

Hide file tree

Showing 11 changed files with 113 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
+spring.spring.servlet.multipart.max-request-size=200MB
+
+wds.linkis.session.ticket.key=bdp-user-ticket-id
diff --git a/dss-appconn/linkis-appconn-engineplugin/pom.xml b/dss-appconn/linkis-appconn-engineplugin/pom.xml
@@ -55,7 +55,7 @@
 
         <dependency>
             <groupId>org.apache.linkis</groupId>
-            <artifactId>linkis-message-scheduler</artifactId>
+            <artifactId>linkis-rpc</artifactId>
             <version>${linkis.version}</version>
             <exclusions>
                 <exclusion>

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
@@ -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
+wds.linkis.engineconn.max.free.time=0
+
+wds.linkis.default.computation.executormanager.clazz=org.apache.linkis.manager.engineplugin.appconn.executor.AppConnComputationExecutorManagerImpl
diff --git a/dss-appconn/linkis-appconn-engineplugin/src/main/resources/log4j2.xml b/dss-appconn/linkis-appconn-engineplugin/src/main/resources/log4j2.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  ~
+  -->
+
+<configuration status="error" monitorInterval="30">
+    <appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger{36} %L %M - %msg%xEx%n"/>
+        </Console>
+        <Send name="Send" >
+            <Filters>
+                <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY" />
+            </Filters>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger{36} %L %M - %msg%xEx%n"/>
+        </Send>
+        <File name="stderr" fileName="${env:PWD}/logs/stderr" append="true">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %class{36} %L %M - %msg%xEx%n"/>
+        </File>
+    </appenders>
+    <loggers>
+        <root level="INFO">
+            <appender-ref ref="Console"/>
+            <appender-ref ref="Send"/>
+        </root>
+        <logger name="org.springframework.boot.diagnostics.LoggingFailureAnalysisReporter " level="error" additivity="true">
+            <appender-ref ref="stderr"/>
+        </logger>
+        <logger name="com.netflix.discovery" level="warn" additivity="true">
+            <appender-ref ref="Send"/>
+        </logger>
+        <logger name="org.apache.hadoop.yarn" level="warn" additivity="true">
+            <appender-ref ref="Send"/>
+        </logger>
+        <logger name="org.springframework" level="warn" additivity="true">
+            <appender-ref ref="Send"/>
+        </logger>
+        <logger name="org.apache.linkis.server.security" level="warn" additivity="true">
+            <appender-ref ref="Send"/>
+        </logger>
+        <logger name="org.apache.hadoop.hive.ql.exec.mr.ExecDriver" level="fatal" additivity="true">
+            <appender-ref ref="Send"/>
+        </logger>
+        <logger name="org.apache.hadoop.hdfs.KeyProviderCache" level="fatal" additivity="true">
+            <appender-ref ref="Send"/>
+        </logger>
+        <logger name="org.spark_project.jetty" level="ERROR" additivity="true">
+            <appender-ref ref="Send"/>
+        </logger>
+        <logger name="org.eclipse.jetty" level="ERROR" additivity="true">
+            <appender-ref ref="Send"/>
+        </logger>
+        <logger name="org.springframework" level="ERROR" additivity="true">
+            <appender-ref ref="Send"/>
+        </logger>
+        <logger name="org.reflections.Reflections" level="ERROR" additivity="true">
+            <appender-ref ref="Send"/>
+        </logger>
+
+    </loggers>
+</configuration>
diff --git a/.../linkis/manager/engineplugin/appconn/executor/AppConnComputationExecutorManagerImpl.scala b/.../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/...rc/main/java/com/webank/wedatasphere/dss/apiservice/core/service/impl/ApiServiceImpl.java b/...rc/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/...ce-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/token/JwtManager.java b/...ce-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/...a/com/webank/wedatasphere/dss/flow/execution/entrance/restful/FlowEntranceRestfulApi.java b/...a/com/webank/wedatasphere/dss/flow/execution/entrance/restful/FlowEntranceRestfulApi.java
@@ -74,7 +74,7 @@ public Message execute(HttpServletRequest req, @RequestBody Map<String, Object>
 //        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<String, Object> params = (Map<String, Object>) json.get("params");
         params.put("workspace", workspace);
         String label = ((Map<String, Object>) json.get(DSSCommonUtils.DSS_LABELS_KEY)).get("route").toString();

diff --git a/pom.xml b/pom.xml
@@ -39,7 +39,7 @@
 
     <properties>
         <dss.version>1.0.1</dss.version>
-        <linkis.version>1.1.0</linkis.version>
+        <linkis.version>1.1.1</linkis.version>
         <scala.version>2.11.12</scala.version>
         <jdk.compile.version>1.8</jdk.compile.version>
         <maven.version>3.3.3</maven.version>