From d51b77f42bfe0d54752689dd6a993816a12842f7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 19 七月 2022 11:31:54 +0800
Subject: [PATCH] add 增加框架声明
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java | 184 ++++++++++++++++++++++++++++++---------------
1 files changed, 122 insertions(+), 62 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 a4ee00f..f4e7dff 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,62 +1,122 @@
-package com.ruoyi.web.controller.common;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.utils.VerifyCodeUtils;
-import com.ruoyi.common.utils.sign.Base64;
-import com.ruoyi.common.utils.uuid.IdUtils;
-
-/**
- * 楠岃瘉鐮佹搷浣滃鐞�
- *
- * @author ruoyi
- */
-@RestController
-public class CaptchaController
-{
- @Autowired
- private RedisCache redisCache;
-
- /**
- * 鐢熸垚楠岃瘉鐮�
- */
- @GetMapping("/captchaImage")
- public AjaxResult getCode(HttpServletResponse response) throws IOException
- {
- // 鐢熸垚闅忔満瀛椾覆
- String verifyCode = VerifyCodeUtils.generateVerifyCode(4);
- // 鍞竴鏍囪瘑
- String uuid = IdUtils.simpleUUID();
- String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
-
- redisCache.setCacheObject(verifyKey, verifyCode, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
- // 鐢熸垚鍥剧墖
- int w = 111, h = 36;
- ByteArrayOutputStream stream = new ByteArrayOutputStream();
- VerifyCodeUtils.outputImage(w, h, stream, verifyCode);
- try
- {
- AjaxResult ajax = AjaxResult.success();
- ajax.put("uuid", uuid);
- ajax.put("img", Base64.encode(stream.toByteArray()));
- return ajax;
- }
- catch (Exception e)
- {
- e.printStackTrace();
- return AjaxResult.error(e.getMessage());
- }
- finally
- {
- stream.close();
- }
- }
-}
+package com.ruoyi.web.controller.common;
+
+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;
+import com.ruoyi.common.enums.CaptchaType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.common.utils.reflect.ReflectUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.framework.config.properties.CaptchaProperties;
+import com.ruoyi.sms.config.properties.SmsProperties;
+import com.ruoyi.sms.core.SmsTemplate;
+import com.ruoyi.sms.entity.SmsResult;
+import com.ruoyi.system.service.ISysConfigService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.constraints.NotBlank;
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 楠岃瘉鐮佹搷浣滃鐞�
+ *
+ * @author Lion Li
+ */
+@Anonymous
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+public class CaptchaController {
+
+ private final CaptchaProperties captchaProperties;
+ private final SmsProperties smsProperties;
+ private final ISysConfigService configService;
+
+ /**
+ * 鐭俊楠岃瘉鐮�
+ *
+ * @param phonenumber 鐢ㄦ埛鎵嬫満鍙�
+ */
+ @GetMapping("/captchaSms")
+ public R<Void> smsCaptcha(@NotBlank(message = "{user.phonenumber.not.blank}")
+ String phonenumber) {
+ if (smsProperties.getEnabled()) {
+ R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
+ }
+ String key = CacheConstants.CAPTCHA_CODE_KEY + phonenumber;
+ String code = RandomUtil.randomNumbers(4);
+ RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
+ // 楠岃瘉鐮佹ā鏉縤d 鑷澶勭悊 (鏌ユ暟鎹簱鎴栧啓姝诲潎鍙�)
+ String templateId = "";
+ Map<String, String> map = new HashMap<>(1);
+ map.put("code", code);
+ SmsTemplate smsTemplate = SpringUtils.getBean(SmsTemplate.class);
+ SmsResult result = smsTemplate.send(phonenumber, templateId, map);
+ if (!result.isSuccess()) {
+ log.error("楠岃瘉鐮佺煭淇″彂閫佸紓甯� => {}", result);
+ return R.fail(result.getMessage());
+ }
+ return R.ok();
+ }
+
+ /**
+ * 鐢熸垚楠岃瘉鐮�
+ */
+ @GetMapping("/captchaImage")
+ public R<Map<String, Object>> getCode() {
+ Map<String, Object> ajax = new HashMap<>();
+ boolean captchaOnOff = configService.selectCaptchaOnOff();
+ ajax.put("captchaOnOff", captchaOnOff);
+ if (!captchaOnOff) {
+ return R.ok(ajax);
+ }
+ // 淇濆瓨楠岃瘉鐮佷俊鎭�
+ String uuid = IdUtil.simpleUUID();
+ String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
+ // 鐢熸垚楠岃瘉鐮�
+ CaptchaType captchaType = captchaProperties.getType();
+ boolean isMath = CaptchaType.MATH == captchaType;
+ Integer length = isMath ? captchaProperties.getNumberLength() : captchaProperties.getCharLength();
+ CodeGenerator codeGenerator = ReflectUtils.newInstance(captchaType.getClazz(), length);
+ AbstractCaptcha captcha = SpringUtils.getBean(captchaProperties.getCategory().getClazz());
+ captcha.setGenerator(codeGenerator);
+ captcha.createCode();
+ String code = isMath ? getCodeResult(captcha.getCode()) : captcha.getCode();
+ 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