Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into hecan

buildpackage/src/main/resources/application.yml

@@ -91,8 +91,7 @@ mybatis-plus:
     db-config:
       id-type: auto  # 主键策略
 zt:
-  url:
-# 积木报表工具
+  url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
 #JimuReport[minidao配置]
 minidao :
   base-package: org.jeecg.modules.jmreport.desreport.dao*

pom.xml

@@ -244,12 +244,12 @@
             </exclusions>
         </dependency>
 
-<!--        &lt;!&ndash;  添加dm8 jdbc jar 包依赖&ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.dameng</groupId>-->
-<!--            <artifactId>Dm8JdbcDriver18</artifactId>-->
-<!--            <version>8.1.1.49</version>-->
-<!--        </dependency>-->
+        <!--  添加dm8 jdbc jar 包依赖-->
+        <dependency>
+            <groupId>com.dameng</groupId>
+            <artifactId>Dm8JdbcDriver18</artifactId>
+            <version>8.1.1.49</version>
+        </dependency>
 
 
         <dependency>

service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java

@@ -147,6 +147,8 @@ public class DsDataSourceUtil {
             driveClass = DataSourceUtilProperties.SQL2000DRIVER;
         } else if ("2".equalsIgnoreCase(dataSourceEntity.getSourceType())) {
             driveClass = DataSourceUtilProperties.SQL2005DRIVER;
+        }else if ("4".equalsIgnoreCase(dataSourceEntity.getSourceType())) {
+            driveClass = DataSourceUtilProperties.dm;
         }
         try {
             //测试连接