From 6d408e043d047a75f099dbfb41511a45d862a8d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E6=BC=8F=E6=B4=9E?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=8C=E6=88=90?= <>
Date: Thu, 5 Jun 2025 14:56:34 +0800
Subject: [PATCH] dr

---
 .idea/workspace.xml                                 |  4 +++-
 pom.xml                                             |  4 ++--
 .../AdminClientTemperatureApplication.java          | 13 ++-----------
 src/main/resources/application.yml                  |  2 +-
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 07c3695..802ac3f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,8 @@
     <list default="true" id="eacd3dd8-1e95-428c-a6af-1aadb9921989" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -182,6 +183,7 @@
       <workItem from="1748770647684" duration="2217000" />
       <workItem from="1748967867150" duration="1811000" />
       <workItem from="1749085671046" duration="2375000" />
+      <workItem from="1749105047646" duration="678000" />
     </task>
     <servers />
   </component>
diff --git a/pom.xml b/pom.xml
index b1f5555..03a1c97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <groupId>com.rehome</groupId>
     <artifactId>admin-client-temperature</artifactId>
     <version>1.0.0</version>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <name>admin-client-temperature</name>
     <description>admin-client-temperature</description>
     <properties>
@@ -277,7 +277,7 @@
         </repository>
     </repositories>
     <build>
-        <finalName>${project.artifactId}</finalName>
+        <finalName>${project.artifactId}-pg</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java
index f9ad541..74b31b7 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,22 +38,13 @@ public class AdminClientTemperatureApplication extends SpringBootServletInitiali
         SpringApplication.run(AdminClientTemperatureApplication.class, args);
     }
 
-    /**
-     * @date 2025-06-01 14:32
-     * @description: 容器配置，springboot打war包布署必须添加这个配置 为了打包springboot项目
-     * @Param: SpringApplicationBuilder
-     */
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
-        return builder.sources(AdminClientTemperatureApplication.class);
-    }
 
     /**
      * 调用 applicationContext(不能在main中使用,main是static的,不能调用)
      * @param args
      */
     @Override
-    public void run(String... args) throws Exception {
+    public void run(String... args) {
         //在这里可以调用applicationContext了
         Map<String, Object> controllers = applicationContext.getBeansWithAnnotation(RequestMapping.class);
         for (Map.Entry<String, Object> entry : controllers.entrySet()) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ced307a..c305796 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8873
+  port: 8874
   shutdown: graceful #开启优雅关闭
 
 # 日志配置