192.168.9.165 1 mēnesi atpakaļ
vecāks
revīzija
9bfec49068

+ 2 - 2
pom.xml

@@ -5,10 +5,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.fdkankan</groupId>
-    <artifactId>4dkankan-fusion</artifactId>
+    <artifactId>4dkk-fusion</artifactId>
     <version>1.0.0</version>
 
-
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
@@ -130,6 +129,7 @@
     </dependencies>
 
     <build>
+        <finalName>${artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

+ 10 - 2
src/main/java/com/fdkankan/fusion/AppListener.java

@@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.system.SystemUtil;
 import com.fdkankan.fusion.config.CacheUtil;
+import com.fdkankan.redis.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
@@ -24,7 +25,8 @@ public class AppListener implements ApplicationRunner {
 
     @Resource
     private WebApplicationContext applicationContext;
-
+    @Autowired
+    private RedisUtil redisUtil;
     @Override
     public void run(ApplicationArguments args) {
         if (CacheUtil.settingEntity.getPid()<= 0) {
@@ -42,7 +44,13 @@ public class AppListener implements ApplicationRunner {
                         shutdownApplication();
                         break;
                     }
-                    Thread.sleep(5000);
+                    if (redisUtil.hasKey("QUIT_JOB_FUSION")) {
+                        System.out.println("收到推出通知,准备退出 SpringBoot 服务...");
+                        redisUtil.del("QUIT_JOB_FUSION");
+                        shutdownApplication();
+                        break;
+                    }
+                    Thread.sleep(2000);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

+ 1 - 1
src/main/java/com/fdkankan/fusion/task/InitService.java

@@ -74,7 +74,7 @@ public class InitService {
         Path path = pathService.getBasePath();
         if(path != null){
             CacheUtil.mapping = path.getMapping() + File.separator;
-            CacheUtil.settingEntity.setProfilePath(path.getDir());
+            CacheUtil.settingEntity.setProfilePath(path.getDir() + File.separator);
         }else {
             CacheUtil.mapping = "profile" + File.separator;
         }