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 |   61 +++++++++++++++++++++++++++---
 1 files changed, 55 insertions(+), 6 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 6300b48..bf234ad 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
@@ -11,25 +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.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&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
-      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.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: 192.168.0.52
     port: 6379
@@ -50,8 +80,6 @@
   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: e07a2454-136b-4498-99eb-09dae3336ebe
         username: gkhy_safeplatform_out
@@ -64,9 +92,16 @@
         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:
@@ -87,6 +122,17 @@
     # 取消服务启动检查
     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:
@@ -94,8 +140,11 @@
     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

--
Gitblit v1.9.2