From 74c86606c9abc778a3848025395d7c7d6fbcfac0 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Tue, 19 Jul 2022 15:28:19 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
safePlatfrom-out-web/src/main/resources/config/application-out-dev.yaml | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/resources/config/application-out-dev.yaml b/safePlatfrom-out-web/src/main/resources/config/application-out-dev.yaml
index bfed9b6..017d327 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-out-dev.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-out-dev.yaml
@@ -8,33 +8,61 @@
# mysql
spring:
+ jta:
+ transaction-manager-id: txManager
datasource:
+ type: com.alibaba.druid.pool.xa.DruidXADataSource
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
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
+ 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
redis:
host: 192.168.0.52
- port: 6378
+ port: 6379
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: 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: 11ee8fe9-ea10-4f63-9752-c33c7ac36e36
+ username: gkhy_safeplatform_out
+ password: 9485uyJHISes09t
+ enabled: true
+ register-enabled: true
+ config:
+ server-addr: http://192.168.0.52:8848
+ namespace: 11ee8fe9-ea10-4f63-9752-c33c7ac36e36
+ username: gkhy_safeplatform_out
+ password: 9485uyJHISes09t
mybatis-plus:
configuration:
@@ -59,6 +87,16 @@
# 取消服务启动检查
check: false
+rocketmq:
+ name-server: 192.168.0.52:9876
+ producer:
+ group: gkhy-safeplatform-dev
+ sendMessageTimeout: 300000
+ consumer:
+ group: gkhy-safeplatform-out-dev
+ topic:
+ demoTopic: gkhy-safeplatform-topic-demo
+
minio:
endPoint: 192.168.0.52
port: 9001
--
Gitblit v1.9.2