From e8ce24f3a378d1fdb5c1c9e6fbecb067aa22cdd9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 20 七月 2023 23:23:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
eureka/src/main/java/com/sinata/eureka/EurekaApplication.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/eureka/src/main/java/com/sinata/eureka/EurekaApplication.java b/eureka/src/main/java/com/sinata/eureka/EurekaApplication.java
index 1e9c18d..82ff9a0 100644
--- a/eureka/src/main/java/com/sinata/eureka/EurekaApplication.java
+++ b/eureka/src/main/java/com/sinata/eureka/EurekaApplication.java
@@ -8,15 +8,15 @@
@EnableEurekaServer//开启服务治理
@SpringBootApplication
-public class EurekaApplication extends SpringBootServletInitializer {
+public class EurekaApplication /*extends SpringBootServletInitializer*/ {
public static void main(String[] args) {
SpringApplication.run(EurekaApplication.class, args);
}
- @Override
- protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
- return builder.sources(EurekaApplication.class);
- }
+// @Override
+// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+// return builder.sources(EurekaApplication.class);
+// }
}
--
Gitblit v1.7.1