From b21e22bc5fa102ec3aed02cfd9169fe6226768f7 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 10 七月 2024 16:46:06 +0800
Subject: [PATCH] 数据库连接配置切换达梦数据库
---
lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml | 84 ++++++------------------------------------
lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java | 2
lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml | 11 -----
3 files changed, 13 insertions(+), 84 deletions(-)
diff --git a/lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java b/lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java
index e94a024..a8401e7 100644
--- a/lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java
+++ b/lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java
@@ -13,7 +13,7 @@
public static final String DB_TYPE_ORACLE = "ORACLE";
/**杈炬ⅵ鏁版嵁搴�*/
- public static final String DB_TYPE_DM = "DM";
+ public static final String DB_TYPE_DM = "dm dbms";
/**postgreSQL杈炬ⅵ鏁版嵁搴�*/
public static final String DB_TYPE_POSTGRESQL = "POSTGRESQL";
diff --git a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
index e81ed9d..72c5c33 100644
--- a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
+++ b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
@@ -38,39 +38,19 @@
## quartz瀹氭椂浠诲姟,閲囩敤鏁版嵁搴撴柟寮�
quartz:
job-store-type: jdbc
- initialize-schema: embedded
- #瀹氭椂浠诲姟鍚姩寮�鍏筹紝true-寮� false-鍏�
+ jdbc:
+ initialize-schema: never
auto-startup: true
- #寤惰繜1绉掑惎鍔ㄥ畾鏃朵换鍔�
- startup-delay: 1s
#鍚姩鏃舵洿鏂板繁瀛樺湪鐨凧ob
overwrite-existing-jobs: true
- properties:
- org:
- quartz:
- scheduler:
- instanceName: MyScheduler
- instanceId: AUTO
- jobStore:
- selectWithLockSQL: SELECT* FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?
- # class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
- # driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
- # tablePrefix: QRTZ_
- # isClustered: true
- # misfireThreshold: 12000
- # clusterCheckinInterval: 15000
- threadPool:
- class: org.quartz.simpl.SimpleThreadPool
- threadCount: 10
- threadPriority: 5
- threadsInheritContextClassLoaderOfInitializingThread: true
#json 鏃堕棿鎴崇粺涓�杞崲
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
jpa:
- open-in-view: false
- database-platform: org.hibernate.dialect.SQLServerDialect
+ properties:
+ hibernate:
+ dialect: org.hibernate.dialect.Oracle8iDialect
aop:
proxy-target-class: true
#閰嶇疆freemarker
@@ -95,55 +75,15 @@
matching-strategy: ant_path_matcher
resource:
static-locations: classpath:/static/,classpath:/public/
- autoconfigure:
- exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+# autoconfigure:
+# exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
druid:
- stat-view-servlet:
- enabled: true
- loginUsername: admin
- loginPassword: 123456
- allow:
- web-stat-filter:
- enabled: true
- dynamic:
- druid: # 鍏ㄥ眬druid鍙傛暟锛岀粷澶ч儴鍒嗗�煎拰榛樿淇濇寔涓�鑷淬��(鐜板凡鏀寔鐨勫弬鏁板涓�,涓嶆竻妤氬惈涔変笉瑕佷贡璁剧疆)
- # 杩炴帴姹犵殑閰嶇疆淇℃伅
- # 鍒濆鍖栧ぇ灏忥紝鏈�灏忥紝鏈�澶�
- initial-size: 5
- min-idle: 5
- maxActive: 20
- # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
- maxWait: 60000
- # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
- timeBetweenEvictionRunsMillis: 60000
- # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
- minEvictableIdleTimeMillis: 300000
- validationQuery: SELECT 1
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- # 鎵撳紑PSCache锛屽苟涓旀寚瀹氭瘡涓繛鎺ヤ笂PSCache鐨勫ぇ灏�
- poolPreparedStatements: true
- maxPoolPreparedStatementPerConnectionSize: 20
- # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛屽幓鎺夊悗鐩戞帶鐣岄潰sql鏃犳硶缁熻锛�'wall'鐢ㄤ簬闃茬伀澧�
- filters: stat,wall,slf4j
- # 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
- connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
- datasource:
- master:
- url: jdbc:sqlserver://192.168.124.118:1433;databasename=LXZN_TEST_430
-# url: jdbc:sqlserver://localhost:1433;databasename=LXZN_TEST_430
-# url: jdbc:sqlserver://192.168.124.118:1433;databasename=EAM_430_TEST
- username: sa
- password: 123
- driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
- # 澶氭暟鎹簮閰嶇疆
- #multi-datasource1:
- # url: jdbc:sqlserver://192.168.0.118:1433;databasename=lxzn_test
- # username: sa
- # password: 123
- # driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ driverClassName: dm.jdbc.driver.DmDriver
+ url: jdbc:dm://192.168.124.118:5236/?LXZN_TEST_420&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
+ username: LXZN_TEST_420
+ password: LXZN@1688
#redis 閰嶇疆
redis:
database: 0
diff --git a/lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml b/lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml
index 6ed1352..427bd7b 100644
--- a/lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml
+++ b/lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml
@@ -135,18 +135,7 @@
url: jdbc:sqlserver://195.0.1.10:1433;databasename=SSGX_kns
username: sa
password: Sa123456789
- #password: 123
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
- #url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
- #username: root
- #password: root
- #driver-class-name: com.mysql.cj.jdbc.Driver
- # 澶氭暟鎹簮閰嶇疆
- #multi-datasource1:
- # url: jdbc:sqlserver://192.168.0.118:1433;databasename=lxzn_test
- # username: sa
- # password: 123
- # driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
#redis 閰嶇疆
redis:
database: 0
--
Gitblit v1.9.3