From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore

---
 ruoyi-applet/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java |   61 ++++++++++++++++++++++++++++++
 1 files changed, 61 insertions(+), 0 deletions(-)

diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java b/ruoyi-applet/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java
new file mode 100644
index 0000000..e27f2a5
--- /dev/null
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java
@@ -0,0 +1,61 @@
+package com.ruoyi.web.core.config;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author xiaochen
+ * @ClassName DataUpdateInterceptor
+ * @Description 数据更新操作处理
+ * @date 2021-12-15
+ * <p>
+ * 注意,之前在此处注入了 JwtTokenUtils
+ * <p>
+ * 造成spring循环依赖,项目支棱不起来
+ */
+@Slf4j
+@Configuration
+public class DataUpdateHandlerConfig implements MetaObjectHandler {
+
+    /**
+     * 新增数据执行
+     *
+     * @param metaObject
+     */
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        //  获取登录信息
+//        String userName = SecurityUtils.getUsernameApplet();
+//        if (StringUtils.isNotBlank(userName)) {
+//            this.setFieldValByName("createBy", userName, metaObject);
+//            this.setFieldValByName("updateBy", userName, metaObject);
+//        } else {
+//            this.setFieldValByName("createBy", userName, metaObject);
+//            this.setFieldValByName("updateBy", userName, metaObject);
+//        }
+
+    }
+
+    /**
+     * 修改数据执行
+     *
+     * @param metaObject
+     */
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        //  获取登录信息
+//        String userName = SecurityUtils.getUsernameApplet();
+//        if (StringUtils.isNotBlank(userName)){
+//            this.setFieldValByName("createBy", userName, metaObject);
+//            this.setFieldValByName("updateBy", userName, metaObject);
+//        } else {
+//            this.setFieldValByName("createBy", userName, metaObject);
+//            this.setFieldValByName("updateBy", userName, metaObject);
+//        }
+
+    }
+}

--
Gitblit v1.7.1