diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/service/impl/TaskHandlerImpl.java b/austin-cron/src/main/java/com/java3y/austin/cron/service/impl/TaskHandlerImpl.java
index e95491f..3858fea 100644
--- a/austin-cron/src/main/java/com/java3y/austin/cron/service/impl/TaskHandlerImpl.java
+++ b/austin-cron/src/main/java/com/java3y/austin/cron/service/impl/TaskHandlerImpl.java
@@ -17,6 +17,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
+import java.util.Objects;
 
 /**
  * @author 3y
@@ -35,7 +36,10 @@ public class TaskHandlerImpl implements TaskHandler {
     @Override
     public void handle(Long messageTemplateId) {
 
-        MessageTemplate messageTemplate = messageTemplateDao.findById(messageTemplateId).get();
+        MessageTemplate messageTemplate = messageTemplateDao.findById(messageTemplateId).orElse(null);
+        if (Objects.isNull(messageTemplate)) {
+            return;
+        }
         if (StrUtil.isBlank(messageTemplate.getCronCrowdPath())) {
             log.error("TaskHandler#handle crowdPath empty! messageTemplateId:{}", messageTemplateId);
             return;
diff --git a/austin-support/src/main/java/com/java3y/austin/support/mq/springeventbus/SpringEventBusEvent.java b/austin-support/src/main/java/com/java3y/austin/support/mq/springeventbus/SpringEventBusEvent.java
deleted file mode 100644
index e69de29..0000000
diff --git a/austin-web/src/main/java/com/java3y/austin/web/advice/AustinResponseBodyAdvice.java b/austin-web/src/main/java/com/java3y/austin/web/advice/AustinResponseBodyAdvice.java
index 175a81a..edee65a 100644
--- a/austin-web/src/main/java/com/java3y/austin/web/advice/AustinResponseBodyAdvice.java
+++ b/austin-web/src/main/java/com/java3y/austin/web/advice/AustinResponseBodyAdvice.java
@@ -2,7 +2,6 @@ package com.java3y.austin.web.advice;
 
 import com.java3y.austin.common.vo.BasicResultVO;
 import com.java3y.austin.web.annotation.AustinResult;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
 import org.springframework.http.server.ServerHttpRequest;
diff --git a/austin-web/src/main/java/com/java3y/austin/web/controller/DataController.java b/austin-web/src/main/java/com/java3y/austin/web/controller/DataController.java
index 66d3d85..a28c4d5 100644
--- a/austin-web/src/main/java/com/java3y/austin/web/controller/DataController.java
+++ b/austin-web/src/main/java/com/java3y/austin/web/controller/DataController.java
@@ -16,8 +16,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
 import java.util.Objects;
 
 /**
diff --git a/austin-web/src/main/java/com/java3y/austin/web/controller/MessageTemplateController.java b/austin-web/src/main/java/com/java3y/austin/web/controller/MessageTemplateController.java
index b934458..e1edf8c 100644
--- a/austin-web/src/main/java/com/java3y/austin/web/controller/MessageTemplateController.java
+++ b/austin-web/src/main/java/com/java3y/austin/web/controller/MessageTemplateController.java
@@ -74,8 +74,7 @@ public class MessageTemplateController {
         if (loginUtils.needLogin() && StrUtil.isBlank(messageTemplate.getCreator())) {
             throw new CommonException(RespStatusEnum.NO_LOGIN);
         }
-        MessageTemplate info = messageTemplateService.saveOrUpdate(messageTemplate);
-        return info;
+        return messageTemplateService.saveOrUpdate(messageTemplate);
     }
 
     /**
@@ -89,8 +88,7 @@ public class MessageTemplateController {
         }
         Page<MessageTemplate> messageTemplates = messageTemplateService.queryList(messageTemplateParam);
         List<Map<String, Object>> result = Convert4Amis.flatListMap(messageTemplates.toList());
-        MessageTemplateVo messageTemplateVo = MessageTemplateVo.builder().count(messageTemplates.getTotalElements()).rows(result).build();
-        return messageTemplateVo;
+        return MessageTemplateVo.builder().count(messageTemplates.getTotalElements()).rows(result).build();
     }
 
     /**
diff --git a/austin-web/src/main/java/com/java3y/austin/web/service/impl/DataServiceImpl.java b/austin-web/src/main/java/com/java3y/austin/web/service/impl/DataServiceImpl.java
index be7ffe6..dbfca46 100644
--- a/austin-web/src/main/java/com/java3y/austin/web/service/impl/DataServiceImpl.java
+++ b/austin-web/src/main/java/com/java3y/austin/web/service/impl/DataServiceImpl.java
@@ -72,7 +72,10 @@ public class DataServiceImpl implements DataService {
         List<UserTimeLineVo.ItemsVO> items = new ArrayList<>();
         for (Map.Entry<String, List<SimpleAnchorInfo>> entry : map.entrySet()) {
             Long messageTemplateId = TaskInfoUtils.getMessageTemplateIdFromBusinessId(Long.valueOf(entry.getKey()));
-            MessageTemplate messageTemplate = messageTemplateDao.findById(messageTemplateId).get();
+            MessageTemplate messageTemplate = messageTemplateDao.findById(messageTemplateId).orElse(null);
+            if (Objects.isNull(messageTemplate)) {
+                continue;
+            }
 
             StringBuilder sb = new StringBuilder();
             for (SimpleAnchorInfo simpleAnchorInfo : entry.getValue()) {
diff --git a/austin-web/src/main/java/com/java3y/austin/web/service/impl/MessageTemplateServiceImpl.java b/austin-web/src/main/java/com/java3y/austin/web/service/impl/MessageTemplateServiceImpl.java
index 3f84ed3..15cacb8 100644
--- a/austin-web/src/main/java/com/java3y/austin/web/service/impl/MessageTemplateServiceImpl.java
+++ b/austin-web/src/main/java/com/java3y/austin/web/service/impl/MessageTemplateServiceImpl.java
@@ -100,20 +100,25 @@ public class MessageTemplateServiceImpl implements MessageTemplateService {
 
     @Override
     public MessageTemplate queryById(Long id) {
-        return messageTemplateDao.findById(id).get();
+        return messageTemplateDao.findById(id).orElse(null);
     }
 
     @Override
     public void copy(Long id) {
-        MessageTemplate messageTemplate = messageTemplateDao.findById(id).get();
-        MessageTemplate clone = ObjectUtil.clone(messageTemplate).setId(null).setCronTaskId(null);
-        messageTemplateDao.save(clone);
+        MessageTemplate messageTemplate = messageTemplateDao.findById(id).orElse(null);
+        if (Objects.nonNull(messageTemplate)) {
+            MessageTemplate clone = ObjectUtil.clone(messageTemplate).setId(null).setCronTaskId(null);
+            messageTemplateDao.save(clone);
+        }
     }
 
     @Override
     public BasicResultVO startCronTask(Long id) {
         // 1.获取消息模板的信息
-        MessageTemplate messageTemplate = messageTemplateDao.findById(id).get();
+        MessageTemplate messageTemplate = messageTemplateDao.findById(id).orElse(null);
+        if (Objects.isNull(messageTemplate)) {
+            return BasicResultVO.fail();
+        }
 
         // 2.动态创建或更新定时任务
         XxlJobInfo xxlJobInfo = xxlJobUtils.buildXxlJobInfo(messageTemplate);
@@ -138,7 +143,10 @@ public class MessageTemplateServiceImpl implements MessageTemplateService {
     @Override
     public BasicResultVO stopCronTask(Long id) {
         // 1.修改模板状态
-        MessageTemplate messageTemplate = messageTemplateDao.findById(id).get();
+        MessageTemplate messageTemplate = messageTemplateDao.findById(id).orElse(null);
+        if (Objects.isNull(messageTemplate)) {
+            return BasicResultVO.fail();
+        }
         MessageTemplate clone = ObjectUtil.clone(messageTemplate).setMsgStatus(MessageStatus.STOP.getCode()).setUpdated(Math.toIntExact(DateUtil.currentSeconds()));
         messageTemplateDao.save(clone);