diff --git a/pigx-common/pigx-common-encrypt-api/src/main/java/com/pig4cloud/pigx/common/api/encrypt/core/DecryptQueryParametersFilter.java b/pigx-common/pigx-common-encrypt-api/src/main/java/com/pig4cloud/pigx/common/api/encrypt/core/DecryptQueryParametersFilter.java index 3fdcfed93..890e05d1a 100644 --- a/pigx-common/pigx-common-encrypt-api/src/main/java/com/pig4cloud/pigx/common/api/encrypt/core/DecryptQueryParametersFilter.java +++ b/pigx-common/pigx-common-encrypt-api/src/main/java/com/pig4cloud/pigx/common/api/encrypt/core/DecryptQueryParametersFilter.java @@ -26,10 +26,6 @@ import com.pig4cloud.pigx.common.api.encrypt.config.ApiEncryptProperties; import com.pig4cloud.pigx.common.api.encrypt.util.ApiCryptoUtil; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.util.RepeatBodyRequestWrapper; -import jakarta.servlet.FilterChain; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -37,6 +33,10 @@ import org.springframework.core.Ordered; import org.springframework.http.HttpMethod; import org.springframework.web.filter.OncePerRequestFilter; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; diff --git a/pigx-common/pigx-common-encrypt-api/src/main/java/com/pig4cloud/pigx/common/api/encrypt/core/DefaultSecretKeyResolver.java b/pigx-common/pigx-common-encrypt-api/src/main/java/com/pig4cloud/pigx/common/api/encrypt/core/DefaultSecretKeyResolver.java index 655742d76..fde591f02 100644 --- a/pigx-common/pigx-common-encrypt-api/src/main/java/com/pig4cloud/pigx/common/api/encrypt/core/DefaultSecretKeyResolver.java +++ b/pigx-common/pigx-common-encrypt-api/src/main/java/com/pig4cloud/pigx/common/api/encrypt/core/DefaultSecretKeyResolver.java @@ -2,9 +2,10 @@ package com.pig4cloud.pigx.common.api.encrypt.core; import com.pig4cloud.pigx.common.api.encrypt.config.ApiEncryptProperties; import com.pig4cloud.pigx.common.api.encrypt.enums.EncryptType; -import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletRequest; + /** * 默认的密钥处理器 * @@ -13,16 +14,20 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor public class DefaultSecretKeyResolver implements ISecretKeyResolver { - private final ApiEncryptProperties properties; + private final ApiEncryptProperties properties; + + @Override + public String getSecretKey(HttpServletRequest request, EncryptType encryptType) { + if (encryptType == EncryptType.SM4) { + return properties.getSm4Key(); + } else if (encryptType == EncryptType.DES) { + return properties.getDesKey(); + } else if (encryptType == EncryptType.RSA) { + return properties.getRsaPrivateKey(); + } else { + return properties.getAesKey(); + } + } - @Override - public String getSecretKey(HttpServletRequest request, EncryptType encryptType) { - return switch (encryptType) { - case SM4 -> properties.getSm4Key(); - case DES -> properties.getDesKey(); - case RSA -> properties.getRsaPrivateKey(); - default -> properties.getAesKey(); - }; - } } diff --git a/pigx-common/pigx-common-encrypt-api/src/main/java/com/pig4cloud/pigx/common/api/encrypt/core/ISecretKeyResolver.java b/pigx-common/pigx-common-encrypt-api/src/main/java/com/pig4cloud/pigx/common/api/encrypt/core/ISecretKeyResolver.java index 6d15268c1..0dd9cc5a2 100644 --- a/pigx-common/pigx-common-encrypt-api/src/main/java/com/pig4cloud/pigx/common/api/encrypt/core/ISecretKeyResolver.java +++ b/pigx-common/pigx-common-encrypt-api/src/main/java/com/pig4cloud/pigx/common/api/encrypt/core/ISecretKeyResolver.java @@ -1,7 +1,8 @@ package com.pig4cloud.pigx.common.api.encrypt.core; import com.pig4cloud.pigx.common.api.encrypt.enums.EncryptType; -import jakarta.servlet.http.HttpServletRequest; + +import javax.servlet.http.HttpServletRequest; /** * 解析加密密钥