Skip to content

Commit 225c39d

Browse files
zqburdezqburde
authored
Merge pull request #1125 from WeDataSphere/master
Merge latest code
2 parents a691b7c + 274697a commit 225c39d

File tree

956 files changed

+77229
-76173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

956 files changed

+77229
-76173
lines changed

‎assembly/bin/appconn-refresh.sh

+19-14
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,6 @@ if [ -z $SOURCE_ROOT ]; then
1111
source ${SOURCE_ROOT}/conf/db.sh
1212
fi
1313

14-
function refresh() {
15-
while true; do
16-
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)
17-
if [[ $response == *"succeed"* ]]; then
18-
break
19-
else
20-
sleep 5
21-
fi
22-
done
23-
}
24-
2514
function isSuccess(){
2615
if [ $? -ne 0 ]; then
2716
echo "Failed to " + $1
@@ -31,6 +20,21 @@ function isSuccess(){
3120
fi
3221
}
3322

23+
function refresh() {
24+
while true; do
25+
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)
26+
if [[ $response == *"not appconn manager node"* ]]; then
27+
echo 'not appconn manager node, we will try again 5 seconds later'
28+
sleep 5
29+
elif [[ $response == *"succeed"* ]]; then
30+
echo $response
31+
break
32+
else
33+
echo $response
34+
exit 1
35+
done
36+
}
37+
3438
if [ -z $1 ];then
3539
if [ -z $APPCONN_NAME ]; then
3640
APPCONN_NAME=''
@@ -50,7 +54,7 @@ if [ -z $1 ];then
5054
sh $SOURCE_ROOT/sbin/dss-start-all.sh
5155
else
5256
echo "You chose to wait for 5 minutes."
53-
echo "Now try to call dss-server to reload the plugin of $APPCONN_NAME AppConn."
57+
echo "Now try to call dss-server to reload the plugin of $APPCONN_NAME AppConn. Please wait!"
5458
refresh
5559
isSuccess "reload the plugin of $APPCONN_NAME AppConn in dss-server."
5660
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
5963
fi
6064
else
6165
APPCONN_NAME=$1
62-
echo "Now try to call dss-server to reload the plugin of $APPCONN_NAME AppConn."
66+
echo "Now try to call dss-server to reload the plugin of $APPCONN_NAME AppConn. Please wait!"
6367
refresh
6468
isSuccess "reload the plugin of $APPCONN_NAME AppConn in dss-server."
6569
echo "Now please wait for 5 minutes, then all of the DSS micro-services will refresh the ${APPCONN_NAME} AppConn plugin."
6670
echo ""
6771
exit 0
68-
fi
72+
fi
73+

‎assembly/dss-package/pom.xml

+10-33
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>dss</artifactId>
2323
<groupId>com.webank.wedatasphere.dss</groupId>
24-
<version>1.1.2</version>
24+
<version>1.1.0.20-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
@@ -52,8 +52,16 @@
5252
<artifactId>hibernate-validator</artifactId>
5353
<groupId>org.hibernate.validator</groupId>
5454
</exclusion>
55+
<exclusion>
56+
<artifactId>xstream</artifactId>
57+
<groupId>com.thoughtworks.xstream</groupId>
58+
</exclusion>
5559
</exclusions>
5660
</dependency>
61+
<dependency>
62+
<artifactId>xstream</artifactId>
63+
<groupId>com.thoughtworks.xstream</groupId>
64+
</dependency>
5765
<dependency>
5866
<groupId>com.webank.wedatasphere.dss</groupId>
5967
<artifactId>dss-common</artifactId>
@@ -106,16 +114,7 @@
106114
<artifactId>jackson-databind</artifactId>
107115
<version>${fasterxml.jackson.version}</version>
108116
</dependency>
109-
<dependency>
110-
<groupId>com.fasterxml.jackson.core</groupId>
111-
<artifactId>jackson-core</artifactId>
112-
<version>${fasterxml.jackson.version}</version>
113-
</dependency>
114-
<dependency>
115-
<groupId>com.fasterxml.jackson.core</groupId>
116-
<artifactId>jackson-annotations</artifactId>
117-
<version>${fasterxml.jackson.version}</version>
118-
</dependency>
117+
119118
<dependency>
120119
<groupId>org.apache.commons</groupId>
121120
<artifactId>commons-math3</artifactId>
@@ -132,28 +131,6 @@
132131
<groupId>org.apache.linkis</groupId>
133132
<artifactId>linkis-mybatis</artifactId>
134133
<version>${linkis.version}</version>
135-
<exclusions>
136-
<exclusion>
137-
<groupId>org.springframework.boot</groupId>
138-
<artifactId>spring-boot-starter</artifactId>
139-
</exclusion>
140-
<exclusion>
141-
<groupId>org.springframework.boot</groupId>
142-
<artifactId>spring-boot-autoconfigure</artifactId>
143-
</exclusion>
144-
<exclusion>
145-
<groupId>org.springframework</groupId>
146-
<artifactId>spring-beans</artifactId>
147-
</exclusion>
148-
<exclusion>
149-
<groupId>org.springframework</groupId>
150-
<artifactId>spring-jdbc</artifactId>
151-
</exclusion>
152-
<exclusion>
153-
<groupId>com.zaxxer</groupId>
154-
<artifactId>HikariCP</artifactId>
155-
</exclusion>
156-
</exclusions>
157134
</dependency>
158135
<dependency>
159136
<groupId>org.apache.linkis</groupId>

‎assembly/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>dss</artifactId>
2424
<groupId>com.webank.wedatasphere.dss</groupId>
25-
<version>1.1.2</version>
25+
<version>1.1.0.20-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<packaging>pom</packaging>

‎conf/application-dss.properties

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
eureka.client.serviceUrl.defaultZone=http://127.0.0.1:20303/eureka/
2+
logging.config=classpath:log4j2.xml
3+
management.endpoints.web.exposure.include=refresh,info

‎conf/application-dss.yml

-27
This file was deleted.

‎conf/dss-framework-orchestrator-server.properties

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
#
2+
# Copyright 2019 WeBank
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
#
15+
#
16+
17+
# Spring configurations
18+
spring.server.port=9003
19+
spring.spring.application.name=dss-framework-orchestrator-server-dev
20+
21+
wds.linkis.log.clear=true
22+
23+
wds.linkis.server.version=v1
24+
25+
##restful
26+
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
27+
28+
##mybatis
29+
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
30+
31+
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
32+
33+
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
34+
35+
wds.dss.server.scheduling.clear.cs.cron=0 0 3 * * ?
36+
37+
wds.dss.publish.max.remain.version=3
38+
39+
wds.dss.server.cs.clear.env=DEV
40+
41+
##export file dir
42+
wds.dss.server.export.url=/appcom/tmp/dss
43+
wds.dss.server.import.valid.immediately=false
44+
45+
##import file dir
46+
wds.dss.file.upload.dir=/appcom/tmp/uploads
47+
wds.dss.server.export.env=DEV
48+
wds.dss.server.import.env=DEV
49+
50+
#####flow-execution######
51+
wds.linkis.engine.application.name=flowExecutionEngine
52+
wds.linkis.enginemanager.application.name=flowExecution
53+
54+
wds.linkis.query.application.name=linkis-ps-publicservice
55+
56+
wds.linkis.console.config.application.name=linkis-ps-publicservice
57+
wds.linkis.engine.creation.wait.time.max=20m
58+
wds.linkis.server.version=v1
59+
60+
wds.linkis.server.socket.mode=true
61+
62+
wds.linkis.client.flow.adminuser=ws
63+
64+
wds.linkis.server.component.exclude.classes=org.apache.linkis.entranceclient.conf.ClientForEntranceSpringConfiguration,org.apache.linkis.entranceclient.conf.ClientSpringConfiguration
65+
66+
wds.linkis.server.component.exclude.packages=org.apache.linkis.entrance.restful.
67+
spring.spring.main.allow-bean-definition-overriding=true
68+
69+
wds.linkis.entrance.config.log.path=file:///appcom/tmp/dss/
70+
wds.linkis.spark.engine.version=2.4.3
71+
wds.linkis.hive.engine.version=2.3.3

0 commit comments

Comments
 (0)