From d30a6450c9a3ddfa4886e840939d37daab766a9b Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Thu, 12 Mar 2026 22:22:10 +0800
Subject: [PATCH] !450 update docker image version for master branch Merge pull request !450 from magic/fix/docker
---
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java
index 4c4b53f..175ad7b 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java
@@ -131,9 +131,11 @@
int count = StringUtils.countMatches(packageName, ".");
if (count > 1)
{
- return StringUtils.containsAnyIgnoreCase(invokeTarget, Constants.JOB_WHITELIST_STR);
+ return StringUtils.startsWithAny(invokeTarget, Constants.JOB_WHITELIST_STR);
}
Object obj = SpringUtils.getBean(StringUtils.split(invokeTarget, ".")[0]);
- return StringUtils.containsAnyIgnoreCase(obj.getClass().getPackage().getName(), Constants.JOB_WHITELIST_STR);
+ String beanPackageName = obj.getClass().getPackage().getName();
+ return StringUtils.startsWithAny(beanPackageName, Constants.JOB_WHITELIST_STR)
+ && !StringUtils.startsWithAny(beanPackageName, Constants.JOB_ERROR_STR);
}
}
\ No newline at end of file
--
Gitblit v1.9.3