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 | 143 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 128 insertions(+), 15 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 780cb2d..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,20 +2,104 @@
tomcat:
uri-encoding: UTF-8
basedir: /
- port: 8009
+ port: 7009
servlet:
context-path: /
# mysql
spring:
+ jta:
+ transaction-manager-id: txManager
datasource:
- one:
+ type: com.mysql.cj.jdbc.MysqlXADataSource
+ emergency:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://twt.sinanoaq.com:13306/zhongtai.demo?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- username: root
- password: Sinanoaq#415
- type: com.alibaba.druid.pool.DruidDataSource
+ 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
+ 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
+ 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: 192.168.0.52
+ port: 6377
+ 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: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f
+ username: gkhy_safeplatform_out
+ password: 9485uyJHISes09t
+ enabled: true
+ register-enabled: true
+ config:
+ server-addr: http://192.168.0.52:8848
+ 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：不允许
+ enableCors: false
mybatis-plus:
configuration:
@@ -24,30 +108,59 @@
dubbo:
registry:
protocol: nacos
- address: nacos://192.168.0.62:18848?namespace=e07a2454-136b-4498-99eb-09dae3336ebe&username=gkhy_safeplatform_out&password=9485uyJHISes09t
+ address: nacos://192.168.0.52:8848?namespace=aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f&username=gkhy_safeplatform_out&password=9485uyJHISes09t
application:
- name: gkhy-safeplatform-account-provider
+ name: gkhy-safeplatform-out-test
scan:
# 扫描rpc接口定义包
base-packages: com.gkhy.safePlatform
protocol:
name: dubbo
- port: 18080
+ 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:
+ group: gkhy-safeplatform-guotai
+ sendMessageTimeout: 300000
+ consumer:
+ group: gkhy-safeplatform-guotai
+ topic:
+ demoTopic: gkhy-safeplatform-topic-demo
+
minio:
- endPoint: 192.168.0.62
- port: 9001
- accessKey: kH6eiQtNrWqGNb1r
- secretKey: ff5ykVUJJn0hi5PghsitdGNSsrW0Xrju
+ endPoint: 192.168.0.52
+ port: 9000
+ accessKey: oddER8eSv211WVG3
+ secretKey: TeaEh8eWNhBbjCYK3G6cIX2QGYECwo7M
secure: false
- bucketName: szh-stu
- urlPrefix: http://192.168.0.62/file
+ bucketName: safeplatform-dev
+ urlPrefix: http://192.168.0.52/file
+ #用户名 gkhy_team_out_dev
+ #密码 12345678
+token:
+ header: Authorization
+ secret: safe666
+ expiration: 7200
+ refreshExpiration: 14400
+ tokenHead: Bearer
+ loginUserHeader: uid
--
Gitblit v1.9.2