github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:elunez/eladmin

pull/765/head
Zheng Jie 2022-08-11 09:43:17 +08:00
parent 5cfa96e127 62fab6e76e
commit 1c141bfc5d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java
View File

@ -106,7 +106,7 @@ public class RedisConfig extends CachingConfigurerSupport {
@Override @Override
public KeyGenerator keyGenerator() { public KeyGenerator keyGenerator() {
return (target, method, params) -> { return (target, method, params) -> {
Map<String,Object> container = new HashMap<>(4); Map<String,Object> container = new HashMap<>(8);
Class<?> targetClassClass = target.getClass(); Class<?> targetClassClass = target.getClass();
// 类地址 // 类地址
container.put("class",targetClassClass.toGenericString()); container.put("class",targetClassClass.toGenericString());

6
eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java
View File

@ -96,9 +96,9 @@ public class LogServiceImpl implements LogService {
log.setUsername(username); log.setUsername(username);
log.setParams(getParameter(method, joinPoint.getArgs())); log.setParams(getParameter(method, joinPoint.getArgs()));
// 记录登录用户，隐藏密码信息 // 记录登录用户，隐藏密码信息
if(log.getDescription().equals("用户登录")){ if(signature.getName().equals("login") && StringUtils.isNotEmpty(log.getParams())){
JSONObject obj = JSONUtil.parseObj(log.getParams()); JSONObject obj = JSONUtil.parseObj(log.getParams());
log.setUsername(obj.get("username").toString()); log.setUsername(obj.getStr("username", ""));
log.setParams(JSONUtil.toJsonStr(Dict.create().set("username", log.getUsername()))); log.setParams(JSONUtil.toJsonStr(Dict.create().set("username", log.getUsername())));
} }
log.setBrowser(browser); log.setBrowser(browser);
@ -120,7 +120,7 @@ public class LogServiceImpl implements LogService {
//将RequestParam注解修饰的参数作为请求参数 //将RequestParam注解修饰的参数作为请求参数
RequestParam requestParam = parameters[i].getAnnotation(RequestParam.class); RequestParam requestParam = parameters[i].getAnnotation(RequestParam.class);
if (requestParam != null) { if (requestParam != null) {
Map<String, Object> map = new HashMap<>(4); Map<String, Object> map = new HashMap<>(2);
String key = parameters[i].getName(); String key = parameters[i].getName();
if (!StringUtils.isEmpty(requestParam.value())) { if (!StringUtils.isEmpty(requestParam.value())) {
key = requestParam.value(); key = requestParam.value();