From 09f411e381f885619b32e05fc89cad26bb20824d Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 01 三月 2021 14:27:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'obdserver2/master'
---
src/main/resources/application.yml | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cf37a25..ece910b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,24 +1,38 @@
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://47.100.191.150:3306/obd?serverTimezone=GMT&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
- username: obd
- password: obd2019
+# url: jdbc:mysql://47.100.191.150:3306/uav?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
+# username: uav
+# password: obd2019
+
+ url: jdbc:mysql://114.215.109.124:3306/dronemonitor?serverTimezone=Asia/Shanghai&prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
+ username: root
+ password: 123456
+ hikari:
+ maximum-pool-size: 500
+ minimum-idle: 20
+ idle-timeout: 60000
+ connection-timeout: 60000
+ jmx:
+ enabled: false
+
+
mybatis:
- type-aliases-package: com.flightfeather.obd.domain.entity
+ type-aliases-package: com.flightfeather.uav.domain.entity
mapper-locations: classpath*:mapper/*.xml
## 閫氱敤 Mapper 閰嶇疆
#mappers 澶氫釜鎺ュ彛鏃堕�楀彿闅斿紑
mapper:
- mappers: com.flightfeather.obd.domain.MyMapper
+ mappers: com.flightfeather.uav.domain.MyMapper
not-empty: false
identity: MYSQL
+#鏁版嵁搴撳垎椤甸厤缃�
pagehelper:
helperDialect: mysql
reasonable: true
supportMethodsArguments: true
- params: count=countSql
\ No newline at end of file
+ params: count=countSql
--
Gitblit v1.9.3