From 4bac52602a9e62718f0be70b1d3d5518b9792e1a Mon Sep 17 00:00:00 2001
From: zoper <sw@mail.pigx.vip>
Date: Wed, 30 Mar 2022 20:14:06 +0800
Subject: [PATCH] =?UTF-8?q?:heavy=5Fplus=5Fsign:=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=EF=BC=8C=E6=B7=BB=E5=8A=A0DM8=20=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pigx-common/pigx-common-bom/pom.xml                        | 7 +++++++
 .../{ActivitiConfig.java => ActivitiConfiguration.java}    | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 rename pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/config/{ActivitiConfig.java => ActivitiConfiguration.java} (98%)

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 @@
         <mysql.connector.version>8.0.27</mysql.connector.version>
         <oracle.version>21.3.0.0</oracle.version>
         <sqlserver.version>8.4.1.jre8</sqlserver.version>
+        <dm.version>8.1.2.79</dm.version>
         <swagger.core.version>1.5.22</swagger.core.version>
         <mp.weixin.version>4.2.0</mp.weixin.version>
         <ijpay.version>2.8.0</ijpay.version>
@@ -189,6 +190,12 @@
                 <artifactId>mssql-jdbc</artifactId>
                 <version>${sqlserver.version}</version>
             </dependency>
+            <!--DM8-->
+            <dependency>
+                <groupId>com.dameng</groupId>
+                <artifactId>DmJdbcDriver18</artifactId>
+                <version>${dm.version}</version>
+            </dependency>
             <!--fastjson-->
             <dependency>
                 <groupId>com.alibaba</groupId>
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;