From 2e612dba5bb0abc1f9c412343f470f6593bf9ab5 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Wed, 30 Apr 2025 18:22:49 +0800 Subject: [PATCH] =?UTF-8?q?feat(sample):=20=E6=9B=B4=E6=96=B0=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=E4=BB=BB=E5=8A=A1=E9=85=8D=E7=BD=AE=E5=B9=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=20Dify=20=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改 Ollama 示例任务的触发方式为手动触发 - 新增 Dify 示例任务,用于处理查询班级各学科前三名的问题 -优化 AIXxlJob 中的异常处理,提高错误日志的可 --- doc/db/tables_xxl_job.sql | 15 ++++++++++++--- .../com/xxl/job/executor/jobhandler/AIXxlJob.java | 4 ++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/doc/db/tables_xxl_job.sql b/doc/db/tables_xxl_job.sql index 9a045a41..7cb49429 100644 --- a/doc/db/tables_xxl_job.sql +++ b/doc/db/tables_xxl_job.sql @@ -145,13 +145,22 @@ INSERT INTO `xxl_job_info`(`id`, `job_group`, `job_desc`, `add_time`, `update_ti `child_jobid`) VALUES (1, 1, '示例任务01', now(), now(), 'XXL', '', 'CRON', '0 0 0 * * ? *', 'DO_NOTHING', 'FIRST', 'demoJobHandler', '', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'GLUE代码初始化', - '2018-11-03 22:21:31', ''), - (2, 2, 'Ollama示例任务01', now(), now(), 'XXL', '', 'CRON', '0 0 0 * * ? *', + now(), ''), + (2, 2, 'Ollama示例任务01', now(), now(), 'XXL', '', 'NONE', '', 'DO_NOTHING', 'FIRST', 'ollamaJobHandler', '{ "input": "慢SQL问题分析思路", "prompt": "你是一个研发工程师,擅长解决技术类问题。" }', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'GLUE代码初始化', - '2018-11-03 22:21:31', ''); + now(), ''), + (3, 2, 'Dify示例任务', now(), now(), 'XXL', '', 'NONE', '', + 'DO_NOTHING', 'FIRST', 'difyWorkflowJobHandler', '{ + "inputs":{ + "input":"查询班级各学科前三名" + }, + "user": "xxl-job" +}', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'GLUE代码初始化', + now(), '') + ; INSERT INTO `xxl_job_user`(`id`, `username`, `password`, `role`, `permission`) VALUES (1, 'admin', 'e10adc3949ba59abbe56e057f20f883e', 1, NULL); diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/java/com/xxl/job/executor/jobhandler/AIXxlJob.java b/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/java/com/xxl/job/executor/jobhandler/AIXxlJob.java index 115b2266..aadb7a8f 100644 --- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/java/com/xxl/job/executor/jobhandler/AIXxlJob.java +++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot-ai/src/main/java/com/xxl/job/executor/jobhandler/AIXxlJob.java @@ -64,7 +64,7 @@ public class AIXxlJob { return; } } catch (Exception e) { - XxlJobHelper.log(e); + XxlJobHelper.log(new RuntimeException("OllamaParam parse error", e)); XxlJobHelper.handleFail(); return; } @@ -144,7 +144,7 @@ public class AIXxlJob { difyParam.setUser("xxl-job"); } } catch (Exception e) { - XxlJobHelper.log(e); + XxlJobHelper.log(new RuntimeException("DifyParam parse error", e)); XxlJobHelper.handleFail(); return; }