From 766effa6e04db9b37b1dc3886d988beaa595c38d Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期二, 12 十二月 2023 09:04:55 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/screen/src/main/resources/application-pro.yml | 84 +++++++++--------------------------------
1 files changed, 19 insertions(+), 65 deletions(-)
diff --git a/hd/pipe/screen/src/main/resources/application-pro.yml b/hd/pipe/screen/src/main/resources/application-pro.yml
index 8021082..2f83d6b 100644
--- a/hd/pipe/screen/src/main/resources/application-pro.yml
+++ b/hd/pipe/screen/src/main/resources/application-pro.yml
@@ -1,70 +1,24 @@
-server:
- port: 8887
spring:
- datasource:
- master:
- url: jdbc:mysql://111.30.93.215:7001/pipe_factories?useSSL=false&nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- slave:
- url: jdbc:mysql://111.30.93.215:7002/pipe_factories?useSSL=false&nullCatalogMeansCurrent=true&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
- driverClassName: com.mysql.cj.jdbc.Driver
- username: javad
- password: Thhy@123
- hikari:
- maxLifeTime: 90000
- maxPoolSize: 30
- minIdle: 10
- cloud:
- nacos:
- server-addr: 111.30.93.212:8848
- discovery:
- server-addr: ${spring.cloud.nacos.server-addr}
- heart-beat-interval: 3000
- heart-beat-timeout: 15000
- group: pipe
config:
activate:
on-profile: pro
-redisson:
- enable: true
- address: redis://111.30.93.215:6379
- password: Thhy@123
- timeout: 10000
- connectTimeout: 20000
- connectionPoolSize: 100
- connectionMinimumIdleSize: 10
- retryAttempts: 5
- retryInterval: 3000
- redissonCacheDefault: 86400000
-global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: file
-rocketmq:
- enable: true
- name-server: 111.30.93.212:9876
- consumer:
- access-key: rocketty
- secret-key: Thhy@2023
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
-mqtt:
- pubTopic:
- subTopic: agvmqtt
- broker: tcp://111.30.93.213:1883
- clientId: qingdaoAgv
- username: agvadmin
- password: Thhy123456
+ import:
+ - optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ - optional:nacos:pipe-rocket-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
+ cloud:
+ nacos:
+ server-addr: 111.30.93.215:8848
+ discovery:
+ heart-beat-interval: 3000
+ heart-beat-timeout: 15000
+ group: supipe
+ namespace: suzhou
+ config:
+ file-extension: yml
+ group: sunacos
+ namespace: suzhou
+server:
+ port: ${${spring.application.name}port}
netty:
- port: 8899
\ No newline at end of file
+ port: ${${spring.application.name}nettyport}
\ No newline at end of file
--
Gitblit v1.9.3