Merge pull request #491 from kingsGlory/dev-1.1.0-ctyun

Dev 1.1.0 ctyun

Author: HmhWz

.gitignore

@@ -1,34 +1,105 @@
-*.iml
 .idea
+.idea/*
+
 .DS_Store
-*.class
 
 assembly/target
+assembly/dss-package/target
+
+
+# dss-commons
+dss-commons/dss-sender-service/target
+
+# dss-appconn
+dss-appconn/appconns/dss-datachecker-appconn/target
+dss-appconn/appconns/dss-eventchecker-appconn/target
+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/dss-appconn-core/target
+dss-appconn/dss-appconn-loader/target
+dss-appconn/dss-schedule-appconn-core/target
+dss-appconn/linkis-appconn-engineplugin/target
+dss-appconn/appconns/dss-dolphinscheduler-appconn/target
+dss-appconn/dss-appconn-manager/dss-appconn-manager-client/target
+dss-appconn/dss-appconn-manager/dss-appconn-manager-core/target
+dss-appconn/dss-scheduler-appconn/target
+
+# dss-apps
+dss-apps/dss-apiservice-server/target
+
+# dss-commons
+dss-commons/dss-common/target
+dss-commons/dss-contextservice/target
+
+# dss-framework
+dss-framework/dss-appconn-framework/target
+dss-framework/dss-framework-common/target
+dss-framework/dss-framework-orchestrator-server/target
+dss-framework/dss-framework-project-server/target
+dss-framework/dss-framework-workspace-server/target
+dss-framework/framework-plugins/dss-framework-orchestrator-publish/target
+dss-framework/framework-plugins/dss-framework-release-server/target
+dss-framework/dss-framework-admin/target
+dss-framework/dss-framework-sql-template/target
+dss-framework/dss-framework-dbapi-server/target
+dss-framework/dss-framework-ctyun-service/target
 
-datachecker-appjoint/target/
-dss-appjoint-auth/target/
-dss-appjoint-core/target/
-dss-appjoint-loader/target/
-dss-application/target/
-dss-azkaban-scheduler-appjoint/target/
-dss-common/target/
-dss-flow-execution-entrance/target/
-dss-linkis-node-execution/target/
-dss-scheduler-appjoint-core/target/
-dss-server/target/
-eventchecker-appjoint/target/
-plugins/azkaban/linkis-jobtype/target/
-plugins/linkis/linkis-appjoint-entrance/target/
-
-sendemail-appjoint/sendemail-core/target/
-visualis-appjoint/appjoint/target/
-
-dss-user-manager/target/
-logs
-### Example user template template
-### Example user template
 
-# IntelliJ project files
+# dss-orchestrator
+dss-orchestrator/dss-orchestrator-common/target
+dss-orchestrator/dss-orchestrator-core/target
+dss-orchestrator/dss-orchestrator-db/target
+dss-orchestrator/dss-orchestrator-loader/target
+dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/target
+dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/target
+dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/target
+dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/target
+dss-orchestrator/dss-orchestrator-conversion-standard/target
+dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/target
+dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/target
 
-out
-gen
+# dss-standars
+dss-standard/dss-standard-common/target
+dss-standard/sso-standard/origin-sso-integration-standard/target
+dss-standard/sso-standard/spring-origin-sso-integration-plugin/target
+dss-standard/sso-standard/sso-integration-standard/target
+dss-standard/development-standard/development-process-standard/target
+dss-standard/development-standard/development-process-standard-execution/target
+dss-standard/structure-standard/dss-project-plugin/target
+dss-standard/structure-standard/dss-role-plugin/target
+dss-standard/structure-standard/dss-structure-integration-standard
+dss-standard/structure-standard/spring-origin-dss-project-plugin/target
+
+#dss-data-api
+dss-data-api/dss-data-api-server/src/main/resources
+dss-data-api/dss-api-sql-template/target
+dss-data-api/dss-data-api-server/target
+
+#dss-data-governance
+dss-data-governance/dss-data-governance-server/src/main/resources
+dss-data-governance/dss-data-governance-server/target
+dss-data-governance/dss-data-governance-common/target
+dss-data-governance/dss-data-asset-server/target
+dss-data-governance/dss-data-classification-server/target
+dss-data-governance/dss-data-warehouse-dao/target
+dss-data-governance/dss-data-warehouse-service/target
+dss-data-governance/dss-data-warehouse-server/target
+
+#dss-guide
+dss-guide/dss-guide-server/src/main/resources/
+dss-guide/dss-guide-server/target
+
+
+# plugins
+plugins/azkaban/linkis-jobtype/target
+plugins/linkis/dss-gateway-support/target
+
+logs
+logs/*
+
+*.iml
+/plugins/dolphinscheduler/linkis-dolphinscheduler-client/target/

assembly/config/config.sh

@@ -1,12 +1,12 @@
 ### deploy user
-deployUser=hadoop
+deployUser=root
 
-##微服务的最大内存使用量
+##微服务的�大内存使用量
 SERVER_HEAP_SIZE="512M"
 
 
 ### The install home path of DSS，Must provided
-DSS_INSTALL_HOME=/appcom/Install/dss-dev
+DSS_INSTALL_HOME=/usr/local/anlexander/all_bak/dss_linkis/dss-linkis-1.0.2
 
 ###  Linkis EUREKA  information.  # Microservices Service Registration Discovery Center
 EUREKA_INSTALL_IP=127.0.0.1
@@ -17,7 +17,10 @@ EUREKA_PORT=20303
 #WORKSPACE_USER_ROOT_PATH=file:///tmp/linkis/
 #### Path to store job ResultSet：file or hdfs path
 #RESULT_SET_ROOT_PATH=hdfs:///tmp/linkis
-
+WORKSPACE_USER_ROOT_PATH=file:///tmp/linkis/
+### Path to store job ResultSet¿file or hdfs path
+#RESULT_SET_ROOT_PATH=hdfs:///tmp/linkis
+RESULT_SET_ROOT_PATH=hdfs:///tmp/linkis
 ### Linkis Gateway  information
 GATEWAY_INSTALL_IP=127.0.0.1
 GATEWAY_PORT=9001
@@ -76,6 +79,6 @@ EMAIL_PASSWORD=xxxxx
 EMAIL_PROTOCOL=smtp
 ############## ############## dss_appconn_instance configuration   end   ############## ##############
 
-DSS_VERSION=1.0.1
+DSS_VERSION=1.0.0
 
-DSS_FILE_NAME="dss-$DSS_VERSION"
+DSS_FILE_NAME="dss-$DSS_VERSION"

assembly/config/db.sh

@@ -1,8 +1,8 @@
 ### for DSS-Server and Eventchecker APPCONN
-MYSQL_HOST=127.0.0.1
-MYSQL_PORT=3306
-MYSQL_DB=dss_dev
-MYSQL_USER=hadoop
-MYSQL_PASSWORD=hadoop
+MYSQL_HOST=
+MYSQL_PORT=
+MYSQL_DB=
+MYSQL_USER=
+MYSQL_PASSWORD=
 
 

assembly/dss-package/pom.xml

@@ -51,6 +51,10 @@
                     <artifactId>hibernate-validator</artifactId>
                     <groupId>org.hibernate.validator</groupId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.ws.rs</groupId>
+                    <artifactId>javax.ws.rs-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -62,12 +66,22 @@
                     <artifactId>jackson-core</artifactId>
                     <groupId>com.fasterxml.jackson.core</groupId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.ws.rs</groupId>
+                    <artifactId>javax.ws.rs-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-sender-service</artifactId>
             <version>${dss.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.ws.rs</groupId>
+                    <artifactId>javax.ws.rs-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -125,8 +139,19 @@
             <groupId>org.glassfish.jersey.ext</groupId>
             <artifactId>jersey-bean-validation</artifactId>
             <version>2.21</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.ws.rs</groupId>
+                    <artifactId>javax.ws.rs-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>jsr311-api</artifactId>
+            <version>1.1.1</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -211,6 +211,16 @@
       </includes>
     </fileSet>
 
+    <fileSet>
+      <directory>
+        ${basedir}/../../dss-appconn/appconns/dss-dolphinscheduler-appconn/target/out/
+      </directory>
+      <outputDirectory>dss-appconns</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
+
     <fileSet>
       <directory>
         ${basedir}/../../dss-appconn/linkis-appconn-engineplugin/target/
@@ -251,5 +261,38 @@
         <include>**/*</include>
       </includes>
     </fileSet>
+
+    <!--dss-data-api-server-->
+    <fileSet>
+      <directory>
+        ${basedir}/../../dss-data-api/dss-data-api-server/target/out/dss-data-api-server/lib/
+      </directory>
+      <outputDirectory>lib/dss-data-api/dss-data-api-server</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
+
+    <!--dss-data-governance-server-->
+    <fileSet>
+      <directory>
+        ${basedir}/../../dss-data-governance/dss-data-governance-server/target/out/dss-data-governance-server/lib/
+      </directory>
+      <outputDirectory>lib/dss-data-governance/dss-data-governance-server</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
+
+    <!--dss-guide-server-->
+    <fileSet>
+      <directory>
+        ${basedir}/../../dss-guide/dss-guide-server/target/out/dss-guide-server/lib/
+      </directory>
+      <outputDirectory>lib/dss-guide/dss-guide-server</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
   </fileSets>
 </assembly>

assembly/pom.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Copyright 2019 WeBank
+  ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
+  ~  you may not use this file except in compliance with the License.
   ~ You may obtain a copy of the License at
   ~
   ~ http://www.apache.org/licenses/LICENSE-2.0

conf/atlas-application.properties

@@ -0,0 +1,39 @@
+#
+# /*
+#  * Copyright 2019 WeBank
+#  *
+#  * Licensed under the Apache License, Version 2.0 (the "License");
+#  *  you may not use this file except in compliance with the License.
+#  * You may obtain a copy of the License at
+#  *
+#  * http://www.apache.org/licenses/LICENSE-2.0
+#  *
+#  * Unless required by applicable law or agreed to in writing, software
+#  * distributed under the License is distributed on an "AS IS" BASIS,
+#  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  * See the License for the specific language governing permissions and
+#  * limitations under the License.
+#  */
+#
+
+# Spring configurations
+spring.server.port=9208
+spring.spring.application.name=dss-data-api-server
+
+wds.linkis.log.clear=true
+
+wds.linkis.server.version=v1
+
+##restful
+wds.linkis.server.restful.scan.packages=com.webank.wedatasphere.dss.data.api.server.restful
+
+##mybatis
+wds.linkis.server.mybatis.mapperLocations=classpath*:com/webank/wedatasphere/dss/data/api/server/dao/impl/*.xml
+
+wds.linkis.server.mybatis.typeAliasesPackage=com.webank.wedatasphere.dss.data.api.server.entity
+
+wds.linkis.server.mybatis.BasePackage=com.webank.wedatasphere.dss.data.api.server.dao
+
+#wds.linkis.gateway.ip=127.0.0.1
+#wds.linkis.gateway.port=9001
+#wds.linkis.gateway.url=http://127.0.0.1:9001/