From 4576151cb8452ee6c1e2150c4dbc4ad5fa4d86bf Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期二, 17 十月 2023 16:59:49 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/UserCore/src/main/resources/application-pro.yml | 74 +++++++------------------------------
1 files changed, 14 insertions(+), 60 deletions(-)
diff --git a/hd/pipe/UserCore/src/main/resources/application-pro.yml b/hd/pipe/UserCore/src/main/resources/application-pro.yml
index 30b50c9..4d18667 100644
--- a/hd/pipe/UserCore/src/main/resources/application-pro.yml
+++ b/hd/pipe/UserCore/src/main/resources/application-pro.yml
@@ -1,71 +1,25 @@
-server:
- port: 8881
spring:
- datasource:
- master:
- url: jdbc:mysql://111.30.93.215:7001/pipe_factories?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:7001/pipe_factories?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
config:
activate:
on-profile: pro
+ 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.212:8848
+ server-addr: 111.30.93.215:8848
discovery:
- server-addr: ${spring.cloud.nacos.server-addr}
heart-beat-interval: 3000
heart-beat-timeout: 15000
- group: pipe
-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
-mybatis:
- mapper-locations: classpath*:/mapping/*.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
-global:
- keyPrefix: pipe
- dataSnap: false #日志快照功能
- baseDirName: D:\\file\\
- filePreKey: file
-rocketmq:
- enable: true
- consumer:
- group: pipe
- pull-batch-size: 10
- access-key: rocketty
- secret-key: Thhy@2023
- name-server: 111.30.93.212:9876
- producer:
- group: pipe
- sendMessageTimeout: 10000
- retryTimesWhenSendFailed: 2
- retryTimesWhenSendAsyncFailed: 2
- maxMessageSize: 4096
- compressMessageBodyThreshold: 4096
- retryNextServer: false
- access-key: rocketty
- secret-key: Thhy@2023
+ group: supipe
+ namespace: suzhou
+ config:
+ file-extension: yml
+ group: sunacos
+ namespace: suzhou
wemp:
appId: wx993e9d4056f0f44e
- secret: 87f19fa7f1e6898fb143396283e733b8
\ No newline at end of file
+ secret: 87f19fa7f1e6898fb143396283e733b8
+server:
+ port: ${${spring.application.name}port}
\ No newline at end of file
--
Gitblit v1.9.3