From cd02923a7ce1ffa004b3abbb7af67ab6173dd99d Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期一, 25 三月 2024 10:59:40 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
safePlatfrom-out-web/src/main/resources/config/application-test.yaml | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/resources/config/application-test.yaml b/safePlatfrom-out-web/src/main/resources/config/application-test.yaml
index 5e35629..2fe542a 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-test.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-test.yaml
@@ -2,7 +2,7 @@
tomcat:
uri-encoding: UTF-8
basedir: /
- port: 8009
+ port: 7009
servlet:
context-path: /
@@ -11,31 +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
- type: com.alibaba.druid.pool.DruidDataSource
+ initialSize: 3
+ minIdle: 3
+ maxActive: 10
+ maxWait: 30000
+ validationQuery: select 1
+ validationQueryTimeout: 10000
+ testWhileIdle: true
redis:
host: 192.168.0.52
port: 6377
@@ -56,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: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f
username: gkhy_safeplatform_out
@@ -69,6 +91,11 @@
namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f
username: gkhy_safeplatform_out
password: 9485uyJHISes09t
+ inetutils:
+ ignored-interfaces:
+ - VirtualBox Host-Only Network
+ preferred-networks:
+ - 192.168
#是否允许跨域 true：允许；false：不允许
@@ -89,14 +116,24 @@
base-packages: com.gkhy.safePlatform
protocol:
name: dubbo
- port: 18082
+ port: 33003
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
producer:
--
Gitblit v1.9.2