Merge remote-tracking branch 'origin/6.X' into 6.X

ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java

@@ -15,10 +15,7 @@ import org.dromara.common.core.utils.regex.RegexValidator;
 import org.dromara.common.mail.config.properties.MailProperties;
 import org.dromara.common.redis.annotation.RateLimiter;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 验证码操作处理
@@ -92,12 +89,11 @@ public class CaptchaController {
      * 校验【行为滑块验证码】
      * POST语义更合适，提交校验参数
      *
-     * @param captchaKey 验证码缓存key
-     * @param slideX     用户滑动偏移x坐标
+     * @param data 验证码缓存key
      * @return 校验结果
      */
     @PostMapping("/behavior/verify")
-    public ApiResponse<?> verifyBehaviorCaptcha(behaviorData data) {
+    public ApiResponse<?> verifyBehaviorCaptcha(@RequestBody behaviorData data) {
         return captchaUtils.verifyBehaviorCaptchaFirstStage(data.id(), data.data());
     }
 

ruoyi-admin/src/main/resources/application.yml

@@ -49,7 +49,7 @@ captcha:
   local-cache-ignored-cache-fields: ""
   # 配置字体包，供文字点选验证码使用,可以配置多个，不配置使用默认的字体
   font-path:
-    - classpath:font/SimHei.ttf
+    - classpath:font/AaKuangPaiShouShu-2.ttf
   secondary:
     # 二次验证， 默认false 不开启
     enabled: true