Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xyqb-user2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
head_group
xyqb-user2
Commits
a2473769
Commit
a2473769
authored
Jul 15, 2019
by
技术部-任文超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化(合并冗余方法)
parent
7c0cf9aa
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
11 deletions
+23
-11
SmsController.java
...uantgroup/xyqb/controller/internal/sms/SmsController.java
+23
-11
No files found.
src/main/java/cn/quantgroup/xyqb/controller/internal/sms/SmsController.java
View file @
a2473769
...
@@ -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"
;
}
}
/**
/**
* 新版本短信验证码
* 新版本短信验证码
*
*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment