diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index 21ecb9511..df0880845 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -25,6 +25,7 @@ 8.0.27 21.3.0.0 8.4.1.jre8 + 8.1.2.79 1.5.22 4.2.0 2.8.0 @@ -189,6 +190,12 @@ mssql-jdbc ${sqlserver.version} + + + com.dameng + DmJdbcDriver18 + ${dm.version} + com.alibaba diff --git a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/config/ActivitiConfig.java b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/config/ActivitiConfiguration.java similarity index 98% rename from pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/config/ActivitiConfig.java rename to pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/config/ActivitiConfiguration.java index 382a1490e..01b3eaae7 100644 --- a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/config/ActivitiConfig.java +++ b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/config/ActivitiConfiguration.java @@ -34,7 +34,7 @@ import javax.sql.DataSource; */ @Configuration @AllArgsConstructor -public class ActivitiConfig { +public class ActivitiConfiguration { private final DataSource dataSource;