From 36be00e0f3cbe0d559c646fd2977e6e3a74aa6f9 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:57:22 +0800
Subject: [PATCH] Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea
---
src/main/java/com/xcong/excoin/configurations/interceptor/MybatisInterceptor.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/configurations/interceptor/MybatisInterceptor.java b/src/main/java/com/xcong/excoin/configurations/interceptor/MybatisInterceptor.java
index 144a8c0..5e69b7a 100644
--- a/src/main/java/com/xcong/excoin/configurations/interceptor/MybatisInterceptor.java
+++ b/src/main/java/com/xcong/excoin/configurations/interceptor/MybatisInterceptor.java
@@ -1,6 +1,7 @@
package com.xcong.excoin.configurations.interceptor;
import com.xcong.excoin.common.LoginUserUtils;
+import com.xcong.excoin.common.contants.AppContants;
import com.xcong.excoin.common.system.base.BaseEntity;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import lombok.extern.slf4j.Slf4j;
@@ -11,7 +12,6 @@
import org.apache.ibatis.session.defaults.DefaultSqlSession;
import org.springframework.stereotype.Component;
-import java.lang.reflect.Field;
import java.util.*;
/**
@@ -22,15 +22,12 @@
**/
@Slf4j
@Component
-@Intercepts({ @Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class})})
+@Intercepts({@Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class})})
public class MybatisInterceptor implements Interceptor {
@Override
public Object intercept(Invocation invocation) throws Throwable {
MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0];
- String sqlId = mappedStatement.getId();
- log.info("----sqlId----" + sqlId);
SqlCommandType sqlCommandType = mappedStatement.getSqlCommandType();
- log.info("-------------->{}", sqlCommandType);
Object parameter = invocation.getArgs()[1];
if (parameter == null) {
@@ -75,21 +72,32 @@
}
public void injectForInsert(Object o) {
- MemberEntity member = LoginUserUtils.getAppLoginUser();
+ MemberEntity member = LoginUserUtils.getUser();
if (o instanceof BaseEntity) {
BaseEntity baseEntity = (BaseEntity) o;
- baseEntity.setCreateBy(member.getUsername());
- baseEntity.setUpdateBy(member.getUsername());
+ if (member != null) {
+ String by = member.getPhone() != null ? member.getPhone() : member.getEmail();
+ baseEntity.setCreateBy(by);
+ baseEntity.setUpdateBy(by);
+ } else {
+ baseEntity.setCreateBy(AppContants.SYSTEM_USER);
+ baseEntity.setUpdateBy(AppContants.SYSTEM_USER);
+ }
baseEntity.setCreateTime(new Date());
baseEntity.setUpdateTime(new Date());
}
}
public void injectForUpdate(Object o) {
- MemberEntity member = LoginUserUtils.getAppLoginUser();
+ MemberEntity member = LoginUserUtils.getUser();
if (o instanceof BaseEntity) {
BaseEntity baseEntity = (BaseEntity) o;
- baseEntity.setUpdateBy(member.getUsername());
+ if (member != null) {
+ String by = member.getPhone() != null ? member.getPhone() : member.getEmail();
+ baseEntity.setUpdateBy(by);
+ } else {
+ baseEntity.setUpdateBy(AppContants.SYSTEM_USER);
+ }
baseEntity.setUpdateTime(new Date());
}
}
--
Gitblit v1.9.1