malei05 3 周之前
父节点
当前提交
e13da3c04d

+ 1 - 1
src/main/java/net/yyc/quartz/controller/SysJobController.java

@@ -257,7 +257,7 @@ public class SysJobController {
 	 * @return
 	 */
 	@GetMapping("/is-valid-task-name")
-	public R isValidTaskName(@RequestParam String jobName, @RequestParam String jobGroup) {
+	public R isValidTaskName(@RequestParam("params")String jobName, @RequestParam("params")String jobGroup) {
 		return this.sysJobService
 				.count(Wrappers.query(SysJob.builder().jobName(jobName).jobGroup(jobGroup).build())) > 0 ? R.failed()
 						: R.ok();

+ 12 - 12
src/main/java/net/yyc/quartz/feign/RemoteScheduleTaskService.java

@@ -5,8 +5,8 @@ import net.yyc.common.core.constant.ServiceNameConstants;
 import net.yyc.common.core.util.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * 调度任务 Feign 服务
@@ -18,65 +18,65 @@ public interface RemoteScheduleTaskService {
      * 每日GMV统计
      */
     @PostMapping("/schedule/statistics/daily-gmvs-statistic")
-    R<String> dailyGMVsStatistic(@RequestParam String params, @RequestHeader(SecurityConstants.FROM) String from);
+    R<String> dailyGMVsStatistic(@RequestParam("params") String params, @RequestHeader(SecurityConstants.FROM) String from);
 
     /**
      * 设置热门文章
      */
     @PostMapping("/schedule/article/set-hot-article")
-    R<String> setHotArticle(@RequestParam String params, @RequestHeader(SecurityConstants.FROM) String from);
+    R<String> setHotArticle(@RequestParam("params") String params, @RequestHeader(SecurityConstants.FROM) String from);
 
     /**
      * 单会员多月相同金额检测
      */
     @PostMapping("/schedule/risk/single-member-settle-same-amount")
-    R<String> singleMemberSettleSameAmount(@RequestParam String params, @RequestHeader(SecurityConstants.FROM) String from);
+    R<String> singleMemberSettleSameAmount(@RequestParam("params") String params, @RequestHeader(SecurityConstants.FROM) String from);
 
     /**
      * 单会员多月超限检测
      */
     @PostMapping("/schedule/risk/single-member-settle-amount-overrun")
-    R<String> singleMemberSettleAmountOverrun(@RequestParam String params, @RequestHeader(SecurityConstants.FROM) String from);
+    R<String> singleMemberSettleAmountOverrun(@RequestParam("params") String params, @RequestHeader(SecurityConstants.FROM) String from);
 
     /**
      * 企业向多人支付相同金额检测
      */
     @PostMapping("/schedule/risk/single-enterprise-settle-same-amount")
-    R<String> singleEnterpriseSettleSameAmount(@RequestParam String params, @RequestHeader(SecurityConstants.FROM) String from);
+    R<String> singleEnterpriseSettleSameAmount(@RequestParam("params") String params, @RequestHeader(SecurityConstants.FROM) String from);
 
     /**
      * 单会员多月无指定任务类型检测
      */
     @PostMapping("/schedule/risk/single-member-without-task-types")
-    R<String> singleMemberWithoutTaskTypes(@RequestParam String params, @RequestHeader(SecurityConstants.FROM) String from);
+    R<String> singleMemberWithoutTaskTypes(@RequestParam("params") String params, @RequestHeader(SecurityConstants.FROM) String from);
 
     /**
      * 刷新已结算积分包的任务终审积分
      */
     @PostMapping("/schedule/task/refresh-final-review-score")
-    R<String> refreshFinalReviewScoreForSettlement(@RequestParam String params, @RequestHeader(SecurityConstants.FROM) String from);
+    R<String> refreshFinalReviewScoreForSettlement(@RequestParam("params") String params, @RequestHeader(SecurityConstants.FROM) String from);
 
     /**
      * 发送当日结算数据给企业邮箱
      */
     @PostMapping("/schedule/task/send-settle-data-to-dept")
-    R<String> sendCurrentDaySettleDataToDept(@RequestParam String params, @RequestHeader(SecurityConstants.FROM) String from);
+    R<String> sendCurrentDaySettleDataToDept(@RequestParam("params") String params, @RequestHeader(SecurityConstants.FROM) String from);
 
     /**
      * 发送锋信易申请数据给企业邮箱
      */
     @PostMapping("/schedule/promotion/send-fxy-apply")
-    R<String> sendFxyApply(@RequestParam String params, @RequestHeader(SecurityConstants.FROM) String from);
+    R<String> sendFxyApply(@RequestParam("params") String params, @RequestHeader(SecurityConstants.FROM) String from);
 
     /**
      * 发送推广点击记录给企业邮箱
      */
     @PostMapping("/schedule/promotion/send-promotion-record")
-    R<String> sendPromotionRecord(@RequestParam String params, @RequestHeader(SecurityConstants.FROM) String from);
+    R<String> sendPromotionRecord(@RequestParam("params") String params, @RequestHeader(SecurityConstants.FROM) String from);
 
     /**
      * 批量更新过期积分包状态
      */
     @PostMapping("/schedule/task/batch-update-package-status")
-    R<String> batchUpdatePackageStatus(@RequestParam String params, @RequestHeader(SecurityConstants.FROM) String from);
+    R<String> batchUpdatePackageStatus(@RequestParam("params") String params, @RequestHeader(SecurityConstants.FROM) String from);
 }

+ 3 - 15
src/main/java/net/yyc/quartz/util/RestTaskInvoke.java

@@ -22,7 +22,6 @@ import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
-import net.yyc.common.core.constant.CommonConstants;
 import net.yyc.common.core.constant.SecurityConstants;
 import net.yyc.quartz.entity.SysJob;
 import net.yyc.quartz.exception.TaskException;
@@ -50,19 +49,8 @@ public class RestTaskInvoke implements ITaskInvoke {
             String resolvedUrl = resolveUrl(executePath);
 
             HttpRequest request = HttpUtil.createPost(resolvedUrl);
-
-            // 租户 header
-            if (sysJob.getTenantId() != null) {
-                request.header(CommonConstants.TENANT_ID, sysJob.getTenantId().toString());
-            }
-
-            // 内部调用 header(绕过安全拦截器)
-            request.header(SecurityConstants.FROM, SecurityConstants.FROM_IN);
-
-            // 预留扩展 header(可由子类或配置覆盖)
             addExtraHeaders(request, sysJob);
 
-            // 表单参数(params 对应 Controller @RequestParam)
             String methodParams = sysJob.getMethodParamsValue();
             if (StrUtil.isNotBlank(methodParams)) {
                 Map<String, Object> formData = new HashMap<>();
@@ -74,10 +62,10 @@ public class RestTaskInvoke implements ITaskInvoke {
             String body = response.body();
             if (status >= 200 && status < 300) {
                 log.info("[QUARTZ] REST调用完成 | jobId={} jobName={} url={} status={} result={}",
-                        sysJob.getJobId(), sysJob.getJobName(), resolvedUrl, status, StrUtil.sub(body, 0, 500));
+                        sysJob.getJobId(), sysJob.getJobName(), resolvedUrl, status, body);
             } else {
                 log.error("[QUARTZ] REST调用异常 | jobId={} jobName={} url={} status={} result={}",
-                        sysJob.getJobId(), sysJob.getJobName(), resolvedUrl, status, StrUtil.sub(body, 0, 500));
+                        sysJob.getJobId(), sysJob.getJobName(), resolvedUrl, status, body);
                 throw new TaskException("REST调用返回非2xx状态: " + status + ", url=" + executePath);
             }
         } catch (Exception e) {
@@ -132,7 +120,7 @@ public class RestTaskInvoke implements ITaskInvoke {
      * @param sysJob  任务实体
      */
     protected void addExtraHeaders(HttpRequest request, SysJob sysJob) {
-        // 预留扩展点,可通过 sysJob.invokeHeaders 或配置文件动态添加 header
+        request.header(SecurityConstants.FROM, SecurityConstants.FROM_IN);
     }
 
 }