From 71b622f38e40c857d4bfe193d4efadeacddad008 Mon Sep 17 00:00:00 2001
From: wangqing <250543222@qq.com>
Date: Sat, 29 May 2021 23:13:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=BB=91=E5=8A=A8=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                       | 2 +-
 .../main/java/com/tduck/cloud/api/config/FilterConfig.java    | 3 ++-
 .../src/main/java/com/tduck/cloud/api/util/SignUtils.java     | 1 +
 tduck-api/src/main/resources/application.yml                  | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 137dd22..cae63ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
         <knife4j.version>3.0.1</knife4j.version>
         <jwt.version>0.7.0</jwt.version>
         <weixin-java.version>4.0.0</weixin-java.version>
-        <captcha.version>1.2.4</captcha.version>
+        <captcha.version>1.2.7</captcha.version>
         <fastjson.version>1.2.75</fastjson.version>
         <tencentcloud.version>4.0.11</tencentcloud.version>
         <poi.version>5.0.0</poi.version>
diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/config/FilterConfig.java b/tduck-api/src/main/java/com/tduck/cloud/api/config/FilterConfig.java
index 81a8863..134c5de 100644
--- a/tduck-api/src/main/java/com/tduck/cloud/api/config/FilterConfig.java
+++ b/tduck-api/src/main/java/com/tduck/cloud/api/config/FilterConfig.java
@@ -87,11 +87,12 @@ public class FilterConfig {
 
 
     /**
-     * 请求日志
+     * 验证码过滤器
      *
      * @return
      */
     @Bean
+    @ConditionalOnProperty(prefix = "aj.captcha.enable", name = "enable", havingValue = "true")
     public FilterRegistrationBean validateCodeFilterRegistration() {
         FilterRegistrationBean registration = new FilterRegistrationBean();
         registration.setDispatcherTypes(DispatcherType.REQUEST);
diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/util/SignUtils.java b/tduck-api/src/main/java/com/tduck/cloud/api/util/SignUtils.java
index f108b20..82a15a0 100644
--- a/tduck-api/src/main/java/com/tduck/cloud/api/util/SignUtils.java
+++ b/tduck-api/src/main/java/com/tduck/cloud/api/util/SignUtils.java
@@ -33,6 +33,7 @@ public class SignUtils {
             return false;
         }
         String paramsSign = getParamsSign(params, secret);
+        log.debug("params:{}",JsonUtils.objToJson(params));
         log.debug("sign1 {} sign2 {} result:{}", paramsSign, urlSign,urlSign.equals(paramsSign));
         return StringUtils.isNotBlank(paramsSign) && urlSign.equals(paramsSign);
     }
diff --git a/tduck-api/src/main/resources/application.yml b/tduck-api/src/main/resources/application.yml
index 3c7c35f..277378c 100644
--- a/tduck-api/src/main/resources/application.yml
+++ b/tduck-api/src/main/resources/application.yml
@@ -46,7 +46,7 @@ mybatis-plus:
 #  请求日志是否打印
 platform:
   request:
-    trace-log: true
+    trace-log: false
   sign:
     enable: true
     secret: 916lWh2WMcbSWiHv
@@ -76,5 +76,5 @@ platform:
 
 aj:
   captcha:
+    enable: true
     water-mark: tduck
-