From eb5df8834bfdcb3b9601efa798c461c5a0f62b99 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 14 Dec 2021 10:46:49 +0800
Subject: [PATCH] 修复多参数逗号分隔的问题
---
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java
index a3527e1..0bfc2f7 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java
@@ -110,30 +110,30 @@
{
return null;
}
- String[] methodParams = methodStr.split(",(?=(?:[^\']*\"[^\']*\')*[^\']*$)");
+ String[] methodParams = methodStr.split(",(?=([^\"']*[\"'][^\"']*[\"'])*[^\"']*$)");
List<Object[]> classs = new LinkedList<>();
for (int i = 0; i < methodParams.length; i++)
{
String str = StringUtils.trimToEmpty(methodParams[i]);
- // String字符串类型，包含'
- if (StringUtils.contains(str, "'"))
+ // String字符串类型，以'或"开头
+ if (StringUtils.startsWithAny(str, "'", "\""))
{
- classs.add(new Object[] { StringUtils.replace(str, "'", ""), String.class });
+ classs.add(new Object[] { StringUtils.substring(str, 1, str.length() - 1), String.class });
}
// boolean布尔类型，等于true或者false
- else if (StringUtils.equals(str, "true") || StringUtils.equalsIgnoreCase(str, "false"))
+ else if ("true".equalsIgnoreCase(str) || "false".equalsIgnoreCase(str))
{
classs.add(new Object[] { Boolean.valueOf(str), Boolean.class });
}
- // long长整形，包含L
- else if (StringUtils.containsIgnoreCase(str, "L"))
+ // long长整形，以L结尾
+ else if (StringUtils.endsWith(str, "L"))
{
- classs.add(new Object[] { Long.valueOf(StringUtils.replaceIgnoreCase(str, "L", "")), Long.class });
+ classs.add(new Object[] { Long.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Long.class });
}
- // double浮点类型，包含D
- else if (StringUtils.containsIgnoreCase(str, "D"))
+ // double浮点类型，以D结尾
+ else if (StringUtils.endsWith(str, "D"))
{
- classs.add(new Object[] { Double.valueOf(StringUtils.replaceIgnoreCase(str, "D", "")), Double.class });
+ classs.add(new Object[] { Double.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Double.class });
}
// 其他类型归类为整形
else
--
Gitblit v1.9.3