Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Z
zcq
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
zcq
Commits
faa4435d
提交
faa4435d
authored
3月 20, 2020
作者:
yucaiwei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
6fdf3e2f
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
31 行增加
和
32 行删除
+31
-32
SmsClient.java
.../main/java/com/zrqx/member/fg/client/third/SmsClient.java
+2
-1
SmsHystric.java
...main/java/com/zrqx/member/fg/client/third/SmsHystric.java
+3
-2
FgPermissionsController.java
...m/zrqx/member/fg/permissions/FgPermissionsController.java
+18
-16
PersonalCenterConteroller.java
...x/member/fg/personalcenter/PersonalCenterConteroller.java
+8
-13
没有找到文件。
com.zrqx.member/src/main/java/com/zrqx/member/fg/client/third/SmsClient.java
浏览文件 @
faa4435d
...
...
@@ -5,6 +5,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import
org.springframework.web.bind.annotation.RequestBody
;
import
com.zrqx.core.form.third.sms.SmsForm
;
import
com.zrqx.core.util.response.CallBack
;
/**
* 手机短信
...
...
@@ -18,6 +19,6 @@ public interface SmsClient {
* @return
*/
@PostMapping
(
"/sms/send"
)
public
String
sendSms
(
@RequestBody
SmsForm
smsForm
);
public
CallBack
<
String
>
sendSms
(
@RequestBody
SmsForm
smsForm
);
}
com.zrqx.member/src/main/java/com/zrqx/member/fg/client/third/SmsHystric.java
浏览文件 @
faa4435d
...
...
@@ -6,6 +6,7 @@ import org.springframework.stereotype.Component;
import
org.springframework.web.bind.annotation.RequestBody
;
import
com.zrqx.core.form.third.sms.SmsForm
;
import
com.zrqx.core.util.response.CallBack
;
@Component
public
class
SmsHystric
implements
SmsClient
{
...
...
@@ -13,9 +14,9 @@ public class SmsHystric implements SmsClient {
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
SmsHystric
.
class
);
@Override
public
String
sendSms
(
@RequestBody
SmsForm
smsForm
){
public
CallBack
<
String
>
sendSms
(
@RequestBody
SmsForm
smsForm
){
logger
.
info
(
" 发送: "
+
smsForm
.
getPhone
()
+
" 验证码: "
+
smsForm
.
getCode
()
+
",短信接口不可用"
);
return
"短信接口不可用"
;
return
null
;
}
}
com.zrqx.member/src/main/java/com/zrqx/member/fg/permissions/FgPermissionsController.java
浏览文件 @
faa4435d
...
...
@@ -16,7 +16,6 @@ import java.util.regex.Pattern;
import
javax.imageio.ImageIO
;
import
javax.servlet.http.HttpServletRequest
;
import
org.apache.commons.lang3.RandomStringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -41,7 +40,7 @@ import com.zrqx.core.form.member.fg.permissions.LoginMemberInfo;
import
com.zrqx.core.form.member.fg.permissions.SaveOMemberForm
;
import
com.zrqx.core.form.member.fg.permissions.SavePMemberForm
;
import
com.zrqx.core.form.member.fg.permissions.UpdatePasswordForm
;
import
com.zrqx.core.form.third.s
dksms.Sdk
SmsForm
;
import
com.zrqx.core.form.third.s
ms.
SmsForm
;
import
com.zrqx.core.model.member.Member
;
import
com.zrqx.core.model.member.Organ
;
import
com.zrqx.core.model.member.OrganMember
;
...
...
@@ -56,7 +55,7 @@ import com.zrqx.core.util.ip.CusAccessObjectUtil;
import
com.zrqx.core.util.response.CallBack
;
import
com.zrqx.member.commons.redis.Redis
;
import
com.zrqx.member.fg.client.third.QQLoginClient
;
import
com.zrqx.member.fg.client.third.S
dkS
msClient
;
import
com.zrqx.member.fg.client.third.SmsClient
;
import
com.zrqx.member.fg.client.third.WeChatLoginClient
;
import
com.zrqx.member.fg.member.service.FgLoginLogService
;
import
com.zrqx.member.fg.member.service.FgMemberService
;
...
...
@@ -77,7 +76,7 @@ public class FgPermissionsController {
@Autowired
private
QQLoginClient
qqLogin
;
@Autowired
private
S
dkSmsClient
sdkS
msClient
;
private
S
msClient
s
msClient
;
@Autowired
private
FgMemberService
mService
;
@Autowired
...
...
@@ -619,11 +618,12 @@ public class FgPermissionsController {
if
(
StringUtils
.
isNotBlank
(
sendPhoneCount
)
&&
sendPhoneCount
.
equals
(
"10"
))
{
throw
new
BaseException
(
17
,
"当天注册发送验证码超过10次"
);
}
S
dkSmsForm
ssf
=
new
Sdk
SmsForm
();
ssf
.
set
Mobil
e
(
phone
);
S
msForm
ssf
=
new
SmsForm
();
ssf
.
set
Phon
e
(
phone
);
String
code
=
PasswordUtil
.
createPassword
(
6
,
1
);
ssf
.
setContent
(
"您的验证码是:"
+
code
+
",在5分钟内有效。如非本人操作请忽略本短信。"
);
CallBack
<
String
>
sms
=
sdkSmsClient
.
send
(
ssf
);
ssf
.
setCode
(
code
);
ssf
.
setType
(
5
);
///更换手机号验证验证码
CallBack
<
String
>
sms
=
smsClient
.
sendSms
(
ssf
);
if
(
sms
!=
null
&&
sms
.
isStatus
()){
redis
.
set
(
phone
,
code
,
60
*
5
,
TimeUnit
.
SECONDS
);
sendPhoneCount
=
StringUtils
.
isBlank
(
sendPhoneCount
)
?
"1"
:
Integer
.
parseInt
(
sendPhoneCount
)
+
1
+
""
;
...
...
@@ -645,11 +645,12 @@ public class FgPermissionsController {
if
(
redis
.
get
(
sendTime
)
!=
null
)
{
throw
new
BaseException
(
16
,
"60s内不能再次发送"
);
}
S
dkSmsForm
ssf
=
new
Sdk
SmsForm
();
ssf
.
set
Mobil
e
(
phone
);
S
msForm
ssf
=
new
SmsForm
();
ssf
.
set
Phon
e
(
phone
);
String
code
=
PasswordUtil
.
createPassword
(
6
,
1
);
ssf
.
setContent
(
"您的验证码是:"
+
code
+
",在5分钟内有效。如非本人操作请忽略本短信。"
);
CallBack
<
String
>
sms
=
sdkSmsClient
.
send
(
ssf
);
ssf
.
setCode
(
code
);
ssf
.
setType
(
3
);
///更换手机号验证验证码
CallBack
<
String
>
sms
=
smsClient
.
sendSms
(
ssf
);
if
(
sms
!=
null
&&
sms
.
isStatus
()){
redis
.
set
(
phone
,
code
,
60
*
5
,
TimeUnit
.
SECONDS
);
redis
.
set
(
sendTime
,
"60"
,
60
);
...
...
@@ -668,11 +669,12 @@ public class FgPermissionsController {
if
(
redis
.
get
(
sendTime
)
!=
null
)
{
throw
new
BaseException
(
16
,
"60s内不能再次发送"
);
}
S
dkSmsForm
ssf
=
new
Sdk
SmsForm
();
ssf
.
set
Mobil
e
(
phone
);
S
msForm
ssf
=
new
SmsForm
();
ssf
.
set
Phon
e
(
phone
);
String
code
=
PasswordUtil
.
createPassword
(
6
,
1
);
ssf
.
setContent
(
"您的验证码是:"
+
code
+
",在5分钟内有效。如非本人操作请忽略本短信。"
);
CallBack
<
String
>
sms
=
sdkSmsClient
.
send
(
ssf
);
ssf
.
setCode
(
code
);
ssf
.
setType
(
2
);
///更换手机号验证验证码
CallBack
<
String
>
sms
=
smsClient
.
sendSms
(
ssf
);
if
(
sms
!=
null
&&
sms
.
isStatus
()){
redis
.
set
(
phone
,
code
,
60
*
5
,
TimeUnit
.
SECONDS
);
redis
.
set
(
sendTime
,
"60"
,
60
);
...
...
com.zrqx.member/src/main/java/com/zrqx/member/fg/personalcenter/PersonalCenterConteroller.java
浏览文件 @
faa4435d
...
...
@@ -2,13 +2,8 @@ package com.zrqx.member.fg.personalcenter;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiParam
;
import
java.io.IOException
;
import
java.io.UnsupportedEncodingException
;
import
java.security.NoSuchAlgorithmException
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.Calendar
;
import
java.util.Date
;
import
java.util.List
;
...
...
@@ -35,11 +30,10 @@ import com.zrqx.core.enums.member.LevelEnum;
import
com.zrqx.core.exception.BaseException
;
import
com.zrqx.core.form.member.fg.permissions.BindForm
;
import
com.zrqx.core.form.member.fg.permissions.LoginMemberInfo
;
import
com.zrqx.core.form.member.fg.personalcenter.AddVipMemberForm
;
import
com.zrqx.core.form.member.fg.personalcenter.UpdateMemberForm
;
import
com.zrqx.core.form.member.fg.personalcenter.UpdatePasswordForm
;
import
com.zrqx.core.form.member.fg.personalcenter.UpdatePhoneForm
;
import
com.zrqx.core.form.third.s
dksms.Sdk
SmsForm
;
import
com.zrqx.core.form.third.s
ms.
SmsForm
;
import
com.zrqx.core.model.member.ExpertMember
;
import
com.zrqx.core.model.member.Member
;
import
com.zrqx.core.model.member.PersonalMember
;
...
...
@@ -53,7 +47,7 @@ import com.zrqx.core.vo.order.fg.FgOrderVO;
import
com.zrqx.core.vo.order.fg.OrderPayVo
;
import
com.zrqx.member.commons.redis.Redis
;
import
com.zrqx.member.fg.client.order.OrderClient
;
import
com.zrqx.member.fg.client.third.S
dkS
msClient
;
import
com.zrqx.member.fg.client.third.SmsClient
;
import
com.zrqx.member.fg.emember.service.FgExpertMemberService
;
import
com.zrqx.member.fg.member.service.FgMemberService
;
import
com.zrqx.member.fg.omember.service.FgOrganMemberService
;
...
...
@@ -80,7 +74,7 @@ public class PersonalCenterConteroller {
@Autowired
private
FgOrganMemberService
omService
;
@Autowired
private
S
dkSmsClient
sdkS
msClient
;
private
S
msClient
s
msClient
;
@Autowired
private
Redis
redis
;
@Autowired
...
...
@@ -216,11 +210,12 @@ public class PersonalCenterConteroller {
if
(
StringUtils
.
isNotBlank
(
sendPhoneCount
)
&&
sendPhoneCount
.
equals
(
"10"
))
{
throw
new
BaseException
(
17
,
"当天注册发送验证码超过10次"
);
}
S
dkSmsForm
ssf
=
new
Sdk
SmsForm
();
ssf
.
set
Mobil
e
(
phone
);
S
msForm
ssf
=
new
SmsForm
();
ssf
.
set
Phon
e
(
phone
);
String
code
=
PasswordUtil
.
createPassword
(
6
,
1
);
ssf
.
setContent
(
"您的验证码是:"
+
code
+
",在5分钟内有效。如非本人操作请忽略本短信。"
);
CallBack
<
String
>
sms
=
sdkSmsClient
.
send
(
ssf
);
ssf
.
setCode
(
code
);
ssf
.
setType
(
1
);
///更换手机号验证验证码
CallBack
<
String
>
sms
=
smsClient
.
sendSms
(
ssf
);
if
(
sms
!=
null
&&
sms
.
isStatus
())
{
redis
.
set
(
phone
,
code
,
60
*
5
,
TimeUnit
.
SECONDS
);
sendPhoneCount
=
StringUtils
.
isBlank
(
sendPhoneCount
)
?
"1"
:
Integer
.
parseInt
(
sendPhoneCount
)
+
1
+
""
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论