From c4e17ff8472fd9f8123e86b593b2968ad5936b15 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 01 十一月 2021 13:49:11 +0800
Subject: [PATCH] fix 修复 xxl-job-admin 部署问题
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
index 44eb8fd..ed15d1f 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
@@ -1,18 +1,17 @@
package com.ruoyi.quartz.util;
-import cn.hutool.core.lang.Validator;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.quartz.domain.SysJob;
-
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.LinkedList;
import java.util.List;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.quartz.domain.SysJob;
/**
* 浠诲姟鎵ц宸ュ叿
*
+ * @deprecated 3.4.0鍒犻櫎 杩佺Щ鑷硏xl-job
* @author ruoyi
*/
public class JobInvokeUtil
@@ -52,7 +51,7 @@
throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException,
InvocationTargetException
{
- if (Validator.isNotNull(methodParams) && methodParams.size() > 0)
+ if (StringUtils.isNotNull(methodParams) && methodParams.size() > 0)
{
Method method = bean.getClass().getDeclaredMethod(methodName, getMethodParamsType(methodParams));
method.invoke(bean, getMethodParamsValue(methodParams));
@@ -66,48 +65,48 @@
/**
* 鏍￠獙鏄惁涓轰负class鍖呭悕
- *
+ *
* @param str 鍚嶇О
* @return true鏄� false鍚�
*/
public static boolean isValidClassName(String invokeTarget)
{
- return StringUtils.count(invokeTarget, ".") > 1;
+ return StringUtils.countMatches(invokeTarget, ".") > 1;
}
/**
* 鑾峰彇bean鍚嶇О
- *
+ *
* @param invokeTarget 鐩爣瀛楃涓�
* @return bean鍚嶇О
*/
public static String getBeanName(String invokeTarget)
{
- String beanName = StringUtils.subBefore(invokeTarget, "(",false);
- return StringUtils.subBefore(beanName, ".",true);
+ String beanName = StringUtils.substringBefore(invokeTarget, "(");
+ return StringUtils.substringBeforeLast(beanName, ".");
}
/**
* 鑾峰彇bean鏂规硶
- *
+ *
* @param invokeTarget 鐩爣瀛楃涓�
* @return method鏂规硶
*/
public static String getMethodName(String invokeTarget)
{
- String methodName = StringUtils.subBefore(invokeTarget, "(",false);
- return StringUtils.subAfter(methodName, ".",true);
+ String methodName = StringUtils.substringBefore(invokeTarget, "(");
+ return StringUtils.substringAfterLast(methodName, ".");
}
/**
* 鑾峰彇method鏂规硶鍙傛暟鐩稿叧鍒楄〃
- *
+ *
* @param invokeTarget 鐩爣瀛楃涓�
* @return method鏂规硶鐩稿叧鍙傛暟鍒楄〃
*/
public static List<Object[]> getMethodParams(String invokeTarget)
{
- String methodStr = StringUtils.subBetween(invokeTarget, "(", ")");
+ String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")");
if (StringUtils.isEmpty(methodStr))
{
return null;
@@ -148,7 +147,7 @@
/**
* 鑾峰彇鍙傛暟绫诲瀷
- *
+ *
* @param methodParams 鍙傛暟鐩稿叧鍒楄〃
* @return 鍙傛暟绫诲瀷鍒楄〃
*/
@@ -166,7 +165,7 @@
/**
* 鑾峰彇鍙傛暟鍊�
- *
+ *
* @param methodParams 鍙傛暟鐩稿叧鍒楄〃
* @return 鍙傛暟鍊煎垪琛�
*/
--
Gitblit v1.9.3