From 15f7d4dc471a735ead8000fc0809cd46c390f055 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 22 十二月 2022 18:26:18 +0800
Subject: [PATCH] update 优化 springdoc 配置鉴权头写死问题 增加持久化鉴权头配置
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java | 50 +++++++++++++++++++-------------------------------
1 files changed, 19 insertions(+), 31 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
index c80315f..795359c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
@@ -1,11 +1,10 @@
package com.ruoyi.web.controller.common;
+import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.captcha.AbstractCaptcha;
import cn.hutool.captcha.generator.CodeGenerator;
-import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
-import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.R;
@@ -19,10 +18,11 @@
import com.ruoyi.sms.core.SmsTemplate;
import com.ruoyi.sms.entity.SmsResult;
import com.ruoyi.system.service.ISysConfigService;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.expression.Expression;
+import org.springframework.expression.ExpressionParser;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -37,10 +37,9 @@
*
* @author Lion Li
*/
-@Anonymous
+@SaIgnore
@Slf4j
@Validated
-@Tag(name ="楠岃瘉鐮佹搷浣滃鐞�", description = "楠岃瘉鐮佺鐞�")
@RequiredArgsConstructor
@RestController
public class CaptchaController {
@@ -51,13 +50,14 @@
/**
* 鐭俊楠岃瘉鐮�
+ *
+ * @param phonenumber 鐢ㄦ埛鎵嬫満鍙�
*/
@GetMapping("/captchaSms")
- public R<Void> smsCaptcha(@Parameter(name = "鐢ㄦ埛鎵嬫満鍙�")
- @NotBlank(message = "{user.phonenumber.not.blank}")
+ public R<Void> smsCaptcha(@NotBlank(message = "{user.phonenumber.not.blank}")
String phonenumber) {
- if (smsProperties.getEnabled()) {
- R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
+ if (!smsProperties.getEnabled()) {
+ return R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
}
String key = CacheConstants.CAPTCHA_CODE_KEY + phonenumber;
String code = RandomUtil.randomNumbers(4);
@@ -81,9 +81,9 @@
@GetMapping("/captchaImage")
public R<Map<String, Object>> getCode() {
Map<String, Object> ajax = new HashMap<>();
- boolean captchaOnOff = configService.selectCaptchaOnOff();
- ajax.put("captchaOnOff", captchaOnOff);
- if (!captchaOnOff) {
+ boolean captchaEnabled = configService.selectCaptchaEnabled();
+ ajax.put("captchaEnabled", captchaEnabled);
+ if (!captchaEnabled) {
return R.ok(ajax);
}
// 淇濆瓨楠岃瘉鐮佷俊鎭�
@@ -97,28 +97,16 @@
AbstractCaptcha captcha = SpringUtils.getBean(captchaProperties.getCategory().getClazz());
captcha.setGenerator(codeGenerator);
captcha.createCode();
- String code = isMath ? getCodeResult(captcha.getCode()) : captcha.getCode();
+ String code = captcha.getCode();
+ if (isMath) {
+ ExpressionParser parser = new SpelExpressionParser();
+ Expression exp = parser.parseExpression(StringUtils.remove(code, "="));
+ code = exp.getValue(String.class);
+ }
RedisUtils.setCacheObject(verifyKey, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
ajax.put("uuid", uuid);
ajax.put("img", captcha.getImageBase64());
return R.ok(ajax);
- }
-
- private String getCodeResult(String capStr) {
- int numberLength = captchaProperties.getNumberLength();
- int a = Convert.toInt(StringUtils.substring(capStr, 0, numberLength).trim());
- char operator = capStr.charAt(numberLength);
- int b = Convert.toInt(StringUtils.substring(capStr, numberLength + 1, numberLength + 1 + numberLength).trim());
- switch (operator) {
- case '*':
- return Convert.toStr(a * b);
- case '+':
- return Convert.toStr(a + b);
- case '-':
- return Convert.toStr(a - b);
- default:
- return StringUtils.EMPTY;
- }
}
}
--
Gitblit v1.9.3