From 9b4b9e0c744f43417a3c8b741f35090ab4e3c68f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 15 三月 2021 16:38:43 +0800
Subject: [PATCH] update 删除通用工具 改为使用hutool
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 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 5519c67..f017e1b 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,12 +1,14 @@
package com.ruoyi.quartz.util;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+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;
/**
* 浠诲姟鎵ц宸ュ叿
@@ -50,7 +52,7 @@
throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException,
InvocationTargetException
{
- if (StringUtils.isNotNull(methodParams) && methodParams.size() > 0)
+ if (Validator.isNotNull(methodParams) && methodParams.size() > 0)
{
Method method = bean.getClass().getDeclaredMethod(methodName, getMethodParamsType(methodParams));
method.invoke(bean, getMethodParamsValue(methodParams));
@@ -70,7 +72,7 @@
*/
public static boolean isValidClassName(String invokeTarget)
{
- return StringUtils.countMatches(invokeTarget, ".") > 1;
+ return StrUtil.count(invokeTarget, ".") > 1;
}
/**
@@ -81,8 +83,8 @@
*/
public static String getBeanName(String invokeTarget)
{
- String beanName = StringUtils.substringBefore(invokeTarget, "(");
- return StringUtils.substringBeforeLast(beanName, ".");
+ String beanName = StrUtil.subBefore(invokeTarget, "(",false);
+ return StrUtil.subBefore(beanName, ".",true);
}
/**
@@ -93,8 +95,8 @@
*/
public static String getMethodName(String invokeTarget)
{
- String methodName = StringUtils.substringBefore(invokeTarget, "(");
- return StringUtils.substringAfterLast(methodName, ".");
+ String methodName = StrUtil.subBefore(invokeTarget, "(",false);
+ return StrUtil.subAfter(methodName, ".",true);
}
/**
@@ -105,8 +107,8 @@
*/
public static List<Object[]> getMethodParams(String invokeTarget)
{
- String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")");
- if (StringUtils.isEmpty(methodStr))
+ String methodStr = StrUtil.subBetween(invokeTarget, "(", ")");
+ if (StrUtil.isEmpty(methodStr))
{
return null;
}
@@ -114,26 +116,26 @@
List<Object[]> classs = new LinkedList<>();
for (int i = 0; i < methodParams.length; i++)
{
- String str = StringUtils.trimToEmpty(methodParams[i]);
+ String str = StrUtil.trimToEmpty(methodParams[i]);
// String瀛楃涓茬被鍨嬶紝鍖呭惈'
- if (StringUtils.contains(str, "'"))
+ if (StrUtil.contains(str, "'"))
{
- classs.add(new Object[] { StringUtils.replace(str, "'", ""), String.class });
+ classs.add(new Object[] { StrUtil.replace(str, "'", ""), String.class });
}
// boolean甯冨皵绫诲瀷锛岀瓑浜巘rue鎴栬�協alse
- else if (StringUtils.equals(str, "true") || StringUtils.equalsIgnoreCase(str, "false"))
+ else if (StrUtil.equals(str, "true") || StrUtil.equalsIgnoreCase(str, "false"))
{
classs.add(new Object[] { Boolean.valueOf(str), Boolean.class });
}
// long闀挎暣褰紝鍖呭惈L
- else if (StringUtils.containsIgnoreCase(str, "L"))
+ else if (StrUtil.containsIgnoreCase(str, "L"))
{
- classs.add(new Object[] { Long.valueOf(StringUtils.replaceIgnoreCase(str, "L", "")), Long.class });
+ classs.add(new Object[] { Long.valueOf(StrUtil.replaceIgnoreCase(str, "L", "")), Long.class });
}
// double娴偣绫诲瀷锛屽寘鍚獶
- else if (StringUtils.containsIgnoreCase(str, "D"))
+ else if (StrUtil.containsIgnoreCase(str, "D"))
{
- classs.add(new Object[] { Double.valueOf(StringUtils.replaceIgnoreCase(str, "D", "")), Double.class });
+ classs.add(new Object[] { Double.valueOf(StrUtil.replaceIgnoreCase(str, "D", "")), Double.class });
}
// 鍏朵粬绫诲瀷褰掔被涓烘暣褰�
else
--
Gitblit v1.9.3