v1.0.20

2026-08-21 15:25:04 +08:00
parent 022185079c
commit 4963988ec2
11 changed files with 149 additions and 16 deletions
@@ -42,6 +42,19 @@ public class NotifyQueueConfig {
 		private String secretId;

 		private String secretKey;
+
+		private Captcha captcha;
+
+		/// 短信验证码
+		@Data
+		public static class Captcha {
+
+			private String templateId;
+
+			private int ttlMinute;
+
+			private int argIndex;
+		}
 	}

 	/// 微信队列配置
@@ -0,0 +1,30 @@
+//package com.imyeyu.api.modules.common.service;
+//
+//import com.e2ins.ms.notify.entity.Notify;
+//import com.e2ins.ms.notify.entity.NotifyDetail;
+//
+///**
+// *
+// *
+// * @author 夜雨
+// * @since 2026-05-14 12:12
+// */
+//public interface SmsService {
+//
+//	/**
+//	 * 创建短信验证码通知
+//	 *
+//	 * @param detail 通知
+//	 * @return 通知详情 ID
+//	 */
+//	String captchaCreate(Notify detail);
+//
+//	/**
+//	 * 校验短信验证码
+//	 *
+//	 * @param detailId 通知详情 ID
+//	 * @param captcha  请求验证码
+//	 * @return 通知详情
+//	 */
+//	NotifyDetail captchaVerify(String detailId, String captcha);
+//}
@@ -0,0 +1,82 @@
+//package com.imyeyu.api.modules.common.service.implement;
+//
+//import com.fasterxml.jackson.databind.ObjectMapper;
+//import com.fasterxml.jackson.databind.node.ArrayNode;
+//import com.imyeyu.api.modules.common.config.NotifyQueueConfig;
+//import com.imyeyu.api.modules.common.entity.Notify;
+//import com.imyeyu.api.modules.common.entity.NotifyDetail;
+//import com.imyeyu.api.modules.common.service.NotifyDetailService;
+//import com.imyeyu.api.modules.common.service.NotifyService;
+//import com.imyeyu.api.modules.common.service.SmsService;
+//import com.imyeyu.java.bean.timi.TimiException;
+//import com.imyeyu.utils.Regex;
+//import com.imyeyu.utils.Text;
+//import com.imyeyu.utils.Time;
+//import lombok.RequiredArgsConstructor;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.stereotype.Service;
+//
+//import java.util.List;
+//
+///**
+// *
+// *
+// * @author 夜雨
+// * @since 2026-05-14 12:12
+// */
+//@Slf4j
+//@Service
+//@RequiredArgsConstructor
+//public class SmsServiceImplement implements SmsService {
+//
+//	@Value("${spring.profiles.active}")
+//	private String env;
+//
+//	private final NotifyQueueConfig config;
+//	private final ObjectMapper jackson;
+//
+//	private final NotifyService notifyService;
+//	private final NotifyDetailService notifyDetailService;
+//
+//	@Override
+//	public String captchaCreate(Notify notify) {
+//		NotifyQueueConfig.Sms.Captcha captchaConf = config.getSms().getCaptcha();
+//		TimiException.required(notify.getAppId(), "not found appId");
+//
+//		NotifyDetail detail = notify.getDetailList().getFirst();
+//
+//		TimiException.requiredTrue(Regex.isMatch(Regex.MOBILE_PHONE, detail.getSendTo()), "invalid mobilePhone", "captcha.sms.invalid_mobile_phone");
+//
+//		String code = Text.randomString("0123456789", 6);
+//		if (!env.equalsIgnoreCase("prod")) {
+//			code = "123456";
+//		}
+//		detail.setMsgType(NotifyDetail.MsgType.SMS);
+//		detail.setTemplateId(captchaConf.getTemplateId());
+//		detail.setArgs(jackson.valueToTree(List.of(code, captchaConf.getTtlMinute())));
+//
+//		notifyService.create(notify);
+//		return notifyDetailService.listByNotifyId(notify.getId()).getFirst().getId();
+//	}
+//
+//	@Override
+//	public NotifyDetail captchaVerify(String detailId, String captcha) {
+//		AppConfig.Sms.Captcha captchaConf = config.getSms().getCaptcha();
+//
+//		NotifyDetail detail = notifyDetailService.get(detailId);
+//		if (Time.M * captchaConf.getTtlMinute() < Time.now() - detail.getSendAt()) {
+//			throw new AppException(ResultCode.ARG_EXPIRED).msgKey("captcha.expired");
+//		}
+//		if (detail.getArgs() instanceof ArrayNode array) {
+//			String dbCaptcha = array.get(captchaConf.getArgIndex()).asText();
+//			if (!dbCaptcha.equalsIgnoreCase(captcha)) {
+//				throw new AppException(ResultCode.RESULT_BAD).msgKey("captcha.invalid");
+//			}
+//		} else {
+//			throw new AppException(ResultCode.ERROR, "not array args");
+//		}
+//		detail.setNotify(notifyService.get(detail.getNotifyId()));
+//		return detail;
+//	}
+//}