Skip to content

Commit 44c3d52

Browse files
AlexkunAlexkun
committed
1. update scala version
2. optimize install.sh 3. fix compile bug
1 parent d19102c commit 44c3d52

File tree

5 files changed

+27
-55
lines changed

5 files changed

+27
-55
lines changed

‎bin/install.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,11 @@ cd $SERVER_HOME/;unzip $SERVERNAME.zip > /dev/null
119119
isSuccess "unzip ${SERVERNAME}.zip"
120120

121121
echo "$SERVERNAME-step3:subsitution conf"
122-
SERVER_CONF_PATH=$SERVER_HOME/$SERVERNAME/conf/application.yml
123-
sed -i "s#port:.*#port: $SERVER_PORT#g" $SERVER_CONF_PATH
124-
sed -i "s#defaultZone:.*#defaultZone: $EUREKA_URL#g" $SERVER_CONF_PATH
125-
sed -i "s#hostname:.*#hostname: $SERVER_IP#g" $SERVER_CONF_PATH
126-
isSuccess "subsitution conf of $SERVERNAME"
127-
}
122+
SERVER_CONF_PATH=$SERVER_HOME/$SERVERNAME/conf/application.properties
123+
sed -i "s#server.port.*#server.port=$SERVER_PORT#g" $SERVER_CONF_PATH
124+
sed -i "s#eureka.client.serviceUrl.defaultZon.*#eureka.client.serviceUrl.defaultZon=$EUREKA_URL#g" $SERVER_CONF_PATH
125+
isSuccess "subsitution conf of $SERVERNAME"
126+
}
128127

129128
function setDatasourcePassword(){
130129
PASSWORD=$MYSQL_PASSWORD
@@ -152,6 +151,7 @@ setDatasourcePassword
152151
sed -i "s#wds.linkis.gateway.ip.*#wds.linkis.gateway.ip=$GATEWAY_INSTALL_IP#g" $SERVER_CONF_PATH
153152
sed -i "s#wds.linkis.gateway.port.*#wds.linkis.gateway.port=$GATEWAY_PORT#g" $SERVER_CONF_PATH
154153
sed -i "s#wds.linkis.gateway.url.*#wds.linkis.gateway.url=http://${GATEWAY_INSTALL_IP}:${GATEWAY_PORT}#g" $SERVER_CONF_PATH
154+
sed -i "s#\#wds.linkis.token=.*#wds.linkis.token=${STREAMIS_LINKIS_TOKEN}#g" $SERVER_CONF_PATH
155155
isSuccess "subsitution linkis.properties of $SERVERNAME"
156156
echo "<----------------$SERVERNAME:end------------------->"
157157
echo ""

‎db/streamis_ddl.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ CREATE TABLE `linkis_stream_register_info` (
241241
`application_name` varchar(255) COLLATE utf8_bin DEFAULT NULL,
242242
`password` varchar(255) COLLATE utf8_bin DEFAULT NULL,
243243
`register_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
244-
`heartbeat_time` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
244+
`heartbeat_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
245245
PRIMARY KEY (`id`)
246246
) ENGINE=InnoDB AUTO_INCREMENT=171425 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
247247

‎pom.xml‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<linkis.version>1.7.0</linkis.version>
5050
<junit.version>4.12</junit.version>
5151
<dss.version>1.2.2</dss.version>
52-
<scala.version>2.11.12</scala.version>
52+
<scala.version>2.12.17</scala.version>
5353
<jdk.compile.version>1.8</jdk.compile.version>
5454
<maven.version>3.3.3</maven.version>
5555
<gson.version>2.8.5</gson.version>
@@ -296,7 +296,17 @@
296296
<plugin>
297297
<groupId>net.alchim31.maven</groupId>
298298
<artifactId>scala-maven-plugin</artifactId>
299-
<version>3.2.2</version>
299+
<version>4.8.1</version>
300+
<configuration>
301+
<recompileMode>incremental</recompileMode>
302+
<args>
303+
<arg>-unchecked</arg>
304+
<arg>-deprecation</arg>
305+
<arg>-feature</arg>
306+
<arg>-explaintypes</arg>
307+
<arg>-target:jvm-8</arg>
308+
</args>
309+
</configuration>
300310
<executions>
301311
<execution>
302312
<id>eclipse-add-source</id>
@@ -306,31 +316,19 @@
306316
</execution>
307317
<execution>
308318
<id>scala-compile-first</id>
309-
<phase>process-resources</phase>
310319
<goals>
311320
<goal>compile</goal>
312321
</goals>
322+
<phase>process-resources</phase>
313323
</execution>
314324
<execution>
315325
<id>scala-test-compile-first</id>
316-
<phase>process-test-resources</phase>
317326
<goals>
318327
<goal>testCompile</goal>
319328
</goals>
320-
</execution>
321-
<execution>
322-
<id>attach-scaladocs</id>
323-
<phase>verify</phase>
324-
<goals>
325-
<goal>doc-jar</goal>
326-
</goals>
329+
<phase>process-test-resources</phase>
327330
</execution>
328331
</executions>
329-
<configuration>
330-
<scalaVersion>${scala.version}</scalaVersion>
331-
<recompileMode>incremental</recompileMode>
332-
<useZincServer>true</useZincServer>
333-
</configuration>
334332
</plugin>
335333
<plugin>
336334
<groupId>org.apache.maven.plugins</groupId>

‎streamis-server/src/main/resources/application.yml‎

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

‎streamis-server/src/main/resources/linkis.properties‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,17 @@ wds.linkis.server.mybatis.mapperLocations=classpath*:com/webank/wedatasphere/str
4545
classpath*:com/webank/wedatasphere/streamis/jobmanager/launcher/dao/impl/*.xml,\
4646
classpath*:com/webank/wedatasphere/streamis/jobmanager/manager/dao/impl/*.xml,\
4747
classpath*:com/webank/wedatasphere/streamis/projectmanager/dao/impl/*.xml,\
48-
classpath*:com/webank/wedatasphere/streamis/audit/log/dao/impl/*.xml
48+
classpath*:com/webank/wedatasphere/streamis/audit/log/dao/impl/*.xml,\
49+
classpath*:com/webank/wedatasphere/streamis/errorcode/dao/impl/*.xml
4950

5051
wds.linkis.server.mybatis.typeAliasesPackage=com.webank.wedatasphere.streamis.datasource.manager.domain,\
5152
com.webank.wedatasphere.streamis.jobmanager.launcher.entity,\
5253
com.webank.wedatasphere.streamis.jobmanager.manager.entity,\
5354
com.webank.wedatasphere.streamis.jobmanager.manager.entity.vo,\
5455
com.webank.wedatasphere.streamis.jobmanager.launcher.entity.vo,\
5556
com.webank.wedatasphere.streamis.projectmanager.entity,\
56-
com.webank.wedatasphere.streamis.audit.log.entity
57+
com.webank.wedatasphere.streamis.audit.log.entity,\
58+
com.webank.wedatasphere.streamis.errorcode.entity
5759

5860

5961
wds.linkis.server.mybatis.BasePackage=com.webank.wedatasphere.streamis.datasource.manager.dao,\
@@ -62,7 +64,8 @@ wds.linkis.server.mybatis.BasePackage=com.webank.wedatasphere.streamis.datasourc
6264
com.webank.wedatasphere.streamis.jobmanager.launcher.dao,\
6365
com.webank.wedatasphere.streamis.jobmanager.manager.dao,\
6466
com.webank.wedatasphere.streamis.projectmanager.dao,\
65-
com.webank.wedatasphere.streamis.audit.log.dao
67+
com.webank.wedatasphere.streamis.audit.log.dao,\
68+
com.webank.wedatasphere.streamis.errorcode.dao
6669

6770
# Make sure that can fetch the application info finally
6871
wds.streamis.application.info.fetch.max=20

0 commit comments

Comments
 (0)