From ab4ea7b8f10c9b66aed9c2ea161a08b25c3851a7 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期二, 30 四月 2024 19:11:37 +0800 Subject: [PATCH] 2024.04新增内容 --- meiya-admin/src/main/java/com/sinata/core/aop/LogAop.java | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/meiya-admin/src/main/java/com/sinata/core/aop/LogAop.java b/meiya-admin/src/main/java/com/sinata/core/aop/LogAop.java index ba3991f..4e21e98 100644 --- a/meiya-admin/src/main/java/com/sinata/core/aop/LogAop.java +++ b/meiya-admin/src/main/java/com/sinata/core/aop/LogAop.java @@ -1,14 +1,13 @@ package com.sinata.core.aop; +import cn.hutool.json.JSONUtil; import com.sinata.core.common.annotion.BussinessLog; -import com.sinata.core.common.constant.dictmap.base.AbstractDictMap; import com.sinata.core.log.LogManager; import com.sinata.core.log.LogObjectHolder; import com.sinata.core.log.factory.LogTaskFactory; import com.sinata.core.shiro.ShiroKit; import com.sinata.core.shiro.ShiroUser; import com.sinata.core.support.HttpKit; -import com.sinata.core.util.Contrast; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.Signature; import org.aspectj.lang.annotation.Around; @@ -86,16 +85,20 @@ sb.append(" & "); } - //如果涉及到修改,比对变化 + // 如果涉及到修改,比对变化 String msg; if (bussinessName.indexOf("修改") != -1 || bussinessName.indexOf("编辑") != -1) { Object obj1 = LogObjectHolder.me().get(); Map<String, String> obj2 = HttpKit.getRequestParameters(); - msg = Contrast.contrastObj(dictClass, key, obj1, obj2); + //msg = Contrast.contrastObj(dictClass, key, obj1, obj2); + msg = key + "=" + obj2.get(key) + + ";" + JSONUtil.toJsonStr(obj1) + + ";" + JSONUtil.toJsonStr(obj2); } else { Map<String, String> parameters = HttpKit.getRequestParameters(); - AbstractDictMap dictMap = (AbstractDictMap) dictClass.newInstance(); - msg = Contrast.parseMutiKey(dictMap, key, parameters); + //AbstractDictMap dictMap = (AbstractDictMap) dictClass.newInstance(); + //msg = Contrast.parseMutiKey(dictMap, key, parameters); + msg = JSONUtil.toJsonStr(parameters); } LogManager.me().executeLog(LogTaskFactory.bussinessLog(user.getId(), bussinessName, className, methodName, msg, HttpKit.getIp())); -- Gitblit v1.7.1