From 8f3526aee283ccb4478809f22a5c6b75000bd0de Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期二, 17 十月 2023 14:54:30 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/StaffManage/src/main/resources/application-pro.yml | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/hd/pipe/StaffManage/src/main/resources/application-pro.yml b/hd/pipe/StaffManage/src/main/resources/application-pro.yml
index 180c871..2f83d6b 100644
--- a/hd/pipe/StaffManage/src/main/resources/application-pro.yml
+++ b/hd/pipe/StaffManage/src/main/resources/application-pro.yml
@@ -4,8 +4,8 @@
on-profile: pro
import:
- optional:nacos:${spring.application.name}-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-common-${spring.config.activate.on-profile}.${spring.cloud.nacos.config.file-extension}
- - optional:nacos:supipe-rocket-${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
@@ -13,8 +13,12 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
group: supipe
+ namespace: suzhou
config:
file-extension: yml
group: sunacos
-global:
- filePrefix: https://pipe.thhy-tj.com/
\ No newline at end of file
+ namespace: suzhou
+server:
+ port: ${${spring.application.name}port}
+netty:
+ port: ${${spring.application.name}nettyport}
\ No newline at end of file
--
Gitblit v1.9.3