From d9adbadd9fa14cb7174f6167c438a45e8176fd26 Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: 星期四, 23 二月 2023 15:22:04 +0800
Subject: [PATCH] 数据库连接池移除druid atomikos分布式事务使用com.mysql.cj.jdbc.MysqlXADataSource

---
 safePlatfrom-out-web/src/main/resources/config/application-dev.yaml |  113 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 101 insertions(+), 12 deletions(-)

diff --git a/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml b/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
index 8bb6864..bf234ad 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
@@ -8,37 +8,100 @@
 
 # mysql
 spring:
+  jta:
+    transaction-manager-id: txManager
   datasource:
+    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.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+      url: jdbc:mysql://192.168.0.52:3306/safeplatform.emergency.dev?allowMultiQueries=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.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+      url: jdbc:mysql://192.168.0.52:3306/safeplatform.goalmanage.dev?allowMultiQueries=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.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+      username: gkhy_dev_out_team
+      password: Adsdf675T6AC7yga
+      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.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+      username: gkhy_dev_out_team
+      password: Adsdf675T6AC7yga
+      initialSize: 3
+      minIdle: 3
+      maxActive: 10
+      maxWait: 30000
+      validationQuery: select 1
+      validationQueryTimeout: 10000
+      testWhileIdle: true
   redis:
-    host: 127.0.0.1
+    host: 192.168.0.52
     port: 6379
-    password: root      # Redis 服务器密码,默认为空。生产中,一定要设置 Redis 密码!
+    password: SEF98uvs98dUAUEF90Udssa
     database: 0           # Redis 数据库号,默认为 0
     timeout: 15000        # Redis 连接超时时间,单位:毫秒。
+    lettuce:
+      pool:
+        max-active: 4
+        max-idle: 4
     # 对应 RedisProperties.Jedis 内部类
     jedis:
       pool:
-        max-active: 8     # 连接池最大连接数,默认为 8 。使用负数表示没有限制    同一时间最大只能执行8条sql语句,每执行一条语句就会建立一个连接
-        max-idle: 8       # 默认连接数最大空闲的连接数,默认为 8 。使用负数表示没有限制。
+        max-active: 4     # 连接池最大连接数,默认为 8 。使用负数表示没有限制    同一时间最大只能执行8条sql语句,每执行一条语句就会建立一个连接
+        max-idle: 4       # 默认连接数最大空闲的连接数,默认为 8 。使用负数表示没有限制。
         min-idle: 0       # 默认连接池最小空闲的连接数,默认为 0 。允许设置 0 和 正数。
         max-wait: -1
+  cloud:
+    nacos:
+      discovery:
+        server-addr: http://192.168.0.52:8848
+        namespace: e07a2454-136b-4498-99eb-09dae3336ebe
+        username: gkhy_safeplatform_out
+        password: 9485uyJHISes09t
+        enabled: true
+        register-enabled: true
+      config:
+        server-addr: http://192.168.0.52:8848
+        namespace: e07a2454-136b-4498-99eb-09dae3336ebe
+        username: gkhy_safeplatform_out
+        password: 9485uyJHISes09t
 
+  #是否允许跨域 true:允许;false:不允许
+  enableCors: true
 
 mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  global-config:
+    db-config:
+      logic-delete-value: 1
+      logic-not-delete-value: 0
 
 dubbo:
   registry:
@@ -59,14 +122,40 @@
     # 取消服务启动检查
     check: false
 
+#线程池配置
+threadPool:
+  corePoolSize: 20
+  maxPoolSize: 20
+  queueCapacity: 10000
+  scheduling:
+    #控制线程是否执行 true:执行;false:不执行
+    enabled: true
+#    enabled: false
+
+
+rocketmq:
+  name-server: 192.168.0.52:9876
+  producer:
+    group: gkhy-safeplatform-dev
+    sendMessageTimeout: 300000
+  consumer:
+    group: gkhy-safeplatform-out-dev
+    safeMaterialGroup: gkhy-safeplatform-out-safeMaterialConsumer
+  topic:
+    demoTopic: gkhy-safeplatform-topic-demo
+    safeMaterialTopic: gkhy-safeplatform-out-safeMaterialTopic
+
+
 minio:
   endPoint: 192.168.0.52
-  port: 9001
-  accessKey: kH6eiQtNrWqGNb1r
-  secretKey: ff5ykVUJJn0hi5PghsitdGNSsrW0Xrju
+  port: 9000
+  accessKey: oddER8eSv211WVG3
+  secretKey: TeaEh8eWNhBbjCYK3G6cIX2QGYECwo7M
   secure: false
-  bucketName: szh-stu
+  bucketName: safeplatform-dev
   urlPrefix: http://192.168.0.52/file
+  #用户名 gkhy_team_out_dev
+  #密码 12345678
 
 
 token:

--
Gitblit v1.9.2