Merge pull request #407 from liuyou2/dev-1.0.0

Fix jobtype run error #406
WeBankFinTech · Aug 31, 2021 · 2b31737 · 2b31737
2 parents 095360b + 67ac9f2
commit 2b31737
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
@@ -52,13 +52,6 @@
             <artifactId>linkis-label-common</artifactId>
             <version>${linkis.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>com.webank.wedatasphere.linkis</groupId>
-            <artifactId>linkis-module</artifactId>
-            <version>${linkis.version}</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/...va/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java b/...va/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java
@@ -26,7 +26,6 @@
 import com.webank.wedatasphere.linkis.manager.label.entity.engine.EngineTypeLabel;
 import com.webank.wedatasphere.linkis.manager.label.utils.EngineTypeLabelCreator;
 import com.webank.wedatasphere.linkis.protocol.utils.TaskUtils;
-import com.webank.wedatasphere.linkis.server.BDPJettyServerHelper;
 import com.webank.wedatasphere.linkis.ujes.client.request.JobExecuteAction;
 import com.webank.wedatasphere.linkis.ujes.client.request.JobSubmitAction;
 
@@ -75,7 +74,8 @@ private Map<String, Object> prepareYarnLabel(Job job) {
     private String parseExecutionCode(Job job) {
         String code = job.getCode();
         if (StringUtils.isEmpty(code) || code.equalsIgnoreCase("null")) {
-            code = BDPJettyServerHelper.gson().toJson(job.getParams());
+            Gson gson = new Gson();
+            code = gson.toJson(job.getParams());
             logger.info("The executable code for the job is {}", code);
         }
         return code;