From 4f6690c3bb18185e153bede81fa0a07d3798d1bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= <soldierliuli@hotmail.com>
Date: Wed, 7 Dec 2022 11:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E8=BE=BE=E6=A2=A6=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 system/pom.xml                               | 17 ++++--
 system/src/main/resources/application-dm.yml | 54 ++++++++++++++++++--
 system/src/main/resources/application.yml    | 36 +++++++------
 3 files changed, 82 insertions(+), 25 deletions(-)

diff --git a/system/pom.xml b/system/pom.xml
index 2cce864..13207d9 100644
--- a/system/pom.xml
+++ b/system/pom.xml
@@ -88,20 +88,29 @@
 
         <!--   达梦数据库     -->
         <dependency>
-            <groupId>dm.jdbc</groupId>
-            <artifactId>DmJdbcDriver</artifactId>
-            <version>18</version>
+            <groupId>com.dameng</groupId>
+            <artifactId>DmJdbcDriver18</artifactId>
+            <version>1.0</version>
             <scope>system</scope>
             <systemPath>${pom.basedir}/src/main/resources/lib/DmJdbcDriver18_18.jar</systemPath>
         </dependency>
+
+        <dependency>
+            <groupId>com.dameng</groupId>
+            <artifactId>DmDialect-for-hibernate5.3</artifactId>
+            <version>1.0</version>
+            <scope>system</scope>
+            <systemPath>${pom.basedir}/src/main/resources/lib/DmDialect-for-hibernate5.3.jar</systemPath>
+        </dependency>
+
 <!--        <dependency>-->
 <!--            &lt;!&ndash;注意：只有这个版本的hibernate兼容达梦数据库 &ndash;&gt;-->
 <!--            <groupId>org.hibernate</groupId>-->
 <!--            <artifactId>hibernate-core</artifactId>-->
 <!--            <version>5.3.18.Final</version>-->
 <!--        </dependency>-->
-    </dependencies>
 
+    </dependencies>
 
 
     <build>
diff --git a/system/src/main/resources/application-dm.yml b/system/src/main/resources/application-dm.yml
index 94c9060..3f40f81 100644
--- a/system/src/main/resources/application-dm.yml
+++ b/system/src/main/resources/application-dm.yml
@@ -1,9 +1,55 @@
 spring:
   datasource:
-    driver-class-name: dm.jdbc.driver.DmDriver
-    url: jdbc:dm://192.168.99.101:5236/
-    username: SYSDBA
-    password: ftzn83560792
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      driver-class-name: dm.jdbc.driver.DmDriver
+      url: jdbc:dm://192.168.99.101:5236?YXK_STOREROOM&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&logLevel=all&logDir=d:\jdbclog
+      username: YXK_STOREROOM
+      password: ftzn83560792
+        # 初始连接数
+      initial-size: 5
+        # 最小连接数
+      min-idle: 10
+        # 最大连接数
+      max-active: 20
+        # 获取连接超时时间
+      max-wait: 5000
+        # 连接有效性检测时间
+      time-between-eviction-runs-millis: 60000
+        # 连接在池中最小生存的时间
+      min-evictable-idle-time-millis: 300000
+        # 连接在池中最大生存的时间
+      max-evictable-idle-time-millis: 900000
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      useGlobalDataSourceStat: true
+        # 检测连接是否有效
+      validation-query: select 1
+        # 配置监控统计
+      webStatFilter:
+          enabled: true
+      stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+#          login-username: admin
+#          login-password: 123456
+      filter:
+        stat:
+          enabled: true
+            # 记录慢SQL
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
+
+#  jpa:
+#    properties:
+#      hibernate:
+#        dialect: org.hibernate.dialect.DmDialect
 
 
 # 登录相关配置
diff --git a/system/src/main/resources/application.yml b/system/src/main/resources/application.yml
index 67d14eb..39794bd 100644
--- a/system/src/main/resources/application.yml
+++ b/system/src/main/resources/application.yml
@@ -6,7 +6,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: dev
+    active: dm
   jackson:
     time-zone: GMT+8
   data:
@@ -20,26 +20,28 @@ spring:
       max-file-size: 5MB
 
     #配置 Jpa
+#  jpa:
+#    properties:
+#      hibernate:
+#        hbm2ddl:
+#          auto: none
+#      open-in-view: true
+#    show-sql: true
+
+  #达梦 jpa 配置
   jpa:
+    database-platform: org.hibernate.dialect.DmDialect
+    hibernate:
+      naming:
+        physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+      ddl-auto: none
+    open-in-view: false
     properties:
       hibernate:
-        hbm2ddl:
-          auto: none
-      open-in-view: true
-    show-sql: true
+        show_sql: true
+        dialect: org.hibernate.dialect.DmDialect
+
 
-#  jpa:
-#    database-platform: org.hibernate.dialect.DmDialect
-#    open-in-view: false
-#    properties:
-#     hibernate:
-#      show_sql: false
-#      hbn2ddl:
-#         auto: none
-#      dialect: org.hibernate.dialect.Oracle10gDialect
-#      default_schema: SYSDBA
-#      temp:
-#        use_jdbc_metadata_defaults: false
 
   redis:
     #数据库索引