lbqms.git - Gitblit

			@@ -3,7 +3,6 @@
			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.core.constant.Constants;
			@@ -15,11 +14,11 @@
			import com.ruoyi.common.mail.config.properties.MailProperties;
			import com.ruoyi.common.mail.utils.MailUtils;
			import com.ruoyi.common.redis.utils.RedisUtils;
			import com.ruoyi.common.sms.config.properties.SmsProperties;
			import com.ruoyi.common.sms.core.SmsTemplate;
			import com.ruoyi.common.sms.entity.SmsResult;
			import com.ruoyi.common.web.config.properties.CaptchaProperties;
			import com.ruoyi.common.web.enums.CaptchaType;
			import com.ruoyi.system.service.ISysConfigService;
			import com.ruoyi.web.domain.vo.CaptchaVo;
			import jakarta.validation.constraints.NotBlank;
			import lombok.RequiredArgsConstructor;
			@@ -48,9 +47,8 @@
			public class CaptchaController {

			private final CaptchaProperties captchaProperties;
			private final SmsProperties smsProperties;
			private final MailProperties mailProperties;
			private final ISysConfigService configService;


			/**
			* 短信验证码
			@@ -59,14 +57,14 @@
			*/
			@GetMapping("/sms/code")
			public R<Void> smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) {
			if (!Convert.toBool(configService.selectConfigByKey("sys.account.smsEnabled"))) {
			if (!smsProperties.getEnabled()) {
			return R.fail("当前系统没有开启短信功能！");
			}
			String key = GlobalConstants.CAPTCHA_CODE_KEY + phonenumber;
			String code = RandomUtil.randomNumbers(4);
			RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
			// 验证码模板id 自行处理 (查数据库或写死均可)
			String templateId = configService.selectConfigByKey("sys.account.templateId");
			String templateId = "";
			Map<String, String> map = new HashMap<>(1);
			map.put("code", code);
			SmsTemplate smsTemplate = SpringUtils.getBean(SmsTemplate.class);