From a76a772381fc6697f06394fea768e0c5fa48a0d3 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Fri, 3 Apr 2026 16:14:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=B3=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 oms-gateway/pom.xml                           | 16 +++++-------
 .../org/nl/gateway/GatewayApplication.java    |  2 --
 .../java/org/nl/gateway/InitController.java   | 22 ----------------
 .../src/main/resources/application.yml        |  9 +++++++
 .../nl/gateway/GatewayApplicationTests.java   | 26 +++++++++----------
 5 files changed, 28 insertions(+), 47 deletions(-)
 delete mode 100644 oms-gateway/src/main/java/org/nl/gateway/InitController.java

diff --git a/oms-gateway/pom.xml b/oms-gateway/pom.xml
index 538af15..aa519f2 100644
--- a/oms-gateway/pom.xml
+++ b/oms-gateway/pom.xml
@@ -17,24 +17,20 @@
 		<java.version>17</java.version>
 	</properties>
 	<dependencies>
-		<!-- OpenFeign（必须，用于调用远程服务） -->
+		<!-- Spring Cloud Gateway（3.x官方网关） -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-openfeign</artifactId>
+			<artifactId>spring-cloud-starter-gateway</artifactId>
 		</dependency>
-		<!-- Nacos 服务发现 -->
+		<!-- Nacos注册 -->
 		<dependency>
 			<groupId>com.alibaba.cloud</groupId>
 			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
 		</dependency>
+		<!-- 负载均衡（3.x必须加） -->
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.nl</groupId>
-			<artifactId>finnace-api</artifactId>
-			<version>${project.version}</version>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-loadbalancer</artifactId>
 		</dependency>
 	</dependencies>
 
diff --git a/oms-gateway/src/main/java/org/nl/gateway/GatewayApplication.java b/oms-gateway/src/main/java/org/nl/gateway/GatewayApplication.java
index 800507b..48732ae 100644
--- a/oms-gateway/src/main/java/org/nl/gateway/GatewayApplication.java
+++ b/oms-gateway/src/main/java/org/nl/gateway/GatewayApplication.java
@@ -2,10 +2,8 @@ package org.nl.gateway;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @SpringBootApplication
-@EnableFeignClients(basePackages = {"org.nl.finnaceapi.feignApi"})  // 扫描 Feign 接口
 public class GatewayApplication {
 
 	public static void main(String[] args) {
diff --git a/oms-gateway/src/main/java/org/nl/gateway/InitController.java b/oms-gateway/src/main/java/org/nl/gateway/InitController.java
deleted file mode 100644
index 5814fdc..0000000
--- a/oms-gateway/src/main/java/org/nl/gateway/InitController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.nl.gateway;
-
-import org.nl.finnaceapi.dto.Init;
-import org.nl.finnaceapi.feignApi.FinanceFeignApi;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController()
-@RequestMapping("/api")
-public class InitController {
-
-
-    @Autowired
-    private FinanceFeignApi financeFeignApi;
-
-    @GetMapping("/gateway")
-    public Init getPlan(){
-        return financeFeignApi.init();
-    }
-}
diff --git a/oms-gateway/src/main/resources/application.yml b/oms-gateway/src/main/resources/application.yml
index a4e03e3..4f70d05 100644
--- a/oms-gateway/src/main/resources/application.yml
+++ b/oms-gateway/src/main/resources/application.yml
@@ -2,9 +2,18 @@ server:
   port: 8012
 spring:
   application:
+    name: gateway-server
   cloud:
     nacos:
       discovery:
         server-addr: localhost:8848
         namespace: public
         enabled: true
+    gateway:
+      routes:
+        - id: user-route
+          uri: lb://user-service
+          predicates: Path=/user/**
+        - id: order-route
+          uri: lb://finnace-server
+          predicates: Path=/finnace/**
\ No newline at end of file
diff --git a/oms-gateway/src/test/java/org/nl/gateway/GatewayApplicationTests.java b/oms-gateway/src/test/java/org/nl/gateway/GatewayApplicationTests.java
index d80a46f..886ac7e 100644
--- a/oms-gateway/src/test/java/org/nl/gateway/GatewayApplicationTests.java
+++ b/oms-gateway/src/test/java/org/nl/gateway/GatewayApplicationTests.java
@@ -1,13 +1,13 @@
-package org.nl.gateway;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class GatewayApplicationTests {
-
-	@Test
-	void contextLoads() {
-	}
-
-}
+//package org.nl.gateway;
+//
+//import org.junit.jupiter.api.Test;
+//import org.springframework.boot.test.context.SpringBootTest;
+//
+//@SpringBootTest
+//class GatewayApplicationTests {
+//
+//	@Test
+//	void contextLoads() {
+//	}
+//
+//}