From 4a7f72f49d5cf43205cf1c202104170c82b0a344 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 31 八月 2023 11:14:14 +0800
Subject: [PATCH] 同步代码
---
zuul/pom.xml | 24 ++++++++++++------------
zuul/src/main/java/com/sinata/zuul/ZuulApplication.java | 18 +++++++++---------
zuul/src/main/java/com/sinata/zuul/util/NettyStartListener.java | 10 +++++-----
3 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/zuul/pom.xml b/zuul/pom.xml
index c2048fe..a70e075 100644
--- a/zuul/pom.xml
+++ b/zuul/pom.xml
@@ -10,7 +10,7 @@
</parent>
<groupId>com.sinata</groupId>
<artifactId>zuul</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<name>zuul</name>
<description>Zuul project for Spring Boot</description>
@@ -44,17 +44,17 @@
<version>2.9.0</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.springframework.boot</groupId>-->
- <!--<artifactId>spring-boot-starter-tomcat</artifactId>-->
- <!--<scope>provided</scope>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>javax.servlet</groupId>-->
- <!--<artifactId>javax.servlet-api</artifactId>-->
- <!--<version>3.1.0</version>-->
- <!--<scope>provided</scope>-->
- <!--</dependency>-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>provided</scope>
+ </dependency>
<!-- netty -->
diff --git a/zuul/src/main/java/com/sinata/zuul/ZuulApplication.java b/zuul/src/main/java/com/sinata/zuul/ZuulApplication.java
index e5fa4b5..6618eb7 100644
--- a/zuul/src/main/java/com/sinata/zuul/ZuulApplication.java
+++ b/zuul/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();
}
@@ -113,8 +113,8 @@
}
- @Override
- protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
- return builder.sources(ZuulApplication.class);
- }
+// @Override
+// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+// return builder.sources(ZuulApplication.class);
+// }
}
diff --git a/zuul/src/main/java/com/sinata/zuul/util/NettyStartListener.java b/zuul/src/main/java/com/sinata/zuul/util/NettyStartListener.java
index 2f19e93..1d8670a 100644
--- a/zuul/src/main/java/com/sinata/zuul/util/NettyStartListener.java
+++ b/zuul/src/main/java/com/sinata/zuul/util/NettyStartListener.java
@@ -19,11 +19,11 @@
Thread thread = new Thread(new Runnable() {
@Override
public void run() {
- NettyServer nettyServer = new NettyServer();
- nettyServer.bind();
-
- NettyServer0 nettyServer0 = new NettyServer0();
- nettyServer0.bind();
+// NettyServer nettyServer = new NettyServer();
+// nettyServer.bind();
+//
+// NettyServer0 nettyServer0 = new NettyServer0();
+// nettyServer0.bind();
}
});
thread.start();
--
Gitblit v1.7.1