dataSource

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/
 

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%

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)