diff --git a/.gitignore b/.gitignore index 17461ca7b..d8b0f432b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,8 @@ streamis-project/streamis-project-common/target streamis-project/streamis-project-server/target streamis-server/target -streamis-appconn/target \ No newline at end of file +streamis-appconn/target +/logs/streamis-server.log +/logs/linkis.log +/test/target +/test/src \ No newline at end of file diff --git a/conf/config.sh b/conf/config.sh index ab0d8045f..094a2a1c7 100644 --- a/conf/config.sh +++ b/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" \ No newline at end of file diff --git a/streamis-appconn/src/main/resources/init.sql b/streamis-appconn/src/main/resources/init.sql index cec7e5754..165729516 100644 --- a/streamis-appconn/src/main/resources/init.sql +++ b/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); \ No newline at end of file +VALUES(@jobcenter_dss_appconn_id, 'DEV', 'http://APPCONN_INSTALL_IP:APPCONN_INSTALL_PORT/#/realTimeJobCenter', NULL, NULL); \ No newline at end of file diff --git a/streamis-project/streamis-project-server/pom.xml b/streamis-project/streamis-project-server/pom.xml index e462d2dc3..880d5bf0b 100644 --- a/streamis-project/streamis-project-server/pom.xml +++ b/streamis-project/streamis-project-server/pom.xml @@ -64,7 +64,6 @@ org.apache.commons commons-math3 - provided com.webank.wedatasphere.dss diff --git a/web/package.json b/web/package.json index 212cd077a..fc5a8bfb2 100644 --- a/web/package.json +++ b/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", diff --git a/web/src/apps/streamis/module/jobConfig/index.vue b/web/src/apps/streamis/module/jobConfig/index.vue index c0ed3e2fa..b6bd86f46 100644 --- a/web/src/apps/streamis/module/jobConfig/index.vue +++ b/web/src/apps/streamis/module/jobConfig/index.vue @@ -224,7 +224,11 @@ export default { emptyWarning = !mapKey.key || !mapKey.key.trim(); if (configuration[key][mapKey.key]) warning = true; configuration[key][mapKey.key] = mapKey.value || ''; - }) + }); + if ((this.diyMap[key] || []).length <= 1) { + const only = (this.diyMap[key] || [])[0] || {}; + emptyWarning = !((!only.key || !only.key.trim()) && (!only.value || !only.value.trim())) + } }); console.log('configuration', configuration, this.valueMap) if (emptyWarning) {