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-dev.yml | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/hd/pipe/UserCore/src/main/resources/application-dev.yml b/hd/pipe/UserCore/src/main/resources/application-dev.yml
index ddac89d..22b8584 100644
--- a/hd/pipe/UserCore/src/main/resources/application-dev.yml
+++ b/hd/pipe/UserCore/src/main/resources/application-dev.yml
@@ -1,13 +1,11 @@
-server:
- port: 8881
spring:
config:
activate:
on-profile: dev
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,9 +13,13 @@
heart-beat-interval: 3000
heart-beat-timeout: 15000
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