Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
V
volunteer_service
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
licc
volunteer_service
Commits
56371e55
Commit
56371e55
authored
Jan 22, 2021
by
licc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改用户登录返回结果
parent
650b2c9f
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
UserLoginService.java
.../main/java/cn/wisenergy/service/app/UserLoginService.java
+1
-1
UserLoginServiceImpl.java
...a/cn/wisenergy/service/app/impl/UserLoginServiceImpl.java
+6
-2
PayRecordController.java
...senergy/web/admin/controller/app/PayRecordController.java
+1
-1
UserLoginController.java
...senergy/web/admin/controller/app/UserLoginController.java
+1
-1
No files found.
wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLoginService.java
View file @
56371e55
...
...
@@ -27,7 +27,7 @@ public interface UserLoginService {
* @param userLoginVo 登录信息
* @return true 成功 false 失败
*/
R
<
Boolean
>
loginCode
(
UserLoginVo
userLoginVo
);
R
<
UserInfoVo
>
loginCode
(
UserLoginVo
userLoginVo
);
/**
* 手机-密码登录
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLoginServiceImpl.java
View file @
56371e55
...
...
@@ -93,7 +93,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
}
@Override
public
R
<
Boolean
>
loginCode
(
UserLoginVo
userVo
)
{
public
R
<
UserInfoVo
>
loginCode
(
UserLoginVo
userVo
)
{
log
.
info
(
"volunteer-service[]UserLoginServiceImpl[]loginCode[]input.param.userVo:"
+
userVo
);
if
(
null
==
userVo
||
StringUtils
.
isBlank
(
userVo
.
getPhone
())
||
StringUtils
.
isBlank
(
userVo
.
getCode
())
||
StringUtils
.
isBlank
(
userVo
.
getType
())
||
null
==
userVo
.
getScene
())
{
...
...
@@ -111,7 +111,11 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
//2、判断验证码是否正确
boolean
bool
=
sendSmsSerVice
.
validCode
(
userVo
.
getPhone
(),
userVo
.
getCode
(),
userVo
.
getScene
());
return
R
.
ok
(
bool
);
UserInfoVo
userInfoVo
=
new
UserInfoVo
();
userInfoVo
.
setUserId
(
user
.
getId
());
userInfoVo
.
setUserName
(
user
.
getUserName
());
userInfoVo
.
setPhone
(
user
.
getPhone
());
return
R
.
ok
(
userInfoVo
);
}
@Override
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/PayRecordController.java
View file @
56371e55
...
...
@@ -47,7 +47,7 @@ public class PayRecordController {
@ApiOperation
(
value
=
"获取充值记录列表"
,
notes
=
"获取充值记录列表"
,
httpMethod
=
"GET"
)
@ApiImplicitParam
(
name
=
"payVo"
,
value
=
"充值记录查询参数"
,
dataType
=
"PayRecord"
)
@GetMapping
(
"/getList"
)
public
R
<
PageInfo
<
PayRecordShowVo
>>
getList
(
@RequestBody
PayRecordQueryVo
payVo
)
{
public
R
<
PageInfo
<
PayRecordShowVo
>>
getList
(
PayRecordQueryVo
payVo
)
{
log
.
info
(
"volunteer-service[]PayRecordController[]getList[]input.param.payVo:"
+
payVo
);
if
(
null
==
payVo
)
{
return
R
.
error
(
"入参为空!"
);
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserLoginController.java
View file @
56371e55
...
...
@@ -53,7 +53,7 @@ public class UserLoginController {
@ApiOperation
(
value
=
"用户验证码登录"
,
notes
=
"用户验证码登录"
,
httpMethod
=
"POST"
)
@ApiImplicitParam
(
name
=
"userVo"
,
value
=
"用户信息"
,
dataType
=
"UserLoginVo"
)
@PostMapping
(
"/loginCode"
)
public
R
<
Boolean
>
loginCode
(
@RequestBody
UserLoginVo
userVo
)
{
public
R
<
UserInfoVo
>
loginCode
(
@RequestBody
UserLoginVo
userVo
)
{
log
.
info
(
"volunteer-service[]UserLongController[]loginCode[]input.param.userVo:"
+
userVo
);
if
(
null
==
userVo
||
StringUtils
.
isBlank
(
userVo
.
getPhone
())
||
StringUtils
.
isBlank
(
userVo
.
getCode
())
||
...
...
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