From 2b460dd7f36849659f80e98fbdf0d3fcf0a9b0c2 Mon Sep 17 00:00:00 2001
From: peacewong <wpeace1212@gmail.com>
Date: Tue, 11 Feb 2020 17:30:54 +0800
Subject: [PATCH 1/2]  to remove the useless dependencies  closes #290

---
 ujes/definedEngines/shell/engine/pom.xml              | 11 +----------
 ujes/definedEngines/shell/enginemanager/pom.xml       |  6 ++++++
 .../enginemanager/src/main/assembly/distribution.xml  |  4 ----
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/ujes/definedEngines/shell/engine/pom.xml b/ujes/definedEngines/shell/engine/pom.xml
index c58ab8d7c3..d09c4aa0bb 100644
--- a/ujes/definedEngines/shell/engine/pom.xml
+++ b/ujes/definedEngines/shell/engine/pom.xml
@@ -40,20 +40,11 @@
             <artifactId>linkis-ujes-engine</artifactId>
             <version>${linkis.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.webank.wedatasphere.linkis</groupId>
-            <artifactId>linkis-common</artifactId>
-            <version>${linkis.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-feign</artifactId>
-            <version>${spring.eureka.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.linkis</groupId>
             <artifactId>linkis-cloudRPC</artifactId>
             <version>${linkis.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.linkis</groupId>
diff --git a/ujes/definedEngines/shell/enginemanager/pom.xml b/ujes/definedEngines/shell/enginemanager/pom.xml
index 6f6a06ae2d..2eb9aaa178 100644
--- a/ujes/definedEngines/shell/enginemanager/pom.xml
+++ b/ujes/definedEngines/shell/enginemanager/pom.xml
@@ -38,6 +38,12 @@
             <artifactId>linkis-shell-engine</artifactId>
             <version>${linkis.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.webank.wedatasphere.linkis</groupId>
+            <artifactId>linkis-cloudRPC</artifactId>
+            <version>${linkis.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/ujes/definedEngines/shell/enginemanager/src/main/assembly/distribution.xml b/ujes/definedEngines/shell/enginemanager/src/main/assembly/distribution.xml
index 51b5061d43..435d2a957b 100644
--- a/ujes/definedEngines/shell/enginemanager/src/main/assembly/distribution.xml
+++ b/ujes/definedEngines/shell/enginemanager/src/main/assembly/distribution.xml
@@ -34,10 +34,6 @@
             <unpack>false</unpack>
             <useStrictFiltering>true</useStrictFiltering>
             <useTransitiveFiltering>true</useTransitiveFiltering>
-        <excludes>
-            <exclude>org.apache.httpcomponents:httpclient:jar</exclude>
-            <exclude>org.apache.httpcomponents:httpcore:jar</exclude>
-        </excludes>
         </dependencySet>
     </dependencySets>
 

From 2446123de77acea257d2fd65bc3410b99976d1cb Mon Sep 17 00:00:00 2001
From: peacewong <wpeace1212@gmail.com>
Date: Tue, 11 Feb 2020 17:59:23 +0800
Subject: [PATCH 2/2] to modify the suffix of the shell script to .sh closes
 #291

---
 .../wedatasphere/linkis/filesystem/util/WorkspaceUtil.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/util/WorkspaceUtil.java b/publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/util/WorkspaceUtil.java
index 48e4877c9a..6cc7078844 100644
--- a/publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/util/WorkspaceUtil.java
+++ b/publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/util/WorkspaceUtil.java
@@ -54,7 +54,7 @@ public static String getOpenFileTypeByFileName(String path) throws WorkSpaceExce
                 || path.endsWith(".py")
                 || path.endsWith(".mlsql")
                 || path.endsWith(".jdbc")
-                || path.endsWith(".shell")
+                || path.endsWith(".sh")
         ) {
             return "script";
         } else if (path.endsWith(".dolphin")) {