wsy182
/
RuoYi-Cloud
mirror of https://gitee.com/y_project/RuoYi-Cloud.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pre Merge pull request !421 from AhYi/master

pull/421/MERGE
AhYi 2025-09-04 12:06:45 +00:00 committed by Gitee
parent ac92ae3ae6 2622d9147e
commit 9be4766ca3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
13 changed files with 176 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-api/ruoyi-api-system/pom.xml
View File

@ -23,6 +23,11 @@
<artifactId>ruoyi-common-core</artifactId>
</dependency>
<!-- RuoYi Common Sensitive -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-sensitive</artifactId>
</dependency>
</dependencies>
</project>

2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.system.api;
import com.ruoyi.common.core.annotation.NoSensitive;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -16,6 +17,7 @@ import com.ruoyi.system.api.factory.RemoteLogFallbackFactory;
*
* @author ruoyi
*/
@NoSensitive
@FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class)
public interface RemoteLogService
{

2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.system.api;
import com.ruoyi.common.core.annotation.NoSensitive;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@ -19,6 +20,7 @@ import com.ruoyi.system.api.model.LoginUser;
*
* @author ruoyi
*/
@NoSensitive
@FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
public interface RemoteUserService
{

5
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
View File

@ -3,6 +3,10 @@ package com.ruoyi.system.api.domain;
import java.util.Date;
import java.util.List;
import javax.validation.constraints.*;
import com.ruoyi.common.core.annotation.NoSensitive;
import com.ruoyi.common.sensitive.annotation.Sensitive;
import com.ruoyi.common.sensitive.enums.DesensitizedType;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.annotation.Excel;
@ -44,6 +48,7 @@ public class SysUser extends BaseEntity
/** 手机号码 */
@Excel(name = "手机号码", cellType = ColumnType.TEXT)
@Sensitive(desensitizedType = DesensitizedType.PHONE)
private String phonenumber;
/** 用户性别 */

15
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/NoSensitive.java Normal file
View File

@ -0,0 +1,15 @@
package com.ruoyi.common.core.annotation;
import java.lang.annotation.*;
/**
* @Description “关闭” 数据脱敏
* @Author AhYi
* @Date 2025-07-07 10:23
*/
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface NoSensitive {
}

29
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/aspect/NoSensitiveAspect.java Normal file
View File

@ -0,0 +1,29 @@
package com.ruoyi.common.core.aspect;
import com.ruoyi.common.core.annotation.NoSensitive;
import com.ruoyi.common.core.context.SensitiveContextHolder;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.springframework.stereotype.Component;
/**
* @Description @NoSensitive 注解切面，主要用户对方法的注解
* @Author AhYi
* @Date 2025-07-07 10:31
*/
@Aspect
@Component
public class NoSensitiveAspect {
@Around("@annotation(noSensitive)")
public Object around(ProceedingJoinPoint joinPoint, NoSensitive noSensitive) throws Throwable {
try {
SensitiveContextHolder.enterNoSensitiveScope();
return joinPoint.proceed();
} finally {
SensitiveContextHolder.exitNoSensitiveScope();
}
}
}

36
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SensitiveContextHolder.java Normal file
View File

@ -0,0 +1,36 @@
package com.ruoyi.common.core.context;
/**
* @Description Sensitive 数据脱敏上下文管理，存储当前线程是否需要脱敏
* @Author AhYi
* @Date 2025-07-07 10:27
*/
public class SensitiveContextHolder {
private static final ThreadLocal<Integer> COUNTER = new ThreadLocal<>();
public static void enterNoSensitiveScope() {
Integer count = COUNTER.get();
if (count == null) {
count = 0;
}
COUNTER.set(count + 1);
}
public static void exitNoSensitiveScope() {
Integer count = COUNTER.get();
if (count != null) {
if (count <= 1) {
COUNTER.remove();
} else {
COUNTER.set(count - 1);
}
}
}
public static boolean isNoSensitiveScope() {
Integer count = COUNTER.get();
return count != null && count > 0;
}
}

43
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/NoSensitiveInterceptor.java Normal file
View File

@ -0,0 +1,43 @@
package com.ruoyi.common.security.interceptor;
import com.ruoyi.common.core.annotation.NoSensitive;
import com.ruoyi.common.core.context.SensitiveContextHolder;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.HandlerInterceptor;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
* @Description @NoSensitive 注解的请求拦截器，主要用于对请求的注解，在请求的整个生命周期内有效
* @Author AhYi
* @Date 2025-07-07 10:35
*/
public class NoSensitiveInterceptor implements HandlerInterceptor {
private static final String SENSITIVE_INTERCEPTOR_APPLIED = "SENSITIVE_INTERCEPTOR_APPLIED";
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
if (handler instanceof HandlerMethod) {
HandlerMethod handlerMethod = (HandlerMethod) handler;
NoSensitive noSensitive = handlerMethod.getMethodAnnotation(NoSensitive.class);
if (noSensitive == null) {
noSensitive = handlerMethod.getBeanType().getAnnotation(NoSensitive.class);
}
if (noSensitive != null) {
SensitiveContextHolder.enterNoSensitiveScope();
request.setAttribute(SENSITIVE_INTERCEPTOR_APPLIED, Boolean.TRUE);
}
}
return true;
}
@Override
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
Object applied = request.getAttribute(SENSITIVE_INTERCEPTOR_APPLIED);
if (applied != null && (Boolean) applied) {
SensitiveContextHolder.exitNoSensitiveScope();
}
}
}

3
ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/config/SensitiveJsonSerializer.java
View File

@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.ser.ContextualSerializer;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.context.SecurityContextHolder;
import com.ruoyi.common.core.context.SensitiveContextHolder;
import com.ruoyi.common.sensitive.annotation.Sensitive;
import com.ruoyi.common.sensitive.enums.DesensitizedType;
@ -25,7 +26,7 @@ public class SensitiveJsonSerializer extends JsonSerializer<String> implements C
@Override
public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException
{
if (desensitization())
if (desensitization() && !SensitiveContextHolder.isNoSensitiveScope())
{
gen.writeString(desensitizedType.desensitizer().apply(value));
}

5
ruoyi-modules/ruoyi-system/pom.xml
View File

@ -71,6 +71,11 @@
<artifactId>ruoyi-common-swagger</artifactId>
</dependency>
<!-- RuoYi Common Sensitive -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-sensitive</artifactId>
</dependency>
</dependencies>
<build>

23
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/WebMvcConfig.java Normal file
View File

@ -0,0 +1,23 @@
package com.ruoyi.system;
import com.ruoyi.common.security.interceptor.NoSensitiveInterceptor;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
/**
* @Description WebMvcConfig
* @Author AhYi
* @Date 2025-07-07 10:46
*/
@Configuration
public class WebMvcConfig implements WebMvcConfigurer {
@Override
public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(new NoSensitiveInterceptor())
.addPathPatterns("/**")
.order(-1);
}
}

3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
View File

@ -2,6 +2,8 @@ package com.ruoyi.system.controller;
import java.util.Arrays;
import java.util.Map;
import com.ruoyi.common.core.annotation.NoSensitive;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -49,6 +51,7 @@ public class SysProfileController extends BaseController
/**
* 个人信息
*/
@NoSensitive
@GetMapping
public AjaxResult profile()
{

5
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
View File

@ -6,6 +6,8 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.annotation.NoSensitive;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@ -117,6 +119,7 @@ public class SysUserController extends BaseController
/**
* 获取当前用户信息
*/
@NoSensitive
@InnerAuth
@GetMapping("/info/{username}")
public R<LoginUser> info(@PathVariable("username") String username)
@ -171,6 +174,7 @@ public class SysUserController extends BaseController
*
* @return 用户信息
*/
@NoSensitive
@GetMapping("getInfo")
public AjaxResult getInfo()
{
@ -221,6 +225,7 @@ public class SysUserController extends BaseController
/**
* 根据用户编号获取详细信息
*/
@NoSensitive
@RequiresPermissions("system:user:query")
@GetMapping(value = { "/", "/{userId}" })
public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)