Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
S
scsm
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
scsm
Commits
afa0aaad
提交
afa0aaad
authored
1月 19, 2021
作者:
renjiancai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
c8925077
显示空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
231 行增加
和
24 行删除
+231
-24
Redis.java
...er/src/main/java/com/zrqx/member/commons/redis/Redis.java
+1
-0
CaptchaController.java
.../zrqx/member/fg/captcha/controller/CaptchaController.java
+26
-1
PhoneCodeServiceImpl.java
.../member/fg/captcha/service/impl/PhoneCodeServiceImpl.java
+72
-0
MessageService.java
...rqx/member/fg/captcha/service/message/MessageService.java
+21
-0
MessageServiceImpl.java
...member/fg/captcha/service/message/MessageServiceImpl.java
+33
-0
MessageClient.java
...n/java/com/zrqx/member/fg/client/third/MessageClient.java
+25
-0
MessageHystric.java
.../java/com/zrqx/member/fg/client/third/MessageHystric.java
+23
-0
FgMemberServiceImpl.java
...om/zrqx/member/fg/member/service/FgMemberServiceImpl.java
+12
-6
FgPermissionsController.java
...m/zrqx/member/fg/permissions/FgPermissionsController.java
+3
-5
PersonalCenterConteroller.java
...x/member/fg/personalcenter/PersonalCenterConteroller.java
+15
-12
没有找到文件。
com.zrqx.member/src/main/java/com/zrqx/member/commons/redis/Redis.java
浏览文件 @
afa0aaad
...
@@ -97,6 +97,7 @@ public class Redis extends BaseRedis{
...
@@ -97,6 +97,7 @@ public class Redis extends BaseRedis{
redisMember
.
getMember
().
setQqKey
(
null
);
redisMember
.
getMember
().
setQqKey
(
null
);
redisMember
.
getMember
().
setWechatKey
(
null
);
redisMember
.
getMember
().
setWechatKey
(
null
);
redisMember
.
getMember
().
setPhone
(
null
);
redisMember
.
getMember
().
setPhone
(
null
);
System
.
out
.
println
(
redisMember
.
getLoginVo
().
getToken
());
this
.
set
(
redisMember
.
getLoginVo
().
getToken
(),
redisMember
,
DEFAULT_LOSE_TIME
,
TimeUnit
.
DAYS
);
this
.
set
(
redisMember
.
getLoginVo
().
getToken
(),
redisMember
,
DEFAULT_LOSE_TIME
,
TimeUnit
.
DAYS
);
}
}
...
...
com.zrqx.member/src/main/java/com/zrqx/member/fg/captcha/controller/CaptchaController.java
浏览文件 @
afa0aaad
...
@@ -19,6 +19,7 @@ import com.zrqx.core.exception.ValidateException;
...
@@ -19,6 +19,7 @@ import com.zrqx.core.exception.ValidateException;
import
com.zrqx.core.util.datatype.StringUtils
;
import
com.zrqx.core.util.datatype.StringUtils
;
import
com.zrqx.core.util.response.CallBack
;
import
com.zrqx.core.util.response.CallBack
;
import
com.zrqx.core.util.spring.SpringContextUtils
;
import
com.zrqx.core.util.spring.SpringContextUtils
;
import
com.zrqx.member.commons.redis.Redis
;
import
com.zrqx.member.fg.captcha.commons.vo.CaptchaVO
;
import
com.zrqx.member.fg.captcha.commons.vo.CaptchaVO
;
import
com.zrqx.member.fg.captcha.service.CaptchaService
;
import
com.zrqx.member.fg.captcha.service.CaptchaService
;
...
@@ -38,7 +39,12 @@ public class CaptchaController {
...
@@ -38,7 +39,12 @@ public class CaptchaController {
@Autowired
@Autowired
private
SpringContextUtils
springContextUtils
;
private
SpringContextUtils
springContextUtils
;
@Autowired
@Qualifier
(
"phoneCodeServiceImpl"
)
private
CaptchaService
phoneService
;
@Autowired
@Qualifier
(
"codeServiceImpl"
)
private
CaptchaService
codeService
;
@Autowired
@Autowired
@Qualifier
(
"blockPuzzleCaptchaServiceImpl"
)
@Qualifier
(
"blockPuzzleCaptchaServiceImpl"
)
private
CaptchaService
blockPuzzleCaptchaService
;
private
CaptchaService
blockPuzzleCaptchaService
;
...
@@ -50,6 +56,14 @@ public class CaptchaController {
...
@@ -50,6 +56,14 @@ public class CaptchaController {
CaptchaService
service
=
springContextUtils
.
getEnumsBindBean
(
CaptchaTypeEnum
.
class
,
form
.
getType
(),
CaptchaService
.
class
);
CaptchaService
service
=
springContextUtils
.
getEnumsBindBean
(
CaptchaTypeEnum
.
class
,
form
.
getType
(),
CaptchaService
.
class
);
return
service
;
return
service
;
}
}
@ApiOperation
(
"获取普通验证码:图形验证码"
)
@GetMapping
(
"/code"
)
public
CallBack
<
CaptchaVO
>
getCode
()
{
log
.
info
(
"获取验证码start"
);
CaptchaVO
vo
=
codeService
.
get
(
null
);
log
.
info
(
"获取验证码end,{}"
,
vo
);
return
CallBack
.
success
(
vo
);
}
@ApiOperation
(
"获取普通验证码:滑块验证码"
)
@ApiOperation
(
"获取普通验证码:滑块验证码"
)
@GetMapping
(
"/block-puzzle"
)
@GetMapping
(
"/block-puzzle"
)
...
@@ -59,6 +73,17 @@ public class CaptchaController {
...
@@ -59,6 +73,17 @@ public class CaptchaController {
log
.
info
(
"获取验证码end,{}"
,
vo
);
log
.
info
(
"获取验证码end,{}"
,
vo
);
return
CallBack
.
success
(
vo
);
return
CallBack
.
success
(
vo
);
}
}
@ApiOperation
(
"获取手机验证码,需要带有普通验证码的结果"
)
@GetMapping
(
"/phone"
)
public
CallBack
<
CaptchaVO
>
getPhoneCode
(
CaptchaForm
form
)
{
log
.
info
(
"获取手机验证码start"
);
CaptchaVO
vo
=
phoneService
.
get
(
form
);
log
.
info
(
"获取手机验证码end,{}"
,
vo
);
return
CallBack
.
success
(
vo
);
}
@ApiOperation
(
"校验验证码"
)
@ApiOperation
(
"校验验证码"
)
@GetMapping
(
"/validate"
)
@GetMapping
(
"/validate"
)
public
CallBack
<?>
validate
(
CaptchaForm
form
){
public
CallBack
<?>
validate
(
CaptchaForm
form
){
...
...
com.zrqx.member/src/main/java/com/zrqx/member/fg/captcha/service/impl/PhoneCodeServiceImpl.java
0 → 100644
浏览文件 @
afa0aaad
package
com
.
zrqx
.
member
.
fg
.
captcha
.
service
.
impl
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
com.zrqx.core.components.captcha.form.CaptchaForm
;
import
com.zrqx.core.components.captcha.service.CodeCaptchaValidateServiceImpl
;
import
com.zrqx.core.components.message.form.PhoneMessageForm
;
import
com.zrqx.core.enums.captcha.CaptchaTypeEnum
;
import
com.zrqx.core.exception.ValidateException
;
import
com.zrqx.core.util.datatype.StringUtils
;
import
com.zrqx.core.util.datatype.UUIDUtil
;
import
com.zrqx.core.util.spring.SpringContextUtils
;
import
com.zrqx.member.fg.captcha.commons.vo.CaptchaVO
;
import
com.zrqx.member.fg.captcha.service.CaptchaService
;
import
com.zrqx.member.fg.captcha.service.message.MessageService
;
/**
* @author lpf
* @date 2020-06-22
*/
@Service
public
class
PhoneCodeServiceImpl
extends
CodeCaptchaValidateServiceImpl
implements
CaptchaService
{
private
static
final
Logger
log
=
LoggerFactory
.
getLogger
(
PhoneCodeServiceImpl
.
class
);
@Autowired
private
MessageService
messageService
;
@Autowired
private
SpringContextUtils
springContextUtils
;
private
CaptchaService
getService
(
CaptchaForm
form
)
{
if
(
StringUtils
.
isEmpty
(
form
.
getType
()))
{
throw
new
ValidateException
(
"type不能为空"
);
}
CaptchaService
service
=
springContextUtils
.
getEnumsBindBean
(
CaptchaTypeEnum
.
class
,
form
.
getType
(),
CaptchaService
.
class
);
return
service
;
}
@Override
public
CaptchaVO
get
(
CaptchaForm
form
)
{
// 校验普通验证码
log
.
info
(
"生成手机验证码form:{}"
,
form
);
log
.
info
(
"校验普通验证码"
);
CaptchaService
service
=
this
.
getService
(
form
);
service
.
validate
(
form
);
log
.
info
(
"校验普通验证码成功"
);
CaptchaVO
vo
=
new
CaptchaVO
();
String
uuid
=
UUIDUtil
.
getUUID
();
vo
.
setUuid
(
uuid
);
String
code
=
messageService
.
sendPhoneCaptcha
(
this
.
map
(
form
));
String
key
=
String
.
format
(
REDIS_CAPTCHA_KEY
,
uuid
);
log
.
info
(
"缓存验证码:key:{},value:{}"
,
key
,
code
);
cacheService
.
set
(
key
,
code
,
EXPIRESIN_SECONDS
);
return
vo
;
}
/**
* CaptchaForm -> PhoneMessageForm
* @param form
* @return
*/
private
PhoneMessageForm
map
(
CaptchaForm
form
)
{
PhoneMessageForm
result
=
new
PhoneMessageForm
();
result
.
setTarget
(
form
.
getPhone
());
result
.
setBusinessType
(
form
.
getBusinessType
());
return
result
;
}
}
com.zrqx.member/src/main/java/com/zrqx/member/fg/captcha/service/message/MessageService.java
0 → 100644
浏览文件 @
afa0aaad
package
com
.
zrqx
.
member
.
fg
.
captcha
.
service
.
message
;
import
com.zrqx.core.components.message.form.PhoneMessageForm
;
import
com.zrqx.core.exception.BaseException
;
/**
* 接口响应统一结果处理
* 接口响应失败抛出异常
* @author lpf
* @date 2020-06-22
*/
public
interface
MessageService
{
/**
* 手机发送短信验证码,发送失败处理抛出异常
* @param form
* @return
* @throws BaseException
*/
String
sendPhoneCaptcha
(
PhoneMessageForm
form
)
throws
BaseException
;
}
com.zrqx.member/src/main/java/com/zrqx/member/fg/captcha/service/message/MessageServiceImpl.java
0 → 100644
浏览文件 @
afa0aaad
package
com
.
zrqx
.
member
.
fg
.
captcha
.
service
.
message
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
com.zrqx.core.components.message.form.PhoneMessageForm
;
import
com.zrqx.core.exception.BaseException
;
import
com.zrqx.core.util.response.CallBack
;
import
com.zrqx.member.fg.client.third.MessageClient
;
/**
* @author lpf
* @date 2020-06-22
*/
@Component
public
class
MessageServiceImpl
implements
MessageService
{
private
final
Logger
log
=
LoggerFactory
.
getLogger
(
MessageServiceImpl
.
class
);
@Autowired
private
MessageClient
client
;
@Override
public
String
sendPhoneCaptcha
(
PhoneMessageForm
form
)
throws
BaseException
{
CallBack
<
String
>
callBack
=
client
.
sendPhoneCaptcha
(
form
);
if
(
callBack
.
hasEntity
())
{
return
callBack
.
getData
();
}
throw
new
BaseException
(
"手机发送短信验证码失败,失败原因:"
+
callBack
.
getMsg
()
+
";"
);
}
}
com.zrqx.member/src/main/java/com/zrqx/member/fg/client/third/MessageClient.java
0 → 100644
浏览文件 @
afa0aaad
package
com
.
zrqx
.
member
.
fg
.
client
.
third
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
com.zrqx.core.components.message.form.PhoneMessageForm
;
import
com.zrqx.core.util.response.CallBack
;
/**
* 消息客户端
* @author lpf
* @date 2020-06-22
*/
@FeignClient
(
value
=
"third"
,
fallback
=
MessageHystric
.
class
)
public
interface
MessageClient
{
/**
* 手机短信验证码
* @param form
* @return
*/
@PostMapping
(
"/phone/send-captcha"
)
CallBack
<
String
>
sendPhoneCaptcha
(
@RequestBody
PhoneMessageForm
form
);
}
com.zrqx.member/src/main/java/com/zrqx/member/fg/client/third/MessageHystric.java
0 → 100644
浏览文件 @
afa0aaad
package
com
.
zrqx
.
member
.
fg
.
client
.
third
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.stereotype.Component
;
import
com.zrqx.core.components.message.form.PhoneMessageForm
;
import
com.zrqx.core.util.response.CallBack
;
/**
* @author lpf
* @date 2020-06-22
*/
@Component
public
class
MessageHystric
implements
MessageClient
{
private
final
Logger
log
=
LoggerFactory
.
getLogger
(
MessageHystric
.
class
);
@Override
public
CallBack
<
String
>
sendPhoneCaptcha
(
PhoneMessageForm
form
)
{
log
.
info
(
"熔断器-发送短信验证码失败,form:{}"
,
form
);
return
CallBack
.
fail
(
"熔断器-发送短信失败"
);
}
}
com.zrqx.member/src/main/java/com/zrqx/member/fg/member/service/FgMemberServiceImpl.java
浏览文件 @
afa0aaad
...
@@ -30,6 +30,7 @@ import com.zrqx.core.model.member.Member;
...
@@ -30,6 +30,7 @@ import com.zrqx.core.model.member.Member;
import
com.zrqx.core.model.member.OrganMember
;
import
com.zrqx.core.model.member.OrganMember
;
import
com.zrqx.core.model.member.PersonalMember
;
import
com.zrqx.core.model.member.PersonalMember
;
import
com.zrqx.core.service.BaseServiceImpl
;
import
com.zrqx.core.service.BaseServiceImpl
;
import
com.zrqx.core.util.datatype.UUIDUtil
;
import
com.zrqx.core.util.spring.SpringContextUtils
;
import
com.zrqx.core.util.spring.SpringContextUtils
;
import
com.zrqx.core.vo.member.LoginVo
;
import
com.zrqx.core.vo.member.LoginVo
;
import
com.zrqx.core.vo.member.RedisMember
;
import
com.zrqx.core.vo.member.RedisMember
;
...
@@ -60,7 +61,14 @@ public class FgMemberServiceImpl extends BaseServiceImpl<Member, Integer> implem
...
@@ -60,7 +61,14 @@ public class FgMemberServiceImpl extends BaseServiceImpl<Member, Integer> implem
public
BaseMapper
<
Member
>
getMapper
()
{
public
BaseMapper
<
Member
>
getMapper
()
{
return
mapper
;
return
mapper
;
}
}
@Autowired
private
SpringContextUtils
springContextUtils
;
protected
CaptchaValidateService
getCaptchaValidateService
(
CaptchaForm
form
){
CaptchaValidateService
service
=
springContextUtils
.
getEnumsBindBean
(
CaptchaTypeEnum
.
class
,
form
.
getType
(),
CaptchaValidateService
.
class
);
return
service
;
}
@Override
@Override
public
boolean
isExistByAccount
(
Integer
id
,
String
account
)
{
public
boolean
isExistByAccount
(
Integer
id
,
String
account
)
{
return
mapper
.
isExist
(
id
,
account
,
null
)
>
0
;
return
mapper
.
isExist
(
id
,
account
,
null
)
>
0
;
...
@@ -152,11 +160,7 @@ public class FgMemberServiceImpl extends BaseServiceImpl<Member, Integer> implem
...
@@ -152,11 +160,7 @@ public class FgMemberServiceImpl extends BaseServiceImpl<Member, Integer> implem
return
info
;
return
info
;
}
}
private
SpringContextUtils
springContextUtils
;
protected
CaptchaValidateService
getCaptchaValidateService
(
CaptchaForm
form
){
CaptchaValidateService
service
=
springContextUtils
.
getEnumsBindBean
(
CaptchaTypeEnum
.
class
,
form
.
getType
(),
CaptchaValidateService
.
class
);
return
service
;
}
@Override
@Override
public
Optional
<
Member
>
getByAccountOrPhone
(
String
text
)
{
public
Optional
<
Member
>
getByAccountOrPhone
(
String
text
)
{
...
@@ -190,7 +194,7 @@ public class FgMemberServiceImpl extends BaseServiceImpl<Member, Integer> implem
...
@@ -190,7 +194,7 @@ public class FgMemberServiceImpl extends BaseServiceImpl<Member, Integer> implem
public
Member
insertByPhone
(
BaseLoginForm
<
PhoneAbstractLoginForm
>
form
){
public
Member
insertByPhone
(
BaseLoginForm
<
PhoneAbstractLoginForm
>
form
){
String
phone
=
form
.
getReqForm
().
getCaptchaForm
().
getPhone
();
String
phone
=
form
.
getReqForm
().
getCaptchaForm
().
getPhone
();
Member
entity
=
this
.
initInsert
(
form
);
Member
entity
=
this
.
initInsert
(
form
);
entity
.
set
NickName
(
entity
.
getAccount
(
));
entity
.
set
Account
(
"sc"
+
UUIDUtil
.
getUUID
().
substring
(
0
,
6
));
entity
.
setPhone
(
phone
);
entity
.
setPhone
(
phone
);
this
.
insert
(
entity
);
this
.
insert
(
entity
);
return
entity
;
return
entity
;
...
@@ -277,7 +281,9 @@ public class FgMemberServiceImpl extends BaseServiceImpl<Member, Integer> implem
...
@@ -277,7 +281,9 @@ public class FgMemberServiceImpl extends BaseServiceImpl<Member, Integer> implem
@Override
@Override
public
RedisMember
validateResetPassword
(
PhoneAbstractLoginForm
form
)
{
public
RedisMember
validateResetPassword
(
PhoneAbstractLoginForm
form
)
{
CaptchaValidateService
captchaValidateService
=
this
.
getCaptchaValidateService
(
form
.
getCaptchaForm
());
CaptchaValidateService
captchaValidateService
=
this
.
getCaptchaValidateService
(
form
.
getCaptchaForm
());
if
(
captchaValidateService
!=
null
)
{
captchaValidateService
.
validate
(
form
.
getCaptchaForm
());
captchaValidateService
.
validate
(
form
.
getCaptchaForm
());
}
Member
m
=
this
.
validateResetPasswordPhone
(
form
.
getCaptchaForm
().
getPhone
());
Member
m
=
this
.
validateResetPasswordPhone
(
form
.
getCaptchaForm
().
getPhone
());
RedisMember
redisMember
=
RedisMember
.
build
();
RedisMember
redisMember
=
RedisMember
.
build
();
redisMember
.
setCanResetPassword
(
true
);
redisMember
.
setCanResetPassword
(
true
);
...
...
com.zrqx.member/src/main/java/com/zrqx/member/fg/permissions/FgPermissionsController.java
浏览文件 @
afa0aaad
...
@@ -3,10 +3,8 @@ package com.zrqx.member.fg.permissions;
...
@@ -3,10 +3,8 @@ package com.zrqx.member.fg.permissions;
import
java.awt.image.BufferedImage
;
import
java.awt.image.BufferedImage
;
import
java.io.ByteArrayOutputStream
;
import
java.io.ByteArrayOutputStream
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.concurrent.TimeUnit
;
import
java.util.concurrent.TimeUnit
;
import
java.util.regex.Matcher
;
import
java.util.regex.Matcher
;
...
@@ -340,12 +338,12 @@ public class FgPermissionsController {
...
@@ -340,12 +338,12 @@ public class FgPermissionsController {
redis
.
set
(
token
,
info
);
redis
.
set
(
token
,
info
);
return
CallBack
.
success
(
true
);
return
CallBack
.
success
(
true
);
}
}
/*
@ApiOperation(value = "前台用户登出", notes = "前台用户登出")
@ApiOperation
(
value
=
"前台用户登出"
,
notes
=
"前台用户登出"
)
@GetMapping
(
value
=
MemberRequestPath
.
LOGOUT
)
@GetMapping
(
value
=
MemberRequestPath
.
LOGOUT
)
public
CallBack
<
Boolean
>
logout
()
throws
IOException
{
public
CallBack
<
Boolean
>
logout
()
throws
IOException
{
redis.delete(
R
edis.getFgToken());
redis
.
delete
(
r
edis
.
getFgToken
());
return
CallBack
.
success
(
true
);
return
CallBack
.
success
(
true
);
}
*/
}
@ApiOperation
(
value
=
"查询会员账号是否被注册"
,
notes
=
"查询会员账号是否存在-普通用户和机构用户 共用此接口 0:可用; 99:已被注册;"
)
@ApiOperation
(
value
=
"查询会员账号是否被注册"
,
notes
=
"查询会员账号是否存在-普通用户和机构用户 共用此接口 0:可用; 99:已被注册;"
)
@GetMapping
(
value
=
MemberRequestPath
.
ISEXIST
)
@GetMapping
(
value
=
MemberRequestPath
.
ISEXIST
)
public
CallBack
<
Boolean
>
isExistByAccount
(
Integer
id
,
String
account
)
{
public
CallBack
<
Boolean
>
isExistByAccount
(
Integer
id
,
String
account
)
{
...
...
com.zrqx.member/src/main/java/com/zrqx/member/fg/personalcenter/PersonalCenterConteroller.java
浏览文件 @
afa0aaad
...
@@ -15,17 +15,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
...
@@ -15,17 +15,15 @@ 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
com.zrqx.core.components.CacheService
;
import
com.zrqx.core.constant.member.MemberRequestPath
;
import
com.zrqx.core.constant.member.MemberRequestPath
;
import
com.zrqx.core.enums.member.LevelEnum
;
import
com.zrqx.core.enums.member.LevelEnum
;
import
com.zrqx.core.exception.BaseException
;
import
com.zrqx.core.exception.BaseException
;
import
com.zrqx.core.form.member.fg.permissions.BindForm
;
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.UpdateMemberForm
;
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.UpdatePasswordForm
;
import
com.zrqx.core.form.member.fg.personalcenter.UpdatePhoneForm
;
import
com.zrqx.core.form.member.fg.personalcenter.UpdatePhoneForm
;
import
com.zrqx.core.form.third.sdksms.SdkSmsForm
;
import
com.zrqx.core.form.third.sms.SmsForm
;
import
com.zrqx.core.form.third.sms.SmsForm
;
import
com.zrqx.core.model.member.ExpertMember
;
import
com.zrqx.core.model.member.Member
;
import
com.zrqx.core.model.member.Member
;
import
com.zrqx.core.model.member.Organ
;
import
com.zrqx.core.model.member.Organ
;
import
com.zrqx.core.model.member.OrganMember
;
import
com.zrqx.core.model.member.OrganMember
;
...
@@ -37,9 +35,7 @@ import com.zrqx.core.util.response.CallBack;
...
@@ -37,9 +35,7 @@ import com.zrqx.core.util.response.CallBack;
import
com.zrqx.core.vo.member.RedisMember
;
import
com.zrqx.core.vo.member.RedisMember
;
import
com.zrqx.core.vo.member.fg.personalcenter.MemberInfo
;
import
com.zrqx.core.vo.member.fg.personalcenter.MemberInfo
;
import
com.zrqx.member.commons.redis.Redis
;
import
com.zrqx.member.commons.redis.Redis
;
import
com.zrqx.member.fg.client.third.SdkSmsClient
;
import
com.zrqx.member.fg.client.third.SmsClient
;
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.member.service.FgMemberService
;
import
com.zrqx.member.fg.omember.service.FgOrganMemberService
;
import
com.zrqx.member.fg.omember.service.FgOrganMemberService
;
import
com.zrqx.member.fg.organ.service.FgOrganService
;
import
com.zrqx.member.fg.organ.service.FgOrganService
;
...
@@ -62,10 +58,6 @@ public class PersonalCenterConteroller {
...
@@ -62,10 +58,6 @@ public class PersonalCenterConteroller {
@Autowired
@Autowired
private
FgPersonalMemberService
pmService
;
private
FgPersonalMemberService
pmService
;
@Autowired
@Autowired
private
FgExpertMemberService
emService
;
@Autowired
private
SdkSmsClient
sdkSmsClient
;
@Autowired
private
SmsClient
smsClient
;
private
SmsClient
smsClient
;
@Autowired
@Autowired
private
Redis
redis
;
private
Redis
redis
;
...
@@ -73,6 +65,8 @@ public class PersonalCenterConteroller {
...
@@ -73,6 +65,8 @@ public class PersonalCenterConteroller {
private
FgOrganMemberService
omService
;
private
FgOrganMemberService
omService
;
@Autowired
@Autowired
private
FgOrganService
oService
;
private
FgOrganService
oService
;
@Autowired
protected
CacheService
cacheService
;
@ApiOperation
(
value
=
"个人信息-查询"
,
notes
=
"0:成功;"
)
@ApiOperation
(
value
=
"个人信息-查询"
,
notes
=
"0:成功;"
)
@GetMapping
(
value
=
MemberRequestPath
.
GET
+
MemberRequestPath
.
MEMBER
)
@GetMapping
(
value
=
MemberRequestPath
.
GET
+
MemberRequestPath
.
MEMBER
)
...
@@ -151,6 +145,8 @@ public class PersonalCenterConteroller {
...
@@ -151,6 +145,8 @@ public class PersonalCenterConteroller {
@ApiOperation
(
value
=
"账户安全-更换手机号"
,
notes
=
"0:成功;"
)
@ApiOperation
(
value
=
"账户安全-更换手机号"
,
notes
=
"0:成功;"
)
@PostMapping
(
value
=
MemberRequestPath
.
UPDATE
+
MemberRequestPath
.
PHONE
)
@PostMapping
(
value
=
MemberRequestPath
.
UPDATE
+
MemberRequestPath
.
PHONE
)
public
CallBack
<
String
>
updatePhone
(
@RequestBody
UpdatePhoneForm
form
)
throws
IOException
{
public
CallBack
<
String
>
updatePhone
(
@RequestBody
UpdatePhoneForm
form
)
throws
IOException
{
RedisMember
redisMember
=
redis
.
getNotNullRedisMember
();
final
Member
thirdMember
=
mService
.
notNull
(
redisMember
.
getMember
().
getId
());
Example
example
=
mService
.
createExample
();
Example
example
=
mService
.
createExample
();
example
.
createCriteria
().
andEqualTo
(
"phone"
,
form
.
getPhone
());
example
.
createCriteria
().
andEqualTo
(
"phone"
,
form
.
getPhone
());
if
(
mService
.
selectCountByExample
(
example
)
!=
0
)
{
if
(
mService
.
selectCountByExample
(
example
)
!=
0
)
{
...
@@ -168,9 +164,8 @@ public class PersonalCenterConteroller {
...
@@ -168,9 +164,8 @@ public class PersonalCenterConteroller {
m
.
setPhone
(
form
.
getPhone
());
m
.
setPhone
(
form
.
getPhone
());
mService
.
updateByPrimaryKeySelective
(
m
);
mService
.
updateByPrimaryKeySelective
(
m
);
// 更新redis
// 更新redis
memberInfo
.
setPhone
(
form
.
getPhone
());
thirdMember
.
setPhone
(
form
.
getPhone
());
RedisMember
redisMember
=
new
RedisMember
();
redisMember
.
setMember
(
thirdMember
);
redisMember
.
setMember
(
memberInfo
);
redis
.
setRedisMember
(
redisMember
);
redis
.
setRedisMember
(
redisMember
);
return
CallBack
.
success
(
"成功"
);
return
CallBack
.
success
(
"成功"
);
}
}
...
@@ -179,9 +174,13 @@ public class PersonalCenterConteroller {
...
@@ -179,9 +174,13 @@ public class PersonalCenterConteroller {
@GetMapping
(
value
=
MemberRequestPath
.
CODE_PHONE
)
@GetMapping
(
value
=
MemberRequestPath
.
CODE_PHONE
)
public
CallBack
<
String
>
code
(
String
phone
)
throws
Exception
{
public
CallBack
<
String
>
code
(
String
phone
)
throws
Exception
{
Member
memberInfo
=
redis
.
getMember
();
Member
memberInfo
=
redis
.
getMember
();
RedisMember
redisMember
=
redis
.
getNotNullRedisMember
();
if
(
phone
.
equals
(
memberInfo
.
getPhone
()))
{
if
(
phone
.
equals
(
memberInfo
.
getPhone
()))
{
throw
new
BaseException
(
15
,
"不能修改成当前手机号"
);
throw
new
BaseException
(
15
,
"不能修改成当前手机号"
);
}
}
final
Member
thirdMember
=
mService
.
notNull
(
redisMember
.
getMember
().
getId
());
Example
example
=
mService
.
createExample
();
Example
example
=
mService
.
createExample
();
example
.
createCriteria
().
andEqualTo
(
"phone"
,
phone
);
example
.
createCriteria
().
andEqualTo
(
"phone"
,
phone
);
if
(
mService
.
selectCountByExample
(
example
)
!=
0
)
{
if
(
mService
.
selectCountByExample
(
example
)
!=
0
)
{
...
@@ -205,6 +204,10 @@ public class PersonalCenterConteroller {
...
@@ -205,6 +204,10 @@ public class PersonalCenterConteroller {
ssf
.
setType
(
1
);
ssf
.
setType
(
1
);
String
sms
=
smsClient
.
sendSms
(
ssf
);
String
sms
=
smsClient
.
sendSms
(
ssf
);
if
(
sms
!=
null
)
{
if
(
sms
!=
null
)
{
// 更新redis
thirdMember
.
setPhone
(
phone
);
redisMember
.
setMember
(
thirdMember
);
redis
.
setRedisMember
(
redisMember
);
redis
.
set
(
phone
,
code
,
60
*
5
,
TimeUnit
.
SECONDS
);
redis
.
set
(
phone
,
code
,
60
*
5
,
TimeUnit
.
SECONDS
);
sendPhoneCount
=
StringUtils
.
isBlank
(
sendPhoneCount
)
?
"1"
:
Integer
.
parseInt
(
sendPhoneCount
)
+
1
+
""
;
sendPhoneCount
=
StringUtils
.
isBlank
(
sendPhoneCount
)
?
"1"
:
Integer
.
parseInt
(
sendPhoneCount
)
+
1
+
""
;
redis
.
set
(
key
,
sendPhoneCount
,
60
*
5
);
redis
.
set
(
key
,
sendPhoneCount
,
60
*
5
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论