From 00213a853ecc325ebd67f334261de66a6817ad53 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 19 十月 2023 16:15:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 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..7416056 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:
@@ -26,7 +10,8 @@
- 192.168.0.*
- 127.0.0.1
server:
- port: 80
+ port: 37000
+
spring:
cloud:
gateway:
@@ -36,3 +21,5 @@
loadbalancer:
retry:
enabled: true
+ main:
+ web-application-type: reactive
--
Gitblit v1.9.3