From 5b633cf4126760168f50bf76be3706a1a6536eb0 Mon Sep 17 00:00:00 2001
From: lgcareer <18610854716@163.com>
Date: Mon, 25 May 2020 19:46:39 +0800
Subject: [PATCH] fix oracle connect failure (#2812)

* use method getJdbcUrl of parent

* Remove the incorrect print message
---
 .../api/controller/DataSourceController.java        |  2 +-
 .../dao/datasource/OracleDataSource.java            | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java
index 7f35ac0d70..a34d61a26d 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java
@@ -278,7 +278,7 @@ public class DataSourceController extends BaseController {
                                     @RequestParam(value = "password") String password,
                                     @RequestParam(value = "connectType") DbConnectType connectType,
                                     @RequestParam(value = "other") String other) {
-        logger.info("login user {}, connect datasource: {} failure, note: {}, type: {}, connectType: {}, other: {}",
+        logger.info("login user {}, connect datasource: {}, note: {}, type: {}, connectType: {}, other: {}",
                 loginUser.getUserName(), name, note, type, connectType, other);
         String parameter = dataSourceService.buildParameter(name, note, type, host, port, database, principal, userName, password, connectType, other);
         Boolean isConnection = dataSourceService.checkConnection(type, parameter);
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/OracleDataSource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/OracleDataSource.java
index c457583075..7666ca7d83 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/OracleDataSource.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/OracleDataSource.java
@@ -45,19 +45,6 @@ public class OracleDataSource extends BaseDataSource {
         return Constants.COM_ORACLE_JDBC_DRIVER;
     }
 
-    /**
-     * gets the JDBC url for the data source connection
-     * @return jdbc url
-     */
-    @Override
-    public String getJdbcUrl() {
-        String jdbcUrl = getAddress();
-        if (jdbcUrl.lastIndexOf("/") != (jdbcUrl.length() - 1)) {
-            jdbcUrl += "/";
-        }
-        return jdbcUrl;
-    }
-
     /**
      * @return db type
      */