From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/java/com/ruoyi/common/utils/job/JobInvokeUtil.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/job/JobInvokeUtil.java b/src/main/java/com/ruoyi/common/utils/job/JobInvokeUtil.java
index 71118f2..9711541 100644
--- a/src/main/java/com/ruoyi/common/utils/job/JobInvokeUtil.java
+++ b/src/main/java/com/ruoyi/common/utils/job/JobInvokeUtil.java
@@ -34,7 +34,7 @@
}
else
{
- Object bean = Class.forName(beanName).newInstance();
+ Object bean = Class.forName(beanName).getDeclaredConstructor().newInstance();
invokeMethod(bean, methodName, methodParams);
}
}
@@ -52,12 +52,12 @@
{
if (StringUtils.isNotNull(methodParams) && methodParams.size() > 0)
{
- Method method = bean.getClass().getDeclaredMethod(methodName, getMethodParamsType(methodParams));
+ Method method = bean.getClass().getMethod(methodName, getMethodParamsType(methodParams));
method.invoke(bean, getMethodParamsValue(methodParams));
}
else
{
- Method method = bean.getClass().getDeclaredMethod(methodName);
+ Method method = bean.getClass().getMethod(methodName);
method.invoke(bean);
}
}
@@ -65,7 +65,7 @@
/**
* 鏍￠獙鏄惁涓轰负class鍖呭悕
*
- * @param str 鍚嶇О
+ * @param invokeTarget 鍚嶇О
* @return true鏄� false鍚�
*/
public static boolean isValidClassName(String invokeTarget)
@@ -105,35 +105,35 @@
*/
public static List<Object[]> getMethodParams(String invokeTarget)
{
- String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")");
+ String methodStr = StringUtils.substringBetweenLast(invokeTarget, "(", ")");
if (StringUtils.isEmpty(methodStr))
{
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甯冨皵绫诲瀷锛岀瓑浜巘rue鎴栬�協alse
- 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闀挎暣褰紝浠缁撳熬
+ 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娴偣绫诲瀷锛屽寘鍚獶
- 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