From a07b4b6ff1c98dcf81338bb45d59308db7c058a9 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期五, 03 十一月 2023 17:18:56 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/StaffManage/src/main/resources/application-pro.yml | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/hd/pipe/StaffManage/src/main/resources/application-pro.yml b/hd/pipe/StaffManage/src/main/resources/application-pro.yml
index 5ad14c2..2f83d6b 100644
--- a/hd/pipe/StaffManage/src/main/resources/application-pro.yml
+++ b/hd/pipe/StaffManage/src/main/resources/application-pro.yml
@@ -1,13 +1,11 @@
-server:
- port: 8882
spring:
config:
activate:
- on-profile: dev
+ 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
@@ -15,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