Skip to content

Modify deployment issues #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Davidhua1996 merged 5 commits into from
Jun 27, 2022
Merged

Modify deployment issues #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
92f9697
update init.sql IP PORT
Jun 24, 2022
930bd9c
update web project version、 config.sh project version and project-ser…
Jun 25, 2022
b82a162
Merge branch 'dev-0.2.0-webank' into dev-0.2.0
Jun 27, 2022
ae72b61
fix: the diy config problem
Jun 27, 2022
eef3b4f
Merge branch 'dev-0.2.0' of github.com:WeDataSphere/Streamis into dev…
Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion conf/config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions streamis-appconn/src/main/resources/init.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
1 change: 0 additions & 1 deletion streamis-project/streamis-project-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "streamis",
"version": "1.0.0",
"version": "0.2.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
Expand Down
6 changes: 5 additions & 1 deletion web/src/apps/streamis/module/jobConfig/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down