hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
hecan 2024-06-24 17:42:29 +08:00
parent 422f5f4469 e3a6525c73
commit 6cdbd049a7
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
buildpackage/src/main/resources/application.yml
View File

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

12
pom.xml
View File

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

2
service/src/main/java/com/hzya/frame/serviceUtil/DsDataSourceUtil.java
View File

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