From d33ba05da2fbe74d8b85d393eca2a336f20f8688 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 30 八月 2023 18:19:25 +0800
Subject: [PATCH] 本地提交
---
Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml | 27 ---------------------------
1 files changed, 0 insertions(+), 27 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..b8eaf54 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:
@@ -25,14 +9,3 @@
prior-ip-pattern:
- 192.168.0.*
- 127.0.0.1
-server:
- port: 80
-spring:
- cloud:
- gateway:
- discovery:
- locator:
- enabled: true
- loadbalancer:
- retry:
- enabled: true
--
Gitblit v1.9.3