From cd02923a7ce1ffa004b3abbb7af67ab6173dd99d Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期一, 25 三月 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-guotai-prod-1.yaml |   40 ++++++++++++++++++++++++++++++++--------
 1 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml b/safePlatfrom-out-web/src/main/resources/config/application-guotai-prod-1.yaml
similarity index 83%
rename from safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml
rename to safePlatfrom-out-web/src/main/resources/config/application-guotai-prod-1.yaml
index ec399cb..c037dcf 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-guotai-prod-1.yaml
@@ -11,36 +11,60 @@
   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.30.107:43306/safeplatform.emergency.guotai.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
       username: gkhy_safeplatform_guotai_out
       password: a7687@i8a1Sdd
-      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.30.107:43306/safeplatform.goalmanage.guotai.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
       username: gkhy_safeplatform_guotai_out
       password: a7687@i8a1Sdd
-      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.30.107:43306/safeplatform.incidentmanage.guotai.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
       username: gkhy_safeplatform_guotai_out
       password: a7687@i8a1Sdd
-      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.30.107:43306/safeplatform.equipment.guotai.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
       username: gkhy_safeplatform_guotai_out
       password: a7687@i8a1Sdd
-      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.30.107
-    port: 6375
-    password: SEF98uvs98dUAUEF90Udssa
-    database: 0           # Redis 数据库号,默认为 0
+    port: 6364
+    password: akj78avauba789a
+    database: 13           # Redis 数据库号,默认为 0
     timeout: 15000        # Redis 连接超时时间,单位:毫秒。
     lettuce:
       pool:

--
Gitblit v1.9.2