diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 130dc96..87430e1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,11 +5,9 @@ - - - + diff --git a/pom.xml b/pom.xml index fa6fdaf..f6a2948 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.rehome admin-client-temperature 1.0.0 - war + jar admin-client-temperature admin-client-temperature diff --git a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java index 02d2a4b..28e0fcd 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java +++ b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java @@ -22,7 +22,7 @@ import java.util.Map; @EnableScheduling @EnableAsync @SpringBootApplication -public class AdminClientTemperatureApplication extends SpringBootServletInitializer implements CommandLineRunner, ApplicationContextAware { +public class AdminClientTemperatureApplication implements CommandLineRunner, ApplicationContextAware { /** * 获取Spring框架的上下文 @@ -38,11 +38,6 @@ public class AdminClientTemperatureApplication extends SpringBootServletInitiali SpringApplication.run(AdminClientTemperatureApplication.class, args); } - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(AdminClientTemperatureApplication.class); - } - /** * 调用 applicationContext(不能在main中使用,main是static的,不能调用) * @param args diff --git a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java index 6a84231..8e612f4 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java +++ b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java @@ -89,7 +89,7 @@ public class JdbcDemoController { * 查询测试 * @return */ - @RequestMapping("/api/list") + //@RequestMapping("/api/list") public ResponseDto queryList() { // 自定义一个线程池,内部包含8个线程