From c14fedd8903487457ad0911e8afab47670be754e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 29 八月 2023 22:15:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 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 b8eaf54..284519d 100644
--- a/Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml
+++ b/Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml
@@ -1,3 +1,19 @@
+<<<<<<<< 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:
@@ -9,3 +25,14 @@
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