lbqms.git - Gitblit

			@@ -5,19 +5,20 @@
			import cn.hutool.captcha.generator.CodeGenerator;
			import cn.hutool.core.util.IdUtil;
			import cn.hutool.core.util.RandomUtil;
			import com.ruoyi.common.constant.CacheConstants;
			import com.ruoyi.common.constant.Constants;
			import com.ruoyi.common.core.constant.Constants;
			import com.ruoyi.common.core.constant.GlobalConstants;
			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 com.ruoyi.common.core.utils.SpringUtils;
			import com.ruoyi.common.core.utils.StringUtils;
			import com.ruoyi.common.core.utils.reflect.ReflectUtils;
			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.web.domain.vo.CaptchaVo;
			import jakarta.validation.constraints.NotBlank;
			import lombok.RequiredArgsConstructor;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.expression.Expression;
			@@ -27,7 +28,6 @@
			import org.springframework.web.bind.annotation.GetMapping;
			import org.springframework.web.bind.annotation.RestController;

			import jakarta.validation.constraints.NotBlank;
			import java.time.Duration;
			import java.util.HashMap;
			import java.util.Map;
			@@ -46,7 +46,6 @@

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

			/**
			* 短信验证码
			@@ -59,7 +58,7 @@
			if (!smsProperties.getEnabled()) {
			return R.fail("当前系统没有开启短信功能！");
			}
			String key = CacheConstants.CAPTCHA_CODE_KEY + phonenumber;
			String key = GlobalConstants.CAPTCHA_CODE_KEY + phonenumber;
			String code = RandomUtil.randomNumbers(4);
			RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
			// 验证码模板id 自行处理 (查数据库或写死均可)
			@@ -79,16 +78,16 @@
			* 生成验证码
			*/
			@GetMapping("/captchaImage")
			public R<Map<String, Object>> getCode() {
			Map<String, Object> ajax = new HashMap<>();
			boolean captchaEnabled = configService.selectCaptchaEnabled();
			ajax.put("captchaEnabled", captchaEnabled);
			public R<CaptchaVo> getCode() {
			CaptchaVo captchaVo = new CaptchaVo();
			boolean captchaEnabled = captchaProperties.getEnable();
			if (!captchaEnabled) {
			return R.ok(ajax);
			captchaVo.setCaptchaEnabled(false);
			return R.ok(captchaVo);
			}
			// 保存验证码信息
			String uuid = IdUtil.simpleUUID();
			String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
			String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + uuid;
			// 生成验证码
			CaptchaType captchaType = captchaProperties.getType();
			boolean isMath = CaptchaType.MATH == captchaType;
			@@ -104,9 +103,9 @@
			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);
			captchaVo.setUuid(uuid);
			captchaVo.setImg(captcha.getImageBase64());
			return R.ok(captchaVo);
			}

			}