From b66e9cd7b6e83a5cca24c22f7ec0c5051696baa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E6=B9=98=E6=8C=AF=E5=AE=87?= Date: Sat, 8 Jun 2024 13:23:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=201=E3=80=81=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E5=A2=9E=E5=8A=A0=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=99=A8=EF=BC=8C=E6=96=B9=E4=BE=BF=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=89=A9=E5=B1=95=EF=BC=88=E5=A6=82=E9=92=88?= =?UTF-8?q?=E5=AF=B9=E5=93=8D=E5=BA=94=E5=86=85=E5=AE=B9=E8=B6=85=E8=BF=87?= =?UTF-8?q?2000=E5=AD=97=E7=AC=A6=E7=9A=84=E5=A4=84=E7=90=86=E3=80=81?= =?UTF-8?q?=E6=88=96=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E7=9A=84=E5=A2=9E=E5=BC=BA=EF=BC=89=EF=BC=9B?= =?UTF-8?q?2=E3=80=81=E4=BB=A5=E9=85=8D=E7=BD=AE=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E6=89=A9=E5=B1=95Job=E7=9A=84=E7=99=BD=E5=90=8D?= =?UTF-8?q?=E5=8D=95=EF=BC=9B3=E3=80=81=E4=BF=AE=E5=A4=8DJob=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E6=89=80=E5=9C=A8=E7=9A=84Bean=E6=98=AF=E4=B8=80?= =?UTF-8?q?=E4=B8=AAAOP=E4=BB=A3=E7=90=86=E7=B1=BB=E6=97=B6=E4=BC=9A?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/framework/aspectj/LogAspect.java | 12 ++++++- .../framework/config/ApplicationConfig.java | 10 ++++++ .../handler/OperLogEnhanceHandler.java | 32 +++++++++++++++++++ .../quartz/controller/SysJobController.java | 8 +++-- .../com/ruoyi/quartz/util/ScheduleUtils.java | 16 ++++++++-- 5 files changed, 72 insertions(+), 6 deletions(-) create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/handler/OperLogEnhanceHandler.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java index d40b0f8ed..492a8f53e 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java @@ -2,8 +2,10 @@ package com.ruoyi.framework.aspectj; import java.util.Collection; import java.util.Map; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.commons.lang3.ArrayUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; @@ -12,10 +14,12 @@ import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.NamedThreadLocal; import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; + import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.support.spring.PropertyPreFilters; import com.ruoyi.common.annotation.Log; @@ -24,6 +28,7 @@ import com.ruoyi.common.enums.BusinessStatus; import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.framework.handler.OperLogEnhanceHandler; import com.ruoyi.framework.manager.AsyncManager; import com.ruoyi.framework.manager.factory.AsyncFactory; import com.ruoyi.system.domain.SysOperLog; @@ -44,6 +49,9 @@ public class LogAspect /** 计算操作消耗时间 */ private static final ThreadLocal TIME_THREADLOCAL = new NamedThreadLocal("Cost Time"); + + @Autowired + private OperLogEnhanceHandler operLogEnhanceHandler; /** * 处理请求前执行 @@ -116,6 +124,8 @@ public class LogAspect getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult); // 设置消耗时间 operLog.setCostTime(System.currentTimeMillis() - TIME_THREADLOCAL.get()); + // 操作日志扩展点 + operLogEnhanceHandler.extension(operLog); // 保存数据库 AsyncManager.me().execute(AsyncFactory.recordOper(operLog)); } @@ -155,7 +165,7 @@ public class LogAspect // 是否需要保存response，参数和值 if (log.isSaveResponseData() && StringUtils.isNotNull(jsonResult)) { - operLog.setJsonResult(StringUtils.substring(JSONObject.toJSONString(jsonResult), 0, 2000)); + operLog.setJsonResult(operLogEnhanceHandler.getJsonResult(log, operLog, jsonResult)); } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java index b6b0e88c6..01b68c183 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java @@ -1,9 +1,13 @@ package com.ruoyi.framework.config; import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.EnableAspectJAutoProxy; +import com.ruoyi.framework.handler.OperLogEnhanceHandler; + /** * 程序注解配置 * @@ -16,5 +20,11 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; @MapperScan("com.ruoyi.**.mapper") public class ApplicationConfig { + + @Bean + @ConditionalOnMissingBean + public OperLogEnhanceHandler operLogEnhanceHandler() { + return new OperLogEnhanceHandler() {}; + } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/OperLogEnhanceHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/OperLogEnhanceHandler.java new file mode 100644 index 000000000..c5c111424 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/OperLogEnhanceHandler.java @@ -0,0 +1,32 @@ +package com.ruoyi.framework.handler; + +import com.alibaba.fastjson.JSONObject; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.domain.SysOperLog; + +/** + * 操作日志增强处理器 + * @author 潇湘振宇 + */ +public interface OperLogEnhanceHandler { + + /** + * 获取JSON结果 + * @param log + * @param operLog + * @param jsonResult + * @return + */ + default String getJsonResult(Log log, SysOperLog operLog, Object result) { + return StringUtils.substring(JSONObject.toJSONString(result), 0, 2000); + } + + /** + * 系统操作日志扩展 + * @param operLog + */ + default void extension(SysOperLog operLog) { + } + +} diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java index 6cbe3114b..a9a6b5577 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java @@ -4,6 +4,7 @@ import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.validation.annotation.Validated; @@ -37,6 +38,9 @@ import com.ruoyi.quartz.util.ScheduleUtils; public class SysJobController extends BaseController { private String prefix = "monitor/job"; + + @Value("${job.whiteList:}") + private List whiteList; @Autowired private ISysJobService jobService; @@ -153,7 +157,7 @@ public class SysJobController extends BaseController { return error("新增任务'" + job.getJobName() + "'失败，目标字符串存在违规"); } - else if (!ScheduleUtils.whiteList(job.getInvokeTarget())) + else if (!ScheduleUtils.whiteList(job.getInvokeTarget(), whiteList.toArray(new String[whiteList.size()]))) { return error("新增任务'" + job.getJobName() + "'失败，目标字符串不在白名单内"); } @@ -201,7 +205,7 @@ public class SysJobController extends BaseController { return error("修改任务'" + job.getJobName() + "'失败，目标字符串存在违规"); } - else if (!ScheduleUtils.whiteList(job.getInvokeTarget())) + else if (!ScheduleUtils.whiteList(job.getInvokeTarget(), whiteList.toArray(new String[whiteList.size()]))) { return error("修改任务'" + job.getJobName() + "'失败，目标字符串不在白名单内"); } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java index 598a05b44..54179f542 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java @@ -1,5 +1,6 @@ package com.ruoyi.quartz.util; +import org.apache.commons.lang3.ArrayUtils; import org.quartz.CronScheduleBuilder; import org.quartz.CronTrigger; import org.quartz.Job; @@ -10,6 +11,8 @@ import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.quartz.TriggerBuilder; import org.quartz.TriggerKey; +import org.springframework.aop.support.AopUtils; + import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.ScheduleConstants; import com.ruoyi.common.exception.job.TaskException; @@ -123,19 +126,26 @@ public class ScheduleUtils * 检查包名是否为白名单配置 * * @param invokeTarget 目标字符串 + * @param extendedWhiteList 扩展的名单单 * @return 结果 */ - public static boolean whiteList(String invokeTarget) + public static boolean whiteList(String invokeTarget, String... extendedWhiteList) { + String[] whiteList = StringUtils.isEmpty(extendedWhiteList) ? Constants.JOB_WHITELIST_STR + : ArrayUtils.addAll(extendedWhiteList, Constants.JOB_WHITELIST_STR); String packageName = StringUtils.substringBefore(invokeTarget, "("); int count = StringUtils.countMatches(packageName, "."); if (count > 1) { - return StringUtils.containsAnyIgnoreCase(invokeTarget, Constants.JOB_WHITELIST_STR); + return StringUtils.containsAnyIgnoreCase(invokeTarget, whiteList); } Object obj = SpringUtils.getBean(StringUtils.split(invokeTarget, ".")[0]); + if (AopUtils.isAopProxy(obj)) { + obj = AopUtils.getTargetClass(obj); + } String beanPackageName = obj.getClass().getPackage().getName(); - return StringUtils.containsAnyIgnoreCase(beanPackageName, Constants.JOB_WHITELIST_STR) + return StringUtils.containsAnyIgnoreCase(beanPackageName, whiteList) && !StringUtils.containsAnyIgnoreCase(beanPackageName, Constants.JOB_ERROR_STR); } + } \ No newline at end of file From 67703f4146c42e0e756524312a5c5c8ab6e09aac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E6=B9=98=E6=8C=AF=E5=AE=87?= Date: Sat, 8 Jun 2024 22:27:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8D=95=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E7=94=A8=E6=88=B7=E5=85=B6=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=B8=BA=E3=80=8E=E4=BB=85=E6=9C=AC=E4=BA=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E3=80=8F=E6=97=B6=EF=BC=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=9C=AA=E6=AD=A3=E5=B8=B8=E6=B7=BB=E5=8A=A0=E7=9A=84Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java index f473f4408..1ca354daa 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java @@ -105,7 +105,8 @@ public class DataScopeAspect { continue; } - if (!StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))) + if (StringUtils.isNotEmpty(permission) && StringUtils.isNotEmpty(role.getPermissions()) + && !StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))) { continue; }