Merge remote-tracking branch 'origin/dev-1.1.20'

# Conflicts: # assembly/bin/appconn-refresh.sh # assembly/dss-package/pom.xml # assembly/pom.xml # conf/application-dss.yml # conf/dss-framework-orchestrator-server.properties # db/dss_ddl.sql # db/dss_dml.sql # dss-appconn/appconns/dss-datachecker-appconn/pom.xml # dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/common/CheckDataObject.java # dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/connector/DataCheckerDao.java # dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/utils/QualitisUtil.java # dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml # dss-appconn/appconns/dss-eventchecker-appconn/pom.xml # dss-appconn/appconns/dss-schedulis-appconn/pom.xml # dss-appconn/appconns/dss-scriptis-appconn/pom.xml # dss-appconn/appconns/dss-sendemail-appconn/pom.xml # dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml # dss-appconn/appconns/dss-sso-appconn/pom.xml # dss-appconn/appconns/dss-workflow-appconn/pom.xml # dss-appconn/dss-appconn-core/pom.xml # dss-appconn/dss-appconn-loader/pom.xml # dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml # dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml # dss-appconn/dss-appconn-manager/pom.xml # dss-appconn/dss-scheduler-appconn/pom.xml # dss-appconn/linkis-appconn-engineplugin/pom.xml # dss-appconn/pom.xml # dss-apps/dss-apiservice-server/pom.xml # dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/service/impl/ApiServiceQueryServiceImpl.java # dss-apps/dss-apps-server/pom.xml # dss-apps/dss-data-api/dss-api-sql-template/pom.xml # dss-apps/dss-data-api/dss-data-api-server/pom.xml # dss-apps/dss-data-api/pom.xml # dss-apps/dss-data-governance/dss-data-asset-server/pom.xml # dss-apps/dss-data-governance/dss-data-classification-server/pom.xml # dss-apps/dss-data-governance/dss-data-governance-common/pom.xml # dss-apps/dss-data-governance/dss-data-governance-server/pom.xml # dss-apps/dss-data-governance/pom.xml # dss-apps/dss-scriptis-server/pom.xml # dss-apps/dss-user-guide/dss-user-guide-server/pom.xml # dss-apps/dss-user-guide/pom.xml # dss-apps/pom.xml # dss-commons/dss-common/pom.xml # dss-commons/dss-contextservice/pom.xml # dss-commons/dss-sender-service/pom.xml # dss-commons/pom.xml # dss-framework/dss-appconn-framework/pom.xml # dss-framework/dss-framework-admin-service/pom.xml # dss-framework/dss-framework-common/pom.xml # dss-framework/dss-framework-orchestrator-server/pom.xml # dss-framework/dss-framework-project-server/pom.xml # dss-framework/dss-framework-proxy-user-service/pom.xml # dss-framework/dss-framework-workspace-server/pom.xml # dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml # dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml # dss-framework/pom.xml # dss-orchestrator/dss-orchestrator-common/pom.xml # dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml # dss-orchestrator/dss-orchestrator-core/pom.xml # dss-orchestrator/dss-orchestrator-db/pom.xml # dss-orchestrator/dss-orchestrator-loader/pom.xml # dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml # dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/restful/FlowEntranceRestfulApi.java # dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml # dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml # dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml # dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml # dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml # dss-orchestrator/orchestrators/dss-workflow/pom.xml # dss-orchestrator/pom.xml # dss-server/pom.xml # dss-standard/development-standard/development-process-standard-execution/pom.xml # dss-standard/development-standard/development-process-standard/pom.xml # dss-standard/dss-standard-common/pom.xml # dss-standard/pom.xml # dss-standard/sso-standard/origin-sso-integration-standard/pom.xml # dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml # dss-standard/sso-standard/sso-integration-standard/pom.xml # dss-standard/structure-standard/dss-project-plugin/pom.xml # dss-standard/structure-standard/dss-role-plugin/pom.xml # dss-standard/structure-standard/dss-structure-integration-standard/pom.xml # dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml # plugins/azkaban/linkis-jobtype/pom.xml # plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml # plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml # plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml # plugins/dolphinscheduler/pom.xml # plugins/linkis/dss-gateway-support/pom.xml # pom.xml # web/package-lock.json # web/packages/apiServices/package.json # web/packages/dataGovernance/package.json # web/packages/dataService/package.json # web/packages/dolphinScheduler/package.json # web/packages/dss/package.json # web/packages/editor/editor.vue # web/packages/editor/package.json # web/packages/editorLsp/package.json # web/packages/exts/package.json # web/packages/scriptis/module/hiveSidebar/index.js # web/packages/scriptis/module/workbench/container.vue # web/packages/scriptis/module/workbench/script/editor.vue # web/packages/scriptis/module/workbench/script/script.vue # web/packages/scriptis/package.json # web/packages/shared/components/dynamicForm/index.vue # web/packages/shared/package.json # web/packages/workflows/package.json # web/packages/workspace/module/management/index.vue # web/packages/workspace/package.json
WeBankFinTech · Mar 21, 2024 · f6e8c52 · f6e8c52
2 parents 9708f65 + 7bb2f8e
commit f6e8c52
Show file tree

Hide file tree

Showing 956 changed files with 77,229 additions and 76,172 deletions.
diff --git a/assembly/bin/appconn-refresh.sh b/assembly/bin/appconn-refresh.sh
@@ -11,17 +11,6 @@ if [ -z $SOURCE_ROOT ]; then
   source ${SOURCE_ROOT}/conf/db.sh
 fi
 
-function refresh() {
-  while true; do
-    response=$(curl -H "Token-Code:BML-AUTH" -H "Token-User:hadoop" -X GET http://${GATEWAY_INSTALL_IP}:${GATEWAY_PORT}/api/rest_j/v1/dss/framework/project/appconn/${APPCONN_NAME}/load)
-    if [[ $response == *"succeed"* ]]; then
-      break
-    else
-      sleep 5
-    fi
-  done
-}
-
 function isSuccess(){
   if [ $? -ne 0 ]; then
       echo "Failed to " + $1
@@ -31,6 +20,21 @@ function isSuccess(){
   fi
 }
 
+function refresh() {
+  while true; do
+    response=$(curl -H "Token-Code:BML-AUTH" -H "Token-User:hadoop" -X GET http://${GATEWAY_INSTALL_IP}:${GATEWAY_PORT}/api/rest_j/v1/dss/framework/project/appconn/${APPCONN_NAME}/load)
+    if [[ $response == *"not appconn manager node"* ]]; then
+      echo 'not appconn manager node, we will try again 5 seconds later'
+      sleep 5
+    elif [[ $response == *"succeed"* ]]; then
+      echo $response
+      break
+    else
+      echo $response
+      exit 1
+  done
+}
+
 if [ -z $1 ];then
   if [ -z $APPCONN_NAME ]; then
     APPCONN_NAME=''
@@ -50,7 +54,7 @@ if [ -z $1 ];then
     sh $SOURCE_ROOT/sbin/dss-start-all.sh
   else
     echo "You chose to wait for 5 minutes."
-    echo "Now try to call dss-server to reload the plugin of $APPCONN_NAME AppConn."
+    echo "Now try to call dss-server to reload the plugin of $APPCONN_NAME AppConn. Please wait!"
     refresh
     isSuccess "reload the plugin of $APPCONN_NAME AppConn in dss-server."
     echo "Now please wait for 5 minutes, then all of the DSS micro-services will refresh the ${APPCONN_NAME} AppConn plugin."
@@ -59,10 +63,11 @@ if [ -z $1 ];then
   fi
 else
   APPCONN_NAME=$1
-  echo "Now try to call dss-server to reload the plugin of $APPCONN_NAME AppConn."
+  echo "Now try to call dss-server to reload the plugin of $APPCONN_NAME AppConn. Please wait!"
   refresh
   isSuccess "reload the plugin of $APPCONN_NAME AppConn in dss-server."
   echo "Now please wait for 5 minutes, then all of the DSS micro-services will refresh the ${APPCONN_NAME} AppConn plugin."
   echo ""
   exit 0
-fi
+fi
+
diff --git a/assembly/dss-package/pom.xml b/assembly/dss-package/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.2</version>
+        <version>1.1.0.20-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -52,8 +52,16 @@
                     <artifactId>hibernate-validator</artifactId>
                     <groupId>org.hibernate.validator</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>xstream</artifactId>
+                    <groupId>com.thoughtworks.xstream</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <artifactId>xstream</artifactId>
+            <groupId>com.thoughtworks.xstream</groupId>
+        </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-common</artifactId>
@@ -106,16 +114,7 @@
             <artifactId>jackson-databind</artifactId>
             <version>${fasterxml.jackson.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${fasterxml.jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${fasterxml.jackson.version}</version>
-        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-math3</artifactId>
@@ -132,28 +131,6 @@
             <groupId>org.apache.linkis</groupId>
             <artifactId>linkis-mybatis</artifactId>
             <version>${linkis.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-autoconfigure</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-beans</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-jdbc</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.zaxxer</groupId>
-                    <artifactId>HikariCP</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.linkis</groupId>

diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.2</version>
+        <version>1.1.0.20-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

diff --git a/conf/application-dss.properties b/conf/application-dss.properties
@@ -0,0 +1,3 @@
+eureka.client.serviceUrl.defaultZone=http://127.0.0.1:20303/eureka/
+logging.config=classpath:log4j2.xml
+management.endpoints.web.exposure.include=refresh,info
diff --git a/conf/application-dss.yml b/conf/application-dss.yml
diff --git a/conf/dss-framework-orchestrator-server.properties b/conf/dss-framework-orchestrator-server.properties
@@ -0,0 +1,71 @@
+#
+# 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=9003
+spring.spring.application.name=dss-framework-orchestrator-server-dev
+
+wds.linkis.log.clear=true
+
+wds.linkis.server.version=v1
+
+##restful
+wds.linkis.server.restful.scan.packages=com.webank.wedatasphere.dss.orchestrator.server.restful,com.webank.wedatasphere.dss.workflow.restful,org.apache.linkis.entrance.restful,com.webank.wedatasphere.dss.flow.execution.entrance.restful
+
+##mybatis
+wds.linkis.server.mybatis.mapperLocations=classpath*:com/webank/wedatasphere/dss/framework/appconn/dao/impl/*.xml,classpath*:com/webank/wedatasphere/dss/orchestrator/core/dao/impl/*.xml,classpath*:com/webank/wedatasphere/dss/server/dao/impl/*.xml,classpath*:com/webank/wedatasphere/dss/application/dao/impl/*.xml,classpath*:com/webank/wedatasphere/dss/workspace/mapper/impl/*.xml,classpath*:com/webank/wedatasphere/dss/workspace/common/dao/impl/*.xml,classpath*:com/webank/wedatasphere/dss/orchestrator/db/dao/impl/*.xml,classpath*:com/webank/wedatasphere/dss/workflow/dao/impl/*.xml,classpath*:com/webank/wedatasphere/dss/framework/appconn/dao/impl/*.xml,classpath*:com/webank/wedatasphere/dss/flow/execution/entrance/dao/impl/*.xml
+
+wds.linkis.server.mybatis.typeAliasesPackage=com.webank.wedatasphere.dss.server.entity,com.webank.wedatasphere.dss.application.entity,com.webank.wedatasphere.dss.framework.appconn.entity,com.webank.wedatasphere.dss.workflow.entity,com.webank.wedatasphere.dss.framework.appconn.entity
+
+wds.linkis.server.mybatis.BasePackage=com.webank.wedatasphere.dss.framework.appconn.dao,com.webank.wedatasphere.dss.orchestrator.core.dao,com.webank.wedatasphere.dss.server.dao,com.webank.wedatasphere.dss.application.dao,com.webank.wedatasphere.dss.workspace.mapper,com.webank.wedatasphere.dss.workspace.common.dao,com.webank.wedatasphere.dss.workspace.common.dao,com.webank.wedatasphere.dss.orchestrator.db.dao,com.webank.wedatasphere.dss.workflow.dao,com.webank.wedatasphere.dss.framework.appconn.dao,com.webank.wedatasphere.dss.flow.execution.entrance.dao
+
+wds.dss.server.scheduling.clear.cs.cron=0 0 3 * * ?
+
+wds.dss.publish.max.remain.version=3
+
+wds.dss.server.cs.clear.env=DEV
+
+##export file dir
+wds.dss.server.export.url=/appcom/tmp/dss
+wds.dss.server.import.valid.immediately=false
+
+##import file dir
+wds.dss.file.upload.dir=/appcom/tmp/uploads
+wds.dss.server.export.env=DEV
+wds.dss.server.import.env=DEV
+
+#####flow-execution######
+wds.linkis.engine.application.name=flowExecutionEngine
+wds.linkis.enginemanager.application.name=flowExecution
+
+wds.linkis.query.application.name=linkis-ps-publicservice
+
+wds.linkis.console.config.application.name=linkis-ps-publicservice
+wds.linkis.engine.creation.wait.time.max=20m
+wds.linkis.server.version=v1
+
+wds.linkis.server.socket.mode=true
+
+wds.linkis.client.flow.adminuser=ws
+
+wds.linkis.server.component.exclude.classes=org.apache.linkis.entranceclient.conf.ClientForEntranceSpringConfiguration,org.apache.linkis.entranceclient.conf.ClientSpringConfiguration
+
+wds.linkis.server.component.exclude.packages=org.apache.linkis.entrance.restful.
+spring.spring.main.allow-bean-definition-overriding=true
+
+wds.linkis.entrance.config.log.path=file:///appcom/tmp/dss/
+wds.linkis.spark.engine.version=2.4.3
+wds.linkis.hive.engine.version=2.3.3