Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
liyeyun-user-web
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
cfld-backend
liyeyun-user-web
Commits
7e5a9244
Commit
7e5a9244
authored
Dec 06, 2023
by
yaobaizheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
在登陆时将个人信息一起返回
parent
1b5819a4
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
56 additions
and
14 deletions
+56
-14
SysPcLoginController.java
...yy/user/moudle/login/controller/SysPcLoginController.java
+2
-2
SysUserController.java
...om/lyy/user/moudle/user/controller/SysUserController.java
+2
-1
SysUserInfoService.java
.../com/lyy/user/moudle/user/service/SysUserInfoService.java
+3
-3
SysUserInfoServiceImpl.java
...user/moudle/user/service/impl/SysUserInfoServiceImpl.java
+22
-8
UserInfoVo.java
src/main/java/com/lyy/user/moudle/user/vo/UserInfoVo.java
+27
-0
No files found.
src/main/java/com/lyy/user/moudle/login/controller/SysPcLoginController.java
View file @
7e5a9244
...
...
@@ -28,7 +28,7 @@ public class SysPcLoginController {
*/
@PostMapping
(
"/login"
)
@ApiOperation
(
value
=
"密码登录"
)
public
String
login
(
@Validated
@RequestBody
LoginVo
loginVo
)
{
public
UserInfoVo
login
(
@Validated
@RequestBody
LoginVo
loginVo
)
{
return
this
.
sysUserInfoService
.
loginPc
(
loginVo
);
}
...
...
@@ -42,7 +42,7 @@ public class SysPcLoginController {
// 测试手机格式
@PostMapping
(
"/phoneLogin"
)
@ApiOperation
(
value
=
"手机号登录"
,
notes
=
"手机号登录"
)
public
String
phoneLogin
(
@Validated
@RequestBody
PhoneLoginVo
phoneLoginVo
)
{
public
UserInfoVo
phoneLogin
(
@Validated
@RequestBody
PhoneLoginVo
phoneLoginVo
)
{
return
sysUserInfoService
.
phoneLogin
(
phoneLoginVo
);
}
...
...
src/main/java/com/lyy/user/moudle/user/controller/SysUserController.java
View file @
7e5a9244
...
...
@@ -4,6 +4,7 @@ import com.lyy.user.domain.JwtInfo;
import
com.lyy.user.enums.SendMsgTypeEnum
;
import
com.lyy.user.moudle.user.service.SysUserInfoService
;
import
com.lyy.user.moudle.user.vo.ForgetVo
;
import
com.lyy.user.moudle.user.vo.UserInfoVo
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.RequiredArgsConstructor
;
...
...
@@ -58,7 +59,7 @@ public class SysUserController {
*/
@PostMapping
(
"/detail"
)
@ApiOperation
(
value
=
"获取用户信息"
)
public
JwtInf
o
detail
()
{
public
UserInfoV
o
detail
()
{
return
this
.
sysUserInfoService
.
detail
();
}
}
src/main/java/com/lyy/user/moudle/user/service/SysUserInfoService.java
View file @
7e5a9244
...
...
@@ -20,14 +20,14 @@ public interface SysUserInfoService extends IService<SysUserInfo> {
* @param: [loginVo]
* @return: java.lang.String
**/
String
loginPc
(
LoginVo
loginVo
);
UserInfoVo
loginPc
(
LoginVo
loginVo
);
/**
* @description: pc 手机端登录
* @date: 2023/11/16 17:46
* @param: [phoneLoginVo]
* @return: java.lang.String
**/
String
phoneLogin
(
PhoneLoginVo
phoneLoginVo
);
UserInfoVo
phoneLogin
(
PhoneLoginVo
phoneLoginVo
);
/**
* @description: 退出登录
* @date: 2023/11/16 18:14
...
...
@@ -66,5 +66,5 @@ public interface SysUserInfoService extends IService<SysUserInfo> {
* @param: [token]
* @return: String
**/
JwtInf
o
detail
();
UserInfoV
o
detail
();
}
src/main/java/com/lyy/user/moudle/user/service/impl/SysUserInfoServiceImpl.java
View file @
7e5a9244
package
com
.
lyy
.
user
.
moudle
.
user
.
service
.
impl
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.date.DateTime
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.util.RandomUtil
;
...
...
@@ -89,7 +90,7 @@ public class SysUserInfoServiceImpl extends ServiceImpl<SysUserInfoMapper, SysUs
* @return: java.lang.String token
*/
@Override
public
String
loginPc
(
LoginVo
loginVo
)
{
public
UserInfoVo
loginPc
(
LoginVo
loginVo
)
{
LambdaQueryWrapper
<
SysUserInfo
>
userQuery
=
new
LambdaQueryWrapper
<>();
userQuery
.
eq
(
SysUserInfo:
:
getPhonenumber
,
loginVo
.
getPhone
());
SysUserInfo
sysUserInfo
=
this
.
getOne
(
userQuery
);
...
...
@@ -108,7 +109,14 @@ public class SysUserInfoServiceImpl extends ServiceImpl<SysUserInfoMapper, SysUs
token
,
Constants
.
expireTime
,
TimeUnit
.
SECONDS
);
return
token
;
//将用户基本信息一起返回
UserInfoVo
userInfoVo
=
new
UserInfoVo
()
.
setUserId
(
sysUserInfo
.
getUserId
())
.
setPhone
(
StringUtils
.
overlay
(
sysUserInfo
.
getPhonenumber
(),
"****"
,
3
,
7
))
.
setToken
(
token
);
return
userInfoVo
;
}
/**
...
...
@@ -118,7 +126,7 @@ public class SysUserInfoServiceImpl extends ServiceImpl<SysUserInfoMapper, SysUs
* @return: java.lang.String
*/
@Override
public
String
phoneLogin
(
PhoneLoginVo
phoneLoginVo
)
{
public
UserInfoVo
phoneLogin
(
PhoneLoginVo
phoneLoginVo
)
{
LambdaQueryWrapper
<
SysUserInfo
>
lambdaQueryWrapper
=
new
LambdaQueryWrapper
<>();
lambdaQueryWrapper
.
eq
(
SysUserInfo:
:
getPhonenumber
,
phoneLoginVo
.
getPhone
());
SysUserInfo
sysUserInfo
=
this
.
getOne
(
lambdaQueryWrapper
);
...
...
@@ -140,7 +148,13 @@ public class SysUserInfoServiceImpl extends ServiceImpl<SysUserInfoMapper, SysUs
token
,
Constants
.
expireTime
,
TimeUnit
.
SECONDS
);
return
token
;
//将用户基本信息一起返回
UserInfoVo
userInfoVo
=
new
UserInfoVo
()
.
setUserId
(
sysUserInfo
.
getUserId
())
.
setPhone
(
StringUtils
.
overlay
(
sysUserInfo
.
getPhonenumber
(),
"****"
,
3
,
7
))
.
setToken
(
token
);
return
userInfoVo
;
}
/**
* @description: 获取验证码 如果需要类型 则在key上拼接 type :Constants.MSG_KEY + sendPhoneVo.getType() + ":" +
...
...
@@ -330,11 +344,11 @@ public class SysUserInfoServiceImpl extends ServiceImpl<SysUserInfoMapper, SysUs
}
@Override
public
JwtInf
o
detail
()
{
public
UserInfoV
o
detail
()
{
JwtInfo
jwtUser
=
BaseContextHandler
.
getCurrentUserInfo
();
jwtUser
.
setPhone
(
StringUtils
.
overlay
(
jwtUser
.
getPhone
(),
"****"
,
3
,
7
)
);
jwtUser
.
setUserId
(
null
);
return
jwtUser
;
UserInfoVo
userInfoVo
=
BeanUtil
.
copyProperties
(
jwtUser
,
UserInfoVo
.
class
);
userInfoVo
.
setPhone
(
StringUtils
.
overlay
(
jwtUser
.
getPhone
(),
"****"
,
3
,
7
)
);
return
userInfoVo
;
}
private
void
check
(
String
phone
)
{
...
...
src/main/java/com/lyy/user/moudle/user/vo/UserInfoVo.java
0 → 100644
View file @
7e5a9244
package
com
.
lyy
.
user
.
moudle
.
user
.
vo
;
import
lombok.*
;
import
lombok.experimental.Accessors
;
/**
* @author: zhouxudong
* @version: 1.0
* @createTime: 2023/11/17 17:13
* @description: jwt 信息
*/
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@ToString
@Accessors
(
chain
=
true
)
public
class
UserInfoVo
{
/** 人员id */
private
Integer
userId
;
/** 手机号 */
private
String
phone
;
private
String
token
;
}
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