no message

kxs-gateway/src/main/java/com/kxs/gateway/api/filter/RequestDecoderFilter.java

@@ -1,5 +1,7 @@
 package com.kxs.gateway.api.filter;
 
+import cn.hutool.core.text.CharSequenceUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.symmetric.AES;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -140,6 +142,9 @@ public class RequestDecoderFilter extends AbstractGatewayFilterFactory<Object> {
 		try {
 			MultiValueMap<String, String> queryParams = exchange.getRequest().getQueryParams();
 			String decryptedParam = queryParams.getFirst(PARAM_NAME);
+			if(CharSequenceUtil.isEmpty(decryptedParam)){
+				return chain.filter(exchange);
+			}
 			log.info("GET:{},请求待解密数据 :{}", exchange.getRequest().getURI(),decryptedParam);
 			String decryptStr = cryptoAes.decryptStr(decryptedParam);
 			log.info("GET解密后数据 :{}", decryptStr);

kxs-gateway/src/main/resources/application.yml

@@ -36,6 +36,8 @@ spring:
           filters:
             # 过滤前缀
             - StripPrefix=3
+            # 解密过滤器
+            - RequestDecoderFilter
 
         # 定时任务成模块
         - id: kxs-quartz
@@ -45,6 +47,8 @@ spring:
           filters:
             # 过滤前缀
             - StripPrefix=3
+            # 解密过滤器
+            - RequestDecoderFilter
 
         # 固定路由转发配置 无修改
         - id: openapi

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/KxsQuartzApplication.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/KxsQuartzApplication.java

@@ -1,4 +1,4 @@
-package com.skycloud.sky.daemon.quartz;
+package com.kxs.sky.daemon.quartz;
 
 import com.kxs.common.security.annotation.EnableAuthResourceServer;
 import org.springframework.boot.SpringApplication;

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/config/AutowireCapableBeanJobFactory.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/config/AutowireCapableBeanJobFactory.java

@@ -15,7 +15,7 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.config;
+package com.kxs.sky.daemon.quartz.config;
 
 import org.quartz.JobKey;
 import org.quartz.spi.TriggerFiredBundle;

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/config/SkyInitQuartzJob.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/config/SkyInitQuartzJob.java

@@ -15,11 +15,11 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.config;
+package com.kxs.sky.daemon.quartz.config;
 
-import com.skycloud.sky.daemon.quartz.constants.SkyQuartzEnum;
-import com.skycloud.sky.daemon.quartz.service.SysJobService;
-import com.skycloud.sky.daemon.quartz.util.TaskUtil;
+import com.kxs.sky.daemon.quartz.constants.SkyQuartzEnum;
+import com.kxs.sky.daemon.quartz.service.SysJobService;
+import com.kxs.sky.daemon.quartz.util.TaskUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.Scheduler;

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/config/SkyQuartzConfig.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/config/SkyQuartzConfig.java

@@ -15,7 +15,7 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.config;
+package com.kxs.sky.daemon.quartz.config;
 
 import org.quartz.Calendar;
 import org.quartz.JobDetail;

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/config/SkyQuartzCustomizerConfig.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/config/SkyQuartzCustomizerConfig.java

@@ -15,7 +15,7 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.config;
+package com.kxs.sky.daemon.quartz.config;
 
 import org.springframework.boot.autoconfigure.quartz.SchedulerFactoryBeanCustomizer;
 import org.springframework.context.annotation.Configuration;

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/config/SkyQuartzFactory.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/config/SkyQuartzFactory.java

@@ -15,10 +15,10 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.config;
+package com.kxs.sky.daemon.quartz.config;
 
-import com.skycloud.sky.daemon.quartz.constants.SkyQuartzEnum;
-import com.skycloud.sky.daemon.quartz.entity.SysJob;
+import com.kxs.sky.daemon.quartz.constants.SkyQuartzEnum;
+import com.kxs.sky.daemon.quartz.entity.SysJob;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.DisallowConcurrentExecution;

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/config/SkyQuartzInvokeFactory.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/config/SkyQuartzInvokeFactory.java

@@ -15,10 +15,10 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.config;
+package com.kxs.sky.daemon.quartz.config;
 
-import com.skycloud.sky.daemon.quartz.entity.SysJob;
-import com.skycloud.sky.daemon.quartz.event.SysJobEvent;
+import com.kxs.sky.daemon.quartz.entity.SysJob;
+import com.kxs.sky.daemon.quartz.event.SysJobEvent;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/constants/JobTypeQuartzEnum.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/constants/JobTypeQuartzEnum.java

@@ -15,7 +15,7 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.constants;
+package com.kxs.sky.daemon.quartz.constants;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/constants/SkyQuartzEnum.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/constants/SkyQuartzEnum.java

@@ -15,7 +15,7 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.constants;
+package com.kxs.sky.daemon.quartz.constants;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/controller/SysJobController.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/controller/SysJobController.java

@@ -1,5 +1,5 @@
 
-package com.skycloud.sky.daemon.quartz.controller;
+package com.kxs.sky.daemon.quartz.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -9,12 +9,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kxs.common.core.util.R;
 import com.kxs.common.log.annotation.SysLog;
 import com.kxs.common.security.util.SecurityUtils;
-import com.skycloud.sky.daemon.quartz.constants.SkyQuartzEnum;
-import com.skycloud.sky.daemon.quartz.entity.SysJob;
-import com.skycloud.sky.daemon.quartz.entity.SysJobLog;
-import com.skycloud.sky.daemon.quartz.service.SysJobLogService;
-import com.skycloud.sky.daemon.quartz.service.SysJobService;
-import com.skycloud.sky.daemon.quartz.util.TaskUtil;
+import com.kxs.sky.daemon.quartz.constants.SkyQuartzEnum;
+import com.kxs.sky.daemon.quartz.entity.SysJob;
+import com.kxs.sky.daemon.quartz.entity.SysJobLog;
+import com.kxs.sky.daemon.quartz.service.SysJobLogService;
+import com.kxs.sky.daemon.quartz.service.SysJobService;
+import com.kxs.sky.daemon.quartz.util.TaskUtil;
 import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/controller/SysJobLogController.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/controller/SysJobLogController.java

@@ -15,14 +15,14 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.controller;
+package com.kxs.sky.daemon.quartz.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kxs.common.core.util.R;
-import com.skycloud.sky.daemon.quartz.entity.SysJobLog;
-import com.skycloud.sky.daemon.quartz.service.SysJobLogService;
+import com.kxs.sky.daemon.quartz.entity.SysJobLog;
+import com.kxs.sky.daemon.quartz.service.SysJobLogService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/entity/SysJob.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/entity/SysJob.java

@@ -15,7 +15,7 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.entity;
+package com.kxs.sky.daemon.quartz.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/entity/SysJobLog.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/entity/SysJobLog.java

@@ -15,7 +15,7 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.entity;
+package com.kxs.sky.daemon.quartz.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/event/SysJobEvent.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/event/SysJobEvent.java

@@ -15,9 +15,9 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.event;
+package com.kxs.sky.daemon.quartz.event;
 
-import com.skycloud.sky.daemon.quartz.entity.SysJob;
+import com.kxs.sky.daemon.quartz.entity.SysJob;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.quartz.Trigger;

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/event/SysJobListener.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/event/SysJobListener.java

@@ -15,10 +15,10 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.event;
+package com.kxs.sky.daemon.quartz.event;
 
-import com.skycloud.sky.daemon.quartz.entity.SysJob;
-import com.skycloud.sky.daemon.quartz.util.TaskInvokUtil;
+import com.kxs.sky.daemon.quartz.entity.SysJob;
+import com.kxs.sky.daemon.quartz.util.TaskInvokUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.Trigger;
@@ -43,7 +43,7 @@ public class SysJobListener {
 	public void comSysJob(SysJobEvent event) {
 		SysJob sysJob = event.getSysJob();
 		Trigger trigger = event.getTrigger();
-		taskInvokUtil.invokMethod(sysJob, trigger);
+		taskInvokUtil.invokeMethod(sysJob, trigger);
 	}
 
 }

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/event/SysJobLogEvent.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/event/SysJobLogEvent.java

@@ -15,9 +15,9 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.event;
+package com.kxs.sky.daemon.quartz.event;
 
-import com.skycloud.sky.daemon.quartz.entity.SysJobLog;
+import com.kxs.sky.daemon.quartz.entity.SysJobLog;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/event/SysJobLogListener.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/event/SysJobLogListener.java

@@ -15,10 +15,10 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.event;
+package com.kxs.sky.daemon.quartz.event;
 
-import com.skycloud.sky.daemon.quartz.entity.SysJobLog;
-import com.skycloud.sky.daemon.quartz.service.SysJobLogService;
+import com.kxs.sky.daemon.quartz.entity.SysJobLog;
+import com.kxs.sky.daemon.quartz.service.SysJobLogService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.event.EventListener;

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/exception/TaskException.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/exception/TaskException.java

@@ -15,7 +15,7 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.exception;
+package com.kxs.sky.daemon.quartz.exception;
 
 /**
  * 定时任务异常

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/mapper/SysJobLogMapper.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/mapper/SysJobLogMapper.java

@@ -15,10 +15,10 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.mapper;
+package com.kxs.sky.daemon.quartz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.skycloud.sky.daemon.quartz.entity.SysJobLog;
+import com.kxs.sky.daemon.quartz.entity.SysJobLog;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/mapper/SysJobMapper.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/mapper/SysJobMapper.java

@@ -15,10 +15,10 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.mapper;
+package com.kxs.sky.daemon.quartz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.skycloud.sky.daemon.quartz.entity.SysJob;
+import com.kxs.sky.daemon.quartz.entity.SysJob;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/service/SysJobLogService.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/service/SysJobLogService.java

@@ -15,10 +15,10 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.service;
+package com.kxs.sky.daemon.quartz.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.skycloud.sky.daemon.quartz.entity.SysJobLog;
+import com.kxs.sky.daemon.quartz.entity.SysJobLog;
 
 /**
  * 定时任务执行日志表

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/service/SysJobService.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/service/SysJobService.java

@@ -15,10 +15,10 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.service;
+package com.kxs.sky.daemon.quartz.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.skycloud.sky.daemon.quartz.entity.SysJob;
+import com.kxs.sky.daemon.quartz.entity.SysJob;
 
 /**
  * 定时任务调度表

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/service/impl/SysJobLogServiceImpl.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/service/impl/SysJobLogServiceImpl.java

@@ -15,12 +15,12 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.service.impl;
+package com.kxs.sky.daemon.quartz.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.skycloud.sky.daemon.quartz.entity.SysJobLog;
-import com.skycloud.sky.daemon.quartz.mapper.SysJobLogMapper;
-import com.skycloud.sky.daemon.quartz.service.SysJobLogService;
+import com.kxs.sky.daemon.quartz.entity.SysJobLog;
+import com.kxs.sky.daemon.quartz.mapper.SysJobLogMapper;
+import com.kxs.sky.daemon.quartz.service.SysJobLogService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/service/impl/SysJobServiceImpl.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/service/impl/SysJobServiceImpl.java

@@ -15,12 +15,12 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.service.impl;
+package com.kxs.sky.daemon.quartz.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.skycloud.sky.daemon.quartz.entity.SysJob;
-import com.skycloud.sky.daemon.quartz.mapper.SysJobMapper;
-import com.skycloud.sky.daemon.quartz.service.SysJobService;
+import com.kxs.sky.daemon.quartz.entity.SysJob;
+import com.kxs.sky.daemon.quartz.mapper.SysJobMapper;
+import com.kxs.sky.daemon.quartz.service.SysJobService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/task/RestTaskDemo.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/task/RestTaskDemo.java

@@ -1,4 +1,4 @@
-package com.skycloud.sky.daemon.quartz.task;
+package com.kxs.sky.daemon.quartz.task;
 
 import com.kxs.common.core.util.R;
 import com.kxs.common.security.annotation.Inner;
@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
 /**
  * 用于测试REST风格调用的demo
  *
- * @author lishangbu
+ * @author LXQ
  * @date 2021/3/25
  */
 @Slf4j
@@ -25,7 +25,7 @@ public class RestTaskDemo {
 	 * 测试REST风格调用定时任务的演示方法
 	 */
 	@Inner(value = false)
-	@GetMapping("/{param}")
+	@GetMapping("/test/{param}")
 	public R demoMethod(@PathVariable("param") String param) {
 		log.info("测试于:{}，传入参数{}", LocalDateTime.now(), param);
 		return R.ok();

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/task/SpringBeanTaskDemo.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/task/SpringBeanTaskDemo.java

@@ -15,9 +15,9 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.task;
+package com.kxs.sky.daemon.quartz.task;
 
-import com.skycloud.sky.daemon.quartz.constants.SkyQuartzEnum;
+import com.kxs.sky.daemon.quartz.constants.SkyQuartzEnum;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/util/ITaskInvoke.java

@@ -0,0 +1,19 @@
+package com.kxs.sky.daemon.quartz.util;
+
+import com.kxs.sky.daemon.quartz.exception.TaskException;
+import com.kxs.sky.daemon.quartz.entity.SysJob;
+
+/**
+ * 定时任务反射实现接口类
+ *
+ * @author LXQ
+ */
+public interface ITaskInvoke {
+
+	/**
+	 * 执行反射方法
+	 * @param sysJob 配置类
+     */
+	void invokeMethod(SysJob sysJob) throws TaskException;
+
+}

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/util/JarTaskInvok.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/util/JarTaskInvoke.java

@@ -15,11 +15,11 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.util;
+package com.kxs.sky.daemon.quartz.util;
 
 import cn.hutool.core.util.StrUtil;
-import com.skycloud.sky.daemon.quartz.entity.SysJob;
-import com.skycloud.sky.daemon.quartz.exception.TaskException;
+import com.kxs.sky.daemon.quartz.exception.TaskException;
+import com.kxs.sky.daemon.quartz.entity.SysJob;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -34,11 +34,11 @@ import java.util.List;
  * @author LXQ
  */
 @Slf4j
-@Component("jarTaskInvok")
-public class JarTaskInvok implements ITaskInvok {
+@Component("jarTaskInvoke")
+public class JarTaskInvoke implements ITaskInvoke {
 
 	@Override
-	public void invokMethod(SysJob sysJob) throws TaskException {
+	public void invokeMethod(SysJob sysJob) throws TaskException {
 		ProcessBuilder processBuilder = new ProcessBuilder();
 		File jar = new File(sysJob.getExecutePath());
 		processBuilder.directory(jar.getParentFile());

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/util/JavaClassTaskInvok.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/util/JavaClassTaskInvoke.java

@@ -15,12 +15,12 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.util;
+package com.kxs.sky.daemon.quartz.util;
 
 import cn.hutool.core.util.StrUtil;
-import com.skycloud.sky.daemon.quartz.constants.SkyQuartzEnum;
-import com.skycloud.sky.daemon.quartz.entity.SysJob;
-import com.skycloud.sky.daemon.quartz.exception.TaskException;
+import com.kxs.sky.daemon.quartz.constants.SkyQuartzEnum;
+import com.kxs.sky.daemon.quartz.exception.TaskException;
+import com.kxs.sky.daemon.quartz.entity.SysJob;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -32,12 +32,12 @@ import java.lang.reflect.Method;
  *
  * @author LXQ
  */
-@Component("javaClassTaskInvok")
+@Component("javaClassTaskInvoke")
 @Slf4j
-public class JavaClassTaskInvok implements ITaskInvok {
+public class JavaClassTaskInvoke implements ITaskInvoke {
 
 	@Override
-	public void invokMethod(SysJob sysJob) throws TaskException {
+	public void invokeMethod(SysJob sysJob) throws TaskException {
 		Object obj;
 		Class clazz;
 		Method method;

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/util/RestTaskInvok.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/util/RestTaskInvoke.java

@@ -15,12 +15,12 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.util;
+package com.kxs.sky.daemon.quartz.util;
 
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpUtil;
-import com.skycloud.sky.daemon.quartz.entity.SysJob;
-import com.skycloud.sky.daemon.quartz.exception.TaskException;
+import com.kxs.sky.daemon.quartz.exception.TaskException;
+import com.kxs.sky.daemon.quartz.entity.SysJob;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -32,18 +32,18 @@ import org.springframework.stereotype.Component;
  */
 @Slf4j
 @AllArgsConstructor
-@Component("restTaskInvok")
-public class RestTaskInvok implements ITaskInvok {
+@Component("restTaskInvoke")
+public class RestTaskInvoke implements ITaskInvoke {
 
 	@Override
-	public void invokMethod(SysJob sysJob) throws TaskException {
+	public void invokeMethod(SysJob sysJob) throws TaskException {
 		try {
 			HttpRequest request = HttpUtil.createGet(sysJob.getExecutePath());
 			request.execute();
 		}
 		catch (Exception e) {
-			log.error("定时任务restTaskInvok异常,执行任务：{}", sysJob.getExecutePath());
-			throw new TaskException("定时任务restTaskInvok业务执行失败,任务：" + sysJob.getExecutePath());
+			log.error("定时任务restTaskInvoke异常,执行任务：{}", sysJob.getExecutePath());
+			throw new TaskException("定时任务restTaskInvoke业务执行失败,任务：" + sysJob.getExecutePath());
 		}
 	}
 

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/util/SpringBeanTaskInvok.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/util/SpringBeanTaskInvoke.java

@@ -15,13 +15,14 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.util;
+package com.kxs.sky.daemon.quartz.util;
 
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.StrUtil;
 import com.kxs.common.core.util.SpringContextHolder;
-import com.skycloud.sky.daemon.quartz.constants.SkyQuartzEnum;
-import com.skycloud.sky.daemon.quartz.entity.SysJob;
-import com.skycloud.sky.daemon.quartz.exception.TaskException;
+import com.kxs.sky.daemon.quartz.constants.SkyQuartzEnum;
+import com.kxs.sky.daemon.quartz.entity.SysJob;
+import com.kxs.sky.daemon.quartz.exception.TaskException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ReflectionUtils;
@@ -34,12 +35,12 @@ import java.lang.reflect.Method;
  *
  * @author LXQ
  */
-@Component("springBeanTaskInvok")
+@Component("springBeanTaskInvoke")
 @Slf4j
-public class SpringBeanTaskInvok implements ITaskInvok {
+public class SpringBeanTaskInvoke implements ITaskInvoke {
 
 	@Override
-	public void invokMethod(SysJob sysJob) throws TaskException {
+	public void invokeMethod(SysJob sysJob) throws TaskException {
 		Object target;
 		Method method;
 		Object returnValue;
@@ -56,7 +57,7 @@ public class SpringBeanTaskInvok implements ITaskInvok {
 				ReflectionUtils.makeAccessible(method);
 				returnValue = method.invoke(target);
 			}
-			if (StrUtil.isEmpty(returnValue.toString())
+			if (CharSequenceUtil.isEmpty(returnValue.toString())
 					|| SkyQuartzEnum.JOB_LOG_STATUS_FAIL.getType().equals(returnValue.toString())) {
 				log.error("定时任务springBeanTaskInvok异常,执行任务：{}", sysJob.getClassName());
 				throw new TaskException("定时任务springBeanTaskInvok业务执行失败,任务：" + sysJob.getClassName());

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/util/TaskInvokFactory.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/util/TaskInvokFactory.java

@@ -1,9 +1,9 @@
-package com.skycloud.sky.daemon.quartz.util;
+package com.kxs.sky.daemon.quartz.util;
 
 import cn.hutool.core.util.StrUtil;
 import com.kxs.common.core.util.SpringContextHolder;
-import com.skycloud.sky.daemon.quartz.constants.JobTypeQuartzEnum;
-import com.skycloud.sky.daemon.quartz.exception.TaskException;
+import com.kxs.sky.daemon.quartz.constants.JobTypeQuartzEnum;
+import com.kxs.sky.daemon.quartz.exception.TaskException;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -20,31 +20,31 @@ public class TaskInvokFactory {
 	 * @return
 	 * @throws TaskException
 	 */
-	public static ITaskInvok getInvoker(String jobType) throws TaskException {
+	public static ITaskInvoke getInvoker(String jobType) throws TaskException {
 		if (StrUtil.isBlank(jobType)) {
 			log.info("获取TaskInvok传递参数有误，jobType:{}", jobType);
 			throw new TaskException("");
 		}
 
-		ITaskInvok iTaskInvok = null;
+		ITaskInvoke iTaskInvoke = null;
 		if (JobTypeQuartzEnum.JAVA.getType().equals(jobType)) {
-			iTaskInvok = SpringContextHolder.getBean("javaClassTaskInvok");
+			iTaskInvoke = SpringContextHolder.getBean("javaClassTaskInvoke");
 		}
 		else if (JobTypeQuartzEnum.SPRING_BEAN.getType().equals(jobType)) {
-			iTaskInvok = SpringContextHolder.getBean("springBeanTaskInvok");
+			iTaskInvoke = SpringContextHolder.getBean("springBeanTaskInvoke");
 		}
 		else if (JobTypeQuartzEnum.REST.getType().equals(jobType)) {
-			iTaskInvok = SpringContextHolder.getBean("restTaskInvok");
+			iTaskInvoke = SpringContextHolder.getBean("restTaskInvoke");
 		}
 		else if (JobTypeQuartzEnum.JAR.getType().equals(jobType)) {
-			iTaskInvok = SpringContextHolder.getBean("jarTaskInvok");
+			iTaskInvoke = SpringContextHolder.getBean("jarTaskInvoke");
 		}
 		else if (StrUtil.isBlank(jobType)) {
 			log.info("定时任务类型无对应反射方式，反射类型:{}", jobType);
 			throw new TaskException("");
 		}
 
-		return iTaskInvok;
+		return iTaskInvoke;
 	}
 
 }

kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/util/TaskInvokUtil.java

@@ -0,0 +1,99 @@
+package com.kxs.sky.daemon.quartz.util;
+
+import cn.hutool.core.text.CharSequenceUtil;
+import com.kxs.sky.daemon.quartz.constants.SkyQuartzEnum;
+import com.kxs.sky.daemon.quartz.exception.TaskException;
+import com.kxs.sky.daemon.quartz.service.SysJobService;
+import com.kxs.sky.daemon.quartz.entity.SysJob;
+import com.kxs.sky.daemon.quartz.entity.SysJobLog;
+import com.kxs.sky.daemon.quartz.event.SysJobLogEvent;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.quartz.CronTrigger;
+import org.quartz.Trigger;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.stereotype.Component;
+
+import java.time.ZoneId;
+import java.util.Date;
+
+/**
+ * 定时任务反射工具类
+ *
+ * @author LXQ
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class TaskInvokUtil {
+
+	private final ApplicationEventPublisher publisher;
+
+	private final SysJobService sysJobService;
+
+	@SneakyThrows
+	public void invokeMethod(SysJob sysJob, Trigger trigger) {
+
+		// 执行开始时间
+		long startTime;
+		// 执行结束时间
+		long endTime;
+		// 获取执行开始时间
+		startTime = System.currentTimeMillis();
+		// 更新定时任务表内的状态、执行时间、上次执行时间、下次执行时间等信息
+		SysJob updateSysjob = new SysJob();
+		updateSysjob.setJobId(sysJob.getJobId());
+		// 日志
+		SysJobLog sysJobLog = new SysJobLog();
+		sysJobLog.setJobId(sysJob.getJobId());
+		sysJobLog.setJobName(sysJob.getJobName());
+		sysJobLog.setJobGroup(sysJob.getJobGroup());
+		sysJobLog.setJobOrder(sysJob.getJobOrder());
+		sysJobLog.setJobType(sysJob.getJobType());
+		sysJobLog.setExecutePath(sysJob.getExecutePath());
+		sysJobLog.setClassName(sysJob.getClassName());
+		sysJobLog.setMethodName(sysJob.getMethodName());
+		sysJobLog.setMethodParamsValue(sysJob.getMethodParamsValue());
+		sysJobLog.setCronExpression(sysJob.getCronExpression());
+        try {
+            // 执行任务
+            ITaskInvoke iTaskInvoke = TaskInvokFactory.getInvoker(sysJob.getJobType());
+            // 确保租户上下文有值，使得当前线程中的多租户特性生效。
+            iTaskInvoke.invokeMethod(sysJob);
+            // 记录成功状态
+            sysJobLog.setJobMessage(SkyQuartzEnum.JOB_LOG_STATUS_SUCCESS.getDescription());
+            sysJobLog.setJobLogStatus(SkyQuartzEnum.JOB_LOG_STATUS_SUCCESS.getType());
+            // 任务表信息更新
+            updateSysjob.setJobExecuteStatus(SkyQuartzEnum.JOB_LOG_STATUS_SUCCESS.getType());
+        } catch (TaskException e) {
+            log.error("定时任务执行失败，任务名称：{}；任务组名：{}，cron执行表达式：{}，执行时间：{}", sysJob.getJobName(), sysJob.getJobGroup(),
+                    sysJob.getCronExpression(), new Date());
+            log.error("报错信息", e);
+
+            // 记录失败状态
+            sysJobLog.setJobMessage(SkyQuartzEnum.JOB_LOG_STATUS_FAIL.getDescription());
+            sysJobLog.setJobLogStatus(SkyQuartzEnum.JOB_LOG_STATUS_FAIL.getType());
+            sysJobLog.setExceptionInfo(CharSequenceUtil.sub(e.getMessage(), 0, 2000));
+            // 任务表信息更新
+            updateSysjob.setJobExecuteStatus(SkyQuartzEnum.JOB_LOG_STATUS_FAIL.getType());
+        } finally {
+            // 记录执行时间 立刻执行使用的是simpleTeigger
+            if (trigger instanceof CronTrigger) {
+                updateSysjob
+                        .setStartTime(trigger.getStartTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+                updateSysjob.setPreviousTime(
+                        trigger.getPreviousFireTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+                updateSysjob.setNextTime(
+                        trigger.getNextFireTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+            }
+            // 记录执行时长
+            endTime = System.currentTimeMillis();
+            sysJobLog.setExecuteTime(String.valueOf(endTime - startTime));
+
+            publisher.publishEvent(new SysJobLogEvent(sysJobLog));
+            sysJobService.updateById(updateSysjob);
+        }
+	}
+
+}

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/util/TaskUtil.java → kxs-quartz/src/main/java/com/kxs/sky/daemon/quartz/util/TaskUtil.java

@@ -15,11 +15,11 @@
  * Author: LXQ (609827073@qq.com)
  */
 
-package com.skycloud.sky.daemon.quartz.util;
+package com.kxs.sky.daemon.quartz.util;
 
-import com.skycloud.sky.daemon.quartz.config.SkyQuartzFactory;
-import com.skycloud.sky.daemon.quartz.constants.SkyQuartzEnum;
-import com.skycloud.sky.daemon.quartz.entity.SysJob;
+import com.kxs.sky.daemon.quartz.constants.SkyQuartzEnum;
+import com.kxs.sky.daemon.quartz.config.SkyQuartzFactory;
+import com.kxs.sky.daemon.quartz.entity.SysJob;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.*;
 import org.springframework.stereotype.Component;

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/util/ITaskInvok.java

@@ -1,37 +0,0 @@
-/*
- *    Copyright (c) 2021-2025, LXQ All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: LXQ (609827073@qq.com)
- */
-
-package com.skycloud.sky.daemon.quartz.util;
-
-import com.skycloud.sky.daemon.quartz.entity.SysJob;
-import com.skycloud.sky.daemon.quartz.exception.TaskException;
-
-/**
- * 定时任务反射实现接口类
- *
- * @author LXQ
- */
-public interface ITaskInvok {
-
-	/**
-	 * 执行反射方法
-	 * @param sysJob 配置类
-	 * @throws TaskException
-	 */
-	void invokMethod(SysJob sysJob) throws TaskException;
-
-}

kxs-quartz/src/main/java/com/skycloud/sky/daemon/quartz/util/TaskInvokUtil.java

@@ -1,115 +0,0 @@
-/*
- *    Copyright (c) 2021-2025, LXQ All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: LXQ (609827073@qq.com)
- */
-
-package com.skycloud.sky.daemon.quartz.util;
-
-import cn.hutool.core.util.StrUtil;
-import com.skycloud.sky.daemon.quartz.constants.SkyQuartzEnum;
-import com.skycloud.sky.daemon.quartz.entity.SysJob;
-import com.skycloud.sky.daemon.quartz.entity.SysJobLog;
-import com.skycloud.sky.daemon.quartz.event.SysJobLogEvent;
-import com.skycloud.sky.daemon.quartz.service.SysJobService;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.quartz.CronTrigger;
-import org.quartz.Trigger;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.stereotype.Component;
-
-import java.time.ZoneId;
-import java.util.Date;
-
-/**
- * 定时任务反射工具类
- *
- * @author LXQ
- */
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class TaskInvokUtil {
-
-	private final ApplicationEventPublisher publisher;
-
-	private final SysJobService sysJobService;
-
-	@SneakyThrows
-	public void invokMethod(SysJob sysJob, Trigger trigger) {
-
-		// 执行开始时间
-		long startTime;
-		// 执行结束时间
-		long endTime;
-		// 获取执行开始时间
-		startTime = System.currentTimeMillis();
-		// 更新定时任务表内的状态、执行时间、上次执行时间、下次执行时间等信息
-		SysJob updateSysjob = new SysJob();
-		updateSysjob.setJobId(sysJob.getJobId());
-		// 日志
-		SysJobLog sysJobLog = new SysJobLog();
-		sysJobLog.setJobId(sysJob.getJobId());
-		sysJobLog.setJobName(sysJob.getJobName());
-		sysJobLog.setJobGroup(sysJob.getJobGroup());
-		sysJobLog.setJobOrder(sysJob.getJobOrder());
-		sysJobLog.setJobType(sysJob.getJobType());
-		sysJobLog.setExecutePath(sysJob.getExecutePath());
-		sysJobLog.setClassName(sysJob.getClassName());
-		sysJobLog.setMethodName(sysJob.getMethodName());
-		sysJobLog.setMethodParamsValue(sysJob.getMethodParamsValue());
-		sysJobLog.setCronExpression(sysJob.getCronExpression());
-		try {
-			// 执行任务
-			ITaskInvok iTaskInvok = TaskInvokFactory.getInvoker(sysJob.getJobType());
-			// 确保租户上下文有值，使得当前线程中的多租户特性生效。
-			iTaskInvok.invokMethod(sysJob);
-			// 记录成功状态
-			sysJobLog.setJobMessage(SkyQuartzEnum.JOB_LOG_STATUS_SUCCESS.getDescription());
-			sysJobLog.setJobLogStatus(SkyQuartzEnum.JOB_LOG_STATUS_SUCCESS.getType());
-			// 任务表信息更新
-			updateSysjob.setJobExecuteStatus(SkyQuartzEnum.JOB_LOG_STATUS_SUCCESS.getType());
-		}
-		catch (Throwable e) {
-			log.error("定时任务执行失败，任务名称：{}；任务组名：{}，cron执行表达式：{}，执行时间：{}", sysJob.getJobName(), sysJob.getJobGroup(),
-					sysJob.getCronExpression(), new Date());
-			// 记录失败状态
-			sysJobLog.setJobMessage(SkyQuartzEnum.JOB_LOG_STATUS_FAIL.getDescription());
-			sysJobLog.setJobLogStatus(SkyQuartzEnum.JOB_LOG_STATUS_FAIL.getType());
-			sysJobLog.setExceptionInfo(StrUtil.sub(e.getMessage(), 0, 2000));
-			// 任务表信息更新
-			updateSysjob.setJobExecuteStatus(SkyQuartzEnum.JOB_LOG_STATUS_FAIL.getType());
-		}
-		finally {
-			// 记录执行时间 立刻执行使用的是simpleTeigger
-			if (trigger instanceof CronTrigger) {
-				updateSysjob
-					.setStartTime(trigger.getStartTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
-				updateSysjob.setPreviousTime(
-						trigger.getPreviousFireTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
-				updateSysjob.setNextTime(
-						trigger.getNextFireTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
-			}
-			// 记录执行时长
-			endTime = System.currentTimeMillis();
-			sysJobLog.setExecuteTime(String.valueOf(endTime - startTime));
-
-			publisher.publishEvent(new SysJobLogEvent(sysJobLog));
-			sysJobService.updateById(updateSysjob);
-		}
-	}
-
-}

kxs-system/kxs-system-biz/src/main/resources/mapper/SysDeptMapper.xml

@@ -3,4 +3,5 @@
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.kxs.system.biz.mapper.SysDeptMapper">
+
 </mapper>