From 9cf6d184a1b8a3a2a951a6842a586906747d46cd Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 05 八月 2025 20:56:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ZuulZYTravel/src/main/java/com/sinata/zuul/ZuulApplication.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/ZuulZYTravel/src/main/java/com/sinata/zuul/ZuulApplication.java b/ZuulZYTravel/src/main/java/com/sinata/zuul/ZuulApplication.java
index bd2a0a3..3255a99 100644
--- a/ZuulZYTravel/src/main/java/com/sinata/zuul/ZuulApplication.java
+++ b/ZuulZYTravel/src/main/java/com/sinata/zuul/ZuulApplication.java
@@ -35,14 +35,14 @@
@EnableZuulProxy//开启网关服务
@EnableDiscoveryClient//开启eureka客户端的消费者
@SpringBootApplication
-public class ZuulApplication extends SpringBootServletInitializer {
+public class ZuulApplication /*extends SpringBootServletInitializer*/ {
public static void main(String[] args) {
SpringApplication.run(ZuulApplication.class, args);
- NettyServer nettyServer = new NettyServer();
- nettyServer.bind();
- NettyServer0 nettyServer0 = new NettyServer0();
- nettyServer0.bind();
+// NettyServer nettyServer = new NettyServer();
+// nettyServer.bind();
+// NettyServer0 nettyServer0 = new NettyServer0();
+// nettyServer0.bind();
}
@@ -109,9 +109,8 @@
public List<SwaggerResource> get() {
List resource=new ArrayList<>();
//name可以随便写，location前缀要与zuul配置的path一致。zuul开了token验证,要加上token,否则不用加?token=1
-// resource.add(swaggerResource("user","/user-server/v2/api-docs","1.0"));
-// resource.add(swaggerResource("driver","/driver-server/v2/api-docs","1.0"));
-// resource.add(swaggerResource("dispatch","/dispatch-server/v2/api-docs","1.0"));
+ resource.add(swaggerResource("user","/user-server/v2/api-docs","1.0"));
+ resource.add(swaggerResource("driver","/driver-server/v2/api-docs","1.0"));
return resource;
}
@@ -125,8 +124,8 @@
}
}
- @Override
- protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
- return builder.sources(ZuulApplication.class);
- }
+// @Override
+// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+// return builder.sources(ZuulApplication.class);
+// }
}
--
Gitblit v1.7.1