不同数据库类型兼容

@@ -317,6 +317,18 @@
             <artifactId>jsch</artifactId>
             <version>0.1.55</version>
         </dependency>
+        <!-- Oracle JDBC -->
+        <dependency>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc8</artifactId>
+            <version>21.5.0.0</version>
+        </dependency>
+        <!-- SQLServer JDBC -->
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+            <version>12.4.0.jre11</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.yunteng.dto.TkDbConnectDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkDbConnectSshDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkDbConnectSslDTO;
+import org.thingsboard.server.common.data.yunteng.enums.DbConnectTypeEnum;
 import org.thingsboard.server.dao.yunteng.service.BaseDbConnectService;
 
 import javax.net.ssl.SSLContext;
@@ -23,11 +24,11 @@ import java.util.List;
 import java.util.Properties;
 
 /**
- * mySql类型数据库连接查询
+ * 最终数据库连接查询
  */
-@Service("MySql")
 @Slf4j
-public class MySqlDbConnectServiceImpl implements BaseDbConnectService {
+@Service("baseConnect")
+public class BaseDbConnectServiceImpl implements BaseDbConnectService {
 
     private static SSLContext sslContext = null;
 
@@ -47,6 +48,11 @@ public class MySqlDbConnectServiceImpl implements BaseDbConnectService {
     }
 
     private Object sshAndSslConnect(TkDbConnectDTO tkDbConnectDTO) {
+        // 只有mySql类型可以配置ssl通道
+        if (!DbConnectTypeEnum.MySql.equals(tkDbConnectDTO.getType())) {
+            return sshConnect(tkDbConnectDTO);
+        }
+
         try {
             // 1. 建立SSH隧道
             int localPort = setupSSHTunnel(tkDbConnectDTO.getSsh(), tkDbConnectDTO);
@@ -56,9 +62,9 @@ public class MySqlDbConnectServiceImpl implements BaseDbConnectService {
                 sslContext = createSSLContext(ssl.getClientCert(), ssl.getClientKey());
             }
 
-            String jdbcUrl = "jdbc:mysql://localhost:" + localPort + "/" + tkDbConnectDTO.getDbName() +
-                    "?useSSL=true" +
-                    "&requireSSL=true" +
+            String jdbcUrl = "jdbc:mysql://localhost:" +
+                    localPort + "/" + tkDbConnectDTO.getDbName() +
+                    "?useSSL=true" + "&requireSSL=true" +
                     "&verifyServerCertificate=" + ssl.isVerifyCaCert() +
                     "&enabledTLSProtocols=TLSv1.2,TLSv1.3";
             tkDbConnectDTO.setUrl(jdbcUrl);
@@ -72,6 +78,11 @@ public class MySqlDbConnectServiceImpl implements BaseDbConnectService {
     }
 
     private Object sslConnect(TkDbConnectDTO tkDbConnectDTO) {
+        // 只有mySql类型可以配置ssl通道
+        if (!DbConnectTypeEnum.MySql.equals(tkDbConnectDTO.getType())) {
+            return commonConnect(tkDbConnectDTO);
+        }
+
         try {
             TkDbConnectSslDTO ssl = tkDbConnectDTO.getSsl();
             // 配置SSL
@@ -113,7 +124,22 @@ public class MySqlDbConnectServiceImpl implements BaseDbConnectService {
         try {
             // 1. 建立SSH隧道
             int localPort = setupSSHTunnel(tkDbConnectDTO.getSsh(), tkDbConnectDTO);
-            tkDbConnectDTO.setUrl("jdbc:mysql://localhost:" + localPort + "/" + tkDbConnectDTO.getDbName());
+            StringBuilder stringBuilder = new StringBuilder();
+            if (DbConnectTypeEnum.MySql.equals(tkDbConnectDTO.getType())) {
+                stringBuilder.append("jdbc:mysql://localhost:")
+                        .append(localPort).append("/").append(tkDbConnectDTO.getDbName());
+            } else if (DbConnectTypeEnum.Postgresql.equals(tkDbConnectDTO.getType())) {
+                stringBuilder.append("jdbc:postgresql://localhost:")
+                        .append(localPort).append("/").append(tkDbConnectDTO.getDbName());
+            } else if (DbConnectTypeEnum.Oracle.equals(tkDbConnectDTO.getType())) {
+                stringBuilder.append("jdbc:oracle:thin:@//localhost:")
+                        .append(localPort).append("/").append(tkDbConnectDTO.getDbName());
+            } else if (DbConnectTypeEnum.SQLServer.equals(tkDbConnectDTO.getType())) {
+                stringBuilder.append("jdbc:sqlserver://localhost:")
+                        .append(localPort).append(";databaseName=").append(tkDbConnectDTO.getDbName());
+            }
+
+            tkDbConnectDTO.setUrl(stringBuilder.toString());
             return commonConnect(tkDbConnectDTO);
         } catch (Exception e) {
             log.info("sshConnect occur error!", e);
@@ -158,7 +184,15 @@ public class MySqlDbConnectServiceImpl implements BaseDbConnectService {
             config.setJdbcUrl(tkDbConnectDTO.getUrl());
             config.setUsername(tkDbConnectDTO.getUserName());
             config.setPassword(tkDbConnectDTO.getPassword());
-            config.setDriverClassName("com.mysql.cj.jdbc.Driver");
+            if (DbConnectTypeEnum.MySql.equals(tkDbConnectDTO.getType())) {
+                config.setDriverClassName("com.mysql.cj.jdbc.Driver");
+            } else if (DbConnectTypeEnum.Postgresql.equals(tkDbConnectDTO.getType())) {
+                config.setDriverClassName("org.postgresql.Driver");
+            } else if (DbConnectTypeEnum.Oracle.equals(tkDbConnectDTO.getType())) {
+                config.setDriverClassName("oracle.jdbc.driver.OracleDriver");
+            } else if (DbConnectTypeEnum.SQLServer.equals(tkDbConnectDTO.getType())) {
+                config.setDriverClassName("com.microsoft.sqlserver.jdbc.SQLServerDriver");
+            }
 
             // SSL配置
             if (sslContext != null) {

@@ -119,6 +119,6 @@ public class TkDbConnectServiceImpl extends AbstractBaseService<TkDbConnectMappe
         }
 
         dbDto.setSql(tkDbConnectDTO.getSql());
-        return connectServiceFactory.getService(dbDto.getType().toString()).connect(dbDto);
+        return connectServiceFactory.getService("baseConnect").connect(dbDto);
     }
 }