diff --git a/report-core/pom.xml b/report-core/pom.xml index 69abc8c3f8ca95fa3c0d4aa6aa1d63a0b728c005..3fc4969195b927c7a742161d91ae35f742d8b1bb 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 0485a2945f8039f61fe895b05adb5cf1a415d254..4e301deb6d5bb45cb162a6b3add94c8a6d4a3da1 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 0d2febe58a8693945cb54447c4a89066ac7da29b..24d0c791eb1c27d0017a49a741650758bb0709a2 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 0000000000000000000000000000000000000000..16e97cfc575f889d021d4e1204e20d72c851cf4f --- /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);