fix bug

fix custom datasouce get table list bug
justeene · Nov 1, 2018 · 64de424 · 64de424
1 parent 4f3f775
commit 64de424
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@ spark-warehouse
 *.log
 *.conf
 config/application.yml
+config/datasource_driver.yml
 swagger-ui/
 tempFiles/
 userfiles/

diff --git a/server/src/main/java/edp/core/utils/SqlUtils.java b/server/src/main/java/edp/core/utils/SqlUtils.java
@@ -152,7 +152,8 @@ public List<TableInfo> getTableList() throws SourceException {
             if (null != connection) {
                 DatabaseMetaData metaData = connection.getMetaData();
                 String schemaPattern = null;
-                if (DataTypeEnum.ORACLE.getFeature().equals(DataTypeEnum.urlOf(this.jdbcUrl).getFeature())) {
+                DataTypeEnum dataTypeEnum = DataTypeEnum.urlOf(this.jdbcUrl);
+                if (null != dataTypeEnum && dataTypeEnum.getFeature().equals(DataTypeEnum.ORACLE.getFeature())) {
                     schemaPattern = this.username;
                     if (null != schemaPattern) {
                         schemaPattern = schemaPattern.toUpperCase();

diff --git a/server/src/main/java/edp/davinci/runner/CronJobRunner.java b/server/src/main/java/edp/davinci/runner/CronJobRunner.java
@@ -39,8 +39,12 @@ public class CronJobRunner implements ApplicationRunner {
      * @throws Exception
      */
     @Override
-    public void run(ApplicationArguments args) throws Exception {
-        cronJobService.startAllJobs();
+    public void run(ApplicationArguments args) {
+        try {
+            cronJobService.startAllJobs();
+        } catch (Exception e) {
+            log.error(e.getMessage());
+        }
         log.info("Load cron job finish");
     }
 }