From 9c4c8f5f1b53d5ee70c2d3fbff098c09548c3776 Mon Sep 17 00:00:00 2001
From: godotg <jaysunxiao@gmail.com>
Date: Thu, 27 Jun 2024 16:55:35 +0800
Subject: [PATCH] style[code]: code style

---
 .../java/com/zfoo/event/EventContext.java     | 24 +++++-----
 .../com/zfoo/scheduler/SchedulerContext.java  | 47 +++++++++----------
 2 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/event/src/main/java/com/zfoo/event/EventContext.java b/event/src/main/java/com/zfoo/event/EventContext.java
index bb94db4a..efb477ae 100644
--- a/event/src/main/java/com/zfoo/event/EventContext.java
+++ b/event/src/main/java/com/zfoo/event/EventContext.java
@@ -47,6 +47,18 @@ public class EventContext implements ApplicationListener<ApplicationContextEvent
         return instance.applicationContext;
     }
 
+    @Override
+    public void onApplicationEvent(ApplicationContextEvent event) {
+        if (event instanceof ContextRefreshedEvent) {
+            // 初始化上下文
+            EventContext.instance = this;
+            instance.applicationContext = event.getApplicationContext();
+        } else if (event instanceof ContextClosedEvent) {
+            shutdown();
+            ThreadUtils.shutdownForkJoinPool();
+        }
+    }
+
     private synchronized void shutdown() {
         try {
             var field = EventBus.class.getDeclaredField("executors");
@@ -64,18 +76,6 @@ public class EventContext implements ApplicationListener<ApplicationContextEvent
         logger.info("Event shutdown gracefully.");
     }
 
-    @Override
-    public void onApplicationEvent(ApplicationContextEvent event) {
-        if (event instanceof ContextRefreshedEvent) {
-            // 初始化上下文
-            EventContext.instance = this;
-            instance.applicationContext = event.getApplicationContext();
-        } else if (event instanceof ContextClosedEvent) {
-            shutdown();
-            ThreadUtils.shutdownForkJoinPool();
-        }
-    }
-
     @Override
     public int getOrder() {
         return 30;
diff --git a/scheduler/src/main/java/com/zfoo/scheduler/SchedulerContext.java b/scheduler/src/main/java/com/zfoo/scheduler/SchedulerContext.java
index 856fff53..048c85cc 100644
--- a/scheduler/src/main/java/com/zfoo/scheduler/SchedulerContext.java
+++ b/scheduler/src/main/java/com/zfoo/scheduler/SchedulerContext.java
@@ -43,10 +43,10 @@ public class SchedulerContext implements ApplicationListener<ApplicationContextE
 
     private static SchedulerContext instance;
 
-    private static boolean stop = false;
-
     private ApplicationContext applicationContext;
 
+    private volatile boolean stop = false;
+
 
     public static SchedulerContext getSchedulerContext() {
         return instance;
@@ -57,30 +57,9 @@ public class SchedulerContext implements ApplicationListener<ApplicationContextE
     }
 
     public static boolean isStop() {
-        return stop;
+        return instance.stop;
     }
 
-
-    public synchronized static void shutdown() {
-        if (stop) {
-            return;
-        }
-
-        stop = true;
-
-        try {
-            Field field = SchedulerBus.class.getDeclaredField("executor");
-            ReflectionUtils.makeAccessible(field);
-            var executor = (ScheduledExecutorService) ReflectionUtils.getField(field, null);
-            ThreadUtils.shutdown(executor);
-        } catch (Throwable e) {
-            logger.error("Scheduler thread pool failed shutdown.", e);
-            return;
-        }
-
-        logger.info("Scheduler shutdown gracefully.");
-    }
-    
     @Override
     public void onApplicationEvent(ApplicationContextEvent event) {
         if (event instanceof ContextRefreshedEvent) {
@@ -141,6 +120,26 @@ public class SchedulerContext implements ApplicationListener<ApplicationContextE
         }
     }
 
+    public synchronized static void shutdown() {
+        if (isStop()) {
+            return;
+        }
+
+        instance.stop = true;
+
+        try {
+            Field field = SchedulerBus.class.getDeclaredField("executor");
+            ReflectionUtils.makeAccessible(field);
+            var executor = (ScheduledExecutorService) ReflectionUtils.getField(field, null);
+            ThreadUtils.shutdown(executor);
+        } catch (Throwable e) {
+            logger.error("Scheduler thread pool failed shutdown.", e);
+            return;
+        }
+
+        logger.info("Scheduler shutdown gracefully.");
+    }
+
     @Override
     public int getOrder() {
         return Ordered.LOWEST_PRECEDENCE;