Merge branch 'dev-0.2.0-webank' into dev-0.2.0

Author: v_xiangbiaowu

.gitignore

@@ -16,4 +16,8 @@ streamis-project/streamis-project-common/target
 streamis-project/streamis-project-server/target
 
 streamis-server/target
-streamis-appconn/target
+streamis-appconn/target
+/logs/streamis-server.log
+/logs/linkis.log
+/test/target
+/test/src

conf/config.sh

@@ -40,6 +40,6 @@ GATEWAY_PORT=9001
 STREAMIS_SERVER_INSTALL_IP=127.0.0.1
 STREAMIS_SERVER_INSTALL_PORT=9400
 
-STREAMIS_VERSION=0.1.0
+STREAMIS_VERSION=0.2.0
 
 STREAMIS_FILE_NAME="STREAMIS-$STREAMIS_VERSION"

streamis-appconn/src/main/resources/init.sql

@@ -27,8 +27,8 @@ VALUES(@jobcenter_dss_appconn_id, 1, 'StreamSQL development', 'StreamSQL开发',
 
 INSERT INTO dss_appconn_instance
 (appconn_id, label, url, enhance_json, homepage_uri)
-VALUES(@dss_appconn_id, 'DEV', 'http://Streamis_INSTALL_IP:Streamis_INSTALL_PORT/', '', 'http://Streamis_INSTALL_IP:Streamis_INSTALL_PORT/#/realTimeJobCenter');
+VALUES(@dss_appconn_id, 'DEV', 'http://APPCONN_INSTALL_IP:APPCONN_INSTALL_PORT/', '', 'http://APPCONN_INSTALL_IP:APPCONN_INSTALL_PORT/#/realTimeJobCenter');
 
 INSERT INTO dss_appconn_instance
 (appconn_id, label, url, enhance_json, homepage_uri)
-VALUES(@jobcenter_dss_appconn_id, 'DEV', 'http://Streamis_INSTALL_IP:Streamis_INSTALL_PORT/#/realTimeJobCenter', NULL, NULL);
+VALUES(@jobcenter_dss_appconn_id, 'DEV', 'http://APPCONN_INSTALL_IP:APPCONN_INSTALL_PORT/#/realTimeJobCenter', NULL, NULL);

streamis-project/streamis-project-server/pom.xml

@@ -64,7 +64,6 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-math3</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>

web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "streamis",
-    "version": "1.0.0",
+    "version": "0.2.0",
     "private": true,
     "scripts": {
         "serve": "vue-cli-service serve",