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

优化(合并冗余方法)

parent 7c0cf9aa
...@@ -71,7 +71,7 @@ public class SmsController implements IBaseController { ...@@ -71,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 = TechEnvironment.isPro() ? RandomStringUtils.random(4, RANDOM_CHARS) : "0000"; String randomCode = getRandomCode(4);
return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant); return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant);
} }
...@@ -91,7 +91,7 @@ public class SmsController implements IBaseController { ...@@ -91,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 = TechEnvironment.isPro() ? RandomStringUtils.random(4, RANDOM_CHARS) : "0000"; String randomCode = getRandomCode(4);
return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant); return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant);
} }
...@@ -108,7 +108,7 @@ public class SmsController implements IBaseController { ...@@ -108,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 = TechEnvironment.isPro() ? RandomStringUtils.random(4, RANDOM_CHARS) : "0000"; String randomCode = getRandomCode(4);
return sendVerificationCode2Voice(phoneNo, randomCode, usage); return sendVerificationCode2Voice(phoneNo, randomCode, usage);
} }
...@@ -121,7 +121,7 @@ public class SmsController implements IBaseController { ...@@ -121,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 = TechEnvironment.isPro() ? RandomStringUtils.random(4, RANDOM_CHARS) : "0000"; String randomCode = getRandomCode(4);
return sendVerificationCode2Voice(phoneNo, randomCode, usage); return sendVerificationCode2Voice(phoneNo, randomCode, usage);
} }
...@@ -137,7 +137,7 @@ public class SmsController implements IBaseController { ...@@ -137,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 = TechEnvironment.isPro() ? RandomStringUtils.random(4, RANDOM_CHARS) : "0000"; String randomCode = getRandomCode(4);
return sendVerificationCode2Voice(phoneNo, randomCode, usage); return sendVerificationCode2Voice(phoneNo, randomCode, usage);
} }
...@@ -155,7 +155,7 @@ public class SmsController implements IBaseController { ...@@ -155,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 = TechEnvironment.isPro() ? RandomStringUtils.random(4, RANDOM_CHARS) : "0000"; String randomCode = getRandomCode(4);
return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant); return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant);
} }
...@@ -173,7 +173,7 @@ public class SmsController implements IBaseController { ...@@ -173,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 = TechEnvironment.isPro() ? RandomStringUtils.random(4, RANDOM_CHARS) : "0000"; String randomCode = getRandomCode(4);
return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant); return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant);
} }
...@@ -263,7 +263,7 @@ public class SmsController implements IBaseController { ...@@ -263,7 +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 = getRandomCode(4);
return sendVerificationCode2VoiceNew(phoneNo, randomCode, usage, deviceId); return sendVerificationCode2VoiceNew(phoneNo, randomCode, usage, deviceId);
} }
...@@ -284,7 +284,7 @@ public class SmsController implements IBaseController { ...@@ -284,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 = TechEnvironment.isPro() ? RandomStringUtils.random(4, RANDOM_CHARS) : "0000"; String randomCode = getRandomCode(4);
return sendVerificationCode2New(phoneNo, randomCode, deviceId, true, appName, smsMerchant); return sendVerificationCode2New(phoneNo, randomCode, deviceId, true, appName, smsMerchant);
} }
...@@ -305,7 +305,7 @@ public class SmsController implements IBaseController { ...@@ -305,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 = TechEnvironment.isPro() ? RandomStringUtils.random(4, RANDOM_CHARS) : "0000"; String randomCode = getRandomCode(4);
return sendVerificationCode2New(phoneNo, randomCode, deviceId, false, appName, smsMerchant); return sendVerificationCode2New(phoneNo, randomCode, deviceId, false, appName, smsMerchant);
} }
...@@ -326,10 +326,22 @@ public class SmsController implements IBaseController { ...@@ -326,10 +326,22 @@ 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 = TechEnvironment.isPro() ? RandomStringUtils.random(6, RANDOM_CHARS) : "000000"; String randomCode = getRandomCode(6);
return sendVerificationCode2New(phoneNo, randomCode, deviceId, true, appName, smsMerchant); return sendVerificationCode2New(phoneNo, randomCode, deviceId, true, appName, smsMerchant);
} }
private String getRandomCode(int count) {
if(TechEnvironment.isPro()) {
return RandomStringUtils.random(count, RANDOM_CHARS);
}
switch (count){
case 6:
return "000000";
default:
return "0000";
}
}
/** /**
* 新版本短信验证码 * 新版本短信验证码
* *
......
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