Skip to content

Commit 6be1fa7

Browse files
starchouzzstarchouzz
committed
Merge branch 'dev-1.1.2' into dev-1.1.2-frontend_xxzhou
2 parents 13441c9 + 08fb9f4 commit 6be1fa7

File tree

125 files changed

+1245
-839
lines changed

Some content is hidden

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

125 files changed

+1245
-839
lines changed

‎assembly-package/config/application-eureka.yml‎

Whitespace-only changes.

‎assembly-package/config/exchangis-server.properties‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎assembly-package/config/exchangis.properties‎

Whitespace-only changes.

‎assembly-package/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>exchangis</artifactId>
2323
<groupId>com.webank.wedatasphere.exchangis</groupId>
24-
<version>1.1.1</version>
24+
<version>1.1.2</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727
<artifactId>assembly-package</artifactId>

‎assembly-package/sbin/common.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
#
1717

1818
declare -A MODULE_MAIN_CLASS
19-
MODULE_MAIN_CLASS["exchangis-server"]="com.webank.wedatasphere.exchangis.server.boot.ExchangisServerApplication"
19+
MODULE_MAIN_CLASS["dss-exchangis-main-server-dev"]="com.webank.wedatasphere.exchangis.server.boot.ExchangisServerApplication"

‎assembly-package/sbin/daemon.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ else
2424
fi
2525

2626
usage(){
27-
echo "Usage is [start|stop|restart {service}]"
27+
echo "Usage is [start|stop|restart {server}]"
2828
}
2929

3030
start(){

‎assembly-package/sbin/env.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
EXCHANGIS_CONF_PATH="/appcom/config/exchangis-config"
2-
EXCHANGIS_LOG_PATH="/appcom/logs/exchangis-log"
3-
MODULE_DEFAULT_PREFIX="exchangis-server"
4-
MODULE_DEFAULT_SUFFIX=""
1+
EXCHANGIS_CONF_PATH=/appcom/config/exchangis-config/background
2+
EXCHANGIS_LOG_PATH=/appcom/logs/exchangis/background
3+
MODULE_DEFAULT_PREFIX="dss-exchangis-main-"
4+
MODULE_DEFAULT_SUFFIX="-dev"

‎assembly-package/sbin/install.sh‎

Lines changed: 21 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -123,57 +123,36 @@ interact_echo(){
123123
done
124124
}
125125

126+
# Initalize database
126127
init_database(){
127-
BOOTSTRAP_PROP_FILE="${CONF_PATH}/exchangis-server.properties"
128-
# Start to initalize database
129-
if [ "x${SQL_SOURCE_PATH}" != "x" ] && [ -f "${SQL_SOURCE_PATH}" ]; then
130-
`mysql --version >/dev/null 2>&1`
131-
interact_echo "Do you want to initalize database with sql?"
132-
if [ $? == 0 ]; then
133-
LOG INFO "\033[1m Scan out mysql command, so begin to initalize the database\033[0m"
134-
#interact_echo "Do you want to initalize database with sql: [${SQL_SOURCE_PATH}]?"
135-
#if [ $? == 0 ]; then
128+
BOOTSTRAP_PROP_FILE="${CONF_PATH}/exchangis-server.properties"
129+
if [ "x${SQL_SOURCE_PATH}" != "x" ] && [ -f "${SQL_SOURCE_PATH}" ]; then
130+
`mysql --version >/dev/null 2>&1`
136131
DATASOURCE_URL="jdbc:mysql:\/\/${MYSQL_HOST}:${MYSQL_PORT}\/${DATABASE}\?useSSL=false\&characterEncoding=UTF-8\&allowMultiQueries=true"
137-
mysql -h ${MYSQL_HOST} -P ${MYSQL_PORT} -u ${MYSQL_USERNAME} -p${MYSQL_PASSWORD} --default-character-set=utf8 -e \
138-
"CREATE DATABASE IF NOT EXISTS ${DATABASE}; USE ${DATABASE}; source ${SQL_SOURCE_PATH};"
139-
#sed -ri "s![#]?(DB_HOST=)\S*!\1${HOST}!g" ${BOOTSTRAP_PROP_FILE}
140-
#sed -ri "s![#]?(DB_PORT=)\S*!\1${PORT}!g" ${BOOTSTRAP_PROP_FILE}
141132
sed -ri "s![#]?(wds.linkis.server.mybatis.datasource.username=)\S*!\1${MYSQL_USERNAME}!g" ${BOOTSTRAP_PROP_FILE}
142133
sed -ri "s![#]?(wds.linkis.server.mybatis.datasource.password=)\S*!\1${MYSQL_PASSWORD}!g" ${BOOTSTRAP_PROP_FILE}
143134
sed -ri "s![#]?(wds.linkis.server.mybatis.datasource.url=)\S*!\1${DATASOURCE_URL}!g" ${BOOTSTRAP_PROP_FILE}
144-
#fi
145-
fi
146-
fi
135+
interact_echo "Do you want to initalize database with sql: [${SQL_SOURCE_PATH}]?"
136+
if [ $? == 0 ]; then
137+
LOG INFO "\033[1m Scan out mysql command, so begin to initalize the database\033[0m"
138+
mysql -h ${MYSQL_HOST} -P ${MYSQL_PORT} -u ${MYSQL_USERNAME} -p${MYSQL_PASSWORD} --default-character-set=utf8 -e \
139+
"CREATE DATABASE IF NOT EXISTS ${DATABASE}; USE ${DATABASE}; source ${SQL_SOURCE_PATH};"
140+
fi
141+
fi
147142
}
148143

149144
init_properties(){
150-
BOOTSTRAP_PROP_FILE="${CONF_PATH}/exchangis-server.properties"
151-
APPLICATION_YML="${CONF_PATH}/application-exchangis.yml"
152-
# Start to initalize propertis
153-
#interact_echo "Do you want to initalize exchangis-server.properties?"
154-
#if [ $? == 0 ]; then
155-
156-
LINKIS_GATEWAY_URL="http:\/\/${LINKIS_GATEWAY_HOST}:${LINKIS_GATEWAY_PORT}\/"
157-
158-
if [ "x${LINKIS_SERVER_URL}" == "x" ]; then
159-
LINKIS_SERVER_URL="http://127.0.0.1:3306"
160-
fi
161-
if [ "x${LINKIS_SERVER_URL}" == "x" ]; then
162-
LINKIS_SERVER_URL="http://127.0.0.1:3306"
163-
fi
145+
BOOTSTRAP_PROP_FILE="${CONF_PATH}/exchangis-server.properties"
146+
APPLICATION_YML="${CONF_PATH}/application-exchangis.yml"
147+
LINKIS_GATEWAY_URL="http:\/\/${LINKIS_GATEWAY_HOST}:${LINKIS_GATEWAY_PORT}\/"
148+
if [ "x${LINKIS_SERVER_URL}" == "x" ]; then
149+
LINKIS_SERVER_URL="http://127.0.0.1:9001"
150+
fi
164151

165-
sed -ri "s![#]?(wds.linkis.gateway.ip=)\S*!\1${LINKIS_GATEWAY_HOST}!g" ${BOOTSTRAP_PROP_FILE}
166-
sed -ri "s![#]?(wds.linkis.gateway.port=)\S*!\1${LINKIS_GATEWAY_PORT}!g" ${BOOTSTRAP_PROP_FILE}
167-
sed -ri "s![#]?(wds.linkis.gateway.url=)\S*!\1${LINKIS_GATEWAY_URL}!g" ${BOOTSTRAP_PROP_FILE}
168-
sed -ri "s![#]?(wds.exchangis.datasource.client.serverurl=)\S*!\1${LINKIS_GATEWAY_URL}!g" ${BOOTSTRAP_PROP_FILE}
169-
sed -ri "s![#]?(wds.exchangis.client.linkis.server-url=)\S*!\1${LINKIS_GATEWAY_URL}!g" ${BOOTSTRAP_PROP_FILE}
170-
#sed -ri "s![#]?(wds.exchangis.datasource.client.authtoken.key=)\S*!\1${LINKIS_TOKEN}!g" ${BOOTSTRAP_PROP_FILE}
171-
#sed -ri "s![#]?(wds.exchangis.datasource.client.authtoken.value=)\S*!\1${LINKIS_TOKEN}!g" ${BOOTSTRAP_PROP_FILE}
172-
#sed -ri "s![#]?(wds.exchangis.client.linkis.token.value=)\S*!\1${LINKIS_TOKEN}!g" ${BOOTSTRAP_PROP_FILE}
173-
sed -ri "s![#]?(wds.linkis.gateway.port=)\S*!\1${LINKIS_GATEWAY_PORT}!g" ${BOOTSTRAP_PROP_FILE}
174-
sed -ri "s![#]?(port: )\S*!\1${EXCHANGIS_PORT}!g" ${APPLICATION_YML}
175-
sed -ri "s![#]?(defaultZone: )\S*!\1${EUREKA_URL}!g" ${APPLICATION_YML}
176-
#fi
152+
sed -ri "s![#]?(wds.exchangis.datasource.client.serverurl=)\S*!\1${LINKIS_GATEWAY_URL}!g" ${BOOTSTRAP_PROP_FILE}
153+
sed -ri "s![#]?(wds.exchangis.client.linkis.server-url=)\S*!\1${LINKIS_GATEWAY_URL}!g" ${BOOTSTRAP_PROP_FILE}
154+
sed -ri "s![#]?(port: )\S*!\1${EXCHANGIS_PORT}!g" ${APPLICATION_YML}
155+
sed -ri "s![#]?(defaultZone: )\S*!\1${EUREKA_URL}!g" ${APPLICATION_YML}
177156
}
178157

179158
install_modules(){

‎assembly-package/sbin/launcher.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ load_env_definitions(){
8686
fi
8787
}
8888

89-
90-
9189
construct_java_command(){
9290
verify_java_env
9391
if [[ "x${EXCHANGIS_CONF_PATH}" == "x" ]]; then
@@ -114,7 +112,7 @@ construct_java_command(){
114112
mkdir -p ${EXCHANGIS_PID_PATH}
115113
local classpath=${EXCHANGIS_CONF_PATH}":."
116114
local opts=""
117-
classpath=${EXCHANGIS_LIB_PATH}/exchangis-server/*":"${classpath}
115+
classpath=${EXCHANGIS_LIB_PATH}/"exchangis-server/*:"${classpath}
118116
LOG INFO "classpath:"${classpath}
119117
if [[ "x${EXCHANGIS_JAVA_OPTS}" == "x" ]]; then
120118
# Use G1 garbage collector
@@ -175,7 +173,7 @@ wait_for_startup(){
175173
return 0
176174
fi
177175
sleep ${SLEEP_TIMEREVAL_S}
178-
now_s=`date '+%s'` #计算当前时间时间戳
176+
now_s=`date '+%s'`
179177
done
180178
return 1
181179
}
@@ -204,14 +202,17 @@ launcher_start(){
204202
fi
205203
construct_java_command $1 $2
206204
# Execute
205+
echo ${EXEC_JAVA}
207206
LOG INFO ${EXEC_JAVA}
208207
nohup ${EXEC_JAVA} >/dev/null 2>&1 &
209208
LOG INFO "Launcher: waiting [ $1 ] to start complete ..."
210209
wait_for_startup 20 $1 $2
211210
if [[ $? -eq 0 ]]; then
212211
LOG INFO "Launcher: [ $1 ] start success"
212+
LOG INFO ${EXCHANGIS_CONF_PATH}
213213
APPLICATION_YML="${EXCHANGIS_CONF_PATH}/application-exchangis.yml"
214214
EUREKA_URL=`cat ${APPLICATION_YML} | grep Zone | sed -n '1p'`
215+
echo "${EUREKA_URL}"
215216
LOG INFO "Please check exchangis server in EUREKA_ADDRESS: ${EUREKA_URL#*:} "
216217
else
217218
LOG ERROR "Launcher: [ $1 ] start fail over 20 seconds, please retry it"
@@ -249,4 +250,4 @@ launcher_stop(){
249250
LOG ERROR "Launcher: [ $1 ] stop exceeded over 20s " >&2
250251
return 1
251252
fi
252-
}
253+
}

‎db/1.1.1/exchangis_ddl.sql‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
-- exchangis_job_func definition
2+
DROP TABLE IF EXISTS `exchangis_job_func`;
3+
CREATE TABLE `exchangis_job_func` (
4+
`id` int(11) NOT NULL AUTO_INCREMENT,
5+
`func_type` varchar(50) NOT NULL,
6+
`func_name` varchar(100) NOT NULL,
7+
`tab_name` varchar(50) NOT NULL COMMENT 'Tab',
8+
`name_dispaly` varchar(100) DEFAULT NULL,
9+
`param_num` int(11) DEFAULT '0',
10+
`ref_name` varchar(100) DEFAULT NULL,
11+
`description` varchar(200) DEFAULT NULL,
12+
`modify_time` datetime DEFAULT NULL,
13+
`create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
14+
PRIMARY KEY (`id`),
15+
UNIQUE KEY `job_func_tab_name_idx` (`tab_name`,`func_name`)
16+
) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
17+
18+
-- exchangis_job_func_params definition
19+
DROP TABLE IF EXISTS `exchangis_job_func_params`;
20+
CREATE TABLE IF NOT EXISTS `exchangis_job_func_params`(
21+
`func_id` INT(11) NOT NULL,
22+
`param_name` VARCHAR(100) NOT NULL,
23+
`order` INT(11) DEFAULT 0,
24+
`name_display` VARCHAR(100),
25+
`create_time` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
26+
PRIMARY KEY(`func_id`, `param_name`)
27+
)Engine=InnoDB DEFAULT CHARSET=utf8;
28+
29+
-- exchangis_job_param_config definition
30+
DROP TABLE IF EXISTS `exchangis_job_param_config`;
31+
CREATE TABLE `exchangis_job_param_config` (
32+
`id` bigint(20) NOT NULL AUTO_INCREMENT,
33+
`config_key` varchar(64) NOT NULL,
34+
`config_name` varchar(64) NOT NULL,
35+
`config_direction` varchar(16) DEFAULT NULL,
36+
`type` varchar(32) NOT NULL,
37+
`ui_type` varchar(32) DEFAULT NULL,
38+
`ui_field` varchar(64) DEFAULT NULL,
39+
`ui_label` varchar(32) DEFAULT NULL,
40+
`unit` varchar(32) DEFAULT NULL,
41+
`required` bit(1) DEFAULT b'0',
42+
`value_type` varchar(32) DEFAULT NULL,
43+
`value_range` varchar(255) DEFAULT NULL,
44+
`default_value` varchar(255) DEFAULT NULL,
45+
`validate_type` varchar(64) DEFAULT NULL,
46+
`validate_range` varchar(64) DEFAULT NULL,
47+
`validate_msg` varchar(255) DEFAULT NULL,
48+
`is_hidden` bit(1) DEFAULT NULL,
49+
`is_advanced` bit(1) DEFAULT NULL,
50+
`source` varchar(255) DEFAULT NULL,
51+
`level` tinyint(4) DEFAULT NULL,
52+
`treename` varchar(32) DEFAULT NULL,
53+
`sort` int(11) DEFAULT NULL,
54+
`description` varchar(255) DEFAULT NULL,
55+
`status` tinyint(4) DEFAULT NULL,
56+
`ref_id` bigint(20) DEFAULT NULL,
57+
PRIMARY KEY (`id`)
58+
) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=utf8;
59+
60+
-- exchangis_engine_settings definition
61+
DROP TABLE IF EXISTS `exchangis_engine_settings`;
62+
CREATE TABLE `exchangis_engine_settings` (
63+
`id` bigint(20) NOT NULL AUTO_INCREMENT,
64+
`engine_name` varchar(50) NOT NULL,
65+
`engine_desc` varchar(500) NOT NULL,
66+
`engine_settings_value` text,
67+
`engine_direction` varchar(255) NOT NULL,
68+
`res_loader_class` varchar(255),
69+
`res_uploader_class` varchar(255),
70+
`modify_time` datetime DEFAULT NULL,
71+
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
72+
PRIMARY KEY (`id`),
73+
UNIQUE KEY `engine_setting_idx` (`engine_name`)
74+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
75+
76+
-- exchangis_job_transform_rule
77+
DROP TABLE IF EXISTS `exchangis_job_transform_rule`;
78+
CREATE TABLE `exchangis_job_transform_rule` (
79+
`id` bigint(20) NOT NULL AUTO_INCREMENT,
80+
`rule_name` varchar(100) NOT NULL DEFAULT 'transform_rule',
81+
`rule_type` varchar(64) NOT NULL DEFAULT 'DEF',
82+
`rule_source` varchar(600) DEFAULT '{}',
83+
`data_source_type` varchar(64) NOT NULL,
84+
`engine_type` varchar(32),
85+
`direction` varchar(32) NOT NULL DEFAULT 'NONE',
86+
`create_time` datetime DEFAULT CURRENT_TIMESTAMP,
87+
PRIMARY KEY (`id`)
88+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

0 commit comments

Comments
 (0)