Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 5bcdc36a
authored
Jul 11, 2023
by
chamberone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: fix null error
1 parent
8471d110
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
project-user/src/main/java/com/dituhui/pea/user/controller/UserController.java
project-user/src/main/java/com/dituhui/pea/user/service/UserService.java
project-user/src/main/java/com/dituhui/pea/user/controller/UserController.java
View file @
5bcdc36
...
...
@@ -13,7 +13,6 @@ import com.dituhui.pea.enums.ThirdPartyEnum;
import
com.dituhui.pea.pojo.ThirdUserInfo
;
import
com.dituhui.pea.pojo.UserAuthInfo
;
import
com.dituhui.pea.pojo.UserInfo
;
import
com.dituhui.pea.pojo.UserLoginDTO
;
import
com.dituhui.pea.pojo.UserLoginParam
;
import
com.dituhui.pea.pojo.WebResult
;
import
com.dituhui.pea.user.IUser
;
...
...
@@ -35,10 +34,13 @@ public class UserController implements IUser {
@Autowired
private
RedisService
redisService
;
@Override
public
Result
<?>
userLogin
(
UserLoginParam
user
)
{
System
.
out
.
println
(
user
.
toString
());
return
userService
.
userLogin
(
user
.
getAccount
(),
user
.
getPassword
());
}
@Override
public
Result
<?>
getUserInfo
(
String
token
)
{
return
userService
.
getUserInfo
(
token
);
}
...
...
project-user/src/main/java/com/dituhui/pea/user/service/UserService.java
View file @
5bcdc36
...
...
@@ -60,7 +60,6 @@ public class UserService {
public
Result
<?>
userLogin
(
String
account
,
String
password
)
{
UserEntity
user
=
userDao
.
findByAccountAndPassword
(
account
,
SecureUtil
.
md5
(
password
));
System
.
out
.
println
(
account
+
" : "
+
password
+
" : "
+
SecureUtil
.
md5
(
password
));
log
.
info
(
"{}:{}:{}:{}"
,
account
,
password
,
SecureUtil
.
md5
(
password
),
user
);
if
(
null
!=
user
)
{
// 生成token
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment