From 2509ba4c92d9c69c8079e6ea73ff68662f0af90f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Wed, 10 Apr 2024 20:09:15 +0800 Subject: [PATCH] 123 --- .../src/main/java/com/ruoyi/RuoYiApplication.java | 1 + ruoyi-admin/src/main/resources/application-prod.yml | 2 ++ .../java/com/ruoyi/cai/filter/EncryptionFilter.java | 12 +++++++++--- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index fa121ccc..5c523d0d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -3,6 +3,7 @@ package com.ruoyi; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup; +import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.scheduling.annotation.EnableScheduling; /** diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 823ffe70..8d809ab0 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -99,3 +99,5 @@ agora: yunxin: app-key: 0aaefeb8a80a9889987c5346244b58e2 app-secret: 470345ca2832 +cai: + enable-api-encryption: false diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/filter/EncryptionFilter.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/filter/EncryptionFilter.java index 899786e3..3c9fc2da 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/filter/EncryptionFilter.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/filter/EncryptionFilter.java @@ -2,14 +2,12 @@ package com.ruoyi.cai.filter; import com.ruoyi.cai.config.CaiProperties; import com.ruoyi.cai.util.AES; -import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.AntPathMatcher; import javax.servlet.*; -import javax.servlet.annotation.WebFilter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -18,12 +16,12 @@ import java.util.Set; @Component @Slf4j -@WebFilter(urlPatterns = "/api/**", filterName = "encryptionFilter") public class EncryptionFilter implements Filter { private static final Set IGNORE_URL = new HashSet<>(); static { IGNORE_URL.add("/api/ali/notify"); IGNORE_URL.add("/api/wx/notify"); + IGNORE_URL.add("/api/yx/im/notify"); } private static final AntPathMatcher ANT_PATH_MATCHER = new AntPathMatcher(); @@ -44,6 +42,10 @@ public class EncryptionFilter implements Filter { HttpServletRequest request = (HttpServletRequest) servletRequest; HttpServletResponse originalResponse = (HttpServletResponse) servletResponse; String requestURI = request.getRequestURI(); + if(!ANT_PATH_MATCHER.match("/api/**",requestURI)){ + filterChain.doFilter(servletRequest, servletResponse); + return; + } for (String ignoreUrlMatch : IGNORE_URL) { boolean match = ANT_PATH_MATCHER.match(ignoreUrlMatch, requestURI); if(match){ @@ -67,4 +69,8 @@ public class EncryptionFilter implements Filter { } } } + + @Override + public void destroy() { + } }