From c9529bd19a8d61666b71824dd751682c1e9dc288 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 15 八月 2022 10:39:31 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
safePlatfrom-out-web/src/main/resources/config/application-dev.yaml | 66 ++++++++++++++++++++++++++++++---
1 files changed, 60 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 8449e89..f7b67cb 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
@@ -8,20 +8,62 @@
# 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: 6379
+ password: SEF98uvs98dUAUEF90Udssa
+ database: 0 # Redis 数据库号，默认为 0
+ timeout: 15000 # Redis 连接超时时间，单位：毫秒。
+ lettuce:
+ pool:
+ max-active: 4
+ max-idle: 4
+ # 对应 RedisProperties.Jedis 内部类
+ jedis:
+ pool:
+ 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:
@@ -46,14 +88,26 @@
# 取消服务启动检查
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
- 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