update sa-token 1.44.0 => 1.45.0

update springdoc 3.0.1 => 3.0.2
update spring-boot-admin 4.0.1 => 4.0.2
update redisson 4.2.0 => 4.3.0
update ip2region 3.3.4 => 3.3.6
update aws-sdk 2.41.34 => 2.42.9
update anyline 8.7.3-20260202 => 8.7.3-20260306
update maven-surefire-plugin 3.5.4 => 3.5.5
This commit is contained in:
疯狂的狮子Li
2026-03-19 11:23:16 +08:00
parent 017a1cc772
commit ed7deb66b0
18 changed files with 61 additions and 57 deletions

View File

@@ -1,9 +1,9 @@
package org.dromara.common.sensitive.annotation;
import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import org.dromara.common.sensitive.core.SensitiveStrategy;
import org.dromara.common.sensitive.handler.SensitiveHandler;
import tools.jackson.databind.annotation.JsonSerialize;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

View File

@@ -1,20 +1,18 @@
package org.dromara.common.sensitive.handler;
import cn.hutool.core.util.ObjectUtil;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.BeanProperty;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.ser.ContextualSerializer;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.sensitive.annotation.Sensitive;
import org.dromara.common.sensitive.core.SensitiveService;
import org.dromara.common.sensitive.core.SensitiveStrategy;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeansException;
import tools.jackson.core.JacksonException;
import tools.jackson.core.JsonGenerator;
import tools.jackson.databind.BeanProperty;
import tools.jackson.databind.SerializationContext;
import tools.jackson.databind.ValueSerializer;
import java.io.IOException;
import java.util.Objects;
/**
@@ -23,7 +21,7 @@ import java.util.Objects;
* @author Yjoioooo
*/
@Slf4j
public class SensitiveHandler extends JsonSerializer<String> implements ContextualSerializer {
public class SensitiveHandler extends ValueSerializer<String> {
private final SensitiveStrategy strategy;
private final String[] roleKey;
@@ -38,14 +36,14 @@ public class SensitiveHandler extends JsonSerializer<String> implements Contextu
this.perms = null;
}
public SensitiveHandler(SensitiveStrategy strategy, String[] roleKey, String[] perms) {
public SensitiveHandler(SensitiveStrategy strategy, String[] strings, String[] perms) {
this.strategy = strategy;
this.roleKey = roleKey;
this.roleKey = strings;
this.perms = perms;
}
@Override
public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
public void serialize(String value, JsonGenerator gen, SerializationContext ctxt) throws JacksonException {
try {
SensitiveService sensitiveService = SpringUtils.getBean(SensitiveService.class);
if (ObjectUtil.isNotNull(sensitiveService) && sensitiveService.isSensitive(roleKey, perms)) {
@@ -60,11 +58,11 @@ public class SensitiveHandler extends JsonSerializer<String> implements Contextu
}
@Override
public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty property) throws JsonMappingException {
public ValueSerializer<?> createContextual(SerializationContext ctxt, BeanProperty property) {
Sensitive annotation = property.getAnnotation(Sensitive.class);
if (Objects.nonNull(annotation) && Objects.equals(String.class, property.getType().getRawClass())) {
return new SensitiveHandler(annotation.strategy(), annotation.roleKey(), annotation.perms());
}
return prov.findValueSerializer(property.getType(), property);
return super.createContextual(ctxt, property);
}
}