|
@@ -59,17 +59,16 @@ public class CommonMailServiceImpl implements CommonMailService {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
//迪士尼 获取验证码
|
|
//迪士尼 获取验证码
|
|
|
- if (goodsId == Constant.DISNEY_GID && account.contains("@a22.top")) {
|
|
|
|
|
|
|
+ if (goodsId == Constant.DISNEY_GID) {
|
|
|
String url = "https://32t.cn/api/v1/code/" + emailPwd;
|
|
String url = "https://32t.cn/api/v1/code/" + emailPwd;
|
|
|
HttpRequest post = HttpUtil.createGet(url);
|
|
HttpRequest post = HttpUtil.createGet(url);
|
|
|
HttpResponse execute = post.execute();
|
|
HttpResponse execute = post.execute();
|
|
|
JSONObject resp = Jsons.parseObject(execute.body(), JSONObject.class);
|
|
JSONObject resp = Jsons.parseObject(execute.body(), JSONObject.class);
|
|
|
Object data = resp.getObj("data");
|
|
Object data = resp.getObj("data");
|
|
|
- if (data == null) {
|
|
|
|
|
- throw BusinessRuntimeException.getInstance("验证码不存在或已过期或延迟2~8秒获取");
|
|
|
|
|
|
|
+ if (data != null) {
|
|
|
|
|
+ DisneyCodeResp codeData = Jsons.parseObject(data, DisneyCodeResp.class);
|
|
|
|
|
+ return codeData.getCode();
|
|
|
}
|
|
}
|
|
|
- DisneyCodeResp codeData = Jsons.parseObject(data, DisneyCodeResp.class);
|
|
|
|
|
- return codeData.getCode();
|
|
|
|
|
}
|
|
}
|
|
|
String checkEmail = StrUtil.isNotEmpty(relateEmail) ? relateEmail : account;
|
|
String checkEmail = StrUtil.isNotEmpty(relateEmail) ? relateEmail : account;
|
|
|
//关联邮箱
|
|
//关联邮箱
|