Merge remote-tracking branch 'origin/dev-1.1.4' into dev-1.1.4

Author: wushengyeyouya

sbin/dss-start-all.sh

@@ -107,10 +107,6 @@ function startDssProject(){
 #  fi
 #  echo "------------------------the project service is registered to eureka successfully------------------------------------------------"
 
-	SERVER_NAME=dss-framework-orchestrator-server
-	SERVER_IP=$DSS_FRAMEWORK_ORCHESTRATOR_SERVER_INSTALL_IP
-	startApp
-
 	SERVER_NAME=dss-apiservice-server
 	SERVER_IP=$DSS_APISERVICE_SERVER_INSTALL_IP
 	startApp
@@ -119,10 +115,6 @@ function startDssProject(){
   SERVER_IP=$DSS_SCRIPTIS_SERVER_INSTALL_IP
   startApp
 
-	SERVER_NAME=dss-workflow-server
-	SERVER_IP=$DSS_WORKFLOW_SERVER_INSTALL_IP
-	startApp
-
 	SERVER_NAME=dss-flow-execution-server
 	SERVER_IP=$DSS_FLOW_EXECUTION_SERVER_INSTALL_IP
 	startApp
@@ -139,6 +131,14 @@ function startDssProject(){
 	SERVER_IP=$DSS_GUIDE_SERVER_INSTALL_IP
   startApp
 
+  SERVER_NAME=dss-framework-orchestrator-server
+	SERVER_IP=$DSS_FRAMEWORK_ORCHESTRATOR_SERVER_INSTALL_IP
+	startApp
+
+	SERVER_NAME=dss-workflow-server
+	SERVER_IP=$DSS_WORKFLOW_SERVER_INSTALL_IP
+	startApp
+
 }
 
 function checkDssService(){

web/packages/shared/common/service/api.js

@@ -421,9 +421,6 @@ const action = function (url, data, option) {
           Notice.error({desc: msg,  title: '错误提示', duration: 4});
           throw error;
         }
-        setTimeout(() => {
-          lastMsg = ''
-        }, 4000)
       }
       if (error.message === API_ERR_MSG || error.msg === API_ERR_MSG) {
         if (showApiErrorTips) {
@@ -436,6 +433,9 @@ const action = function (url, data, option) {
       } else {
         showErrMsg()
       }
+      setTimeout(() => {
+        lastMsg = ''
+      }, 4000)
     });
 };