From 4b76a5c396a535b6ea0259ef6ee05ab77d3b23b5 Mon Sep 17 00:00:00 2001
From: "Michelle.Chung" <1242874891@qq.com>
Date: Wed, 22 Nov 2023 08:33:33 +0800
Subject: [PATCH] =?UTF-8?q?rollback=20=E5=9B=9E=E6=BB=9A=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4,=20=E4=BF=9D=E7=95=99=E5=8A=A0=E5=AF=86?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=BC=80=E5=85=B3=20;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/application.yml               | 2 ++
 .../common/encrypt/config/ApiDecryptAutoConfiguration.java   | 1 +
 .../common/encrypt/properties/ApiDecryptProperties.java      | 5 +++++
 3 files changed, 8 insertions(+)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 0bf870664..0ed7ccb67 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -167,6 +167,8 @@ mybatis-encryptor:
 
 # api接口加密
 api-decrypt:
+  # 是否开启全局接口加密
+  enabled: true
   # AES 加密头标识
   headerFlag: encrypt-key
   # 响应加密公钥 非对称算法的公私钥 如：SM2，RSA 使用者请自行更换
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java
index df157f544..098f6bc8d 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java
@@ -16,6 +16,7 @@ import org.springframework.context.annotation.Bean;
  */
 @AutoConfiguration
 @EnableConfigurationProperties(ApiDecryptProperties.class)
+@ConditionalOnProperty(value = "api-decrypt.enabled", havingValue = "true")
 public class ApiDecryptAutoConfiguration {
 
     @Bean
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java
index 0b76e7652..6aadb3e03 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java
@@ -11,6 +11,11 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @ConfigurationProperties(prefix = "api-decrypt")
 public class ApiDecryptProperties {
 
+    /**
+     * 加密开关
+     */
+    private Boolean enabled;
+
     /**
      * 头部标识
      */