From 4a5488e2a68854b02501244cf95c36b1956c45f8 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Wed, 9 Aug 2023 22:04:55 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.0=E3=80=91=E3=80=90res=E3=80=91?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=B5=84=E6=BA=90=E6=B1=87=E6=8A=A5=E7=9A=84?=
 =?UTF-8?q?=E7=9B=91=E5=90=AC=E5=99=A8=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kernel/rule/listener/ApplicationReadyListener.java   | 9 +++++----
 .../roses/kernel/scanner/ResourceReportListener.java     | 4 ++--
 .../sys/starter/listener/SuperAdminInitListener.java     | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/listener/ApplicationReadyListener.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/listener/ApplicationReadyListener.java
index b98108d68..b9fcf32c7 100644
--- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/listener/ApplicationReadyListener.java
+++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/listener/ApplicationReadyListener.java
@@ -25,7 +25,7 @@
 package cn.stylefeng.roses.kernel.rule.listener;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.boot.context.event.ApplicationStartedEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -38,10 +38,10 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
  * @since 2021/5/14 20:28
  */
 @Slf4j
-public abstract class ApplicationReadyListener implements ApplicationListener<ApplicationReadyEvent> {
+public abstract class ApplicationReadyListener implements ApplicationListener<ApplicationStartedEvent> {
 
     @Override
-    public void onApplicationEvent(ApplicationReadyEvent event) {
+    public void onApplicationEvent(ApplicationStartedEvent event) {
 
         // 如果是配置中心的上下文略过，spring cloud环境environment会读取不到
         ConfigurableApplicationContext applicationContext = event.getApplicationContext();
@@ -51,6 +51,7 @@ public abstract class ApplicationReadyListener implements ApplicationListener<Ap
 
         // 执行具体业务
         this.eventCallback(event);
+
     }
 
     /**
@@ -59,6 +60,6 @@ public abstract class ApplicationReadyListener implements ApplicationListener<Ap
      * @author fengshuonan
      * @since 2021/5/14 20:17
      */
-    public abstract void eventCallback(ApplicationReadyEvent event);
+    public abstract void eventCallback(ApplicationStartedEvent event);
 
 }
diff --git a/kernel-d-scanner/scanner-sdk-scanner/src/main/java/cn/stylefeng/roses/kernel/scanner/ResourceReportListener.java b/kernel-d-scanner/scanner-sdk-scanner/src/main/java/cn/stylefeng/roses/kernel/scanner/ResourceReportListener.java
index baaf99b08..22a4b05ed 100644
--- a/kernel-d-scanner/scanner-sdk-scanner/src/main/java/cn/stylefeng/roses/kernel/scanner/ResourceReportListener.java
+++ b/kernel-d-scanner/scanner-sdk-scanner/src/main/java/cn/stylefeng/roses/kernel/scanner/ResourceReportListener.java
@@ -38,7 +38,7 @@ import cn.stylefeng.roses.kernel.scanner.api.pojo.resource.ResourceDefinition;
 import cn.stylefeng.roses.kernel.scanner.api.pojo.resource.SysResourcePersistencePojo;
 import cn.stylefeng.roses.kernel.scanner.api.pojo.scanner.ScannerProperties;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.boot.context.event.ApplicationStartedEvent;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.Ordered;
 
@@ -55,7 +55,7 @@ import java.util.Map;
 public class ResourceReportListener extends ApplicationReadyListener implements Ordered {
 
     @Override
-    public void eventCallback(ApplicationReadyEvent event) {
+    public void eventCallback(ApplicationStartedEvent event) {
 
         ConfigurableApplicationContext applicationContext = event.getApplicationContext();
 
diff --git a/kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/sys/starter/listener/SuperAdminInitListener.java b/kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/sys/starter/listener/SuperAdminInitListener.java
index 0d90cb028..209deab6b 100644
--- a/kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/sys/starter/listener/SuperAdminInitListener.java
+++ b/kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/sys/starter/listener/SuperAdminInitListener.java
@@ -28,7 +28,7 @@ import cn.stylefeng.roses.kernel.rule.listener.ApplicationReadyListener;
 import cn.stylefeng.roses.kernel.sys.api.constants.SysConstants;
 import cn.stylefeng.roses.kernel.sys.starter.init.InitAdminService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.boot.context.event.ApplicationStartedEvent;
 import org.springframework.core.Ordered;
 import org.springframework.stereotype.Component;
 
@@ -48,7 +48,7 @@ public class SuperAdminInitListener extends ApplicationReadyListener implements
     private InitAdminService initAdminService;
 
     @Override
-    public void eventCallback(ApplicationReadyEvent event) {
+    public void eventCallback(ApplicationStartedEvent event) {
         long startTime = System.currentTimeMillis();
         initAdminService.initSuperAdmin();
         log.info("初始化超级管理员权限完成，耗时：{}ms", (System.currentTimeMillis() - startTime));