feat: 提供获取所有基于quartz的任务的接口

src/main/java/org/daming/hoteler/api/filter/SecurityAuthTokenFilter.java

@@ -61,17 +61,20 @@ protected void doFilterInternal(HttpServletRequest servletRequest, HttpServletRe
         try {
             var requestUrl = request.getRequestURI();
             logger.debug("url: " + requestUrl + "\t" + isFilter(requestUrl));
-            if (!isFilter(requestUrl) && !requestUrl.contains("token") && !requestUrl.contains("/api/v1/job")) {
-                logger.info("verify url: " + requestUrl);
-                // verifyHttpHeaders(request);
-                var context = new HotelerContext();
-                ThreadLocalContextHolder.put(context);
-                context.setIn(in);
-                context.setRequestId(UUID.randomUUID().toString());
-                verifyToken(request, context);
-            } else {
-                logger.info("url: " + requestUrl + " is ignored");
-            }
+            var context = new HotelerContext();
+            ThreadLocalContextHolder.put(context);
+            context.setIn(in);
+            context.setRequestId(UUID.randomUUID().toString());
+//            if (!isFilter(requestUrl)
+//                    && !requestUrl.contains("token")
+//                    && (!requestUrl.contains("/api/v1/job") || requestUrl.contains("/api/v1/job/jobinfos"))) {
+//                logger.info("verify url: " + requestUrl);
+//                // verifyHttpHeaders(request);
+//                verifyToken(request, context);
+//            } else {
+//                logger.info("url: " + requestUrl + " is ignored");
+//            }
+            verifyToken(context, request);
             filterChain.doFilter(servletRequest, servletResponse);
         } catch (ExpiredJwtException ex) {
             SecurityContextHolder.clearContext();
@@ -86,7 +89,6 @@ protected void doFilterInternal(HttpServletRequest servletRequest, HttpServletRe
             }
             response.sendError(HttpServletResponse.SC_UNAUTHORIZED, ex.getMessage());
         } catch (Exception ex) {
-            ex.printStackTrace();
             SecurityContextHolder.clearContext();
             if (logger.isErrorEnabled()) {
                 logger.error("<{}> ErrorMsg: {}", ex.getClass().getSimpleName(), ex.getMessage());
@@ -139,7 +141,7 @@ private boolean isFilter(String url) {
         return !r.matcher(url).matches();
     }
 
-    private void verifyToken(HttpServletRequest httpRequest, HotelerContext context) {
+    private void verifyToken(HotelerContext context, HttpServletRequest httpRequest) {
         final String requestTokenHeader = httpRequest.getHeader("Authorization");
         if (Objects.isNull(requestTokenHeader) || !requestTokenHeader.startsWith("Bearer ")) {
             throw ExceptionBuilder.buildException(600002, "访问拒绝.");

src/main/java/org/daming/hoteler/api/web/JobController.java

@@ -5,9 +5,15 @@
 import com.cronutils.model.definition.CronDefinitionBuilder;
 import com.cronutils.model.field.expression.FieldExpression;
 import com.cronutils.model.field.expression.FieldExpressionFactory;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.daming.hoteler.base.exceptions.HotelerException;
 import org.daming.hoteler.base.logger.LoggerManager;
+import org.daming.hoteler.pojo.JobInfo;
 import org.daming.hoteler.pojo.request.AddPingJobTaskRequest;
+import org.daming.hoteler.pojo.response.ListResponse;
+import org.daming.hoteler.service.IErrorService;
 import org.daming.hoteler.service.IQuartzService;
 import org.daming.hoteler.task.CustomerTask;
 import org.daming.hoteler.task.job.CheckInTimeEventJob;
@@ -30,9 +36,11 @@
 @RequestMapping("api/v1/job")
 public class JobController {
 
-    private CustomerTask customerTask;
+    private final CustomerTask customerTask;
 
-    private IQuartzService quartzService;
+    private final IQuartzService quartzService;
+
+    private final IErrorService errorService;
 
     @GetMapping("update-crpyto-customer-id")
     public String updateCrpytoCustomerId() {
@@ -66,9 +74,23 @@ public String addPingTask(@RequestBody AddPingJobTaskRequest request) {
 
     }
 
-    public JobController(CustomerTask customerTask, IQuartzService quartzService) {
+    @Operation(summary = "get all quartz jobs", security = { @SecurityRequirement(name = "bearer-key") })
+    @GetMapping("jobinfos")
+    public ListResponse<JobInfo> listQuartzJobs() throws HotelerException {
+        try {
+            System.out.println("jobinfos");
+            var jobs = this.quartzService.listJob();
+            System.out.println(jobs);
+            return new ListResponse<>(jobs);
+        } catch (Exception ex) {
+            throw this.errorService.createHotelerSystemException(ex.getMessage(), ex);
+        }
+    }
+
+    public JobController(CustomerTask customerTask, IQuartzService quartzService, IErrorService errorService) {
         super();
         this.customerTask = customerTask;
         this.quartzService = quartzService;
+        this.errorService = errorService;
     }
 }

src/main/java/org/daming/hoteler/config/WebSecurityConfig.java

@@ -80,8 +80,9 @@ public SecurityFilterChain filterChain(
                             .requestMatchers("/resources/**", "/static/**", "/css/**", "/js/**", "/img/**", "/icon/**", "/assets/**").anonymous()
                             .requestMatchers("/**.js", "/**.css", "/**.ico", "/**.woff2", "/**.svg").anonymous()
                             .requestMatchers("/api/v1/token").anonymous()//普通用户权限
-                            .requestMatchers("/api/**").hasRole("USERS")//普通用户权限
+                            .requestMatchers("/api/v1/job/jobinfos").hasRole("USERS")//普通用户权限
                             .requestMatchers("/api/login").permitAll()
+                            .requestMatchers("/api/**").hasRole("USERS")//普通用户权限
                             .requestMatchers(authWhiteList).permitAll()
                             //其他的需要授权后访问
                             .anyRequest().anonymous();

src/main/java/org/daming/hoteler/pojo/JobInfo.java

@@ -0,0 +1,92 @@
+package org.daming.hoteler.pojo;
+
+import java.util.StringJoiner;
+
+/**
+ * @author gming001
+ * @version 2024-02-29 15:00
+ */
+public class JobInfo {
+
+    private String name;
+
+    private String group;
+
+    private String cron;
+
+    private String state;
+
+    private String timeZone;
+
+    private String className;
+
+    public String getName() {
+        return name;
+    }
+
+    public JobInfo setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getGroup() {
+        return group;
+    }
+
+    public JobInfo setGroup(String group) {
+        this.group = group;
+        return this;
+    }
+
+    public String getCron() {
+        return cron;
+    }
+
+    public JobInfo setCron(String cron) {
+        this.cron = cron;
+        return this;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public JobInfo setState(String state) {
+        this.state = state;
+        return this;
+    }
+
+    public String getTimeZone() {
+        return timeZone;
+    }
+
+    public JobInfo setTimeZone(String timeZone) {
+        this.timeZone = timeZone;
+        return this;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public JobInfo setClassName(String className) {
+        this.className = className;
+        return this;
+    }
+
+    public JobInfo() {
+        super();
+    }
+
+    @Override
+    public String toString() {
+        return new StringJoiner(", ", JobInfo.class.getSimpleName() + "[", "]")
+                .add("name='" + name + "'")
+                .add("group='" + group + "'")
+                .add("cron='" + cron + "'")
+                .add("state='" + state + "'")
+                .add("timeZone='" + timeZone + "'")
+                .add("className='" + className + "'")
+                .toString();
+    }
+}

src/main/java/org/daming/hoteler/service/IQuartzService.java

@@ -1,5 +1,6 @@
 package org.daming.hoteler.service;
 
+import org.daming.hoteler.pojo.JobInfo;
 import org.quartz.Job;
 import org.quartz.JobDataMap;
 import org.quartz.SchedulerException;
@@ -19,7 +20,7 @@ public interface IQuartzService {
 
     void addJob(String name, String group, String cron, Class<? extends Job> clazz, JobDataMap jobDataMap) throws SchedulerException;
 
-    // JobInfo getJob(String name, String group) throws SchedulerException;
+    JobInfo getJob(String name, String group) throws SchedulerException;
 
     boolean modifyJob(String name, String group, String cron) throws SchedulerException;
 
@@ -29,5 +30,5 @@ public interface IQuartzService {
 
     boolean resumeJob(String name, String group) throws SchedulerException;
 
-    // List<JobInfo> listJob() throws SchedulerException;
+    List<JobInfo> listJob() throws SchedulerException;
 }

src/main/java/org/daming/hoteler/service/impl/QuartzServiceImpl.java

@@ -1,7 +1,9 @@
 package org.daming.hoteler.service.impl;
 
+import org.daming.hoteler.pojo.JobInfo;
 import org.daming.hoteler.service.IQuartzService;
 import org.quartz.CronScheduleBuilder;
+import org.quartz.CronTrigger;
 import org.quartz.Job;
 import org.quartz.JobBuilder;
 import org.quartz.JobDataMap;
@@ -12,8 +14,10 @@
 import org.quartz.Trigger;
 import org.quartz.TriggerBuilder;
 import org.quartz.TriggerKey;
+import org.quartz.impl.matchers.GroupMatcher;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -61,24 +65,24 @@ public void addJob(String name, String group, String cron, Class<? extends Job>
         }
     }
 
-//    @Override
-//    public JobInfo getJob(String name, String group) throws SchedulerException {
-//        var triggerKey = TriggerKey.triggerKey(name, group);
-//        var jobKey =  JobKey.jobKey(name, group);
-//        var jobDetail = scheduler.getJobDetail(jobKey);
-//        var triggers = scheduler.getTriggersOfJob(jobKey);
-//        if (triggers.isEmpty()) {
-//            throw new SchedulerException("no trigger");
-//        }
-//        var trigger = triggers.get(0);
-//        var triggerState = scheduler.getTriggerState(trigger.getKey());
-//        if (!(trigger instanceof CronTrigger)) {
-//            throw new SchedulerException("no cronTrigger");
-//        }
-//        var cronTrigger = (CronTrigger)trigger;
-//        return new JobInfo().setName(name).setGroup(group).setState(triggerState.name()).setCron(cronTrigger.getCronExpression()).setTimezone(cronTrigger.getTimeZone().getID()).setClassName(jobDetail.getJobClass().getName());
-//
-//    }
+    @Override
+    public JobInfo getJob(String name, String group) throws SchedulerException {
+        var triggerKey = TriggerKey.triggerKey(name, group);
+        var jobKey =  JobKey.jobKey(name, group);
+        var jobDetail = scheduler.getJobDetail(jobKey);
+        var triggers = scheduler.getTriggersOfJob(jobKey);
+        if (triggers.isEmpty()) {
+            throw new SchedulerException("no trigger");
+        }
+        var trigger = triggers.getFirst();
+        var triggerState = scheduler.getTriggerState(trigger.getKey());
+        if (!(trigger instanceof CronTrigger)) {
+            throw new SchedulerException("no cronTrigger");
+        }
+        var cronTrigger = (CronTrigger)trigger;
+        return new JobInfo().setName(name).setGroup(group).setState(triggerState.name()).setCron(cronTrigger.getCronExpression()).setTimeZone(cronTrigger.getTimeZone().getID()).setClassName(jobDetail.getJobClass().getName());
+
+    }
 
     @Override
     public boolean modifyJob(String name, String group, String cron) throws SchedulerException {
@@ -113,43 +117,43 @@ public boolean resumeJob(String name, String group) throws SchedulerException {
         return true;
     }
 
-//    @Override
-//    public List<JobInfo> listJob() throws SchedulerException {
-//        var groupNames = scheduler.getJobGroupNames();
-//        var jobInfos = new ArrayList<JobInfo>(groupNames.size());
-//        groupNames.forEach(groupName -> {
-//            try {
-//                var jobKeys = scheduler.getJobKeys(GroupMatcher.jobGroupEquals(groupName));
-//                jobKeys.forEach(jobKey -> {
-//                    try {
-//                        var jobName = jobKey.getName();
-//                        var jobGroup = jobKey.getGroup();
-//                        var jobDetail = scheduler.getJobDetail(jobKey);
-//                        var triggers = scheduler.getTriggersOfJob(jobKey);
-//                        triggers.forEach(trigger -> {
-//                            try {
-//                                var triggerState = scheduler.getTriggerState(trigger.getKey());
-//                                if (trigger instanceof CronTrigger) {
-//                                    var cronTrigger = (CronTrigger)trigger;
-//                                    jobInfos.add(new JobInfo().setName(jobName).setGroup(jobGroup).setState(triggerState.name()).setCron(cronTrigger.getCronExpression()).setTimezone(cronTrigger.getTimeZone().getID()).setClassName(jobDetail.getJobClass().getName()));
-//                                }
-//                            } catch (SchedulerException e) {
-//                                // TODO add logger
-//                                e.printStackTrace();
-//                            }
-//                        });
-//                    } catch (SchedulerException e) {
-//                        // TODO add logger
-//                        e.printStackTrace();
-//                    }
-//                });
-//            } catch (SchedulerException e) {
-//                // TODO add logger
-//                e.printStackTrace();
-//            }
-//        });
-//        return jobInfos;
-//    }
+    @Override
+    public List<JobInfo> listJob() throws SchedulerException {
+        var groupNames = scheduler.getJobGroupNames();
+        var jobInfos = new ArrayList<JobInfo>(groupNames.size());
+        groupNames.forEach(groupName -> {
+            try {
+                var jobKeys = scheduler.getJobKeys(GroupMatcher.jobGroupEquals(groupName));
+                jobKeys.forEach(jobKey -> {
+                    try {
+                        var jobName = jobKey.getName();
+                        var jobGroup = jobKey.getGroup();
+                        var jobDetail = scheduler.getJobDetail(jobKey);
+                        var triggers = scheduler.getTriggersOfJob(jobKey);
+                        triggers.forEach(trigger -> {
+                            try {
+                                var triggerState = scheduler.getTriggerState(trigger.getKey());
+                                if (trigger instanceof CronTrigger) {
+                                    var cronTrigger = (CronTrigger)trigger;
+                                    jobInfos.add(new JobInfo().setName(jobName).setGroup(jobGroup).setState(triggerState.name()).setCron(cronTrigger.getCronExpression()).setTimeZone(cronTrigger.getTimeZone().getID()).setClassName(jobDetail.getJobClass().getName()));
+                                }
+                            } catch (SchedulerException e) {
+                                // TODO add logger
+                                e.printStackTrace();
+                            }
+                        });
+                    } catch (SchedulerException e) {
+                        // TODO add logger
+                        e.printStackTrace();
+                    }
+                });
+            } catch (SchedulerException e) {
+                // TODO add logger
+                e.printStackTrace();
+            }
+        });
+        return jobInfos;
+    }
 
 
     public QuartzServiceImpl(Scheduler scheduler) {

src/main/resources/application.yml

@@ -76,7 +76,7 @@ secret:
   key: damingerdai
 
 logger:
-  level: info
+  level: debug
 
 springdoc:
   packagesToScan: org.daming.hoteler.api.web