lbqms.git - Gitblit

			@@ -1,11 +1,11 @@
			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,8 +19,6 @@
			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.validation.annotation.Validated;
			@@ -37,10 +35,9 @@
			*
			* @author Lion Li
			*/
			@Anonymous
			@SaIgnore
			@Slf4j
			@Validated
			@Tag(name ="验证码操作处理", description = "验证码管理")
			@RequiredArgsConstructor
			@RestController
			public class CaptchaController {
			@@ -51,13 +48,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 +79,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);
			}
			// 保存验证码信息