|
@@ -15,6 +15,7 @@ import com.cyksj.common.constant.Constant;
|
|
|
import com.cyksj.common.exception.BusinessRuntimeException;
|
|
import com.cyksj.common.exception.BusinessRuntimeException;
|
|
|
import com.cyksj.common.task.GlobalThreadPoolTaskExecutor;
|
|
import com.cyksj.common.task.GlobalThreadPoolTaskExecutor;
|
|
|
import com.cyksj.common.util.Jsons;
|
|
import com.cyksj.common.util.Jsons;
|
|
|
|
|
+import com.cyksj.common.util.StringUtil;
|
|
|
import com.cyksj.enums.GatewayApiCode;
|
|
import com.cyksj.enums.GatewayApiCode;
|
|
|
import com.cyksj.mapper.*;
|
|
import com.cyksj.mapper.*;
|
|
|
import com.cyksj.mapper.sys.SysEmailMapper;
|
|
import com.cyksj.mapper.sys.SysEmailMapper;
|
|
@@ -24,6 +25,7 @@ import com.cyksj.model.views.*;
|
|
|
import com.cyksj.redis.RedisService;
|
|
import com.cyksj.redis.RedisService;
|
|
|
import com.cyksj.service.chatgpt.ChatGptAuthService;
|
|
import com.cyksj.service.chatgpt.ChatGptAuthService;
|
|
|
import com.cyksj.service.groups.GroupsFuncService;
|
|
import com.cyksj.service.groups.GroupsFuncService;
|
|
|
|
|
+import com.cyksj.service.mail.CuiQiuMailService;
|
|
|
import com.cyksj.service.mail.MailService;
|
|
import com.cyksj.service.mail.MailService;
|
|
|
import com.cyksj.service.mange.coupon.CouponCommonService;
|
|
import com.cyksj.service.mange.coupon.CouponCommonService;
|
|
|
import com.cyksj.service.relation.GroupRelationFrontService;
|
|
import com.cyksj.service.relation.GroupRelationFrontService;
|
|
@@ -42,8 +44,6 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
-import java.util.regex.Matcher;
|
|
|
|
|
-import java.util.regex.Pattern;
|
|
|
|
|
|
|
|
|
|
import static com.cyksj.enums.GatewayApiCode.GROUP_INDEX_ALREADY_BE_USER;
|
|
import static com.cyksj.enums.GatewayApiCode.GROUP_INDEX_ALREADY_BE_USER;
|
|
|
import static com.cyksj.enums.GatewayApiCode.GROUP_INDEX_NOT_FIND;
|
|
import static com.cyksj.enums.GatewayApiCode.GROUP_INDEX_NOT_FIND;
|
|
@@ -98,7 +98,10 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
|
|
|
|
|
private final UserLoginRecordService userLoginRecordService;
|
|
private final UserLoginRecordService userLoginRecordService;
|
|
|
|
|
|
|
|
- private final static String VERIFY_CODE_SECRET = "q1w2e3";
|
|
|
|
|
|
|
+ private final CuiQiuMailService cuiQiuMailService;
|
|
|
|
|
+
|
|
|
|
|
+ //脆球邮箱后缀
|
|
|
|
|
+ private final static String CUI_QIU_EMAIL_SUFFIX = "@kindvd.com";
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public SearchResult<RenewalView> getMyTicket(long userId, Boolean isLoginPopularize, String customId, String account) {
|
|
public SearchResult<RenewalView> getMyTicket(long userId, Boolean isLoginPopularize, String customId, String account) {
|
|
@@ -454,6 +457,9 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
if (StrUtil.hasEmpty(account, password)) {
|
|
if (StrUtil.hasEmpty(account, password)) {
|
|
|
throw BusinessRuntimeException.getInstance("您的车票账号密码异常,请联系客服...");
|
|
throw BusinessRuntimeException.getInstance("您的车票账号密码异常,请联系客服...");
|
|
|
}
|
|
}
|
|
|
|
|
+ if (renewalView.getGoodsId() == 33l && renewalView.getAccount().contains(CUI_QIU_EMAIL_SUFFIX)) {
|
|
|
|
|
+ return cuiQiuMailService.getVerifyCode(renewalView.getAccount());
|
|
|
|
|
+ }
|
|
|
//获取邮箱密码
|
|
//获取邮箱密码
|
|
|
SysEmail sysEmail = sysEmailMapper.selectOne(Wrappers.lambdaQuery(SysEmail.class)
|
|
SysEmail sysEmail = sysEmailMapper.selectOne(Wrappers.lambdaQuery(SysEmail.class)
|
|
|
.eq(SysEmail::getEmail, account)
|
|
.eq(SysEmail::getEmail, account)
|
|
@@ -647,22 +653,11 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
if (goodsId == 33l) {
|
|
if (goodsId == 33l) {
|
|
|
code = StrUtil.subWithLength(body, body.indexOf("ADOBE"), 215);
|
|
code = StrUtil.subWithLength(body, body.indexOf("ADOBE"), 215);
|
|
|
}
|
|
}
|
|
|
- code = getVerifyCode(code);
|
|
|
|
|
|
|
+ code = StringUtil.getVerifyCodePattern(code);
|
|
|
if (!Validator.isNumber(code)) {
|
|
if (!Validator.isNumber(code)) {
|
|
|
log.error("获取账号验证码失败:{}", StrUtil.subSufByLength(code, 512));
|
|
log.error("获取账号验证码失败:{}", StrUtil.subSufByLength(code, 512));
|
|
|
throw BusinessRuntimeException.getInstance("获取验证码失败,请重新获取..");
|
|
throw BusinessRuntimeException.getInstance("获取验证码失败,请重新获取..");
|
|
|
}
|
|
}
|
|
|
return code.trim();
|
|
return code.trim();
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
- public String getVerifyCode(String code) {
|
|
|
|
|
- if (StrUtil.isNotEmpty(code)) {
|
|
|
|
|
- Pattern pattern = Pattern.compile("\\d{4,}");
|
|
|
|
|
- Matcher matcher = pattern.matcher(code);
|
|
|
|
|
- while (matcher.find()) {
|
|
|
|
|
- return matcher.group();
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- return StrUtil.EMPTY;
|
|
|
|
|
- }
|
|
|
|
|
}
|
|
}
|