Commit ef0cdcb4 authored by 技术部-任文超's avatar 技术部-任文超

运行环境判定

parent 8e9689a7
package cn.quantgroup.xyqb.controller.internal.sms; package cn.quantgroup.xyqb.controller.internal.sms;
import cn.quantgroup.sms.MsgParams; import cn.quantgroup.sms.MsgParams;
import cn.quantgroup.tech.util.TechEnvironment;
import cn.quantgroup.xyqb.Constants; import cn.quantgroup.xyqb.Constants;
import cn.quantgroup.xyqb.aspect.captcha.CaptchaNewValidator; import cn.quantgroup.xyqb.aspect.captcha.CaptchaNewValidator;
import cn.quantgroup.xyqb.controller.IBaseController; import cn.quantgroup.xyqb.controller.IBaseController;
...@@ -22,7 +23,10 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -22,7 +23,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.*; import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/** /**
...@@ -67,7 +71,7 @@ public class SmsController implements IBaseController { ...@@ -67,7 +71,7 @@ public class SmsController implements IBaseController {
@RequestParam(required = false, defaultValue = "") String appName, @RequestParam(required = false, defaultValue = "") String appName,
@RequestParam(required = false) String smsMerchant) { @RequestParam(required = false) String smsMerchant) {
LOGGER.info("注册-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom); LOGGER.info("注册-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
String randomCode = smsIsDebug ? "0000" : RandomStringUtils.random(4, RANDOM_CHARS); String randomCode = TechEnvironment.isPro() ? RandomStringUtils.random(4, RANDOM_CHARS) : "0000";
return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant); return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant);
} }
...@@ -87,7 +91,7 @@ public class SmsController implements IBaseController { ...@@ -87,7 +91,7 @@ public class SmsController implements IBaseController {
@RequestParam(required = false, defaultValue = "") String appName, @RequestParam(required = false, defaultValue = "") String appName,
@RequestParam(required = false) String smsMerchant) { @RequestParam(required = false) String smsMerchant) {
LOGGER.info("重置密码-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom); LOGGER.info("重置密码-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
String randomCode = smsIsDebug ? "0000" : RandomStringUtils.random(4, RANDOM_CHARS); String randomCode = TechEnvironment.isPro() ? RandomStringUtils.random(4, RANDOM_CHARS) : "0000";
return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant); return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant);
} }
...@@ -104,7 +108,7 @@ public class SmsController implements IBaseController { ...@@ -104,7 +108,7 @@ public class SmsController implements IBaseController {
return JsonResult.buildErrorStateResult("参数校验失败.", null); return JsonResult.buildErrorStateResult("参数校验失败.", null);
} }
LOGGER.info("注册-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom); LOGGER.info("注册-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
String randomCode = smsIsDebug ? "0000" : RandomStringUtils.random(4, RANDOM_CHARS); String randomCode = TechEnvironment.isPro() ? RandomStringUtils.random(4, RANDOM_CHARS) : "0000";
return sendVerificationCode2Voice(phoneNo, randomCode, usage); return sendVerificationCode2Voice(phoneNo, randomCode, usage);
} }
...@@ -117,7 +121,7 @@ public class SmsController implements IBaseController { ...@@ -117,7 +121,7 @@ public class SmsController implements IBaseController {
return JsonResult.buildErrorStateResult("参数校验失败.", null); return JsonResult.buildErrorStateResult("参数校验失败.", null);
} }
LOGGER.info("重置密码-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom); LOGGER.info("重置密码-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
String randomCode = smsIsDebug ? "0000" : RandomStringUtils.random(4, RANDOM_CHARS); String randomCode = TechEnvironment.isPro() ? RandomStringUtils.random(4, RANDOM_CHARS) : "0000";
return sendVerificationCode2Voice(phoneNo, randomCode, usage); return sendVerificationCode2Voice(phoneNo, randomCode, usage);
} }
...@@ -133,7 +137,7 @@ public class SmsController implements IBaseController { ...@@ -133,7 +137,7 @@ public class SmsController implements IBaseController {
return JsonResult.buildErrorStateResult("参数校验失败.", null); return JsonResult.buildErrorStateResult("参数校验失败.", null);
} }
LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom); LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
String randomCode = smsIsDebug ? "0000" : RandomStringUtils.random(4, RANDOM_CHARS); String randomCode = TechEnvironment.isPro() ? RandomStringUtils.random(4, RANDOM_CHARS) : "0000";
return sendVerificationCode2Voice(phoneNo, randomCode, usage); return sendVerificationCode2Voice(phoneNo, randomCode, usage);
} }
...@@ -151,7 +155,7 @@ public class SmsController implements IBaseController { ...@@ -151,7 +155,7 @@ public class SmsController implements IBaseController {
@RequestParam(required = false, defaultValue = "") String appName, @RequestParam(required = false, defaultValue = "") String appName,
@RequestParam(required = false) String smsMerchant) { @RequestParam(required = false) String smsMerchant) {
LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom); LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
String randomCode = smsIsDebug ? "0000" : RandomStringUtils.random(4, RANDOM_CHARS); String randomCode = TechEnvironment.isPro() ? RandomStringUtils.random(4, RANDOM_CHARS) : "0000";
return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant); return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant);
} }
...@@ -169,7 +173,7 @@ public class SmsController implements IBaseController { ...@@ -169,7 +173,7 @@ public class SmsController implements IBaseController {
@RequestParam(required = false, defaultValue = "") String appName, @RequestParam(required = false, defaultValue = "") String appName,
@RequestParam(required = false) String smsMerchant) { @RequestParam(required = false) String smsMerchant) {
LOGGER.info("快速注册-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom); LOGGER.info("快速注册-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
String randomCode = smsIsDebug ? "0000" : RandomStringUtils.random(4, RANDOM_CHARS); String randomCode = TechEnvironment.isPro() ? RandomStringUtils.random(4, RANDOM_CHARS) : "0000";
return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant); return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant);
} }
...@@ -259,8 +263,7 @@ public class SmsController implements IBaseController { ...@@ -259,8 +263,7 @@ public class SmsController implements IBaseController {
return JsonResult.buildErrorStateResult("参数校验失败.", null); return JsonResult.buildErrorStateResult("参数校验失败.", null);
} }
LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom); LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
String randomCode = TechEnvironment.isPro() ? RandomStringUtils.random(4, RANDOM_CHARS) : "0000";
String randomCode = smsIsDebug ? "0000" : RandomStringUtils.random(4, RANDOM_CHARS);
return sendVerificationCode2VoiceNew(phoneNo, randomCode, usage, deviceId); return sendVerificationCode2VoiceNew(phoneNo, randomCode, usage, deviceId);
} }
...@@ -281,7 +284,7 @@ public class SmsController implements IBaseController { ...@@ -281,7 +284,7 @@ public class SmsController implements IBaseController {
@RequestParam(required = false, defaultValue = "") String appName, @RequestParam(required = false, defaultValue = "") String appName,
@RequestParam(required = false) String smsMerchant) { @RequestParam(required = false) String smsMerchant) {
LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom); LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
String randomCode = smsIsDebug ? "0000" : RandomStringUtils.random(4, RANDOM_CHARS); String randomCode = TechEnvironment.isPro() ? RandomStringUtils.random(4, RANDOM_CHARS) : "0000";
return sendVerificationCode2New(phoneNo, randomCode, deviceId, true, appName, smsMerchant); return sendVerificationCode2New(phoneNo, randomCode, deviceId, true, appName, smsMerchant);
} }
...@@ -302,7 +305,7 @@ public class SmsController implements IBaseController { ...@@ -302,7 +305,7 @@ public class SmsController implements IBaseController {
@RequestParam(required = false, defaultValue = "") String appName, @RequestParam(required = false, defaultValue = "") String appName,
@RequestParam(required = false) String smsMerchant) { @RequestParam(required = false) String smsMerchant) {
LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom); LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
String randomCode = smsIsDebug ? "0000" : RandomStringUtils.random(4, RANDOM_CHARS); String randomCode = TechEnvironment.isPro() ? RandomStringUtils.random(4, RANDOM_CHARS) : "0000";
return sendVerificationCode2New(phoneNo, randomCode, deviceId, false, appName, smsMerchant); return sendVerificationCode2New(phoneNo, randomCode, deviceId, false, appName, smsMerchant);
} }
...@@ -323,7 +326,7 @@ public class SmsController implements IBaseController { ...@@ -323,7 +326,7 @@ public class SmsController implements IBaseController {
@RequestParam(required = false, defaultValue = "") String appName, @RequestParam(required = false, defaultValue = "") String appName,
@RequestParam(required = false) String smsMerchant) { @RequestParam(required = false) String smsMerchant) {
LOGGER.info("VCC-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom); LOGGER.info("VCC-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
String randomCode = smsIsDebug ? "000000" : RandomStringUtils.random(6, RANDOM_CHARS); String randomCode = TechEnvironment.isPro() ? RandomStringUtils.random(6, RANDOM_CHARS) : "000000";
return sendVerificationCode2New(phoneNo, randomCode, deviceId, true, appName, smsMerchant); return sendVerificationCode2New(phoneNo, randomCode, deviceId, true, appName, smsMerchant);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment