From 3157a11da4197f82912fea807646d8c3abbea04c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=80=9A=E4=BF=A1=E5=B7=A5=E7=A8=8B=E5=AD=A6=E7=94=9F?=
<382172566@qq.com>
Date: Tue, 16 Nov 2021 06:57:32 +0000
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=AF=B9=E8=BE=BE?=
=?UTF-8?q?=E6=A2=A68=E7=9A=84=E6=94=AF=E6=8C=81=EF=BC=8C=E5=85=B6?=
=?UTF-8?q?=E5=AE=9E=E5=8F=AF=E4=BB=A5=E9=80=89=E6=8B=A9jdbc=E6=8C=87?=
=?UTF-8?q?=E5=AE=9A=E9=A9=B1=E5=8A=A8=E5=AE=9E=E7=8E=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
report-core/pom.xml | 6 ++++++
.../datasource/service/impl/DataSourceServiceImpl.java | 2 ++
.../anjiplus/template/gaea/business/util/JdbcConstants.java | 2 ++
.../resources/db/migration/V1.0.13__add_dict_DM8driver.sql | 1 +
4 files changed, 11 insertions(+)
create mode 100644 report-core/src/main/resources/db/migration/V1.0.13__add_dict_DM8driver.sql
diff --git a/report-core/pom.xml b/report-core/pom.xml
index 69abc8c3..3fc49691 100644
--- a/report-core/pom.xml
+++ b/report-core/pom.xml
@@ -132,6 +132,12 @@
poi-ooxml-schemas
4.1.2
+
+
+ com.dameng
+ DmJdbcDriver18
+ 8.1.2.79
+
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java
index 0485a294..4e301deb 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java
@@ -100,6 +100,7 @@ public class DataSourceServiceImpl implements DataSourceService {
case JdbcConstants.ORACLE:
case JdbcConstants.SQL_SERVER:
case JdbcConstants.JDBC:
+ case JdbcConstants.DM8:
case JdbcConstants.POSTGRESQL:
testRelationalDb(dto);
break;
@@ -125,6 +126,7 @@ public class DataSourceServiceImpl implements DataSourceService {
case JdbcConstants.ORACLE:
case JdbcConstants.SQL_SERVER:
case JdbcConstants.JDBC:
+ case JdbcConstants.DM8:
case JdbcConstants.POSTGRESQL:
return executeRelationalDb(dto);
case JdbcConstants.HTTP:
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/util/JdbcConstants.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/util/JdbcConstants.java
index 0d2febe5..24d0c791 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/util/JdbcConstants.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/util/JdbcConstants.java
@@ -15,6 +15,7 @@ public class JdbcConstants {
public final static String SQL_SERVER = "mssqlserver";
public final static String JDBC = "jdbc";
public final static String POSTGRESQL = "postgresql";
+ public final static String DM8 = "dm";
public final static String JTDS = "jtds";
@@ -22,6 +23,7 @@ public class JdbcConstants {
public final static String HSQL = "hsql";
public final static String DB2 = "db2";
public final static String DB2_DRIVER = "COM.ibm.db2.jdbc.app.DB2Driver";
+ public final static String DM8_DRIVER ="dm.jdbc.driver.DmDriver";
public final static String POSTGRESQL_DRIVER = "org.postgresql.Driver";
public final static String SYBASE = "sybase";
public final static String SQL_SERVER_DRIVER = "com.microsoft.jdbc.sqlserver.SQLServerDriver";
diff --git a/report-core/src/main/resources/db/migration/V1.0.13__add_dict_DM8driver.sql b/report-core/src/main/resources/db/migration/V1.0.13__add_dict_DM8driver.sql
new file mode 100644
index 00000000..16e97cfc
--- /dev/null
+++ b/report-core/src/main/resources/db/migration/V1.0.13__add_dict_DM8driver.sql
@@ -0,0 +1 @@
+INSERT INTO `aj_report`.`gaea_dict_item`( `dict_code`, `item_name`, `item_value`, `item_extend`, `enabled`, `locale`, `remark`, `sort`, `create_by`, `create_time`, `update_by`, `update_time`, `version`) VALUES ('SOURCE_TYPE', '达梦8', 'dm', '[{\"label\":\"driverName\",\"value\":\"dm.jdbc.driver.DmDriver\",\"labelValue\":\"驱动类\"},{\"label\":\"jdbcUrl\",\"value\":\"jdbc:dm://127.0.0.1:5236?schema=DMHR\",\"labelValue\":\"连接串\"},{\"label\":\"username\",\"value\":\"SYSDBA\",\"labelValue\":\"用户名\"},{\"label\":\"password\",\"value\":\"SYSDBA\",\"labelValue\":\"密码\"}]', 1, 'zh', NULL, 21, '管理员', '2021-04-13 17:26:38', 'admin', '2021-04-13 17:26:38', 1);
--
Gitee