Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio into dev-1.1.4

Author: ElishaZhang

.gitignore

@@ -17,7 +17,6 @@ dss-appconn/appconns/dss-orchestrator-framework-appconn/target
 dss-appconn/appconns/dss-schedulis-appconn/target
 dss-appconn/appconns/dss-sendemail-appconn/esb-email-support/target
 dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/target
-dss-appconn/appconns/dss-visualis-appconn/target
 dss-appconn/appconns/dss-workflow-appconn/target
 dss-appconn/appconns/dss-sso-appconn/target
 dss-appconn/appconns/dss-scriptis-appconn-appconn/target

assembly/dss-package/src/main/assembly/distribution.xml

@@ -189,17 +189,6 @@
       </includes>
     </fileSet>
 
-    <!--dss-visualis-appconn-->
-    <fileSet>
-      <directory>
-        ${basedir}/../../dss-appconn/appconns/dss-visualis-appconn/target/out/
-      </directory>
-      <outputDirectory>dss-appconns</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-
     <!--dss-sso-appconn-->
     <fileSet>
       <directory>

conf/dss-guide-server.properties

@@ -51,3 +51,5 @@ host.gitbook.path=/appcom/Install/ApacheInstall/gitbook_books
 target.gitbook.path=/appcom/Install/ApacheInstall
 #SUMMARY.md ignore absolve
 summary.ignore.model=km
+#sync model include: gitbook or database
+guide.sync.model=gitbook

db/dss_dml.sql

@@ -403,5 +403,9 @@ INSERT INTO `dss_workspace_appconn_role` (`workspace_id`, `appconn_id`, `role_id
 INSERT INTO `dss_workspace_appconn_role` (`workspace_id`, `appconn_id`, `role_id`, `priv`, `update_time`, `updateby`) VALUES('-1',@workflow_appconn_id,'6','1',now(),'system');
 INSERT INTO `dss_workspace_appconn_role` (`workspace_id`, `appconn_id`, `role_id`, `priv`, `update_time`, `updateby`) VALUES('-1',@workflow_appconn_id,'7','1',now(),'system');
 
+INSERT INTO `dss_workspace_appconn_role` (`workspace_id`, `appconn_id`, `role_id`, `priv`, `update_time`, `updateby`) VALUES('224',@scriptis_appconn_id,'1','1',now(),'system');
+INSERT INTO `dss_workspace_appconn_role` (`workspace_id`, `appconn_id`, `role_id`, `priv`, `update_time`, `updateby`) VALUES('224',@workflow_appconn_id,'1','1',now(),'system');
+INSERT INTO `dss_workspace_appconn_role` (`workspace_id`, `appconn_id`, `role_id`, `priv`, `update_time`, `updateby`) VALUES('224',@apiservice_appconn_id,'1','1',now(),'system');
+
 
 INSERT INTO `dss_workspace_admin_dept` (`id`, `parent_id`, `ancestors`, `dept_name`, `order_num`, `leader`, `phone`, `email`, `status`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES('100','0','0','基础科技','0','leader01','1888888888','123@qq.com','0','0','admin',now(),'admin',now());

dss-appconn/appconns/dss-dolphinscheduler-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/dolphinscheduler/conversion/NodeConverter.java

@@ -73,6 +73,7 @@ public DolphinSchedulerTask convertNode(DolphinSchedulerConvertedRel dolphinSche
             addObjectLine.accept("JOB_SOURCE", sourceMap);
             addLine.accept("CONTEXT_ID", workflow.getContextID());
             addLine.accept("LINKIS_GATEWAY_URL", Configuration.getGateWayURL());
+            addLine.accept("DS_VERSION", DolphinSchedulerConf.DS_VERSION.getValue());
             //todo
             addLine.accept("RUN_DATE", "${global_run_date}");
             addObjectLine.accept("JOB_LABELS", new EnvDSSLabel(SchedulerConf.JOB_LABEL.getValue()).getValue());