From 00b2e9ca48fead3fb14506e0b987b891029fc18d Mon Sep 17 00:00:00 2001 From: Raod <1130305001@qq.com> Date: Sat, 31 Jul 2021 15:42:52 +0800 Subject: [PATCH] dataSource --- build.sh | 1 + report-core/src/main/assembly/bin/start.bat | 2 +- .../src/views/report/datasource/components/EditDataSource.vue | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 64244d19..14e5d0b3 100644 --- a/build.sh +++ b/build.sh @@ -13,6 +13,7 @@ npm install >/dev/null 2>&1 npm run build:prod >/dev/null 2>&1 echo "publish web to springboot src/main/resources/static" +rm -rf $BuildDir/report-core/src/main/resources/static mkdir -p $BuildDir/report-core/src/main/resources/static mv $BuildDir/report-ui/dist/* $BuildDir/report-core/src/main/resources/static/ diff --git a/report-core/src/main/assembly/bin/start.bat b/report-core/src/main/assembly/bin/start.bat index df4bcc9d..573e1954 100755 --- a/report-core/src/main/assembly/bin/start.bat +++ b/report-core/src/main/assembly/bin/start.bat @@ -38,4 +38,4 @@ IF "%JAVA_HOME%" == "" ( set JAVA_OPTS= -server -Xms1g -Xmx2g -Xmn256m -XX:PermSize=128m -Xss256k rem 正式启动 - %JAVA_HOME%\bin\java %JAVA_OPTS% -Xbootclasspath/a:%LIB_JARS% -jar -Dspring.config.location=%CONF_YML% %BIN_DIR%\lib\%BOOT_JAR% + "%JAVA_HOME%"\bin\java %JAVA_OPTS% -Xbootclasspath/a:%LIB_JARS% -jar -Dspring.config.location=%CONF_YML% %BIN_DIR%\lib\%BOOT_JAR% diff --git a/report-ui/src/views/report/datasource/components/EditDataSource.vue b/report-ui/src/views/report/datasource/components/EditDataSource.vue index b8ee5af1..9f9cf001 100644 --- a/report-ui/src/views/report/datasource/components/EditDataSource.vue +++ b/report-ui/src/views/report/datasource/components/EditDataSource.vue @@ -129,7 +129,8 @@ export default { sourceDesc: '', sourceConfig: '', } - this.getSystem() + const { code } = await this.getSystem(); + if (code != '200') return //根据dataSourceId判断新增还是编辑 if (this.dataSource.id) { const {code, data} = await reportDataSourceDetail(this.dataSource)