From 571a25d4865e8865cf1e80f3ba86cc4cbebe8d03 Mon Sep 17 00:00:00 2001
From: gowshwah <145280043+nodjoy@users.noreply.github.com>
Date: Thu, 12 Mar 2026 16:42:31 +0800
Subject: [PATCH] update docker image version for master branch
---
ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/config/SensitiveJsonSerializer.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/config/SensitiveJsonSerializer.java b/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/config/SensitiveJsonSerializer.java
index 88bfe00..cbb0d7e 100644
--- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/config/SensitiveJsonSerializer.java
+++ b/ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/config/SensitiveJsonSerializer.java
@@ -8,10 +8,10 @@
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.context.SecurityContextHolder;
import com.ruoyi.common.sensitive.annotation.Sensitive;
import com.ruoyi.common.sensitive.enums.DesensitizedType;
-import com.ruoyi.system.api.model.LoginUser;
/**
* 数据脱敏序列化过滤
@@ -55,9 +55,9 @@
{
try
{
- LoginUser securityUser = SecurityUtils.getLoginUser();
+ Long userId = SecurityContextHolder.getUserId();
// 管理员不脱敏
- return !securityUser.getSysUser().isAdmin();
+ return !UserConstants.isAdmin(userId);
}
catch (Exception e)
{
--
Gitblit v1.9.3