Merge pull request #32 from linhaojun857/dev

merge dev

aurora-springboot/src/main/java/com/aurora/handler/ControllerAdviceHandler.java

@@ -4,8 +4,6 @@ import com.aurora.model.vo.ResultVO;
 import com.aurora.enums.StatusCodeEnum;
 import com.aurora.exception.BizException;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;

aurora-springboot/src/main/java/com/aurora/service/impl/JobServiceImpl.java

@@ -1,6 +1,5 @@
 package com.aurora.service.impl;
 
-import com.aurora.constant.ScheduleConstant;
 import com.aurora.enums.JobStatusEnum;
 import com.aurora.model.dto.JobDTO;
 import com.aurora.entity.Job;

aurora-springboot/src/main/java/com/aurora/util/ScheduleUtil.java

@@ -2,6 +2,7 @@ package com.aurora.util;
 
 import com.aurora.constant.ScheduleConstant;
 import com.aurora.entity.Job;
+import com.aurora.enums.JobStatusEnum;
 import com.aurora.exception.TaskException;
 import com.aurora.quartz.QuartzDisallowConcurrentExecution;
 import com.aurora.quartz.QuartzJobExecution;
@@ -36,7 +37,7 @@ public class ScheduleUtil {
             scheduler.deleteJob(getJobKey(jobId, jobGroup));
         }
         scheduler.scheduleJob(jobDetail, trigger);
-        if (job.getStatus().equals(ScheduleConstant.Status.PAUSE.getValue())) {
+        if (job.getStatus().equals(JobStatusEnum.PAUSE.getValue())) {
             scheduler.pauseJob(ScheduleUtil.getJobKey(jobId, jobGroup));
         }
     }

aurora-vue/aurora-blog/src/views/FriendLink.vue

@@ -30,7 +30,7 @@
           <div
             class="post-html"
             v-html="
-              `需要交换友链的可在下方留言💖<br><br>友链信息展示需要，你的信息格式要包含：名称、介绍、链接、头像`
+              `需要交换友链的可在下方留言💖<br><br>友链信息展示需要，你的信息格式要包含：名称、头像、链接、介绍`
             " />
           <Comment />
         </div>