From 992a57d864c6fc3a4785f35d4bde9de256ce3598 Mon Sep 17 00:00:00 2001
From: erzhongxmu <erzhongxmu@hotmail.com>
Date: Thu, 13 Apr 2023 12:58:01 +0800
Subject: [PATCH] =?UTF-8?q?POM=E5=8E=BB=E6=8E=89=E4=B8=8D=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E7=9A=84=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                 | 9 ++++++++-
 src/main/resources/dbconfig.properties  | 2 ++
 src/main/resources/sysConfig.properties | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b68f37fa..5ff90547 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
 		<proxool.version>0.9.1</proxool.version>
 		<commons-pool.version>1.6</commons-pool.version>
 		<commons-dbcp.version>1.4</commons-dbcp.version>
-		<druid.version>0.2.9</druid.version>
+		<druid.version>1.1.22</druid.version>
 		<mysql.version>5.1.27</mysql.version>
 <!--		<mysql.version>8.0.11</mysql.version>-->
 		<!-- sqlserver2005 -->
@@ -330,6 +330,13 @@
 			<version>${mysql.version}</version>
 			<scope>runtime</scope>
 		</dependency>
+
+<!--		<dependency>-->
+<!--			<groupId>org.mariadb.jdbc</groupId>-->
+<!--			<artifactId>mariadb-java-client</artifactId>-->
+<!--			<version>2.7.4</version>-->
+<!--		</dependency>-->
+
 		<!-- sqlserver -->
 <!--		<dependency>-->
 <!--			<groupId>com.microsoft.sqlserver</groupId>-->
diff --git a/src/main/resources/dbconfig.properties b/src/main/resources/dbconfig.properties
index 0691f43d..989dedf9 100644
--- a/src/main/resources/dbconfig.properties
+++ b/src/main/resources/dbconfig.properties
@@ -1,7 +1,9 @@
 #MySQL
 hibernate.dialect=org.hibernate.dialect.MySQLDialect
+#hibernate.dialect=org.hibernate.dialect.MariaDBDialect
 validationQuery.sqlserver=SELECT 1
 jdbc.url.jeecg=jdbc:mysql://127.0.0.1:3306/wms?useUnicode=true&characterEncoding=UTF-8
+#jdbc.url.jeecg=jdbc:mariadb://127.0.0.1:3306/wms?useUnicode=true&characterEncoding=UTF-8
 jdbc.username.jeecg=root
 jdbc.password.jeecg=Zzerp123
 jdbc.dbType=mysql
diff --git a/src/main/resources/sysConfig.properties b/src/main/resources/sysConfig.properties
index a63136f8..dc07e91f 100644
--- a/src/main/resources/sysConfig.properties
+++ b/src/main/resources/sysConfig.properties
@@ -166,7 +166,7 @@ usetuopan=yes
 #\u56FA\u5B9A\u6258\u76D8\u7801
 tuopanma=A
 #\u662F\u5426\u542F\u7528\u751F\u4EA7\u65E5\u671F
-scrqon=yes
+scrqon=no
 scrq=2099-12-31