From cd02923a7ce1ffa004b3abbb7af67ab6173dd99d Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: Mon, 25 Mar 2024 10:59:40 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
safePlatfrom-out-web/src/main/resources/config/application-uat.yaml | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/resources/config/application-uat.yaml b/safePlatfrom-out-web/src/main/resources/config/application-uat.yaml
index 715fa3b..6adf37c 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-uat.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-uat.yaml
@@ -11,31 +11,55 @@
jta:
transaction-manager-id: txManager
datasource:
- type: com.alibaba.druid.pool.xa.DruidXADataSource
+ type: com.mysql.cj.jdbc.MysqlXADataSource
emergency:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.0.52:3306/safeplatform.emergency.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
username: gkhy_dev_out_team
password: Adsdf675T6AC7yga
- type: com.alibaba.druid.pool.DruidDataSource
+ initialSize: 3
+ minIdle: 3
+ maxActive: 10
+ maxWait: 30000
+ validationQuery: select 1
+ validationQueryTimeout: 10000
+ testWhileIdle: true
goalmanage:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.0.52:3306/safeplatform.goalmanage.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
username: gkhy_dev_out_team
password: Adsdf675T6AC7yga
- type: com.alibaba.druid.pool.DruidDataSource
+ initialSize: 3
+ minIdle: 3
+ maxActive: 10
+ maxWait: 30000
+ validationQuery: select 1
+ validationQueryTimeout: 10000
+ testWhileIdle: true
incidentmanage:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.0.52:3306/safeplatform.incidentmanage.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
username: gkhy_dev_out_team
password: Adsdf675T6AC7yga
- type: com.alibaba.druid.pool.DruidDataSource
+ initialSize: 3
+ minIdle: 3
+ maxActive: 10
+ maxWait: 30000
+ validationQuery: select 1
+ validationQueryTimeout: 10000
+ testWhileIdle: true
equipment:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.0.52:3306/safeplatform.equipment.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
username: gkhy_dev_out_team
password: Adsdf675T6AC7yga
- type: com.alibaba.druid.pool.DruidDataSource
+ initialSize: 3
+ minIdle: 3
+ maxActive: 10
+ maxWait: 30000
+ validationQuery: select 1
+ validationQueryTimeout: 10000
+ testWhileIdle: true
redis:
host: 192.168.0.52
port: 6375
--
Gitblit v1.9.2