From 1707976c2f30199565c2ddbea0e2c33edd4688a9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 26 九月 2023 09:11:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml | 25 -------------------------
1 files changed, 0 insertions(+), 25 deletions(-)
diff --git a/Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml b/Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml
index 284519d..d775f95 100644
--- a/Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml
+++ b/Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml
@@ -1,19 +1,3 @@
-<<<<<<<< HEAD:Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml
-
-========
-server:
- port: 37000
-
-spring:
- cloud:
- gateway:
- discovery:
- locator:
- enabled: true
- loadbalancer:
- retry:
- enabled: true
->>>>>>>> origin/master:Source/UBCS/ubcs-gateway/src/main/resources/application-dev.yml
blade:
#澶氬洟闃熷崗浣滄湇鍔￠厤缃�
loadbalancer:
@@ -27,12 +11,3 @@
- 127.0.0.1
server:
port: 80
-spring:
- cloud:
- gateway:
- discovery:
- locator:
- enabled: true
- loadbalancer:
- retry:
- enabled: true
--
Gitblit v1.10.0