Merge pull request #449 from JackChen0810/dev-1.0.1

fix bug #448

Author: liuyou2

dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/OrchestratorIERestful.java

@@ -157,15 +157,14 @@ public void exportOrcFile(@Context HttpServletRequest req,
 
     //生成label list
     public List<DSSLabel> getDSSLabelList(String labels) {
-        //原来的逻辑
-//        List<DSSLabel> dssLabelList = Arrays.asList(dssLabels.split(",")).stream().map(label -> {
-//            DSSLabel dssLabel = new EnvDSSLabel(label);
-//            return dssLabel;
-//        }).collect(Collectors.toList());
         String labelStr = DSSCommonUtils.ENV_LABEL_VALUE_DEV;
-        Map<String, Object> labelMap = DSSCommonUtils.COMMON_GSON.fromJson(labels, Map.class);
-        if (labelMap.containsKey(LabelKeyConvertor.ROUTE_LABEL_KEY)) {
-            labelStr = (String) labelMap.get(LabelKeyConvertor.ROUTE_LABEL_KEY);
+        try{
+            Map<String, Object> labelMap = DSSCommonUtils.COMMON_GSON.fromJson(labels, Map.class);
+            if (labelMap.containsKey(LabelKeyConvertor.ROUTE_LABEL_KEY)) {
+                labelStr = (String) labelMap.get(LabelKeyConvertor.ROUTE_LABEL_KEY);
+            }
+        }catch (Exception e){
+            logger.error("get labels failed for {}", e.getMessage());
         }
         List<DSSLabel> dssLabelList = Arrays.asList(new EnvDSSLabel(labelStr));
         return dssLabelList;

dss-standard/sso-standard/origin-sso-integration-standard/src/main/scala/com/webank/wedatasphere/dss/standard/app/sso/origin/plugin/OriginSSOMsgParseOperation.scala

@@ -31,14 +31,14 @@ class OriginSSOMsgParseOperation extends AbstractSSOMsgParseOperation {
     val dssUrl = dssMsg.getDSSUrl
     val dwsHttpClient:Client=null
     Utils.tryFinally({
-    val dwsHttpClient = HttpClient.getHttpClient(dssUrl, "DSS")
-    val userInfoAction = new UserInfoAction
-    HttpClient.addCookies(dssMsg, userInfoAction)
-    dwsHttpClient.execute(userInfoAction) match {
-      case userInfoResult: UserInfoResult =>
-        userInfoResult.getUserName
-    }
-  })(IOUtils.closeQuietly(dwsHttpClient))
+      val dwsHttpClient = HttpClient.getHttpClient(dssUrl, "DSS")
+      val userInfoAction = new UserInfoAction
+      HttpClient.addCookies(dssMsg, userInfoAction)
+      dwsHttpClient.execute(userInfoAction) match {
+        case userInfoResult: UserInfoResult =>
+          userInfoResult.getUserName
+      }
+    })(Utils.tryQuietly(dwsHttpClient.close()))
   }
 
 }

sbin/dss-start-all.sh

@@ -43,7 +43,7 @@ source $DSS_HOME/conf/config.sh
 function startApp(){
 echo "<-------------------------------->"
 echo "Begin to start $SERVER_NAME"
-SERVER_START_CMD="sh $DSS_INSTALL_HOME/sbin/dss-daemon.sh restart $SERVER_NAME"
+SERVER_START_CMD="sh $DSS_HOME/sbin/dss-daemon.sh restart $SERVER_NAME"
 if test -z "$SERVER_IP"
 then
   SERVER_IP=$local_host

web/src/apps/workflows/module/workflow/index.vue

@@ -510,7 +510,7 @@ export default {
       this.publishingList = this.publishingList.filter((i) => i !== id);
     },
     orchestratorImport() {
-      this.uploadUrl = `/api/rest_j/v1/dss/framework/orchestrator/importOrchestratorFile?labels=dev`
+      this.uploadUrl = `/api/rest_j/v1/dss/framework/orchestrator/importOrchestratorFile`
       this.uploadData = {
         projectName: this.$route.query.projectName,
         projectID: +this.$route.query.projectID,