From d9adbadd9fa14cb7174f6167c438a45e8176fd26 Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: Thu, 23 Feb 2023 15:22:04 +0800
Subject: [PATCH] 数据库连接池移除druid atomikos分布式事务使用com.mysql.cj.jdbc.MysqlXADataSource
---
safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml | 118 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 77 insertions(+), 41 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-demo.yaml
index 4c05944..726fa5c 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml
@@ -2,7 +2,7 @@
tomcat:
uri-encoding: UTF-8
basedir: /
- port: 16009
+ port: 16012
servlet:
context-path: /
@@ -11,35 +11,58 @@
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.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- &allowPublicKeyRetrieval=true
- username: gkhy_out_team
- password: sas@sASDa28
- type: com.alibaba.druid.pool.DruidDataSource
+ 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
+ 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.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
- username: gkhy_out_team
- password: sas@sASDa28
- type: com.alibaba.druid.pool.DruidDataSource
+ 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
+ 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.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
- username: gkhy_out_team
- password: sas@sASDa28
- type: com.alibaba.druid.pool.DruidDataSource
+ 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
+ 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.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
- username: gkhy_out_team
- password: sas@sASDa28
- type: com.alibaba.druid.pool.DruidDataSource
+ 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
+ initialSize: 3
+ minIdle: 3
+ maxActive: 10
+ maxWait: 30000
+ validationQuery: select 1
+ validationQueryTimeout: 10000
+ testWhileIdle: true
redis:
- host: 192.168.0.52
- port: 6377
+ host: 192.168.30.107
+ port: 6375
password: SEF98uvs98dUAUEF90Udssa
database: 0 # Redis 数据库号，默认为 0
timeout: 15000 # Redis 连接超时时间，单位：毫秒。
@@ -57,19 +80,22 @@
cloud:
nacos:
discovery:
- # server-addr: nacos://121.239.169.27:18848?username=nacos&password=guokehongyu
- # server-addr: 192.168.0.52:8848?namespace=e07a2454-136b-4498-99eb-09dae3336ebe&username=gkhy_team_safeplatform_dev&password=nacosadmin
- server-addr: http://192.168.0.52:8848
- namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f
- username: gkhy_safeplatform_out
+ server-addr: http://192.168.30.107:8848
+ namespace: 78fe80cc-6159-4381-8e42-1cc6c68eb22e
+ username: gkhy_dev_out_team
password: 9485uyJHISes09t
enabled: true
register-enabled: true
config:
- server-addr: http://192.168.0.52:8848
- namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f
- username: gkhy_safeplatform_out
+ server-addr: http://192.168.30.107:8848
+ namespace: 78fe80cc-6159-4381-8e42-1cc6c68eb22e
+ username: gkhy_dev_out_team
password: 9485uyJHISes09t
+ inetutils:
+ ignored-interfaces:
+ - VirtualBox Host-Only Network
+ preferred-networks:
+ - 192.168
#是否允许跨域 true：允许；false：不允许
enableCors: false
@@ -81,40 +107,50 @@
dubbo:
registry:
protocol: nacos
- address: nacos://192.168.0.52:8848?namespace=aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f&username=gkhy_safeplatform_out&password=9485uyJHISes09t
+ address: nacos://192.168.30.107:8848?namespace=78fe80cc-6159-4381-8e42-1cc6c68eb22e&username=gkhy_dev_out_team&password=9485uyJHISes09t
application:
- name: gkhy-safeplatform-out-test
+ name: gkhy-safeplatform-out
scan:
# 扫描rpc接口定义包
base-packages: com.gkhy.safePlatform
protocol:
name: dubbo
- port: 18082
+ port: 18089
serialization: kryo
+ host: ${spring.cloud.client.ip-address}
consumer:
# 服务连接超时时间
timeout: 3000
# 取消服务启动检查
check: false
+threadPool:
+ corePoolSize: 20
+ maxPoolSize: 20
+ queueCapacity: 10000
+ scheduling:
+ #控制线程是否执行 true：执行；false：不执行
+ enabled: true
+# enabled: false
+
rocketmq:
- name-server: 192.168.0.52:9876
+ name-server: 192.168.30.107:9876
producer:
- group: gkhy-safeplatform-guotai
+ group: gkhy-safeplatform-guotai-uat
sendMessageTimeout: 300000
consumer:
- group: gkhy-safeplatform-guotai
+ group: gkhy-safeplatform-guotai-uat
topic:
- demoTopic: gkhy-safeplatform-topic-demo
+ demoTopic: gkhy-safeplatform-topic-demo-uat
minio:
- endPoint: 192.168.0.52
+ endPoint: 121.239.169.27
port: 9000
- accessKey: oddER8eSv211WVG3
- secretKey: TeaEh8eWNhBbjCYK3G6cIX2QGYECwo7M
+ accessKey: QR0J7S55SZO8QI1TC2AD
+ secretKey: X0oSBT7vRqYWU41Ut21B+FU7G5A87BzPIRdObGjK
secure: false
- bucketName: safeplatform-dev
- urlPrefix: http://192.168.0.52/file
+ bucketName: safeplatform-guotai-uat
+ urlPrefix: http://121.239.169.27/file
#用户名 gkhy_team_out_dev
#密码 12345678
--
Gitblit v1.9.2